From b2c04f7c5003e4319952a74fde72410f681ef8b5 Mon Sep 17 00:00:00 2001
From: root <root@transnum.transnum.cadol.es>
Date: Tue, 4 Jun 2019 09:24:42 +0200
Subject: [PATCH] maj sgar

---
 dicos/{30_ninegate.xml => 90_ninegate.xml}    | 213 +++++++++++++++---
 src/ninegate-1.0/app/config/twig.yml          |   1 +
 .../CoreBundle/Command/data/core-init-01.sql  |  20 +-
 .../CoreBundle/Controller/AjaxController.php  |  28 +++
 .../Cadoles/CoreBundle/Entity/Niveau01.php    |  41 +++-
 .../CoreBundle/Resources/config/routing.yml   |   4 +
 .../Controller/AlertcategoryController.php    |  19 +-
 .../Controller/ItemController.php             |   7 +-
 .../Controller/PagewidgetController.php       |  19 ++
 .../PortalBundle/Entity/Alertcategory.php     |  62 ++---
 .../src/Cadoles/PortalBundle/Entity/Icon.php  |  44 +++-
 .../src/Cadoles/PortalBundle/Entity/Item.php  |  44 +++-
 .../PortalBundle/Form/AlertcategoryType.php   |   9 +-
 .../Cadoles/PortalBundle/Form/ItemType.php    |  21 +-
 .../Resources/views/Alert/list.html.twig      |  17 +-
 .../views/Alertcategory/edit.html.twig        |  63 ++++--
 .../Resources/views/Item/edit.html.twig       |   3 +-
 .../Resources/views/Item/list.html.twig       |   4 +-
 .../Resources/views/Pagewidget/constants.twig |   5 +
 .../views/Pagewidget/viewalert.html.twig      |  10 +-
 .../views/Pagewidget/viewitem.html.twig       |   5 +-
 .../web/uploads/icon/icon_chart.png           | Bin 0 -> 4410 bytes
 .../web/uploads/icon/icon_chartpie.png        | Bin 0 -> 5428 bytes
 .../web/uploads/icon/icon_users.png           | Bin 0 -> 5703 bytes
 tmpl/ninegate-init-01.sql                     |   9 +
 tmpl/ninegate-template.yml                    |  21 +-
 26 files changed, 563 insertions(+), 106 deletions(-)
 rename dicos/{30_ninegate.xml => 90_ninegate.xml} (63%)
 create mode 100644 src/ninegate-1.0/web/uploads/icon/icon_chart.png
 create mode 100644 src/ninegate-1.0/web/uploads/icon/icon_chartpie.png
 create mode 100644 src/ninegate-1.0/web/uploads/icon/icon_users.png

diff --git a/dicos/30_ninegate.xml b/dicos/90_ninegate.xml
similarity index 63%
rename from dicos/30_ninegate.xml
rename to dicos/90_ninegate.xml
index 7d364fda..d7fcd47e 100644
--- a/dicos/30_ninegate.xml
+++ b/dicos/90_ninegate.xml
@@ -21,14 +21,26 @@
             <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_wordpress" type="oui/non" description="Activer Wordpress" hidden='True' exists='False'>
+                <value>non</value>
+            </variable>
+
+            <variable name='ninegate_test_conf_cadolesldap' type='oui/non' hidden='True'/>
+            <variable name='ninegate_test_conf_ldap' type='oui/non' hidden='True'/>
 
             <variable type='oui/non' name='activer_ninegate' description='Activer Ninegate'><value>oui</value></variable>
 
-            <variable type='string' name='ninegate_masteridentity' description="Maître de l'Identité" mandatory='True'><value>SQL</value></variable>
-            <variable type='string' name='ninegate_mode_auth' description="Mode Authentification" mandatory='True'><value>SQL</value></variable>
+            <variable type='string' name='ninegate_masteridentity' description="Maître de l'Identité" mandatory='True'><value>LDAP</value></variable>
+            <variable type='string' name='ninegate_mode_auth' description="Mode Authentification" mandatory='True'><value>CAS</value></variable>
 
-            <variable type='oui/non' name='ninegate_syncldap' description="Synchroniser Ninegate vers votre annuaire"><value>oui</value></variable>
-            <variable type='oui/non' name='ninegate_synceportail' description="Synchroniser Ninegate vers ePortail"><value>oui</value></variable>
+            <variable type='oui/non' name='ninegate_syncldap' description="Synchroniser Ninegate vers votre annuaire"><value>non</value></variable>
+            <variable type='oui/non' name='ninegate_synceportail' description="Synchroniser Ninegate vers ePortail"><value>non</value></variable>
             <variable type='string' name='ninegate_ldaptemplate' description="Modèle d'annuaire"><value>scribe</value></variable>
 
             <variable type='string' name='ninegate_pwdadmin' description="Mot de passe du compte admin durant l'instance (idem valeur Cadoles ldap)" mandatory='True'/>
@@ -53,6 +65,25 @@
             <variable type='string' name='ninegate_moderegistration' description="Mode de registration : none / byuser / byadmin"  mandatory='True'><value>none</value></variable>
             <variable type='string' name='ninegate_keyterm' description="Taille minimun du password"  mandatory='True'><value>8</value></variable>
 
+            <variable type="oui/non" name='ninegate_activate_portal' description='Activer le module portail'  mandatory='True'>
+                <value>oui</value>
+            </variable>
+            <variable type="oui/non" name='ninegate_activate_item' description='Activer le module item'  mandatory='True'>
+                <value>oui</value>
+            </variable>
+
+            <variable type="oui/non" name='ninegate_activate_widmoodle' description='Activer le widget Moodle'  mandatory='True'>
+                <value>non</value>
+            </variable>
+            <variable type='string' name='ninegate_widmoodle_url' description='URL complète de votre Moodle'  mandatory='True' />
+            <variable type='string' name='ninegate_widmoodle_apikey' description='API Key de votre Moodle'  mandatory='True' />
+
+            <variable type="oui/non" name='ninegate_activate_widlimesurvey' description='Activer le widget Limesurvey'  mandatory='True'>
+                <value>non</value>
+            </variable>
+            <variable type='string' name='ninegate_widlimesurvey_url' description='URL complète de votre Limesurvey'  mandatory='True' />
+            <variable type='string' name='ninegate_widlimesurvey_apiuser' description='API User de votre Limesurvey'  mandatory='True' />
+            <variable type='string' name='ninegate_widlimesurvey_apikey' description='API Key de votre Limesurvey'  mandatory='True' />
 
             <variable type='string' name='ninegate_noreply' description='Adresse mail utilisé pour le noreply'  mandatory='True' />
             <variable type='string' name='ninegate_smtphost' description='Host du serveur SMTP' />
@@ -73,6 +104,8 @@
         <separators>
             <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_widmoodle">Paramètres associés au Portail</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>
         </separators> 
@@ -119,6 +152,9 @@
             <target type='variable'>ninegate_moderegistration</target>
             <target type='variable'>ninegate_keyterm</target>
 
+            <target type='variable'>ninegate_activate_portal</target>
+            <target type='variable'>ninegate_activate_item</target>
+            
             <target type='variable'>ninegate_noreply</target>
             <target type='variable'>ninegate_smtphost</target>
             <target type='variable'>ninegate_smtpport</target>
