From 2fea902837ce2ec33ced97de70ca3270bc1a0377 Mon Sep 17 00:00:00 2001 From: afornerot Date: Fri, 26 Jul 2019 13:29:58 +0200 Subject: [PATCH] svg --- dicos/90_ninegate.xml | 33 +++++++++++++++++++ .../CoreBundle/Command/data/core-init-01.sql | 2 +- .../CoreBundle/Resources/public/js/local.js | 6 ++-- .../views/Pagewidget/viewchat.html.twig | 3 +- .../Cadoles/WebsocketBundle/Form/ChatType.php | 12 +++++-- .../Resources/views/Chat/client.html.twig | 32 +++++++++++++++--- 6 files changed, 75 insertions(+), 13 deletions(-) diff --git a/dicos/90_ninegate.xml b/dicos/90_ninegate.xml index 1fd67d00..21c4dfce 100644 --- a/dicos/90_ninegate.xml +++ b/dicos/90_ninegate.xml @@ -28,6 +28,7 @@ + @@ -144,6 +145,12 @@ + + + non + + + non @@ -348,6 +355,7 @@ ninegate_activate_widlimesurvey ninegate_activate_widmoodle + ninegate_activate_widnextcloud ninegate_activate_widopensondage ninegate_activate_widpiwik ninegate_activate_widwordpress @@ -487,6 +495,31 @@ + + + oui + activer_nextcloud + oui + non + non + + + + non + + ninegate_widnextcloud_url + + + + oui + activer_nextcloud + /nextcloud + None + + + + + oui 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 d8c7576c..2de7943d 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}ydZGT20kB14WfmeVQZVPRTfbbrX0ahPR +(-100, -100, 'admin', 'Administrateur', 'draaf', '{SSHA}Y6RhE3PXKWEdWAZEO+BbtDgjuF5wzJAM ', 'admin@ldapbundle.ac-arno.fr', 'admin.jpg', 'ROLE_ADMIN', '130007107', 'simple'); diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/js/local.js b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/js/local.js index 2df2a00c..e2a60078 100644 --- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/js/local.js +++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/js/local.js @@ -77,7 +77,6 @@ $(document).on('ready', function(){ return false; }); - /* if( typeof CKEDITOR !== 'undefined') { CKEDITOR.on('dialogDefinition', function(ev) { try { @@ -89,15 +88,16 @@ $(document).on('ready', function(){ var targetField = informationTab.get('linkTargetType'); targetField['default'] = '_blank'; } - + + /* dialogDefinition.onShow = function() { this.move(this.getPosition().x,0); // Top center }; + */ } catch(exception) { } }); } - */ }); \ No newline at end of file diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewchat.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewchat.html.twig index fad31df1..b15fba9c 100644 --- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewchat.html.twig +++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewchat.html.twig @@ -46,11 +46,12 @@ {{ entity.name }} -
+
{{ render(url('cadoles_websocket_chat',{'id':group,'framed':true,'border':entity.border,'colorbodybacklight':colorbodyback, 'colorbodyback':colorbodyback,'colorbodyfont':colorbodyfont})) }} +
{% endif %}
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 f1eca332..e38623bf 100644 --- a/src/ninegate-1.0/src/Cadoles/WebsocketBundle/Form/ChatType.php +++ b/src/ninegate-1.0/src/Cadoles/WebsocketBundle/Form/ChatType.php @@ -25,11 +25,17 @@ class ChatType extends AbstractType { $builder ->add("message",CKEditorType::class,[ - 'config_name' => 'small_config', + 'config_name' => 'small_config', 'label' => "Message", 'mapped'=> false, 'required' => false, - 'config' => ["height" => "100px",'filebrowserUploadRoute' => 'cadoles_portal_user_pagewidget_upload'] + 'config' => ["height" => "100px",'filebrowserUploadRoute' => 'cadoles_portal_user_pagewidget_upload'], + 'plugins' => array( + 'wordcount' => array( + 'path' => '/ckeditor/plugins/divarea/', // with trailing slash + 'filename' => 'plugin.js', + ), + ), ]); $builder @@ -38,7 +44,7 @@ class ChatType extends AbstractType 'label' => "Message", 'mapped'=> false, 'required' => false, - 'config' => ["height" => "200px",'filebrowserUploadRoute' => 'cadoles_portal_user_pagewidget_upload'] + '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 45c5ea57..d1c39096 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 @@ -48,7 +48,7 @@ margin:0px 5px 5px 0px; cursor:pointer; } - #cke_1_bottom{ display:none } + .cke_bottom{ display:none } {% endblock %} {% block pagewrapper %} @@ -115,13 +115,35 @@ {% block localexternalscript %} + {% endblock %} {% block localjavascript %} $(document).ready(function(){ + if (CKEDITOR.instances["chat_message"]) CKEDITOR.instances["chat_message"].destroy(); + if (CKEDITOR.instances["chat_messagemail"]) CKEDITOR.instances["chat_messagemail"].destroy(); + + CKEDITOR.replace( 'chat_message', { + toolbar: [ + { name: 'custo01', items: [ 'Bold','Italic','Underline','RemoveFormat' ] }, + { name: 'custo02', items: [ 'NumberedList','BulletedList' ] }, + { name: 'custo03', items: [ 'Smiley','Link','Unlink' ]} + ], + height: 100 + }); + + CKEDITOR.replace( 'chat_messagemail', { + toolbar: [ + { name: 'custo01', items: [ 'Bold','Italic','Underline','RemoveFormat' ] }, + { name: 'custo02', items: [ 'NumberedList','BulletedList' ] }, + { name: 'custo03', items: [ 'Smiley','Link','Unlink' ]} + ], + height: 150 + }); + $(".switch").bootstrapSwitch(); var dateoptions = {weekday: "long", year: "numeric", month: "long", day: "numeric", hour: "2-digit", minute: "2-digit" }; - + $("#mymodal-sendmail").removeAttr("tabindex"); {% if websocket_activate and app.user %} var _WS_URI = "wss://{{ gos_web_socket_server_host }}:{{ gos_web_socket_server_port }}"; @@ -186,7 +208,7 @@ CKEDITOR.instances["chat_message"].setData(''); event={type: "add", group:{{groupid}}}; - parent.counter(event); + parent.parent.counter(event); } } }); @@ -202,7 +224,7 @@ CKEDITOR.instances["chat_message"].setData(''); event={type: "add", group:{{groupid}}}; - parent.counter(event); + parent.parent.counter(event); $("#sendbymail").bootstrapSwitch('state',false); $('#mymodal-sendmail').modal('hide'); @@ -223,7 +245,7 @@ $(this).remove(); }); }) - {% endif %} + {% endif %} }); {% endblock %} \ No newline at end of file