From 4717b95efdf42592433184d17eb30962cefb7e53 Mon Sep 17 00:00:00 2001
From: afornerot <afornerot@cadoles.com>
Date: Tue, 26 Nov 2019 09:24:11 +0100
Subject: [PATCH] bouton plus sur widget blog et calendar

---
 dicos/90_ninegate.xml                         | 174 +++++++++++++++++-
 .../CoreBundle/Command/data/core-init-01.sql  |   2 +-
 .../views/Pagewidget/viewblog.html.twig       |   4 +-
 .../views/Pagewidget/viewcalendar.html.twig   |   2 +-
 4 files changed, 176 insertions(+), 6 deletions(-)

diff --git a/dicos/90_ninegate.xml b/dicos/90_ninegate.xml
index 2fe6c736..f56ebf23 100644
--- a/dicos/90_ninegate.xml
+++ b/dicos/90_ninegate.xml
@@ -26,10 +26,15 @@
 
     <variables>
         <family name='Ninegate'>
+            <variable name="activer_adminer" type="oui/non" description="Activer Adminer" hidden='True' exists='False'><value>non</value></variable>
+            <variable name="activer_balado" type="oui/non" description="Activer Balado" hidden='True' exists='False'><value>non</value></variable>
+            <variable name="activer_dokuwiki" type="oui/non" description="Activer Dokuwiki" hidden='True' exists='False'><value>non</value></variable>
+            <variable name="activer_grr" type="oui/non" description="Activer Grr" 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_phpldapadmin" type="oui/non" description="Activer phpLdapAdmin" 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>
             <variable name="activer_wordpress" type="oui/non" description="Activer Wordpress" hidden='True' exists='False'><value>non</value></variable>
@@ -128,6 +133,30 @@
 
 
 
+            <!-- ADMINER -->
+            <variable type="oui/non" name='ninegate_activate_widadminer' description='Activer Adminer'  mandatory='True'>
+                <value>non</value>
+            </variable>
+            <variable type='string' name='ninegate_widadminer_url' description='URL complète de votre Adminer'  mandatory='True' />
+
+            <!-- BALADO -->
+            <variable type="oui/non" name='ninegate_activate_widbalado' description='Activer Balado'  mandatory='True'>
+                <value>non</value>
+            </variable>
+            <variable type='string' name='ninegate_widbalado_url' description='URL complète de votre Balado'  mandatory='True' />
+
+            <!-- DOKUWIKI -->
+            <variable type="oui/non" name='ninegate_activate_widdokuwiki' description='Activer Dokuwiki'  mandatory='True'>
+                <value>non</value>
+            </variable>
+            <variable type='string' name='ninegate_widdokuwiki_url' description='URL complète de votre dokuwiki'  mandatory='True' />
+
+            <!-- GRR -->
+            <variable type="oui/non" name='ninegate_activate_widgrr' description='Activer Grr'  mandatory='True'>
+                <value>non</value>
+            </variable>
+            <variable type='string' name='ninegate_widgrr_url' description='URL complète de votre Grr'  mandatory='True' />
+
             <!-- LIMESURVEY -->
             <variable type="oui/non" name='ninegate_activate_widlimesurvey' description='Activer Limesurvey'  mandatory='True'>
                 <value>non</value>
@@ -162,13 +191,18 @@
             <variable type='string' name='ninegate_widonlyoffice_user' description='Login admin de votre Onlyoffice'  mandatory='True' />
             <variable type='string' name='ninegate_widonlyoffice_password' description='Password admin de votre Onlyoffice'  mandatory='True' />
 
-
             <!-- OPENSONDAGE -->
             <variable type="oui/non" name='ninegate_activate_widopensondage' description='Activer Opensondage'  mandatory='True'>
                 <value>non</value>
             </variable>
             <variable type='string' name='ninegate_widopensondage_url' description='URL complète de votre Opensondage'  mandatory='True' />
 
+            <!-- PHPLDAPADMIN -->
+            <variable type="oui/non" name='ninegate_activate_widphpldapadmin' description='Activer phpLdapAdmin'  mandatory='True'>
+                <value>non</value>
+            </variable>
+            <variable type='string' name='ninegate_widphpldapadmin_url' description='URL complète de votre phpLdapAdmin'  mandatory='True' />
+
             <!-- PIWIK -->
             <variable type="oui/non" name='ninegate_activate_widpiwik' description='Activer Piwik'  mandatory='True'>
                 <value>non</value>
