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 00000000..6e702082 Binary files /dev/null and b/src/ninegate-1.0/web/uploads/icon/icon_nextcloud.png differ 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