@@ -150,17 +186,40 @@
             <param>SSO</param>
 
             <target type='variable'>ninegate_ldaptemplate</target>
+            <target type='variable'>ninegate_test_conf_cadolesldap</target>
         </condition>  
 
         <condition name='hidden_if_in' source='ninegate_syncldap'>
             <param>non</param>
 
             <target type='variable'>ninegate_pwdadmin</target>
+            <target type='variable'>ninegate_niveau01name</target>
+            <target type='variable'>ninegate_niveau01siren</target>
+        </condition>   
+
+        <auto name='calc_multi_condition' target='ninegate_test_conf_cadolesldap'>
+            <param>CadolesLDAP</param>
+            <param type='eole' name='condition_1' hidden='False'>ninegate_ldaptemplate</param>
+            <param name='match'>oui</param>
+            <param name='mismatch'>non</param>
+            <param name='default_mismatch'>non</param>
+        </auto>
+
+        <auto name='calc_multi_condition' target='ninegate_test_conf_ldap'>
+            <param>oui</param>
+            <param name="operator">OR</param>
+            <param type='eole' name='condition_1' hidden='False'>ninegate_syncldap</param>
+            <param type='eole' name='condition_2' hidden='False'>ninegate_test_conf_cadolesldap</param>
+            <param name='match'>oui</param>
+            <param name='mismatch'>non</param>
+        </auto>
+
+        <condition name='hidden_if_in' source='ninegate_test_conf_ldap'>
+            <param>non</param>
+
             <target type='variable'>ninegate_organization</target>
             <target type='variable'>ninegate_niveau01branche</target>
             <target type='variable'>ninegate_niveau02branche</target>
-            <target type='variable'>ninegate_niveau01name</target>
-            <target type='variable'>ninegate_niveau01siren</target>
         </condition>   
 
         <condition name='hidden_if_in' source='ninegate_niveau02view'>
@@ -172,32 +231,100 @@
         </condition>   
 
 
-        <check name='valid_enum' target='ninegate_masteridentity'>
-            <param>['LDAP', 'SQL', 'SSO']</param>
-        </check>
 
-        <check name='valid_enum' target='ninegate_mode_auth'>
-            <param>['CAS', 'SAML', 'SQL', 'LDAP']</param>
-        </check>
 
-        <check name='valid_enum' target='ninegate_moderegistration'>
-            <param>['none', 'byuser', 'byadmin']</param>
-        </check>
+        <!-- AFFICHAGE EN FONCTION DES MODULES ACTIVES -->
+        <condition name='hidden_if_in' source='ninegate_activate_portal'>
+            <param>non</param>
 
-        <check name='valid_enum' target='ninegate_ldaptemplate'>
-            <param>['scribe', 'open']</param>
-        </check>
+            <target type='variable'>ninegate_activate_widmoodle</target>
+            <target type='variable'>ninegate_activate_widlimesurvey</target>
+        </condition>   
 
-        <check name='valid_enum' target='ninegate_smtpencryption'>
-            <param>['tls', 'ssl', 'null']</param>
-        </check>
-        <check name='valid_enum' target='ninegate_smtpauthmode'>
-            <param>['plain', 'login', 'cram-md5', 'null']</param>
-        </check>
+        <condition name='hidden_if_in' source='ninegate_activate_portal'>
+            <param>oui</param>
 
-        <check name='valid_enum' target='ninegate_db_mode'>
-            <param>['default', 'externe', 'local']</param>
-        </check>
+            <target type='variable'>ninegate_activate_item</target>
+        </condition>   
+
+
+
+
+        <!-- AFFICHAGE EN FONCTION DU WIDGET MOODLE -->
+        <fill name='calc_multi_condition' target='ninegate_activate_widmoodle'>
+            <param>oui</param>
+            <param type='eole' name='condition_1' hidden='False'>activer_moodle</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_widmoodle'>
+            <param>non</param>
+
+            <target type='variable'>ninegate_widmoodle_url</target>
+            <target type='variable'>ninegate_widmoodle_apikey</target>
+        </condition>   
+
+        <fill name='calc_multi_condition' target='ninegate_widmoodle_url'>
+            <param>oui</param>
+            <param type='eole' name='condition_1' hidden='False'>activer_moodle</param>
+            <param name='match'>/moodle</param>
+            <param name='default_mismatch'>None</param>
+        </fill>
+
+        <fill name='calc_multi_condition' target='ninegate_widmoodle_apikey'>
+            <param>oui</param>
+            <param type='eole' name='condition_1' hidden='False'>activer_moodle</param>
+            <param type='eole' name='match' hidden='False'>moodle_apikey</param>
+            <param name='default_mismatch'>None</param>
+        </fill>
+
+
+
+
+        <!-- AFFICHAGE EN FONCTION DU WIDGET LIMESURVEY -->
+        <fill name='calc_multi_condition' target='ninegate_activate_widlimesurvey'>
+            <param>oui</param>
+            <param type='eole' name='condition_1' hidden='False'>activer_limesurvey</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_widlimesurvey'>
+            <param>non</param>
+
+            <target type='variable'>ninegate_widlimesurvey_url</target>
+            <target type='variable'>ninegate_widlimesurvey_apiuser</target>
+            <target type='variable'>ninegate_widlimesurvey_apikey</target>
+        </condition>   
+
+        <fill name='calc_multi_condition' target='ninegate_widlimesurvey_url'>
+            <param>oui</param>
+            <param type='eole' name='condition_1' hidden='False'>activer_limesurvey</param>
+            <param name='match'>/limesurvey</param>
+            <param name='default_mismatch'>None</param>
+        </fill>
+
+        <fill name='calc_multi_condition' target='ninegate_widlimesurvey_apiuser'>
+            <param>oui</param>
+            <param type='eole' name='condition_1' hidden='False'>activer_limesurvey</param>
+            <param name='match'>restuser</param>
+            <param name='default_mismatch'>None</param>
+        </fill>
+
+        <fill name='calc_multi_condition' target='ninegate_widlimesurvey_apikey'>
+            <param>oui</param>
+            <param type='eole' name='condition_1' hidden='False'>activer_limesurvey</param>
+            <param name='match'>apikeyenvole</param>
+            <param name='default_mismatch'>None</param>
+        </fill>
+
+
+
+
+        <!-- AFFICHAGE EN FONCTION DU MODE DE BDD -->
         <condition name='hidden_if_in' source='ninegate_db_mode'>
             <param>local</param>
             <target type='variable'>ninegate_dbserver</target>
@@ -213,6 +340,38 @@
             <target type='variable'>ninegate_dbpass</target>
             <target type='variable'>ninegate_allow_hosts</target>
         </condition>