@@ -220,7 +254,18 @@
             <separator name="ninegate_syncldap">Paramètres associés à l'Annuaire</separator>
             <separator name="ninegate_niveau01label">Paramètres associés aux look de l'application</separator>
             <separator name="ninegate_activate_portal">Paramètres associés aux modules à activer</separator>
-            <separator name="ninegate_activate_widlimesurvey">Paramètres associés au Portail</separator>
+            <separator name="ninegate_activate_widadminer">Paramètres associés à Adminer</separator>
+            <separator name="ninegate_activate_widbalado">Paramètres associés à Balado</separator>
+            <separator name="ninegate_activate_widdokuwiki">Paramètres associés à Dokuwiki</separator>
+            <separator name="ninegate_activate_widgrr">Paramètres associés à Grr</separator>
+            <separator name="ninegate_activate_widlimesurvey">Paramètres associés à Limesurvey</separator>
+            <separator name="ninegate_activate_widmoodle">Paramètres associés à Moodle</separator>
+            <separator name="ninegate_activate_widnextcloud">Paramètres associés à Nextcloud</separator>
+            <separator name="ninegate_activate_widonlyoffice">Paramètres associés à Only Office</separator>
+            <separator name="ninegate_activate_widopensondage">Paramètres associés à Opensondage</separator>
+            <separator name="ninegate_activate_widphpldapadmin">Paramètres associés à phpLdapAdmin</separator>
+            <separator name="ninegate_activate_widpiwik">Paramètres associés à Piwik</separator>
+            <separator name="ninegate_activate_widwordpress">Paramètres associés à Wordpress</separator>
             <separator name="ninegate_websocket_url">Paramètres associés au Serveur WEBSOCKET</separator>
             <separator name="ninegate_noreply">Paramètres associés aux Mails</separator>
             <separator name="ninegate_db_mode">Paramètres associés à la Base de Données</separator>
@@ -359,11 +404,16 @@
         <condition name='hidden_if_in' source='ninegate_activate_portal'>
             <param>non</param>
 
+            <target type='variable'>ninegate_activate_widadminer</target>
+            <target type='variable'>ninegate_activate_widbalado</target>
+            <target type='variable'>ninegate_activate_widdokuwiki</target>
+            <target type='variable'>ninegate_activate_widgrr</target>
             <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_widonlyoffice</target>
             <target type='variable'>ninegate_activate_widopensondage</target>
+            <target type='variable'>ninegate_activate_widphpldapadmin</target>
             <target type='variable'>ninegate_activate_widpiwik</target>
             <target type='variable'>ninegate_activate_widwordpress</target>
         </condition>   
@@ -412,6 +462,101 @@
         </fill>
 
 
+        <!-- AFFICHAGE EN FONCTION DU WIDGET ADMINER -->
+        <fill name='calc_multi_condition' target='ninegate_activate_widadminer'>
+            <param>oui</param>
+            <param type='eole' name='condition_1' hidden='False'>activer_adminer</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_widadminer'>
+            <param>non</param>
+
+            <target type='variable'>ninegate_widadminer_url</target>
+        </condition>   
+
+        <fill name='calc_multi_condition' target='ninegate_widadminer_url'>
+            <param>oui</param>
+            <param type='eole' name='condition_1' hidden='False'>activer_adminer</param>
+            <param name='match'>/adminer</param>
+            <param name='default_mismatch'>None</param>
+        </fill>
+
+
+
+        <!-- AFFICHAGE EN FONCTION DU WIDGET BALDAO -->
+        <fill name='calc_multi_condition' target='ninegate_activate_widbalado'>
+            <param>oui</param>
+            <param type='eole' name='condition_1' hidden='False'>activer_balado</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_widbalado'>
+            <param>non</param>
+
+            <target type='variable'>ninegate_widbalado_url</target>
+        </condition>   
+
+        <fill name='calc_multi_condition' target='ninegate_widbalado_url'>
+            <param>oui</param>
+            <param type='eole' name='condition_1' hidden='False'>activer_balado</param>
+            <param name='match'>/balado</param>
+            <param name='default_mismatch'>None</param>
+        </fill>
+
+
+
+        <!-- AFFICHAGE EN FONCTION DU WIDGET DOKUWIKI -->
+        <fill name='calc_multi_condition' target='ninegate_activate_widdokuwiki'>
+            <param>oui</param>
+            <param type='eole' name='condition_1' hidden='False'>activer_dokuwiki</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_widdokuwiki'>
+            <param>non</param>
+
+            <target type='variable'>ninegate_widdokuwiki_url</target>
+        </condition>   
+
+        <fill name='calc_multi_condition' target='ninegate_widdokuwiki_url'>
+            <param>oui</param>
+            <param type='eole' name='condition_1' hidden='False'>activer_dokuwiki</param>
+            <param name='match'>/dokuwiki</param>
+            <param name='default_mismatch'>None</param>
+        </fill>
+
+
+
+        <!-- AFFICHAGE EN FONCTION DU WIDGET GRR -->
+        <fill name='calc_multi_condition' target='ninegate_activate_widgrr'>
+            <param>oui</param>
+            <param type='eole' name='condition_1' hidden='False'>activer_grr</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_widgrr'>
+            <param>non</param>
+
+            <target type='variable'>ninegate_widgrr_url</target>
+        </condition>   
+
+        <fill name='calc_multi_condition' target='ninegate_widgrr_url'>
+            <param>oui</param>
+            <param type='eole' name='condition_1' hidden='False'>activer_grr</param>
+            <param name='match'>/grr</param>
+            <param name='default_mismatch'>None</param>
+        </fill>
+
+
 
         <!-- AFFICHAGE EN FONCTION DU WIDGET LIMESURVEY -->
         <fill name='calc_multi_condition' target='ninegate_activate_widlimesurvey'>
