+
{{ 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