+
+
+
+        <!-- VALID EMUN DES DIFFRENTES COMBO -->
+        <check name='valid_enum' target='ninegate_masteridentity'>
+            <param>['LDAP', 'SQL', 'SSO']</param>
+        </check>
+
+        <check name='valid_enum' target='ninegate_mode_auth'>
+            <param>['CAS', 'SAML', 'SQL', 'LDAP']</param>
+        </check>
+
+        <check name='valid_enum' target='ninegate_moderegistration'>
+            <param>['none', 'byuser', 'byadmin']</param>
+        </check>
+
+        <check name='valid_enum' target='ninegate_ldaptemplate'>
+            <param>['scribe', 'open', 'CadolesLDAP']</param>
+        </check>
+
+        <check name='valid_enum' target='ninegate_smtpencryption'>
+            <param>['tls', 'ssl', 'null']</param>
+        </check>
+        <check name='valid_enum' target='ninegate_smtpauthmode'>
+            <param>['plain', 'login', 'cram-md5', 'null']</param>
+        </check>
+
+        <check name='valid_enum' target='ninegate_db_mode'>
+            <param>['default', 'externe', 'local']</param>
+        </check>
+
+
     </constraints>
     <help>
     </help>
diff --git a/src/ninegate-1.0/app/config/twig.yml b/src/ninegate-1.0/app/config/twig.yml
index defc52de..468e53ee 100644
--- a/src/ninegate-1.0/app/config/twig.yml
+++ b/src/ninegate-1.0/app/config/twig.yml
@@ -8,6 +8,7 @@ twig:
 
     cron_activate: %cron_activate%
     portal_activate: %portal_activate%
+    portal_item_activate: %portal_item_activate%
 
     eportail_sync: %eportail_sync%
     moderegistration: %moderegistration%
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 5ef639d3..ecc277eb 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
@@ -5,10 +5,10 @@ SET foreign_key_checks = 0;
 SET sql_mode = 'NO_AUTO_VALUE_ON_ZERO';
 
 INSERT IGNORE INTO `niveau01` (`id`, `label`, `siren`) VALUES
-(-100, 'ldapbundle', '0000000A');
+(-100, 'transnum', '0000000A');
 
 INSERT IGNORE INTO `user` (`id`, `niveau01_id`, `username`, `firstname`, `lastname`, `password`, `email`, `avatar`, `role`,`siren`,`authlevel`) VALUES
-(-100, -100, 'admin', 'Administrateur', 'ldapbundle', 'PWD_CAS', 'admin@ldapbundle.ac-arno.fr', 'admin.jpg', 'ROLE_ADMIN', '0000000A', 'simple');
+(-100, -100, 'admin', 'Administrateur', 'transnum', 'PWD_CAS', 'admin@transnum.cadol.es', 'admin.jpg', 'ROLE_ADMIN', '0000000A', 'simple');
 
 
 