@@ -570,6 +715,31 @@
 
 
 
+
+        <!-- AFFICHAGE EN FONCTION DU WIDGET PHPLDAPADMIN -->
+        <fill name='calc_multi_condition' target='ninegate_activate_widphpldapadmin'>
+            <param>oui</param>
+            <param type='eole' name='condition_1' hidden='False'>activer_phpldapadmin</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_widphpldapadmin'>
+            <param>non</param>
+
+            <target type='variable'>ninegate_widphpldapadmin_url</target>
+        </condition>   
+
+        <fill name='calc_multi_condition' target='ninegate_widphpldapadmin_url'>
+            <param>oui</param>
+            <param type='eole' name='condition_1' hidden='False'>activer_phpldapadmin</param>
+            <param name='match'>/phpldapadmin</param>
+            <param name='default_mismatch'>None</param>
+        </fill>
+        
+        
+        
         <!-- AFFICHAGE EN FONCTION DU WIDGET PIWIK -->
         <fill name='calc_multi_condition' target='ninegate_activate_widpiwik'>
             <param>oui</param>
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 35dd8bfa..2065bd21 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}UbfbjPUD5ncn2LZE/UFmvmhsi5Y5wiek
+(-100, -100, 'admin', 'Administrateur', 'draaf', '{SSHA}iSRVumfiVye8+j41aCmpruf4eQAhRoLe
 ', 'admin@ldapbundle.ac-arno.fr', 'admin.jpg', 'ROLE_ADMIN', '130007107', 'simple');
 
 
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewblog.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewblog.html.twig
index 6fe66f75..80fa0fc6 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewblog.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewblog.html.twig
@@ -26,14 +26,14 @@
         {% endif %}
         
         {% if access=="config" %}
-        <a href='{{ path('cadoles_portal_config_blog') }}' style="{{ stylewidgetmenu }}"><i class="fa fa-paper-plane fa-fw"></i></a>
+        <a href='{{ path('cadoles_portal_config_blog') }}' style="{{ stylewidgetmenu }}"><i class="fa fa-plus fa-fw"></i></a>
         {% else %}
         {% set idblog = "" %}
         {% set url=  path('cadoles_portal_user_blog_view') %}
         {% if usage=="group" and firstblog is defined %}
             {% set url=  path('cadoles_portal_user_blog_view',{id:firstblog}) %}
         {% endif %}
-        <a onClick="showFrameitem('blog','{{ url }}',true)" style="{{ stylewidgetmenu }}"><i class="fa fa-paper-plane fa-fw"></i></a>
+        <a onClick="showFrameitem('blog','{{ url }}',true)" style="{{ stylewidgetmenu }}"><i class="fa fa-plus fa-fw"></i></a>
         {% endif %}
     </div>
 
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewcalendar.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewcalendar.html.twig
index 8936233c..630f8d11 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewcalendar.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewcalendar.html.twig
@@ -30,7 +30,7 @@
             {% if usage=="group" and firstcalendar is defined %}
                 {% set url=  path('cadoles_portal_'~access~'_calendar_view',{id:firstcalendar}) %}
             {% endif %}         
-            <a onClick="showFrameitem('calendar','{{ url }}',true)" style="{{ stylewidgetmenu }}"><i class="fa fa-calendar fa-fw"></i></a>
+            <a onClick="showFrameitem('calendar','{{ url }}',true)" style="{{ stylewidgetmenu }}"><i class="fa fa-plus fa-fw"></i></a>
         {% endif %}
     </div>