Cadoles/ninegate
21
0
Fork 0
Code Issues 29 Pull Requests Projects 1 Releases Wiki Activity

svg

Browse Source
This commit is contained in:
afornerot
2019-07-26 13:29:58 +02:00
parent c5bb701330
commit 2fea902837
6 changed files with 75 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ninegate-1.0/src/Cadoles/CoreBundle/Command/data/core-init-01.sql
View File

@ -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');

6
src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/js/local.js
View File

@ -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) {
}
});
}
*/
});

3
src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewchat.html.twig
View File

@ -46,11 +46,12 @@
<span class="title">{{ entity.name }}</span>
</div>
<div class="widgetbody" style="{{ stylewidgetbody }}">
<div class="widgetbody" style="{{ stylewidgetbodyframe }}">
{{ render(url('cadoles_websocket_chat',{'id':group,'framed':true,'border':entity.border,'colorbodybacklight':colorbodyback, 'colorbodyback':colorbodyback,'colorbodyfont':colorbodyfont})) }}
<!--
<iframe src="{{ path(tool,{'id':group,'framed':true,'border':entity.border,'colorbodybacklight':colorbodyback, 'colorbodyback':colorbodyback,'colorbodyfont':colorbodyfont}) }}" class="{% if entity.autoajust %}frameajust {% endif %}"></iframe>
-->
</div>
{% endif %}
</div>

12
src/ninegate-1.0/src/Cadoles/WebsocketBundle/Form/ChatType.php
View File

@ -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']
]);
}

32
src/ninegate-1.0/src/Cadoles/WebsocketBundle/Resources/views/Chat/client.html.twig
View File

@ -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 %}
<script src="/{{alias}}/bundles/goswebsocket/js/vendor/autobahn.min.js"></script>
<script src="/{{alias}}/bundles/goswebsocket/js/gos_web_socket_client.js"></script>
<script type="text/javascript" src="/{{alias}}/ckeditor/adapters/jquery.js"></script>
{% 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 %}