@@ -20,6 +20,7 @@ INSERT IGNORE INTO `sidebar` (`id`, `parent_id`, `roworder`, `label`, `path`, `f
 (1200,	NULL,	1200,	'ORGANISATION',	    NULL,	                            'fa-sitemap',	        'ROLE_ADMIN,ROLE_MODO', ''),
 (1210,	1200,	1210,	'Listes Blanche',	'cadoles_core_config_whitelist',	'fa-tasks',	            'ROLE_ADMIN',           ''),
 (1220,	1200,	1220,	'Niveau 01',	    'cadoles_core_config_niveau01',	    'fa-building',	        'ROLE_ADMIN',           ''),
+(1230,	1200,	1230,	'Niveau 02',	    'cadoles_core_config_niveau02',	    'fa-sitemap',	        'ROLE_ADMIN,ROLE_MODO', ''),
 (1240,	1200,	1240,	'Groupes',	        'cadoles_core_config_group',	    'fa-users',	            'ROLE_ADMIN,ROLE_MODO', ''),
 (1250,	1200,	1250,	'Inscriptions',	    'cadoles_core_config_registration',	'fa-pencil-square-o',	'ROLE_ADMIN,ROLE_MODO', ''),
 (1260,	1200,	1260,	'Utilisateurs',	    'cadoles_core_config_user',	        'fa-child',	            'ROLE_ADMIN,ROLE_MODO', ''),
@@ -34,6 +35,15 @@ INSERT IGNORE INTO `sidebar` (`id`, `parent_id`, `roworder`, `label`, `path`, `f
 (1570,	1500,	1570,	'Chartes',	        'cadoles_portal_config_notice',     'fa-info',              'ROLE_ADMIN,ROLE_MODO', 'portal_activate'),
 (1580,	1500,	1580,	'Icônes',	        'cadoles_portal_config_icon',       'fa-bug',	            'ROLE_ADMIN,ROLE_MODO', 'portal_activate'),
 
+(2500,	NULL,	2500,	'MODULES', 	        NULL,	                            'fa-cubes',	            'ROLE_ADMIN,ROLE_MODO', 'module_activate'),
+(2510,	2500,	2510,	'Pages',	        'cadoles_portal_config_page',       'fa-file',              'ROLE_ADMIN,ROLE_MODO', 'page_activate'),
+(2520,	2500,	2520,	'Items',	        'cadoles_portal_config_item',       'fa-desktop',           'ROLE_ADMIN,ROLE_MODO', 'item_activate'),
+(2530,	2500,	2530,	'Annonces',	        'cadoles_portal_config_alert',      'fa-bell',              'ROLE_ADMIN,ROLE_MODO', 'alert_activate'),
+(2540,	2500,	2540,	'Calendriers',      'cadoles_portal_config_calendar',   'fa-calendar',          'ROLE_ADMIN,ROLE_MODO', 'calendar_activate'),
+(2550,	2500,	2550,	'Blogs',            'cadoles_portal_config_blog',       'fa-paper-plane',       'ROLE_ADMIN,ROLE_MODO', 'blog_activate'),
+(2560,	2500,	2560,	'Flux',	            'cadoles_portal_config_flux',       'fa-rss',               'ROLE_ADMIN,ROLE_MODO', 'flux_activate'),
+(2570,	2500,	2570,	'Chartes',	        'cadoles_portal_config_notice',     'fa-info',              'ROLE_ADMIN,ROLE_MODO', 'notice_activate'),
+(2580,	2500,	2580,	'Icônes',	        'cadoles_portal_config_icon',       'fa-bug',	            'ROLE_ADMIN,ROLE_MODO', 'module_activate'),
 
 (7000,	NULL,	7000,	'CRON',	            NULL,	                            'fa-bolt',	            'ROLE_ADMIN',           'cron_activate'),
 (7010,	7000,	7010,	'Jobs',	            'cadoles_cron_config',              'fa-bullseye',          'ROLE_ADMIN',           'cron_activate'),
@@ -61,6 +71,6 @@ INSERT IGNORE INTO `config` (`order`, `visible`, `changeable`, `required`, `type
 ('060', 1, 1, 1, 'font', 			'fontfacetitle',    'Anton-Regular',											'',				'Police des titres de votre site'),
 ('061', 1, 1, 1, 'font', 			'fontfacebody',     'Helvetica',				    						    '',				'Police des titres de votre site'),
 
-('200', 1, 0, 1, 'boolean', 		'PROXYactivate',	'1',														'',             'Définit un Proxy'),
-('201', 1, 0, 1, 'string', 			'PROXYserver',		'192.168.57.160',									'PROXYactivate','Adresse du Proxy'),
-('202', 1, 0, 1, 'string', 			'PROXYport',		'8080',										'PROXYactivate','Port du Proxy');
+('200', 1, 0, 1, 'boolean',			'PROXYactivate',	'0',														'',             'Définit un Proxy'),
+('201', 1, 0, 1, 'string', 			'PROXYserver',		'',															'PROXYactivate','Adresse du Proxy'),
+('202', 1, 0, 1, 'string', 			'PROXYport',		'',															'PROXYactivate','Port du Proxy');
diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/AjaxController.php b/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/AjaxController.php
index a0c2c7e5..8d71d856 100644
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/AjaxController.php
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/AjaxController.php
@@ -70,6 +70,34 @@ class AjaxController extends Controller
 
     }    
 
+    public function niveau01listAction(Request $request)
+    {
+        // S'assurer que c'est un appel ajax
+        if (!$request->isXmlHttpRequest()) {
+            return new JsonResponse(array('message' => 'Interdit'), 400);
+        }
+
+        $output=array();
+        $em = $this->getDoctrine()->getManager();
+        $page_limit=$request->query->get('page_limit');
+        $q=$request->query->get('q');
+        
+        $qb = $em->createQueryBuilder();
+        $qb->select('table')->from("CadolesCoreBundle:Niveau01",'table')
+           ->where('table.label LIKE :value')
+           ->setParameter("value", "%".$q."%")
+           ->orderBy('table.label');
+        
+        $datas=$qb->setFirstResult(0)->setMaxResults($page_limit)->getQuery()->getResult();
+        foreach($datas as $data) {
+            array_push($output,array("id"=>$data->getId(),"text"=>$data->getLabel()));
+        }
+
+        $response = new Response(json_encode($output));    
+        $response->headers->set('Content-Type', 'application/json');      
+        return $response;
+    }   
+
     public function niveau02listAction(Request $request)
     {
         // S'assurer que c'est un appel ajax
diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Entity/Niveau01.php b/src/ninegate-1.0/src/Cadoles/CoreBundle/Entity/Niveau01.php
index 9f49594c..b182ff64 100644
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Entity/Niveau01.php
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Entity/Niveau01.php
@@ -76,7 +76,11 @@ class Niveau01
      */
     private $modos;
 
-    
+    /**
+    * @ORM\ManyToMany(targetEntity="Cadoles\PortalBundle\Entity\Item", mappedBy="groups")
+    */    
+    protected $items;
+
     /**
      * Constructor
      */
@@ -86,6 +90,7 @@ class Niveau01
         $this->registrations = new \Doctrine\Common\Collections\ArrayCollection();
         $this->users = new \Doctrine\Common\Collections\ArrayCollection();
         $this->modos = new \Doctrine\Common\Collections\ArrayCollection();
+        $this->items = new \Doctrine\Common\Collections\ArrayCollection();
     }
 
     /**
@@ -329,4 +334,38 @@ class Niveau01
     {
         return $this->modos;
     }
+
+    /**
+     * Add item
+     *
+     * @param \Cadoles\PortalBundle\Entity\Item $item
+     *
+     * @return Niveau01
+     */
+    public function addItem(\Cadoles\PortalBundle\Entity\Item $item)
+    {
+        $this->items[] = $item;
+
+        return $this;
+    }
+
+    /**
+     * Remove item
+     *
+     * @param \Cadoles\PortalBundle\Entity\Item $item
+     */
+    public function removeItem(\Cadoles\PortalBundle\Entity\Item $item)
+    {
+        $this->items->removeElement($item);
+    }
+
+    /**
+     * Get items
+     *
+     * @return \Doctrine\Common\Collections\Collection
+     */
+    public function getItems()
+    {
+        return $this->items;
+    }
 }
diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/config/routing.yml b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/config/routing.yml
index 51f0b826..5379067d 100644
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/config/routing.yml
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/config/routing.yml
@@ -99,6 +99,10 @@ cadoles_core_ajax_city_list:
     path: /ajax/city/list
     defaults:  { _controller: CadolesCoreBundle:Ajax:citylist }
 
+cadoles_core_ajax_niveau01_list:
+    path: /ajax/niveau01/list
+    defaults:  { _controller: CadolesCoreBundle:Ajax:niveau01list }
+
 cadoles_core_ajax_niveau02_list:
     path: /ajax/niveau02/list
     defaults:  { _controller: CadolesCoreBundle:Ajax:niveau02list }
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/AlertcategoryController.php b/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/AlertcategoryController.php
index d50e7180..5669c113 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/AlertcategoryController.php
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/AlertcategoryController.php
@@ -37,7 +37,11 @@ class AlertcategoryController extends Controller
         if ($form->get('submit')->isClicked() && $form->isValid()) {  
             $data = $form->getData();  
             $em = $this->getDoctrine()->getManager();
-            
+
+            $idicon = $form->get('idicon')->getData();
+            $icon=$this->getDoctrine()->getRepository("CadolesPortalBundle:Icon")->findoneby(["id"=>$idicon]);
+            $data->setIcon($icon);
+
             // Sauvegarde
             $em->persist($data);
             $em->flush();
@@ -53,6 +57,7 @@ class AlertcategoryController extends Controller
             'usesidebar'        => true,
             $this->labeldata    => $data,
             'mode'              => 'submit',
+            'icons'             => $this->getDoctrine()->getRepository("CadolesPortalBundle:Icon")->findAll(),
             'form'              => $form->createView()
         ]);
     }  
@@ -65,7 +70,10 @@ class AlertcategoryController extends Controller
         // Vérifier que cet enregistrement est modifiable
                                     
         // Création du formulaire
-        $form = $this->createForm(AlertcategoryType::class,$data,array("mode"=>"update"));
+        $form = $this->createForm(AlertcategoryType::class,$data,array(
+            "mode"      =>"update",
+            "idicon"    => ($data->getIcon()?$data->getIcon()->getId():null),
+        ));
 
         // Récupération des data du formulaire
         $form->handleRequest($request);
@@ -77,7 +85,11 @@ class AlertcategoryController extends Controller
         if ($form->get('submit')->isClicked() && $form->isValid()) {
             $em = $this->getDoctrine()->getManager();
             $data = $form->getData();
-            
+
+            $idicon = $form->get('idicon')->getData();
+            $icon=$this->getDoctrine()->getRepository("CadolesPortalBundle:Icon")->findoneby(["id"=>$idicon]);
+            $data->setIcon($icon);
+
             // Sauvegarde
             $em->persist($data);
             $em->flush();
@@ -94,6 +106,7 @@ class AlertcategoryController extends Controller
             'usesidebar'        => true,            
             $this->labeldata    => $data,
             'mode'              => 'update',
+            'icons'             => $this->getDoctrine()->getRepository("CadolesPortalBundle:Icon")->findAll(),
             'form'              => $form->createView()
         ]);
     }
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/ItemController.php b/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/ItemController.php
index 2084de95..86beaac2 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/ItemController.php
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/ItemController.php
@@ -39,7 +39,7 @@ class ItemController extends Controller
         $data = new Item();
         
         // Création du formulaire
-        $form = $this->createForm(ItemType::class,$data,array("mode"=>"submit"));
+        $form = $this->createForm(ItemType::class,$data,array("mode"=>"submit","labelniveau01" => $this->GetParameter("labelsniveau01"),));
 
         // Récupération des data du formulaire
         $form->handleRequest($request);
@@ -85,8 +85,9 @@ class ItemController extends Controller
                                     
         // Création du formulaire
         $form = $this->createForm(ItemType::class,$data,array(
-            "mode"      => "update",
-            "idicon"    => ($data->getIcon()?$data->getIcon()->getId():null),
+            "mode"          => "update",
+            "idicon"        => ($data->getIcon()?$data->getIcon()->getId():null),
+            "labelniveau01" => $this->GetParameter("labelsniveau01"),
         ));
 
         // Récupération des data du formulaire
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/PagewidgetController.php b/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/PagewidgetController.php
index fa2fdbdd..e00cac07 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/PagewidgetController.php
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/PagewidgetController.php
@@ -388,6 +388,7 @@ class PagewidgetController extends Controller
         $user=$this->getUser();
         $roles=($user?$user->getRoles():["ROLE_ANONYME"]);
         $groups=($user?$user->getGroups():[]);
+        $niveau01=($user?$user->getNiveau01():[]);
 
         // Bookmark de l'utilisateur
         $bookmarks = array();
@@ -438,6 +439,24 @@ class PagewidgetController extends Controller
             }
         }
 
+        // Récupération des items par niveau01
+        if($niveau01) {
+            $qb = $em->createQueryBuilder();
+            $qb->select('item')
+                ->from("CadolesPortalBundle:Item", 'item')
+                ->where(":niveau01 MEMBER OF item.niveau01s")
+                ->setParameter("niveau01",$niveau01);
+            
+            if($iditemcategory && $itemcategoryfilter) {
+                $qb->andWhere("item.itemcategory=:itemcategory")
+                   ->setParameter("itemcategory",$itemcategoryfilter);
+            }
+            $itemsniveau01s=$qb->getQuery()->getResult();
+            foreach($itemsniveau01s as $itemniveau01) {
+                if(!$bookmarksitems->contains($itemniveau01) && !$items->contains($itemniveau01)) $items->add($itemniveau01);
+            }
+        }
+
         // Trie des items
         $itemsordered = $items->getIterator();
         $itemsordered->uasort(function ($first, $second) {
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Entity/Alertcategory.php b/src/ninegate-1.0/src/Cadoles/PortalBundle/Entity/Alertcategory.php
index f60c08d6..3999c47c 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Entity/Alertcategory.php
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Entity/Alertcategory.php
@@ -31,13 +31,6 @@ class Alertcategory
      */
     private $label;
 
-    /**
-     * @var string
-     *
-     * @ORM\Column(name="icon", type="text")
-     */
-    private $icon;
-
     /**
      * @var integer
      *
@@ -45,12 +38,19 @@ class Alertcategory
      */
     private $color;
 
+    /**
+     * @ORM\ManyToOne(targetEntity="Icon", inversedBy="alertcategorys")
+     * @ORM\JoinColumn(nullable=true, onDelete="SET NULL")
+     */
+    private $icon;
+
     /**
      * @ORM\OneToMany(targetEntity="Alert", mappedBy="alertcategory", cascade={"persist"}, orphanRemoval=true)
      * @ORM\JoinColumn(name="alerts", referencedColumnName="id")
      */
     protected $alerts;
 
+
     /**
      * Constructor
      */
@@ -93,30 +93,6 @@ class Alertcategory
         return $this->label;
     }
 
-    /**
-     * Set icon
-     *
-     * @param string $icon
-     *
-     * @return Alertcategory
-     */
-    public function setIcon($icon)
-    {
-        $this->icon = $icon;
-
-        return $this;
-    }
-
-    /**
-     * Get icon
-     *
-     * @return string
-     */
-    public function getIcon()
-    {
-        return $this->icon;
-    }
-
     /**
      * Set color
      *
@@ -141,6 +117,30 @@ class Alertcategory
         return $this->color;
     }
 
+    /**
+     * Set icon
+     *
+     * @param \Cadoles\PortalBundle\Entity\Icon $icon
+     *
+     * @return Alertcategory
+     */
+    public function setIcon(\Cadoles\PortalBundle\Entity\Icon $icon = null)
+    {
+        $this->icon = $icon;
+
+        return $this;
+    }
+
+    /**
+     * Get icon
+     *
+     * @return \Cadoles\PortalBundle\Entity\Icon
+     */
+    public function getIcon()
+    {
+        return $this->icon;
+    }
+
     /**
      * Add alert
      *
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Entity/Icon.php b/src/ninegate-1.0/src/Cadoles/PortalBundle/Entity/Icon.php
index 0d8a4cb5..26fe182f 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Entity/Icon.php
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Entity/Icon.php
@@ -41,6 +41,14 @@ class Icon
      */
     private $items;
 
+    /**
+     * @var ArrayCollection $alertcategorys
+     * @var Alertcategory
+     *
+     * @ORM\OneToMany(targetEntity="Alertcategory", mappedBy="icon", cascade={"persist"}, orphanRemoval=false)
+     */
+    private $alertcategorys;
+
     /**
      * @var ArrayCollection $pagewidgets
      * @var Pagewidget
@@ -67,13 +75,13 @@ class Icon
     private $bookmarks;
 
     
-
     /**
      * Constructor
      */
     public function __construct()
     {
         $this->items = new \Doctrine\Common\Collections\ArrayCollection();
+        $this->alertcategorys = new \Doctrine\Common\Collections\ArrayCollection();
         $this->pagewidgets = new \Doctrine\Common\Collections\ArrayCollection();
         $this->widgets = new \Doctrine\Common\Collections\ArrayCollection();
         $this->bookmarks = new \Doctrine\Common\Collections\ArrayCollection();
@@ -171,6 +179,40 @@ class Icon
         return $this->items;
     }
 
+    /**
+     * Add alertcategory
+     *
+     * @param \Cadoles\PortalBundle\Entity\Alertcategory $alertcategory
+     *
+     * @return Icon
+     */
+    public function addAlertcategory(\Cadoles\PortalBundle\Entity\Alertcategory $alertcategory)
+    {
+        $this->alertcategorys[] = $alertcategory;
+
+        return $this;
+    }
+
+    /**
+     * Remove alertcategory
+     *
+     * @param \Cadoles\PortalBundle\Entity\Alertcategory $alertcategory
+     */
+    public function removeAlertcategory(\Cadoles\PortalBundle\Entity\Alertcategory $alertcategory)
+    {
+        $this->alertcategorys->removeElement($alertcategory);
+    }
+
+    /**
+     * Get alertcategorys
+     *
+     * @return \Doctrine\Common\Collections\Collection
+     */
+    public function getAlertcategorys()
+    {
+        return $this->alertcategorys;
+    }
+
     /**
      * Add pagewidget
      *
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Entity/Item.php b/src/ninegate-1.0/src/Cadoles/PortalBundle/Entity/Item.php
index 10aeae5b..d73aadab 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Entity/Item.php
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Entity/Item.php
@@ -123,7 +123,14 @@ class Item
      */
     protected $groups;
 
-
+    /**
+     * @ORM\ManyToMany(targetEntity="Cadoles\CoreBundle\Entity\Niveau01", inversedBy="items", cascade={"persist"})
+     * @ORM\JoinTable(name="itemniveau01",
+     *   joinColumns={@ORM\JoinColumn(name="item", referencedColumnName="id")},
+     *   inverseJoinColumns={@ORM\JoinColumn(name="niveau01", referencedColumnName="id")}
+     * )
+     */
+    protected $niveau01s;
 
 
     /**
@@ -133,6 +140,7 @@ class Item
     {
         $this->bookmarks = new \Doctrine\Common\Collections\ArrayCollection();
         $this->groups = new \Doctrine\Common\Collections\ArrayCollection();
+        $this->niveau01s = new \Doctrine\Common\Collections\ArrayCollection();
     }
 
     /**
@@ -500,4 +508,38 @@ class Item
     {
         return $this->groups;
     }
+
+    /**
+     * Add niveau01
+     *
+     * @param \Cadoles\CoreBundle\Entity\Niveau01 $niveau01
+     *
+     * @return Item
+     */
+    public function addNiveau01(\Cadoles\CoreBundle\Entity\Niveau01 $niveau01)
+    {
+        $this->niveau01s[] = $niveau01;
+
+        return $this;
+    }
+
+    /**
+     * Remove niveau01
+     *
+     * @param \Cadoles\CoreBundle\Entity\Niveau01 $niveau01
+     */
+    public function removeNiveau01(\Cadoles\CoreBundle\Entity\Niveau01 $niveau01)
+    {
+        $this->niveau01s->removeElement($niveau01);
+    }
+
+    /**
+     * Get niveau01s
+     *
+     * @return \Doctrine\Common\Collections\Collection
+     */
+    public function getNiveau01s()
+    {
+        return $this->niveau01s;
+    }
 }
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Form/AlertcategoryType.php b/src/ninegate-1.0/src/Cadoles/PortalBundle/Form/AlertcategoryType.php
index 4046127f..67d4225c 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Form/AlertcategoryType.php
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Form/AlertcategoryType.php
@@ -37,11 +37,7 @@ class AlertcategoryType extends AbstractType
             )
         );
 
-        $builder->add('icon',
-            IconChoiceType::class, array(
-                "label" => 'Icône'
-          )
-        );        
+        $builder->add('idicon', HiddenType::class,['mapped'=> false,'data' => $options["idicon"]]);   
 
         $builder->add('color', TextType::class, [
             'label'         => "Couleur",
@@ -54,7 +50,8 @@ class AlertcategoryType extends AbstractType
     {
         $resolver->setDefaults(array(
             'data_class' => 'Cadoles\PortalBundle\Entity\Alertcategory',
-            'mode' => "string"
+            'mode' => "string",
+            'idicon' => "string",
         ));
     }
 }
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Form/ItemType.php b/src/ninegate-1.0/src/Cadoles/PortalBundle/Form/ItemType.php
index 2c988c31..f80dab17 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Form/ItemType.php
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Form/ItemType.php
@@ -68,6 +68,24 @@ class ItemType extends AbstractType
                 "disabled"      => ($options["mode"]=="delete"?true:false),
             ])
 
+            ->add('niveau01s', Select2EntityType::class, [
+                'label'                 => 'Visible pour les '.$options["labelniveau01"],
+                'class'                 => 'CadolesCoreBundle:Niveau01',
+                'text_property'         => 'label',
+                'multiple'              => true,
+                'remote_route'          => 'cadoles_core_ajax_niveau01_list',
+                'primary_key'           => 'id',
+                'text_property'         => 'label',
+                'minimum_input_length'  => 0,
+                'page_limit'            => 100,
+                'allow_clear'           => true,
+                'delay'                 => 250,
+                'cache'                 => false,
+                'cache_timeout'         => 60000,
+                'language'              => 'fr',
+                'placeholder'           => 'Selectionner des '.$options["labelniveau01"],                        
+            ])
+
             ->add('groups', Select2EntityType::class, [
                 'label'                 => 'Visible pour les Groupes',
                 'class'                 => 'CadolesCoreBundle:Group',
@@ -83,7 +101,7 @@ class ItemType extends AbstractType
                 'cache'                 => false,
                 'cache_timeout'         => 60000,
                 'language'              => 'fr',
-                'placeholder'           => 'Selectionner un groupe',                        
+                'placeholder'           => 'Selectionner des groupes',                        
             ])
 
             ->add('color', TextType::class, [
@@ -117,6 +135,7 @@ class ItemType extends AbstractType
             'data_class' => 'Cadoles\PortalBundle\Entity\Item',
             'mode' => "string",
             'idicon' => "string",
+            'labelniveau01' => "string",
         ]);
     }
 }
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Alert/list.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Alert/list.html.twig
index b073667b..f368f2a8 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Alert/list.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Alert/list.html.twig
@@ -27,11 +27,15 @@
                             "
                         data-alert-category-id="{{ alert.alertcategory.id }}"
                         data-alert-id="{{ alert.id }}"
-                        style="background: {{ "#"~alert.alertcategory.color }};"
+                        style="background:  {{ alert.alertcategory.color ? '#'~alert.alertcategory.color : '#'~color['main'] }};"
                     >
                         <div class="panel-heading" role="tab">
                             <a href="{{ path('cadoles_portal_config_alert_update', { id: alert.id }) }}" class="panel-heading-icon pull-left">
-                                <i class="fa fa-fw {{ alert.alertcategory.icon }}"></i>
+                                {% if alert.alertcategory.icon %}
+                                    <img height="25" src="/{{ alias }}/{{ alert.alertcategory.icon.label }}">
+                                {% else %}
+                                    <img height="25" src="/{{ alias }}/uploads/icon/icon_megaphone.png">
+                                {% endif %}                                
                             </a>
                     
                             <a href="{{ path('cadoles_portal_config_alert_update', { id: alert.id }) }}">
@@ -69,8 +73,13 @@
                                     <i class="fa fa-edit"></i>
                                 </a>
               
-                                <a href="#" class="list-group-item active category-alert-item" data-category="{{ alertcategory.id }}" style="border-left: 15px solid {{ "#"~alertcategory.color }}; position: inherit;">
-                                    <i class="fa fa-fw {{ alertcategory.icon }}"></i>
+                                <a href="#" class="list-group-item active category-alert-item" data-category="{{ alertcategory.id }}" style="border-left: 15px solid {{ alertcategory.color ? '#'~alertcategory.color : '#'~color['main'] }}; position: inherit;">
+                                    {% if alertcategory.icon %}
+                                        <img height="25" src="/{{ alias }}/{{ alertcategory.icon.label }}">
+                                    {% else %}
+                                        <img height="25" src="/{{ alias }}/uploads/icon/icon_megaphone.png">
+                                    {% endif %}
+
                                     {{ alertcategory.label }}
                                 </a>
                             </div>
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Alertcategory/edit.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Alertcategory/edit.html.twig
index daf8c89a..22d7266b 100755
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Alertcategory/edit.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Alertcategory/edit.html.twig
@@ -47,29 +47,64 @@
 
         <div class="panel-body">
             {{ form_row(form.label) }}
-            {{ form_row(form.icon) }}
             {{ form_row(form.color) }}
+
+            <div id="diviconsel" class="col-md-12 text-left" style="height:140px; padding:20px; text-align:center; background-color: {{ alertcategory.color ? "#"~alertcategory.color : '#'~color['main'] }};">
+                {% if alertcategory.icon %}
+                    <img src="/{{ alias }}/{{ alertcategory.icon.label }}" height="100" />
+                {% endif %}
+            </div>
+
+            <div class="col-md-12" style="text-align:center;padding:0px">
+                {{ form_row(form.idicon) }}
+                <a class="btn btn-success" data-toggle="modal" data-target="#selicon" title='Ajouter' style="width:100%">Selectionner un Icône</a>
+                <a class="btn btn-danger" onClick="delIcon()" title='Détacher' style="width:100%">Détacher l'Icône</a>
+            </div>             
         </div>
     </div>
 
+    <div id="selicon" class="modal fade bs-item-modal" tabindex="-1" role="dialog" aria-labelledby="myLargeModalLabel" aria-hidden="true">
+        <div class="modal-dialog modal-lg">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+                    <h4 class="modal-title">SELECTIONNER UN ICONE</h4>
+                </div>
 
+                <div class="modal-body">
+                    <div class="form-group row clearfix">
+                        <div class="col-md-12" style="margin-bottom:15px">
+                            <a onclick="$('#selicon').modal('hide');" class="btn btn-default">Annuler</a>
+                        </div>  
+
+                        <div class="col-md-12">
+                            {% for icon in icons %}
+                                <a href="#" onClick="selIcon({{ icon.id }})">
+                                <img id="icon-{{ icon.id }}" class="grid-item-img" height="40" src="/{{ alias }}/{{ icon.label }}" style="padding:2px">
+                                </a>
+                            {% endfor %}                  
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>  
 {{ form_end(form) }}
 {% endblock %}
 
 {% block localjavascript %}
-    function iformat(icon) {
-        var originalOption = icon.element;
-        return $('<span><i class="fa ' + icon.text + '"></i> ' + icon.text + '</span>');
+    function selIcon(idicon) {
+        $("#alertcategory_idicon").val(idicon);
+        $("#diviconsel img").remove();
+
+        $("#icon-"+idicon).clone().appendTo($("#diviconsel"));
+        $("#diviconsel img").attr("height","100px");
+        $('#selicon').modal('hide');
     }
 
-    $('.select2-icon').select2({
-        width: "100%",
-        formatSelection: iformat,
-        templateResult: iformat,
-        formatResult: iformat,
-        allowHtml: true,
-        escapeMarkup: function(m) {
-            return m;
-        }
-    });
+    function delIcon() {
+        $("#diviconsel img").remove();
+        $("#item_idicon").val(null);
+    }
 {% endblock %}
+
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Item/edit.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Item/edit.html.twig
index 7fdc168f..7b9f889a 100755
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Item/edit.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Item/edit.html.twig
@@ -56,10 +56,11 @@
             {{ form_row(form.target) }}    
             {{ form_row(form.itemcategory) }}
             {{ form_row(form.roles) }}
+            {{ form_row(form.niveau01s) }}
             {{ form_row(form.groups) }}
             {{ form_row(form.color) }}
 
-            <div id="diviconsel" class="col-md-12 text-left" style="height:140px; padding:20px; text-align:center; background-color: {{ item.color ? "#"~item.color : '#000000' }};">
+            <div id="diviconsel" class="col-md-12 text-left" style="height:140px; padding:20px; text-align:center; background-color: {{ item.color ? "#"~item.color : '#'~color['main'] }};">
                 {% if item.icon %}
                     <img src="/{{ alias }}/{{ item.icon.label }}" height="100" />
                 {% endif %}
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Item/list.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Item/list.html.twig
index 85944a45..90ec24db 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Item/list.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Item/list.html.twig
@@ -27,8 +27,8 @@
 
                         <div class="grid clearfix">
                             {% for item in itemcategory.items %}
-                                <div class="grid-item {% for group in item.groups %}{{ ' group-' ~ group.id }}{% endfor %}{% for role in item.roles %}{{ ' role-' ~ role }}{% endfor %}" data-item-id="{{ item.id }}">
-                                    <div class="grid-item-content" style="background-color: {{ item.color ? '#'~item.color : '#000' }};">
+                                <div class="grid-item {% for group in item.groups %}{{ ' group-' ~ group.id }}{% endfor %}{% for role in item.roles %}{{ ' group-' ~ role }}{% endfor %}" data-item-id="{{ item.id }}">
+                                    <div class="grid-item-content" style="background-color: {{ item.color ? '#'~item.color : '#'~color['main'] }};">
                                         <span class="item-drag"><i class="fa fa-arrows"></i></span>
                                         <a class="item-link" href="{{ path('cadoles_portal_config_item_update', {"id": item.id}) }}">
                                             <div class="grid-item-logo">
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/constants.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/constants.twig
index 6e72f2c1..a4e81950 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/constants.twig
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/constants.twig
@@ -25,8 +25,13 @@
     {%endif%}
 {% endmacro %}
 
+{% macro mycolormain() %}
+{% set color = app.session.get('color') %}{% set colormain = color['main'] %}{{ colormain }}
+{% endmacro %}`
+
 {% macro mystylewidget(entity) %}
     {% set color = app.session.get('color') %}
+    {% set colormain = color['main'] %}
 
     {% set colorheaderback = entity.colorheaderback %}
     {% if colorheaderback is null %}
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewalert.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewalert.html.twig
index 80184400..afeb39bd 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewalert.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewalert.html.twig
@@ -5,6 +5,7 @@
 
 {% import "@CadolesPortal/Pagewidget/constants.twig" as constants %}
 
+{% set colormain = constants.mycolormain() %}
 {% set stylewidget = constants.mystylewidget(entity) %}
 {% set stylewidgetmenu = constants.mystylewidgetmenu(entity) %}
 {% set stylewidgetheader = constants.mystylewidgetheader(entity) %}
@@ -32,9 +33,14 @@
 
     <div class="widgetbody" style="{{ stylewidgetbody }}">
         {% for alert in alerts %}
-            <div class="panel list-item" style="background: #{{ alert.alertcategory.color }};">
+            <div class="panel list-item" style="background: {{ alert.alertcategory.color ? '#'~alert.alertcategory.color : '#'~colormain }};">
                 <div class="panel-heading" role="tab">
-                    <i class="fa fa-fw {{ alert.alertcategory.icon }}"></i>
+                    {% if alert.alertcategory.icon %}
+                        <img height="25" src="/{{ alias }}/{{ alert.alertcategory.icon.label }}">
+                    {% else %}
+                        <img height="25" src="/{{ alias }}/uploads/icon/icon_megaphone.png">
+                    {% endif %}   
+
                     {{ alert.title }}         
                 </div>
             
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewitem.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewitem.html.twig
index 71d78a99..e59bb815 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewitem.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewitem.html.twig
@@ -5,6 +5,7 @@
 
 {% import "@CadolesPortal/Pagewidget/constants.twig" as constants %}
 
+{% set colormain = constants.mycolormain() %}
 {% set stylewidget = constants.mystylewidget(entity) %}
 {% set stylewidgetmenu = constants.mystylewidgetmenu(entity) %}
 {% set stylewidgetheader = constants.mystylewidgetheader(entity) %}
@@ -60,7 +61,7 @@
                     <div class="grid-gutter-sizer"></div>
                     {% for bookmark in bookmarks %}
                         <div class="grid-item {{ stylegrid }}">
-                            <div class="grid-item-content" style="background-color: {{ bookmark.color ? "#"~bookmark.color : '#000' }};">
+                            <div class="grid-item-content" style="background-color: {{ bookmark.color ? "#"~bookmark.color : '#'~colormain }};">
                                 <a  style="cursor:pointer" onClick="modBookmark({{ bookmark.id }})" class="item-update"><i style="color: #FFF" class="fa fa-file" title="Modifier le favori"></i></a>
 
                                 {% if bookmark.target == 'frame' %}
@@ -133,7 +134,7 @@
                 {% endif %}
                                 
                     <div class="grid-item {{ stylegrid }}" data-idcategory="{{ item.itemcategory.id }}" data-iditem="{{ item.id }}">
-                        <div class="grid-item-content" style="background-color: {{ item.color ? "#"~item.color : '#000' }};">
+                        <div class="grid-item-content" style="background-color: {{ item.color ? "#"~item.color : '#'~colormain }};">
                             {% if item.content %}
                             <a  style="cursor:pointer" class="item-preview"><i style="color: #FFF" class="fa fa-info" title="Informations sur ce service"></i></a>
                             {% endif %}
diff --git a/src/ninegate-1.0/web/uploads/icon/icon_chart.png b/src/ninegate-1.0/web/uploads/icon/icon_chart.png
new file mode 100644
index 0000000000000000000000000000000000000000..9ae9a5db34fe592b6e72bf8a56fef50e0e95ef12
GIT binary patch
literal 4410
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
A$N&HU

literal 0
HcmV?d00001

diff --git a/src/ninegate-1.0/web/uploads/icon/icon_chartpie.png b/src/ninegate-1.0/web/uploads/icon/icon_chartpie.png
new file mode 100644
index 0000000000000000000000000000000000000000..c457e1743fba949ea290e20de37ba2b9dcfd4a1d
GIT binary patch
literal 5428
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

literal 0
HcmV?d00001

diff --git a/src/ninegate-1.0/web/uploads/icon/icon_users.png b/src/ninegate-1.0/web/uploads/icon/icon_users.png
new file mode 100644
index 0000000000000000000000000000000000000000..5ec1a651e14c5815e3aac3a132ac122e2cdc5565
GIT binary patch
literal 5703
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

literal 0
HcmV?d00001

diff --git a/tmpl/ninegate-init-01.sql b/tmpl/ninegate-init-01.sql
index 47a8b19f..f3efe75a 100644
--- a/tmpl/ninegate-init-01.sql
+++ b/tmpl/ninegate-init-01.sql
@@ -47,6 +47,15 @@ INSERT IGNORE INTO `sidebar` (`id`, `parent_id`, `roworder`, `label`, `path`, `f
 (1570,	1500,	1570,	'Chartes',	        'cadoles_portal_config_notice',     'fa-info',              'ROLE_ADMIN,ROLE_MODO', 'portal_activate'),
 (1580,	1500,	1580,	'Icônes',	        'cadoles_portal_config_icon',       'fa-bug',	            'ROLE_ADMIN,ROLE_MODO', 'portal_activate'),
 
+(2500,	NULL,	2500,	'MODULES', 	        NULL,	                            'fa-cubes',	            'ROLE_ADMIN,ROLE_MODO', 'module_activate'),
+(2510,	2500,	2510,	'Pages',	        'cadoles_portal_config_page',       'fa-file',              'ROLE_ADMIN,ROLE_MODO', 'page_activate'),
+(2520,	2500,	2520,	'Items',	        'cadoles_portal_config_item',       'fa-desktop',           'ROLE_ADMIN,ROLE_MODO', 'item_activate'),
+(2530,	2500,	2530,	'Annonces',	        'cadoles_portal_config_alert',      'fa-bell',              'ROLE_ADMIN,ROLE_MODO', 'alert_activate'),
+(2540,	2500,	2540,	'Calendriers',      'cadoles_portal_config_calendar',   'fa-calendar',          'ROLE_ADMIN,ROLE_MODO', 'calendar_activate'),
+(2550,	2500,	2550,	'Blogs',            'cadoles_portal_config_blog',       'fa-paper-plane',       'ROLE_ADMIN,ROLE_MODO', 'blog_activate'),
+(2560,	2500,	2560,	'Flux',	            'cadoles_portal_config_flux',       'fa-rss',               'ROLE_ADMIN,ROLE_MODO', 'flux_activate'),
+(2570,	2500,	2570,	'Chartes',	        'cadoles_portal_config_notice',     'fa-info',              'ROLE_ADMIN,ROLE_MODO', 'notice_activate'),
+(2580,	2500,	2580,	'Icônes',	        'cadoles_portal_config_icon',       'fa-bug',	            'ROLE_ADMIN,ROLE_MODO', 'module_activate'),
 
 (7000,	NULL,	7000,	'CRON',	            NULL,	                            'fa-bolt',	            'ROLE_ADMIN',           'cron_activate'),
 (7010,	7000,	7010,	'Jobs',	            'cadoles_cron_config',              'fa-bullseye',          'ROLE_ADMIN',           'cron_activate'),
diff --git a/tmpl/ninegate-template.yml b/tmpl/ninegate-template.yml
index a0374d06..27ba66d5 100644
--- a/tmpl/ninegate-template.yml
+++ b/tmpl/ninegate-template.yml
@@ -26,9 +26,22 @@ parameters:
     %end if
 
     # Activation module
+    portal_module_activate: false
     cron_activate: true
+%if %%getVar("ninegate_activate_portal", 'non') == "oui"    
     portal_activate: true
-    
+%else
+    portal_activate: false
+
+%if %%getVar("ninegate_activate_item", 'non') == "oui"    
+    portal_module_activate: true
+    portal_item_activate: true
+%else
+    portal_item_activate: false
+%end if
+
+%end if
+
     # Information de base de l'annuaire
     ldap_host: %%adresse_ip_ldap
     ldap_port: %%ldap_port
@@ -68,12 +81,16 @@ parameters:
     # Si masteridentity est à SQL = où sont synchronisées les datas dans l'annuaire
 %if %%getVar("ninegate_syncldap", 'non') == "oui"    
     ldap_sync: true
+%else
+    ldap_sync: false
+%end if
+
+%if %%getVar("ninegate_test_conf_ldap", 'non') == "oui"    
     ldap_baseuser: ou=users,ou=%%ninegate_organization,o=gouv,c=fr
     ldap_baseniveau01: ou=%%ninegate_niveau01branche,ou=%%ninegate_organization,o=gouv,c=fr
     ldap_baseniveau02: ou=%%ninegate_niveau02branche,ou=%%ninegate_organization,o=gouv,c=fr
     ldap_basegroup: ou=groups,ou=%%ninegate_organization,o=gouv,c=fr
 %else
-    ldap_sync: false
     ldap_baseuser: 
     ldap_baseniveau01: 
     ldap_baseniveau02: