From 3b1bff07109926ce876fb62fcc4f7dcac1ad3fa6 Mon Sep 17 00:00:00 2001 From: afornerot Date: Mon, 9 Dec 2019 13:38:25 +0100 Subject: [PATCH] correction --- .../src/Cadoles/CoreBundle/Command/OnlyCommand.php | 4 ++-- .../src/Cadoles/CoreBundle/Command/data/core-init-01.sql | 2 +- .../src/Cadoles/WebsocketBundle/Form/ChatType.php | 4 +++- .../WebsocketBundle/Resources/views/Chat/client.html.twig | 2 -- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Command/OnlyCommand.php b/src/ninegate-1.0/src/Cadoles/CoreBundle/Command/OnlyCommand.php index b7afb6bb..65816bd1 100644 --- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Command/OnlyCommand.php +++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Command/OnlyCommand.php @@ -102,8 +102,8 @@ class OnlyCommand extends Command $this->only_url = $this->container->getParameter("widonlyoffice_url")."/api/2.0/"; $this->only_host = str_replace("https://","",str_replace("http://","",$this->container->getParameter("widonlyoffice_url"))); - $this->only_url = "https://transnum.oo.ac-dijon.fr"."/api/2.0/"; - $this->only_host = "transnum.oo.ac-dijon.fr"; + //$this->only_url = "https://transnum.oo.ac-dijon.fr"."/api/2.0/"; + //$this->only_host = "transnum.oo.ac-dijon.fr"; $this->only_user = $this->container->getParameter("widonlyoffice_user"); $this->only_password = $this->container->getParameter("widonlyoffice_password"); 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 caefbf5f..fcd8b6ba 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}6YNXtIHaQ6w62Z/IFo4Ux8oRFfg3LpIf +(-100, -100, 'admin', 'Administrateur', 'draaf', '{SSHA}7edyZMIwG4aTOpc6rVXCWrDljOW5K9xW ', 'admin@ldapbundle.ac-arno.fr', 'admin.jpg', 'ROLE_ADMIN', '130007107', 'simple'); 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 ee96a556..a2f46aeb 100644 --- a/src/ninegate-1.0/src/Cadoles/WebsocketBundle/Form/ChatType.php +++ b/src/ninegate-1.0/src/Cadoles/WebsocketBundle/Form/ChatType.php @@ -29,7 +29,8 @@ class ChatType extends AbstractType 'label' => "Message", 'mapped'=> false, 'required' => false, - 'config' => ["height" => "100px",'filebrowserUploadRoute' => 'cadoles_portal_user_pagewidget_upload'], + 'attr' => array("class" => "form-control", "style" => "margin-bottom:15px"), + 'config' => ["height" => "100px",'filebrowserUploadRoute' => 'cadoles_portal_user_pagewidget_upload',], ]); $builder @@ -38,6 +39,7 @@ class ChatType extends AbstractType 'label' => "Message", 'mapped'=> false, 'required' => false, + 'attr' => array("class" => "form-control", "style" => "margin-bottom:15px"), 'config' => ["height" => "150px",'filebrowserUploadRoute' => 'cadoles_portal_user_pagewidget_upload'] ]); } diff --git a/src/ninegate-1.0/src/Cadoles/WebsocketBundle/Resources/views/Chat/client.html.twig b/src/ninegate-1.0/src/Cadoles/WebsocketBundle/Resources/views/Chat/client.html.twig index 132bab28..87f21ffb 100644 --- a/src/ninegate-1.0/src/Cadoles/WebsocketBundle/Resources/views/Chat/client.html.twig +++ b/src/ninegate-1.0/src/Cadoles/WebsocketBundle/Resources/views/Chat/client.html.twig @@ -214,7 +214,6 @@ {% endif %} $(document).ready(function(){ - /* if (CKEDITOR.instances["chat_message"]) CKEDITOR.instances["chat_message"].destroy(); if (CKEDITOR.instances["chat_messagemail"]) CKEDITOR.instances["chat_messagemail"].destroy(); @@ -237,7 +236,6 @@ height: 150 }); },1000); - */ $(".switch").bootstrapSwitch(); $("#mymodal-sendmail").removeAttr("tabindex");