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

View File

@ -28,6 +28,7 @@
<variable name="activer_eportail" type="oui/non" description="Activer ePortail" hidden='True' exists='False'><value>non</value></variable>
<variable name="activer_limesurvey" type="oui/non" description="Activer Limesurvey" hidden='True' exists='False'><value>non</value></variable>
<variable name="activer_moodle" type="oui/non" description="Activer Moodle" hidden='True' exists='False'><value>non</value></variable>
<variable name="activer_nextcloud" type="oui/non" description="Activer Nextcloud" hidden='True' exists='False'><value>non</value></variable>
<variable name="activer_opensondage" type="oui/non" description="Activer Opensondage" hidden='True' exists='False'><value>non</value></variable>
<variable name="activer_piwik" type="oui/non" description="Activer Piwik" hidden='True' exists='False'><value>non</value></variable>
<variable name="activer_sondepiwik_local" type="oui/non" description="Activer Sonde Piwik" hidden='True' exists='False'><value>non</value></variable>
@ -144,6 +145,12 @@
<variable type='string' name='ninegate_widmoodle_apikey' description='API Key de votre Moodle' mandatory='True' />
<variable type='string' name='ninegate_widmoodle_syncenvole' description='URL Posh-Profil pour synchronisation Moodle' mandatory='True' />
<!-- NEXTCLOUD -->
<variable type="oui/non" name='ninegate_activate_widnextcloud' description='Activer le widget Nextcloud' mandatory='True'>
<value>non</value>
</variable>
<variable type='string' name='ninegate_widnextcloud_url' description='URL complète de votre Nextcloud' mandatory='True' />
<!-- OPENSONDAGE -->
<variable type="oui/non" name='ninegate_activate_widopensondage' description='Activer le widget Opensondage' mandatory='True'>
<value>non</value>
@ -348,6 +355,7 @@
<target type='variable'>ninegate_activate_widlimesurvey</target>
<target type='variable'>ninegate_activate_widmoodle</target>
<target type='variable'>ninegate_activate_widnextcloud</target>
<target type='variable'>ninegate_activate_widopensondage</target>
<target type='variable'>ninegate_activate_widpiwik</target>
<target type='variable'>ninegate_activate_widwordpress</target>
@ -487,6 +495,31 @@
<!-- AFFICHAGE EN FONCTION DU WIDGET NEXTCLOUD -->
<fill name='calc_multi_condition' target='ninegate_activate_widnextcloud'>
<param>oui</param>
<param type='eole' name='condition_1' hidden='False'>activer_nextcloud</param>
<param name='match'>oui</param>
<param name='mismatch'>non</param>
<param name='default_mismatch'>non</param>
</fill>
<condition name='hidden_if_in' source='ninegate_activate_widnextcloud'>
<param>non</param>
<target type='variable'>ninegate_widnextcloud_url</target>
</condition>
<fill name='calc_multi_condition' target='ninegate_widnextcloud_url'>
<param>oui</param>
<param type='eole' name='condition_1' hidden='False'>activer_nextcloud</param>
<param name='match'>/nextcloud</param>
<param name='default_mismatch'>None</param>
</fill>
<!-- AFFICHAGE EN FONCTION DU WIDGET OPENSONDAGE -->
<fill name='calc_multi_condition' target='ninegate_activate_widopensondage'>
<param>oui</param>

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

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

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>

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

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 %}