From 8147233340d2ffaa3585e99661b3593ae1a1437c Mon Sep 17 00:00:00 2001 From: afornerot Date: Fri, 26 Jul 2019 14:45:56 +0200 Subject: [PATCH] svg --- .../CoreBundle/Command/data/core-init-01.sql | 2 +- .../PortalBundle/Command/InitDataCommand.php | 23 +++++++++++++++++- .../Cadoles/WebsocketBundle/Form/ChatType.php | 6 ----- .../web/uploads/icon/icon_nextcloud.png | Bin 0 -> 7265 bytes tmpl/ninegate-template.yml | 7 ++++++ 5 files changed, 30 insertions(+), 8 deletions(-) create mode 100644 src/ninegate-1.0/web/uploads/icon/icon_nextcloud.png diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Command/data/core-init-01.sql b/src/ninegate-1.0/src/Cadoles/CoreBundle/Command/data/core-init-01.sql index 2de7943d..bd52f9ad 100644 --- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Command/data/core-init-01.sql +++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Command/data/core-init-01.sql @@ -8,7 +8,7 @@ INSERT IGNORE INTO `niveau01` (`id`, `label`, `siren`) VALUES (-100, 'DRAAF', '130007107'); INSERT IGNORE INTO `user` (`id`, `niveau01_id`, `username`, `firstname`, `lastname`, `password`, `email`, `avatar`, `role`,`siren`,`authlevel`) VALUES -(-100, -100, 'admin', 'Administrateur', 'draaf', '{SSHA}Y6RhE3PXKWEdWAZEO+BbtDgjuF5wzJAM +(-100, -100, 'admin', 'Administrateur', 'draaf', '{SSHA}7d5OuaGuX92B8iwYzkNe1P7C4reX07En ', 'admin@ldapbundle.ac-arno.fr', 'admin.jpg', 'ROLE_ADMIN', '130007107', 'simple'); diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Command/InitDataCommand.php b/src/ninegate-1.0/src/Cadoles/PortalBundle/Command/InitDataCommand.php index 8e912633..9d07c19e 100644 --- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Command/InitDataCommand.php +++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Command/InitDataCommand.php @@ -40,6 +40,7 @@ class InitDataCommand extends ContainerAwareCommand $activate_widlimesurvey = $this->getContainer()->getParameter('activate_widlimesurvey'); $activate_widmoodle = $this->getContainer()->getParameter('activate_widmoodle'); + $activate_widnextcloud = $this->getContainer()->getParameter('activate_widnextcloud'); $activate_widopensondage = $this->getContainer()->getParameter('activate_widopensondage'); $activate_widpiwik = $this->getContainer()->getParameter('activate_widpiwik'); $activate_widwordpress = $this->getContainer()->getParameter('activate_widwordpress'); @@ -335,7 +336,27 @@ class InitDataCommand extends ContainerAwareCommand $em->persist($entityItem); } - + // Item Nextcloud + if($activate_widnextcloud) { + $widnextcloud_url =$this->getContainer()->getParameter('widnextcloud_url'); + $entityItem = $em->getRepository('CadolesPortalBundle:Item')->find(-366); + if(!$entityItem) { + $entityicon = $em->getRepository('CadolesPortalBundle:Icon')->findoneby(["label"=>"uploads/icon/icon_nextcloud.png"]); + + $entityItem = new Item(); + $entityItem->setId(-366); + $entityItem->setRowOrder(0); + $entityItem->setTitle('Nextcloud'); + $entityItem->SetSubtitle("Stockage de Fichiers"); + $entityItem->setIcon($entityicon); + $entityItem->setColor("f15a22"); + $entityItem->setTarget("_blank"); + $entityItem->setItemcategory($entityItemcategoryapp); + } + $entityItem->setUrl($widnextcloud_url); + $em->persist($entityItem); + } + //== WIDGET ============================================================================================================================================ $output->writeln(' > Creation Widget'); diff --git a/src/ninegate-1.0/src/Cadoles/WebsocketBundle/Form/ChatType.php b/src/ninegate-1.0/src/Cadoles/WebsocketBundle/Form/ChatType.php index e38623bf..ee96a556 100644 --- a/src/ninegate-1.0/src/Cadoles/WebsocketBundle/Form/ChatType.php +++ b/src/ninegate-1.0/src/Cadoles/WebsocketBundle/Form/ChatType.php @@ -30,12 +30,6 @@ class ChatType extends AbstractType 'mapped'=> false, 'required' => false, 'config' => ["height" => "100px",'filebrowserUploadRoute' => 'cadoles_portal_user_pagewidget_upload'], - 'plugins' => array( - 'wordcount' => array( - 'path' => '/ckeditor/plugins/divarea/', // with trailing slash - 'filename' => 'plugin.js', - ), - ), ]); $builder diff --git a/src/ninegate-1.0/web/uploads/icon/icon_nextcloud.png b/src/ninegate-1.0/web/uploads/icon/icon_nextcloud.png new file mode 100644 index 0000000000000000000000000000000000000000..6e702082fa9bec466cc4c2561f0fd2a53bb12eed GIT binary patch literal 7265 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 literal 0 HcmV?d00001 diff --git a/tmpl/ninegate-template.yml b/tmpl/ninegate-template.yml index 9e470262..e42aa265 100644 --- a/tmpl/ninegate-template.yml +++ b/tmpl/ninegate-template.yml @@ -195,6 +195,13 @@ parameters: activate_widmoodle: false %end if +%if %%getVar("ninegate_activate_widnextcloud", 'non') == "oui" + activate_widnextcloud: true + widnextcloud_url: %%ninegate_widnextcloud_url +%else + activate_widnextcloud: false +%end if + %if %%getVar("ninegate_activate_widopensondage", 'non') == "oui" activate_widopensondage: true widopensondage_url: %%ninegate_widopensondage_url