Merge branch 'master' into dist/envole/6/master

dicos/91_ninegate.xml

@@ -20,6 +20,7 @@
             <file filelist='ninegate-migration' name='/var/www/html/envole-migration/config/config-db-ninegate.php' source='ninegate-migration.php' mkdir='True'/>
 
             <service method='apache' servicelist='ninegate'>ninegate</service>
+            <service servicelist="ninegate">wssninegate</service>
         </container>
     </containers>
 
@@ -36,6 +37,7 @@
             <variable name="ninegate_test_ninegate" type="oui/non" hidden='True' exists='False'><value>non</value></variable>
             <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_cdt" type="oui/non" description="Activer CdT" 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_econnect" type="oui/non" description="Activer eConnect" hidden='True' exists='False'><value>non</value></variable>
             <variable name="activer_ead_web" type="oui/non" description="Activer EAD" hidden='True' exists='False'><value>non</value></variable>
@@ -62,6 +64,7 @@
             <variable name="activer_roundcube" type="oui/non" description="Activer Roundcube" hidden='True' exists='False'><value>non</value></variable>
             <variable name="activer_sacoche" type="oui/non" description="Activer Sacoche" 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="activer_revprox" type="oui/non" description="Activer le reverse proxy Nginx" 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>            
@@ -193,6 +196,13 @@
             <variable type='string'  name='ninegate_widbalado_url' description='URL complète de votre Balado'  mandatory='True' />
             <variable type='string'  name='ninegate_widbalado_syncenvole' description='URL Posh-Profil pour synchronisation Balado' mandatory='True' />
 
+            <!-- CDT -->
+            <variable type="oui/non" name='ninegate_activate_widcdt' description='Activer CdT'  mandatory='True'>
+                <value>non</value>
+            </variable>
+            <variable type='string'  name='ninegate_widcdt_url' description='URL complète de votre CdT'  mandatory='True' />
+            <variable type='string'  name='ninegate_widcdt_syncenvole' description='URL Posh-Profil pour synchronisation CdT' mandatory='True' />
+
             <!-- DOKUWIKI -->
             <variable type="oui/non" name='ninegate_activate_widdokuwiki' description='Activer Dokuwiki'  mandatory='True'>
                 <value>non</value>
@@ -398,6 +408,7 @@
             <separator name="ninegate_activate_portal">Paramètres associés aux modules à activer</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_widcdt">Paramètres associés à CdT</separator>
             <separator name="ninegate_activate_widdokuwiki">Paramètres associés à Dokuwiki</separator>
             <separator name="ninegate_activate_wideconnect">Paramètres associés à eConnect</separator>
             <separator name="ninegate_activate_widead">Paramètres associés à EAD</separator>
@@ -714,6 +725,7 @@
 
             <target type='variable'>ninegate_activate_widadminer</target>
             <target type='variable'>ninegate_activate_widbalado</target>
+            <target type='variable'>ninegate_activate_widcdt</target>
             <target type='variable'>ninegate_activate_widdokuwiki</target>
             <target type='variable'>ninegate_activate_wideconnect</target>
             <target type='variable'>ninegate_activate_widead</target>
@@ -763,6 +775,7 @@
             <param>non</param>
 
             <target type='variable'>ninegate_widbalado_syncenvole</target>
+            <target type='variable'>ninegate_widcdt_syncenvole</target>
             <target type='variable'>ninegate_widgepi_syncenvole</target>
             <target type='variable'>ninegate_widlimesurvey_syncenvole</target>
             <target type='variable'>ninegate_widmoodle_syncenvole</target>
@@ -781,6 +794,7 @@
         <condition name='hidden_if_in' source='poshprofil_typesynchro'>
             <param>Annuaire</param>
             <target type='variable'>ninegate_widbalado_syncenvole</target>
+            <target type='variable'>ninegate_widcdt_syncenvole</target>
             <target type='variable'>ninegate_widgepi_syncenvole</target>
             <target type='variable'>ninegate_widnextcloud_syncenvole</target>
             <target type='variable'>ninegate_widsacoche_syncenvole</target>
@@ -810,7 +824,7 @@
 
 
 
-        <!-- AFFICHAGE EN FONCTION DU WIDGET BALADAO -->
+        <!-- AFFICHAGE EN FONCTION DU WIDGET BALADO -->
         <fill name='calc_multi_condition' target='ninegate_activate_widbalado'>
             <param>oui</param>
             <param type='eole' name='condition_1' hidden='False'>activer_balado</param>
@@ -841,6 +855,39 @@
         </fill>
 
 
+
+        <!-- AFFICHAGE EN FONCTION DU WIDGET CDT -->
+        <fill name='calc_multi_condition' target='ninegate_activate_widcdt'>
+            <param>oui</param>
+            <param type='eole' name='condition_1' hidden='False'>activer_cdt</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_widcdt'>
+            <param>non</param>
+
+            <target type='variable'>ninegate_widcdt_url</target>
+            <target type='variable'>ninegate_widcdt_syncenvole</target>
+        </condition>   
+
+        <fill name='calc_multi_condition' target='ninegate_widcdt_url'>
+            <param>oui</param>
+            <param type='eole' name='condition_1' hidden='False'>activer_cdt</param>
+            <param name='match'>/cdt</param>
+            <param name='default_mismatch'>None</param>
+        </fill>
+
+        <fill name='calc_multi_condition' target='ninegate_widcdt_syncenvole'>
+            <param>oui</param>
+            <param type='eole' name='condition_1' hidden='False'>activer_cdt</param>
+            <param name='match'>/posh-profil</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>

src/ninegate-1.0/src/Cadoles/CoreBundle/Command/InitDataCommand.php

@@ -228,9 +228,17 @@ class InitDataCommand extends ContainerAwareCommand
             $this->addModeration($profil,'cadoles_portal_config_flux',1);
             $this->addModeration($profil,'cadoles_portal_config_notice',1);
             $this->addModeration($profil,'cadoles_portal_config_icon',1);
+            $this->addModeration($profil,'cadoles_portal_config_syncbalado',0);
+            $this->addModeration($profil,'cadoles_portal_config_synccdt',0);
+            $this->addModeration($profil,'cadoles_portal_config_syncgepiannu',0);
+            $this->addModeration($profil,'cadoles_portal_config_syncgepisiecle',0);
             $this->addModeration($profil,'cadoles_portal_config_synclimesurvey',0);
             $this->addModeration($profil,'cadoles_portal_config_syncmoodle',0);
+            $this->addModeration($profil,'cadoles_portal_config_syncnextcloud',0);
+            $this->addModeration($profil,'cadoles_portal_config_syncsacoche',0);
+            $this->addModeration($profil,'cadoles_portal_config_syncpiwik',0);
             $this->addModeration($profil,'cadoles_portal_config_syncwordpress',0);
+
             $this->addModeration($profil,'cadoles_core_config_statistic',1);
             $this->addModeration($profil,'cadoles_core_config_mailing',1);
             $this->addModeration($profil,'cadoles_core_config_importuser',0);

src/ninegate-1.0/src/Cadoles/CoreBundle/Command/ScriptCommand.php

@@ -180,6 +180,20 @@ class ScriptCommand extends Command
             $this->writeln("");
         }
 
+        if($this->container->getParameter('ldap_template')=="scribe") {
+            $script=$this->em->getRepository("CadolesCoreBundle:Script")->findOneBy(["name"=>"purgepageprofil"]);
+            if(!$script) {
+                $this->writeln("== SCRIPT = purgepageprofil");
+                $this->purgepageprofil();
+                
+                $script=new Script();
+                $script->setName("purgepageprofil");
+                $this->em->persist($script);
+                $this->em->flush();                  
+                $this->writeln("");
+            }
+        }
+
         return 1;
     }
 
@@ -434,6 +448,20 @@ class ScriptCommand extends Command
         }
     }
 
+    private function purgepageprofil() {
+        $page=$this->em->getRepository('CadolesPortalBundle:Page')->findOneBy(['name'=>'PROFIL - Enseignants']);
+        if($page) {
+            $this->em->remove($page);
+            $this->em->flush();
+        }
+
+        $page=$this->em->getRepository('CadolesPortalBundle:Page')->findOneBy(['name'=>'PROFIL - Administratifs']);
+        if($page) {
+            $this->em->remove($page);
+            $this->em->flush();
+        }
+    }
+
 
 
 

src/ninegate-1.0/src/Cadoles/CoreBundle/Command/SynchroCommand.php

@@ -128,7 +128,7 @@ class SynchroCommand extends Command
                     $ldapfilter="(|(&(uid=*)(ENTPersonProfils=enseignant))(&(uid=*)(typeadmin=0))(&(uid=*)(typeadmin=2)))";
                     $label="PROFIL - Enseignants";
                     $this->writeln("    - $label");
-                    if(!$simulate) $this->addmodGroup($label,$ldapfilter,$scribe_group);
+                    if(!$simulate) $this->addmodGroup($label,$ldapfilter,false);
 
                     // Responsables
                     $ldapfilter="(&(uid=*)(ENTPersonProfils=responsable))";
@@ -140,7 +140,20 @@ class SynchroCommand extends Command
                     $ldapfilter="(&(uid=*)(ENTPersonProfils=administratif))";
                     $label="PROFIL - Administratifs";
                     $this->writeln("    - $label");
-                    if(!$simulate) $this->addmodGroup($label,$ldapfilter,$scribe_group);
+                    if(!$simulate) $this->addmodGroup($label,$ldapfilter,false);
+
+                    // Niveaux
+                    $this->writeln('');
+                    $this->writeln('== NIVEAUX ==========================================');
+                    $results = $this->ldap->search("type=Niveau", ['cn','description','gidNumber'], $this->ldap_basedn);
+                    foreach($results as $result) {
+                        $cn=$result["cn"];
+                        $ldapfilter="(&(type=Niveau)(cn=$cn))";
+
+                        $label="NIVEAU - ".$result["cn"];
+                        $this->writeln("    - $label");
+                        if(!$simulate) $this->addmodGroup($label,$ldapfilter,false);                        
+                    }
 
                     // Classes
                     $this->writeln('');
@@ -155,6 +168,32 @@ class SynchroCommand extends Command
                         if(!$simulate) $this->addmodGroup($label,$ldapfilter,$scribe_group);                        
                     }
 
+                    // Elèves des Classes
+                    $this->writeln('');
+                    $this->writeln('== ELEVES DES CLASSES ==========================================');
+                    $results = $this->ldap->search("type=Classe", ['cn','description','gidNumber'], $this->ldap_basedn);
+                    foreach($results as $result) {
+                        $cn=$result["cn"];
+                        $ldapfilter="(&(type=Classe)(cn=$cn))";
+
+                        $label="ELEVES - ".$result["cn"];
+                        $this->writeln("    - $label");
+                        if(!$simulate) $this->addmodGroup($label,$ldapfilter,false);                        
+                    }
+
+                    // Professeurs des Classes
+                    $this->writeln('');
+                    $this->writeln('== PROFESSEURS DES CLASSES ==========================================');
+                    $results = $this->ldap->search("type=Classe", ['cn','description','gidNumber'], $this->ldap_basedn);
+                    foreach($results as $result) {
+                        $cn=$result["cn"];
+                        $ldapfilter="(|(&(type=Equipe)(cn=profs-$cn))(&(ENTPersonProfils=Administratif)(divcod=$cn)))";
+
+                        $label="PROFESSEURS - ".$result["cn"];
+                        $this->writeln("    - $label");
+                        if(!$simulate) $this->addmodGroup($label,$ldapfilter,false);                        
+                    }
+
                     // Options
                     $this->writeln('');
                     $this->writeln('== OPTIONS ==========================================');

src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/PermmodoprofilController.php

@@ -331,8 +331,15 @@ class PermmodoprofilController extends Controller
         $this->addModeration($profil,'cadoles_portal_config_flux',1);
         $this->addModeration($profil,'cadoles_portal_config_notice',1);
         $this->addModeration($profil,'cadoles_portal_config_icon',1);
+        $this->addModeration($profil,'cadoles_portal_config_syncbalado',0);
+        $this->addModeration($profil,'cadoles_portal_config_synccdt',0);
+        $this->addModeration($profil,'cadoles_portal_config_syncgepiannu',0);
+        $this->addModeration($profil,'cadoles_portal_config_syncgepisiecle',0);
         $this->addModeration($profil,'cadoles_portal_config_synclimesurvey',0);
         $this->addModeration($profil,'cadoles_portal_config_syncmoodle',0);
+        $this->addModeration($profil,'cadoles_portal_config_syncnextcloud',0);
+        $this->addModeration($profil,'cadoles_portal_config_syncsacoche',0);
+        $this->addModeration($profil,'cadoles_portal_config_syncpiwik',0);
         $this->addModeration($profil,'cadoles_portal_config_syncwordpress',0);
         $this->addModeration($profil,'cadoles_core_config_statistic',1);
         $this->addModeration($profil,'cadoles_core_config_mailing',1);

src/ninegate-1.0/src/Cadoles/CoreBundle/EventListener/sessionListener.php

@@ -94,6 +94,7 @@
             $app["activate_widwordpress"]               =$this->container->getParameter('activate_widwordpress');
 
             $app["widbalado_activate_syncenvole"]       =$this->container->getParameter('widbalado_activate_syncenvole');
+            $app["widcdt_activate_syncenvole"]          =$this->container->getParameter('widcdt_activate_syncenvole');
             $app["widgepi_activate_syncenvole"]         =$this->container->getParameter('widgepi_activate_syncenvole');
             $app["widnextcloud_activate_syncenvole"]    =$this->container->getParameter('widnextcloud_activate_syncenvole');
             $app["widpiwik_activate_syncenvole"]        =$this->container->getParameter('widpiwik_activate_syncenvole');

src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/css/style.css

@@ -765,6 +765,11 @@ a.item-heart {
     max-width: 100%;
 }
 
+.widget-ckeditor img {
+    height:auto !important;
+}
+
+
 .frameitem {
     position: absolute;
     right: 0px;

src/ninegate-1.0/src/Cadoles/PortalBundle/Command/InitDataCommand.php

@@ -43,6 +43,7 @@ class InitDataCommand extends ContainerAwareCommand
 
         $activate_widadminer        = $this->getContainer()->getParameter('activate_widadminer');
         $activate_widbalado         = $this->getContainer()->getParameter('activate_widbalado');
+        $activate_widcdt            = $this->getContainer()->getParameter('activate_widcdt');
         $activate_widdokuwiki       = $this->getContainer()->getParameter('activate_widdokuwiki');
         $activate_wideconnect       = $this->getContainer()->getParameter('activate_wideconnect');
         $activate_widead            = $this->getContainer()->getParameter('activate_widead');
@@ -414,6 +415,29 @@ class InitDataCommand extends ContainerAwareCommand
             $em->persist($entityItem);            
         }
 
+        // Item CdT
+        if($activate_widcdt) {
+            $widcdt_url =$this->getContainer()->getParameter('widcdt_url');
+            $entityItem = $em->getRepository('CadolesPortalBundle:Item')->find(-391);
+            if(!$entityItem) {
+                $entityicon = $em->getRepository('CadolesPortalBundle:Icon')->findoneby(["label"=>"uploads/icon/icon_cdt.png"]);
+
+                $entityItem = new Item();
+                $entityItem->setId(-391);
+                $entityItem->setRowOrder(0);
+                $entityItem->setTitle('CdT');
+                $entityItem->setSubtitle("Application complète de gestion de cahier de texte scolaire");
+                $entityItem->SetContent("Application complète de gestion de cahier de texte scolaire");
+                $entityItem->setIcon($entityicon);
+                $entityItem->setTarget("_blank");
+                $entityItem->setItemcategory($entityItemcategoryapp);
+                $entityItem->setEssential(true);
+                $entityItem->addGroup($groupall);
+            }
+            $entityItem->setUrl($widcdt_url);
+            $em->persist($entityItem);            
+        }
+
         // Item Dokuwiki
         if($activate_widdokuwiki) {
             $widdokuwiki_url =$this->getContainer()->getParameter('widdokuwiki_url');

src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/ItemController.php

@@ -71,7 +71,8 @@ class ItemController extends Controller
             "mode"                  => "submit",
             "labelniveau01"         => $this->GetParameter("labelsniveau01"),
             "ssosynchroitem"        => $this->GetParameter("ssosynchroitem"),
-            "user_attr_cas_item"    => $this->GetParameter("user_attr_cas_item")
+            "user_attr_cas_item"    => $this->GetParameter("user_attr_cas_item"),
+            "activate_widsonde"     => $this->GetParameter("activate_widsonde"),
         ));
 
         // Récupération des data du formulaire
@@ -122,7 +123,8 @@ class ItemController extends Controller
             "idicon"                => ($data->getIcon()?$data->getIcon()->getId():null),
             "labelniveau01"         => $this->GetParameter("labelsniveau01"),
             "ssosynchroitem"        => $this->GetParameter("ssosynchroitem"),
-            "user_attr_cas_item"    => $this->GetParameter("user_attr_cas_item")
+            "user_attr_cas_item"    => $this->GetParameter("user_attr_cas_item"),
+            "activate_widsonde"     => ($this->GetParameter("activate_widsonde")&&$data->getId()>0),
         ));
 
         // Récupération des data du formulaire
@@ -230,6 +232,13 @@ class ItemController extends Controller
         if ($form->get('submit')->isClicked() && $mode=="submit") {
         }
 
+        if ($form->get('submit')->isClicked() && ($mode=="submit" || $mode=="update")) {
+            // si clicksonde alors clicksondeservice obligatoire
+            if ($data->getClicksonde() && !$data->getClicksondeservice()) {
+                $form->addError(new FormError('Type de service sur le click sonde est obligatoire'));
+            }
+        }
+
         if ($form->get('submit')->isClicked() && !$form->isValid()) {
             $this->get('session')->getFlashBag()->clear();
             $validator = $this->get('validator');

src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/SyncenvoleController.php

@@ -39,6 +39,20 @@ class SyncenvoleController extends Controller
         ]);        
     }
 
+    public function cdtAction()
+    {
+        $url=$this->getParameter("widcdt_syncenvole");
+        $color=$this->get('session')->get('colormain');
+        $themename=$this->get('session')->get("theme");
+
+        return $this->render('CadolesPortalBundle:Tool:frame.html.twig', [
+            'useheader'         => true,
+            'usemenu'           => false,
+            'usesidebar'        => true,              
+            'url'               => $url."/synchro.php?app=cdt&color=#color#"
+        ]);        
+    }
+
     public function gepiannuAction()
     {
         $url=$this->getParameter("widgepi_syncenvole");

src/ninegate-1.0/src/Cadoles/PortalBundle/Entity/Item.php

@@ -122,6 +122,20 @@ class Item
      */
     private $icon;
 
+    /**
+     * @var boolean
+     *
+     * @ORM\Column(name="clicksonde", type="boolean", nullable=true, options={"default":false})
+     */
+    private $clicksonde = false;    
+
+    /**
+     * @var boolean
+     *
+     * @ORM\Column(name="clicksondeservice", type="string", nullable=true)
+     */
+    private $clicksondeservice;    
+
     /**
      * @var ArrayCollection $bookmark
      * @var Bookmark
@@ -681,4 +695,52 @@ class Item
     {
         return $this->badgeurl;
     }
+
+    /**
+     * Set clicksonde
+     *
+     * @param boolean $clicksonde
+     *
+     * @return Item
+     */
+    public function setClicksonde($clicksonde)
+    {
+        $this->clicksonde = $clicksonde;
+
+        return $this;
+    }
+
+    /**
+     * Get clicksonde
+     *
+     * @return boolean
+     */
+    public function getClicksonde()
+    {
+        return $this->clicksonde;
+    }
+
+    /**
+     * Set clicksondeservice
+     *
+     * @param string $clicksondeservice
+     *
+     * @return Item
+     */
+    public function setClicksondeservice($clicksondeservice)
+    {
+        $this->clicksondeservice = $clicksondeservice;
+
+        return $this;
+    }
+
+    /**
+     * Get clicksondeservice
+     *
+     * @return string
+     */
+    public function getClicksondeservice()
+    {
+        return $this->clicksondeservice;
+    }
 }

src/ninegate-1.0/src/Cadoles/PortalBundle/Form/AlertType.php

@@ -118,14 +118,13 @@ class AlertType extends AbstractType
                         
             ->add('publishedat', DateType::class, [
                 'label'         => 'Publier du',
-                'input'         => 'datetime',
+                "widget"        => 'single_text',
             ])
 
             ->add('unpublishedat', DateType::class, [
                 'label'         => 'Jusqu\'au',
-                'input'         => 'datetime',
                 'required'      => false,
-                'years'         => range(date('Y'), date('Y')+10)
+                "widget"        => 'single_text',
             ]);
 
 

src/ninegate-1.0/src/Cadoles/PortalBundle/Form/ItemType.php

@@ -146,6 +146,51 @@ class ItemType extends AbstractType
                 "disabled"      => ($options["mode"]=="delete"?true:false),
             ]);            
         }
+
+
+        if($options["activate_widsonde"]) {
+            $builder
+            ->add('clicksonde', CheckboxType::class, [
+                "label"         => "Exécuter une sonde statistique sur le clic",
+                "required"      => false
+            ])   
+            
+            ->add('clicksondeservice', ChoiceType::class, [
+                "label" => 'Type de Service associé à la sonde',
+                "placeholder" => 'Sélectionner un service',     
+                "required" => false,
+                "choices" => [
+                    "ACCUEIL" => "ACCUEIL",
+                    "ACTUALITES" => "ACTUALITES",
+                    "CAHIER TEXTES" => "CAHIER_TEXTES",
+                    "CAHIER LIAISON" => "CAHIER_LIAISON",
+                    "COURRIER ELECTRONIQUE" => "COURRIER_ELECTRONIQUE",
+                    "MESSAGERIE INSTANTANEE" => "MESSAGERIE_INSTANTANEE",
+                    "VISIOCONFERENCE" => "VISIOCONFERENCE",
+                    "STOCKAGE PARTAGE" => "STOCKAGE_PARTAGE",
+                    "PRODUCTION COLLABORATIVE" => "PRODUCTION_COLLABORATIVE",
+                    "DOCUMENTATION CDI" => "DOCUMENTATION_CDI",
+                    "PARCOURS PEDAGOGIQUE" => "PARCOURS_PEDAGOGIQUE",
+                    "RESERVATION SALLES MATERIELS" => "RESERVATION_SALLES_MATERIELS",
+                    "SERVICE COLLECTIVITE" => "SERVICE_COLLECTIVITE",
+                    "SERVICES VIE SCOLAIRE" => "SERVICES_VIE_SCOLAIRE",
+                    "GESTION TEMPS" => "GESTION_TEMPS",
+                    "ABSENCES" => "ABSENCES",
+                    "GESTION COMPETENCES" => "GESTION_COMPETENCES",
+                    "NOTES" => "NOTES",
+                    "MANUEL NUMERIQUE" => "MANUEL_NUMERIQUE",
+                    "RESSOURCE MULTIMEDIA" => "RESSOURCE_MULTIMEDIA",
+                    "RESSOURCE ORIENTATION" => "RESSOURCE_ORIENTATION",
+                    "RESSOURCE PRODUCTION" => "RESSOURCE_PRODUCTION",
+                    "RESSOURCE ACCOMPAGNEMENT ENTRAINEMENT" => "RESSOURCE_ACCOMPAGNEMENT_ENTRAINEMENT",
+                    "RESSOURCE REFERENCE DICTIONNAIRE" => "RESSOURCE_REFERENCE_DICTIONNAIRE",
+                    "RESSOURCE DOCUMENTAIRE" => "RESSOURCE_DOCUMENTAIRE",
+                    "PAGE ENT" => "PAGE_ENT",
+                ],                
+                "disabled"      => ($options["mode"]=="delete"?true:false),
+            ]);
+            
+        }        
     }
 
     public function configureOptions(OptionsResolver $resolver)
@@ -157,6 +202,7 @@ class ItemType extends AbstractType
             'labelniveau01' => "string",
             'ssosynchroitem' => "string",
             'user_attr_cas_item' => "string",
+            "activate_widsonde" => "string",
         ]);
     }
 }

src/ninegate-1.0/src/Cadoles/PortalBundle/Repository/AlertRepository.php

@@ -45,7 +45,9 @@ class AlertRepository extends EntityRepository
         $roles=($user?$user->getRoles():["ROLE_ANONYME"]);
         $niveau01=($user?$user->getNiveau01():null);
         $groups=($user?$user->getGroups():[]);
-        
+
+        $userreads=($user?$user->getAlertreaders():new ArrayCollection());
+
         // Initialisation du calcul des alerts
         $alerts=new ArrayCollection();
 
@@ -67,8 +69,9 @@ class AlertRepository extends EntityRepository
                     ->setParameter("alertcategory",$alertcategoryfilter);
             }
             $alertsroles=$qb->getQuery()->getResult();
+
             foreach($alertsroles as $alertrole) {
-                if(!$alerts->contains($alertrole)&&!$alertrole->getReaders()->contains($user)) $alerts->add($alertrole);
+                if(!$alerts->contains($alertrole)&&!$userreads->contains($alertrole)) $alerts->add($alertrole);
             }
         }
 
@@ -91,7 +94,7 @@ class AlertRepository extends EntityRepository
         }
         $alertsniveau01s=$qb->getQuery()->getResult();
         foreach($alertsniveau01s as $alertniveau01) {
-            if(!$alerts->contains($alertniveau01)&&!$alertniveau01->getReaders()->contains($user)) $alerts->add($alertniveau01);
+            if(!$alerts->contains($alertniveau01)&&!$userreads->contains($alertniveau01)) $alerts->add($alertniveau01);
         }
 
         // Récupération des alerts par group
@@ -113,8 +116,8 @@ class AlertRepository extends EntityRepository
                     ->setParameter("alertcategory",$alertcategoryfilter);
             }
             $alertsgroups=$qb->getQuery()->getResult();
-            foreach($alertsgroups as $alertgroup) {
-                if(!$alerts->contains($alertgroup)&&!$alertgroup->getReaders()->contains($user)) $alerts->add($alertgroup);
+            foreach($alertsgroups as $alertgroup) {             
+                if(!$alerts->contains($alertgroup)&&!$userreads->contains($alertgroup)) $alerts->add($alertgroup);
             }
         }
 
@@ -141,8 +144,8 @@ class AlertRepository extends EntityRepository
                     ->setParameter("alertcategory",$alertcategoryfilter);
             }
             $alertsitems=$qb->getQuery()->getResult();
-            foreach($alertsitems as $alertitem) {
-                if(!$alerts->contains($alertitem)&&!$alertitem->getReaders()->contains($user)) $alerts->add($alertitem);
+            foreach($alertsitems as $alertitem) {               
+                if(!$alerts->contains($alertitem)&&!$userreads->contains($alertitem)) $alerts->add($alertitem);
             }
         }
 

src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/config/routing.yml

@@ -8,7 +8,11 @@ cadoles_portal_config_syncdelegation:
 cadoles_portal_config_syncbalado:
     path: /config/syncenvole/balado
     defaults: { _controller: CadolesPortalBundle:Syncenvole:balado }
-    
+
+cadoles_portal_config_synccdt:
+    path: /config/syncenvole/cdt
+    defaults: { _controller: CadolesPortalBundle:Syncenvole:cdt }
+
 cadoles_portal_config_syncgepiannu:
     path: /config/syncenvole/gepiannu
     defaults: { _controller: CadolesPortalBundle:Syncenvole:gepiannu }

src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Item/edit.html.twig

@@ -67,6 +67,13 @@
                 {{ form_row(form.ssoitem) }}
             {% endif %}
 
+            {% if form.clicksonde is defined %}
+                {{ form_row(form.clicksonde) }}
+                <div id="divclicksondeservice">
+                {{ form_row(form.clicksondeservice) }}
+                </div>
+            {% endif %}
+
             {{ 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 : '#'~color['main'] }};">
@@ -94,6 +101,10 @@
         showhide();
     });
 
+    $('#item_clicksonde').change(function() {
+        showhide();
+    });
+
     function selIcon(idicon,label) {
         $("#item_idicon").val(idicon);
         $("#diviconsel img").remove();
@@ -122,5 +133,13 @@
         if($("#item_target").val()=="frame") {
             $("#divhelp").show();
         }
+        
+
+        if($("#item_clicksonde").is(':checked')) {
+            $("#divclicksondeservice").show();
+        }
+        else {
+            $("#divclicksondeservice").hide();
+        }
     }
 {% endblock %}

src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Page/application.html.twig

@@ -25,12 +25,17 @@
                                 <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>
 
+                                    {% set datasonde = "" %}
+                                    {% if bookmark.item and bookmark.item.clicksonde %}
+                                        {% set datasonde = "class='linktosonde' data-sondetitle='"~bookmark.item.title~"' data-sondeservice='"~bookmark.item.clicksondeservice~"'" %}
+                                    {% endif %}
+
                                     {% if bookmark.target == 'frame' %}
-                                        <a class="linktosonde" data-sonde="{{ bookmark.title }}" style="cursor:pointer" onClick="showFrameitem('bookmark{{ bookmark.id }}','{{ bookmark.url }}')">
+                                        <a {{datasonde|raw}} style="cursor:pointer" onClick="showFrameitem('bookmark{{ bookmark.id }}','{{ bookmark.url }}')">
                                     {% elseif bookmark.target == "_self" %}
-                                        <a class="linktosonde" data-sonde="{{ bookmark.title }}" href="{{ bookmark.url }}" target="{% if access=="user" %}_top{% else %}{{ bookmark.target }}{% endif %}">
+                                        <a {{datasonde|raw}} href="{{ bookmark.url }}" target="{% if access=="user" %}_top{% else %}{{ bookmark.target }}{% endif %}">
                                     {% else %}
-                                        <a class="linktosonde" data-sonde="{{ bookmark.title }}" href="{{ bookmark.url }}" target="{{ bookmark.target }}">
+                                        <a {{datasonde|raw}} href="{{ bookmark.url }}" target="{{ bookmark.target }}">
                                     {% endif %}
 
                                     <div class="item-link clearfix">
@@ -110,12 +115,17 @@
                                 {% endif %}
                                 
                                 {% else %}
+                                    {% set datasonde = "" %}
+                                    {% if item.clicksonde %}
+                                        {% set datasonde = "class='linktosonde' data-sondetitle='"~item.title~"' data-sondeservice='"~item.clicksondeservice~"'" %}
+                                    {% endif %}
+
                                     {% if item.target == 'frame' %}
-                                        <a class="linktosonde" data-sonde="{{ item.title }}" style="cursor:pointer" onClick="showFrameitem({{ item.id }},'{{ item.url }}')">
+                                        <a {{datasonde|raw}} style="cursor:pointer" onClick="showFrameitem({{ item.id }},'{{ item.url }}')">
                                     {% elseif item.target == "_self" %}
-                                        <a class="linktosonde" data-sonde="{{ item.title }}" href="{{ item.url }}" target="{% if access=="user" %}_top{% else %}{{ item.target }}{% endif %}">
+                                        <a {{datasonde|raw}} href="{{ item.url }}" target="{% if access=="user" %}_top{% else %}{{ item.target }}{% endif %}">
                                     {% else %}
-                                        <a class="linktosonde" data-sonde="{{ item.title }}" href="{{ item.url }}" target="{{ item.target }}">
+                                        <a {{datasonde|raw}} href="{{ item.url }}" target="{{ item.target }}">
                                     {% endif %}
                                 {% endif %}
 
@@ -196,9 +206,10 @@
         // Sur click item à sonder
         {% if activate_widsonde %}
         $( ".linktosonde" ).click(function() {
-            title=$(this).attr("data-sonde");
-            //$.getScript( "{{ widsonde_url }}?appli="+title );
-        });        
+            title=$(this).attr("data-sondetitle");
+            service=$(this).attr("data-sondeservice");
+            EnvoleClickSondes($(this),title,service);
+        });         
         {% endif %}
 
     });

src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Page/noportal.html.twig

@@ -26,11 +26,11 @@
                                     <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' %}
-                                        <a class="linktosonde" data-sonde="{{ bookmark.title }}" style="cursor:pointer" onClick="showFrameitem('bookmark{{ bookmark.id }}','{{ bookmark.url }}')">
+                                        <a style="cursor:pointer" onClick="showFrameitem('bookmark{{ bookmark.id }}','{{ bookmark.url }}')">
                                     {% elseif bookmark.target == "_self" %}
-                                        <a class="linktosonde" data-sonde="{{ bookmark.title }}" href="{{ bookmark.url }}" target="{% if access=="user" %}_top{% else %}{{ bookmark.target }}{% endif %}">
+                                        <a href="{{ bookmark.url }}" target="{% if access=="user" %}_top{% else %}{{ bookmark.target }}{% endif %}">
                                     {% else %}
-                                        <a class="linktosonde" data-sonde="{{ bookmark.title }}" href="{{ bookmark.url }}" target="{{ bookmark.target }}">
+                                        <a href="{{ bookmark.url }}" target="{{ bookmark.target }}">
                                     {% endif %}
 
                                     <div class="item-link clearfix">
@@ -111,11 +111,11 @@
                                 
                                 {% else %}
                                     {% if item.target == 'frame' %}
-                                        <a class="linktosonde" data-sonde="{{ item.title }}" style="cursor:pointer" onClick="showFrameitem({{ item.id }},'{{ item.url }}')">
+                                        <a style="cursor:pointer" onClick="showFrameitem({{ item.id }},'{{ item.url }}')">
                                     {% elseif item.target == "_self" %}
-                                        <a class="linktosonde" data-sonde="{{ item.title }}" href="{{ item.url }}" target="{% if access=="user" %}_top{% else %}{{ item.target }}{% endif %}">
+                                        <a href="{{ item.url }}" target="{% if access=="user" %}_top{% else %}{{ item.target }}{% endif %}">
                                     {% else %}
-                                        <a class="linktosonde" data-sonde="{{ item.title }}" href="{{ item.url }}" target="{{ item.target }}">
+                                        <a href="{{ item.url }}" target="{{ item.target }}">
                                     {% endif %}
                                 {% endif %}
 
@@ -192,15 +192,6 @@
                 var grid = $('.grid').masonry(optiongrid);
             }
         });
-
-        // Sur click item à sonder
-        {% if activate_widsonde %}
-        $( ".linktosonde" ).click(function() {
-            title=$(this).attr("data-sonde");
-            //$.getScript( "{{ widsonde_url }}?appli="+title );
-        });        
-        {% endif %}
-
     });
 
 

src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Page/viewwidget.html.twig

@@ -289,8 +289,9 @@
         // Sur click item à sonder
         {% if activate_widsonde %}
         $( ".linktosonde" ).click(function() {
-            title=$(this).attr("data-sonde");
-            //$.getScript( "{{ widsonde_url }}?appli="+title );
+            title=$(this).attr("data-sondetitle");
+            service=$(this).attr("data-sondeservice");
+            EnvoleClickSondes($(this),title,service);
         });        
         {% endif %}
 

src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewalert.html.twig

@@ -68,7 +68,7 @@
                         </div>
                     
                         <div class="panel-body">
-                            {{ alert.content|raw }}
+                            <div class="widget-ckeditor">{{ alert.content|raw }}</div>
 
                             {% if not alert.items is empty %}
                                 {% if app.user %}
@@ -95,11 +95,11 @@
                                                 
                                                 {% else %}
                                                     {% if item.target == 'frame' %}
-                                                        <a class="linktosonde" data-sonde="{{ item.title }}" style="cursor:pointer" onClick="showFrameitem({{ item.id }},'{{ item.url|replace({'#login#': username}) }}')">
+                                                        <a style="cursor:pointer" onClick="showFrameitem({{ item.id }},'{{ item.url|replace({'#login#': username}) }}')">
                                                     {% elseif item.target == "_self" %}
-                                                        <a class="linktosonde" data-sonde="{{ item.title }}" href="{{ item.url|replace({'#login#': username}) }}" target="{% if access=="user" %}_top{% else %}{{ item.target }}{% endif %}">
+                                                        <a href="{{ item.url|replace({'#login#': username}) }}" target="{% if access=="user" %}_top{% else %}{{ item.target }}{% endif %}">
                                                     {% else %}
-                                                        <a class="linktosonde" data-sonde="{{ item.title }}" href="{{ item.url|replace({'#login#': username}) }}" target="{{ item.target }}">
+                                                        <a href="{{ item.url|replace({'#login#': username}) }}" target="{{ item.target }}">
                                                     {% endif %}
                                                 {% endif %}
 

src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewappexternal.html.twig

@@ -83,7 +83,7 @@
                                     
                         <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 : '#'~colormain }};">
-                                <a class="linktosonde" data-sonde="{{ item.itemcategory.label }}" href="{{ item.url }}" target="_blank">
+                                <a href="{{ item.url }}" target="_blank">
 
 
                                 <div class="item-link clearfix">

src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewbookmark.html.twig

@@ -87,11 +87,11 @@
                                     {% endif %}
                                     
                                     {% if bookmark.target == 'frame' %}
-                                        <a class="linktosonde" data-sonde="{{ bookmark.title }}" style="cursor:pointer" onClick="showFrameitem('bookmark{{ bookmark.id }}','{{ bookmark.url|replace({'#login#': username}) }}')">
+                                        <a style="cursor:pointer" onClick="showFrameitem('bookmark{{ bookmark.id }}','{{ bookmark.url|replace({'#login#': username}) }}')">
                                     {% elseif bookmark.target == "_self" %}
-                                        <a class="linktosonde" data-sonde="{{ bookmark.title }}" href="{{ bookmark.url|replace({'#login#': username}) }}" target="{% if access=="user" %}_top{% else %}{{ bookmark.target }}{% endif %}">
+                                        <a href="{{ bookmark.url|replace({'#login#': username}) }}" target="{% if access=="user" %}_top{% else %}{{ bookmark.target }}{% endif %}">
                                     {% else %}
-                                        <a class="linktosonde" data-sonde="{{ bookmark.title }}" href="{{ bookmark.url|replace({'#login#': username}) }}" target="{{ bookmark.target }}">
+                                        <a href="{{ bookmark.url|replace({'#login#': username}) }}" target="{{ bookmark.target }}">
                                     {% endif %}
 
                                     <div class="item-link clearfix">

src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewflux.html.twig

@@ -109,7 +109,7 @@
 
                     <div class="grid-item {{ stylegrid }}  feed flux-{{ feed.fluxid }}">
                         <div class="grid-item-content" style="{{ stylecolor }};">
-                            <a class="linktosonde" data-sonde="Flux = {{ feed.fluxtitle }}" href="{{ feed.link }}" target="_blank">
+                            <a href="{{ feed.link }}" target="_blank">
                                 <div class="item-link clearfix">
                                     {% if feed.image is not empty %}
                                     <div class="grid-item-logo">

src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewitem.html.twig

@@ -125,11 +125,11 @@
                                     <a  style="cursor:pointer"  onClick="delBookmark({{ bookmark.id }})"  class="item-heart"><i style="color: #FFF" class="fa fa-trash" title="Supprimer le favori"></i></a>
 
                                     {% if bookmark.target == 'frame' %}
-                                        <a class="linktosonde" data-sonde="{{ bookmark.title }}" style="cursor:pointer" onClick="showFrameitem('bookmark{{ bookmark.id }}','{{ bookmark.url|replace({'#login#': username}) }}')">
+                                        <a style="cursor:pointer" onClick="showFrameitem('bookmark{{ bookmark.id }}','{{ bookmark.url|replace({'#login#': username}) }}')">
                                     {% elseif bookmark.target == "_self" %}
-                                        <a class="linktosonde" data-sonde="{{ bookmark.title }}" href="{{ bookmark.url|replace({'#login#': username}) }}" target="{% if access=="user" %}_top{% else %}{{ bookmark.target }}{% endif %}">
+                                        <a href="{{ bookmark.url|replace({'#login#': username}) }}" target="{% if access=="user" %}_top{% else %}{{ bookmark.target }}{% endif %}">
                                     {% else %}
-                                        <a class="linktosonde" data-sonde="{{ bookmark.title }}" href="{{ bookmark.url|replace({'#login#': username}) }}" target="{{ bookmark.target }}">
+                                        <a href="{{ bookmark.url|replace({'#login#': username}) }}" target="{{ bookmark.target }}">
                                     {% endif %}
 
                                     <div class="item-link clearfix">
@@ -188,12 +188,17 @@
                                 <a  style="cursor:pointer"  onClick="delBookmark({{ bookmark.id }})"  class="item-heart"><i style="color: #FFF" class="fa fa-trash" title="Supprimer des favoris"></i></a>
                                 {% endif %}
 
+                                {% set datasonde = "" %}
+                                {% if bookmark.item and bookmark.item.clicksonde %}
+                                    {% set datasonde = "class='linktosonde' data-sondetitle='"~bookmark.item.title~"' data-sondeservice='"~bookmark.item.clicksondeservice~"'" %}
+                                {% endif %}
+
                                 {% if bookmark.item.target == 'frame' %}
-                                    <a class="linktosonde" data-sonde="{{ bookmark.item.title }}" style="cursor:pointer" onClick="showFrameitem('bookmark{{ bookmark.item.id }}','{{ bookmark.item.url|replace({'#login#': username}) }}')">
+                                    <a {{datasonde|raw}} style="cursor:pointer" onClick="showFrameitem('bookmark{{ bookmark.item.id }}','{{ bookmark.item.url|replace({'#login#': username}) }}')">
                                 {% elseif bookmark.target == "_self" %}
-                                    <a class="linktosonde" data-sonde="{{ bookmark.item.title }}" href="{{ bookmark.item.url|replace({'#login#': username}) }}" target="{% if access=="user" %}_top{% else %}{{ bookmark.item.target }}{% endif %}">
+                                    <a {{datasonde|raw}} data-sonde="{{ bookmark.item.title }}" href="{{ bookmark.item.url|replace({'#login#': username}) }}" target="{% if access=="user" %}_top{% else %}{{ bookmark.item.target }}{% endif %}">
                                 {% else %}
-                                    <a class="linktosonde" data-sonde="{{ bookmark.item.title }}" href="{{ bookmark.item.url|replace({'#login#': username}) }}" target="{{ bookmark.item.target }}">
+                                    <a {{datasonde|raw}} href="{{ bookmark.item.url|replace({'#login#': username}) }}" target="{{ bookmark.item.target }}">
                                 {% endif %}
 
                                 <div class="item-link clearfix">
@@ -244,12 +249,17 @@
                                         <a  style="cursor:pointer"  onClick="delBookmark({{ bookmark.id }})"  class="item-heart"><i style="color: #FFF" class="fa fa-trash" title="Supprimer des favoris"></i></a>
                                         {% endif %}
 
+                                        {% set datasonde = "" %}
+                                        {% if bookmark.item and bookmark.item.clicksonde %}
+                                            {% set datasonde = "class='linktosonde' data-sondetitle='"~bookmark.item.title~"' data-sondeservice='"~bookmark.item.clicksondeservice~"'" %}
+                                        {% endif %}
+
                                         {% if bookmark.item.target == 'frame' %}
-                                            <a class="linktosonde" data-sonde="{{ bookmark.item.title }}" style="cursor:pointer" onClick="showFrameitem('bookmark{{ bookmark.item.id }}','{{ bookmark.item.url|replace({'#login#': username}) }}')">
+                                            <a {{datasonde|raw}} style="cursor:pointer" onClick="showFrameitem('bookmark{{ bookmark.item.id }}','{{ bookmark.item.url|replace({'#login#': username}) }}')">
                                         {% elseif bookmark.target == "_self" %}
-                                            <a class="linktosonde" data-sonde="{{ bookmark.item.title }}" href="{{ bookmark.item.url|replace({'#login#': username}) }}" target="{% if access=="user" %}_top{% else %}{{ bookmark.item.target }}{% endif %}">
+                                            <a {{datasonde|raw}} href="{{ bookmark.item.url|replace({'#login#': username}) }}" target="{% if access=="user" %}_top{% else %}{{ bookmark.item.target }}{% endif %}">
                                         {% else %}
-                                            <a class="linktosonde" data-sonde="{{ bookmark.item.title }}" href="{{ bookmark.item.url|replace({'#login#': username}) }}" target="{{ bookmark.item.target }}">
+                                            <a {{datasonde|raw}} href="{{ bookmark.item.url|replace({'#login#': username}) }}" target="{{ bookmark.item.target }}">
                                         {% endif %}
 
                                         <div class="item-link clearfix">
@@ -285,11 +295,11 @@
                                         <a  style="cursor:pointer"  onClick="delBookmark({{ bookmark.id }})"  class="item-heart"><i style="color: #FFF" class="fa fa-trash" title="Supprimer le favori"></i></a>
 
                                         {% if bookmark.target == 'frame' %}
-                                            <a class="linktosonde" data-sonde="{{ bookmark.title }}" style="cursor:pointer" onClick="showFrameitem('bookmark{{ bookmark.id }}','{{ bookmark.url|replace({'#login#': username}) }}')">
+                                            <a style="cursor:pointer" onClick="showFrameitem('bookmark{{ bookmark.id }}','{{ bookmark.url|replace({'#login#': username}) }}')">
                                         {% elseif bookmark.target == "_self" %}
-                                            <a class="linktosonde" data-sonde="{{ bookmark.title }}" href="{{ bookmark.url|replace({'#login#': username}) }}" target="{% if access=="user" %}_top{% else %}{{ bookmark.target }}{% endif %}">
+                                            <a href="{{ bookmark.url|replace({'#login#': username}) }}" target="{% if access=="user" %}_top{% else %}{{ bookmark.target }}{% endif %}">
                                         {% else %}
-                                            <a class="linktosonde" data-sonde="{{ bookmark.title }}" href="{{ bookmark.url|replace({'#login#': username}) }}" target="{{ bookmark.target }}">
+                                            <a href="{{ bookmark.url|replace({'#login#': username}) }}" target="{{ bookmark.target }}">
                                         {% endif %}
 
                                         <div class="item-link clearfix">
@@ -394,12 +404,17 @@
                                 {% endif %}
                                 
                                 {% else %}
+                                    {% set datasonde = "" %}
+                                    {% if item.clicksonde %}
+                                        {% set datasonde = "class='linktosonde' data-sondetitle='"~item.title~"' data-sondeservice='"~item.clicksondeservice~"'" %}
+                                    {% endif %}
+
                                     {% if item.target == 'frame' %}
-                                        <a class="linktosonde" data-sonde="{{ item.title }}" style="cursor:pointer" onClick="showFrameitem({{ item.id }},'{{ item.url|replace({'#login#': username}) }}')">
+                                        <a {{datasonde|raw}} style="cursor:pointer" onClick="showFrameitem({{ item.id }},'{{ item.url|replace({'#login#': username}) }}')">
                                     {% elseif item.target == "_self" %}
-                                        <a class="linktosonde" data-sonde="{{ item.title }}" href="{{ item.url|replace({'#login#': username}) }}" target="{% if access=="user" %}_top{% else %}{{ item.target }}{% endif %}">
+                                        <a {{datasonde|raw}} href="{{ item.url|replace({'#login#': username}) }}" target="{% if access=="user" %}_top{% else %}{{ item.target }}{% endif %}">
                                     {% else %}
-                                        <a class="linktosonde" data-sonde="{{ item.title }}" href="{{ item.url|replace({'#login#': username}) }}" target="{{ item.target }}">
+                                        <a {{datasonde|raw}} href="{{ item.url|replace({'#login#': username}) }}" target="{{ item.target }}">
                                     {% endif %}
                                 {% endif %}
 

src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewitemessential.html.twig

@@ -97,12 +97,17 @@
                                 <a  style="cursor:pointer"  onClick="delBookmark({{ bookmark.id }})"  class="item-heart"><i style="color: #FFF" class="fa fa-trash" title="Supprimer des favoris"></i></a>
                                 {% endif %}
 
+                                {% set datasonde = "" %}
+                                {% if bookmark.item.clicksonde %}
+                                    {% set datasonde = "class='linktosonde' data-sondetitle='"~bookmark.item.title~"' data-sondeservice='"~bookmark.item.clicksondeservice~"'" %}
+                                {% endif %}
+                                
                                 {% if bookmark.item.target == 'frame' %}
-                                    <a class="linktosonde" data-sonde="{{ bookmark.item.title }}" style="cursor:pointer" onClick="showFrameitem('bookmark{{ bookmark.item.id }}','{{ bookmark.item.url|replace({'#login#': username}) }}')">
+                                    <a {{datasonde|raw}} style="cursor:pointer" onClick="showFrameitem('bookmark{{ bookmark.item.id }}','{{ bookmark.item.url|replace({'#login#': username}) }}')">
                                 {% elseif bookmark.target == "_self" %}
-                                    <a class="linktosonde" data-sonde="{{ bookmark.item.title }}" href="{{ bookmark.item.url|replace({'#login#': username}) }}" target="{% if access=="user" %}_top{% else %}{{ bookmark.item.target }}{% endif %}">
+                                    <a {{datasonde|raw}} href="{{ bookmark.item.url|replace({'#login#': username}) }}" target="{% if access=="user" %}_top{% else %}{{ bookmark.item.target }}{% endif %}">
                                 {% else %}
-                                    <a class="linktosonde" data-sonde="{{ bookmark.item.title }}" href="{{ bookmark.item.url|replace({'#login#': username}) }}" target="{{ bookmark.item.target }}">
+                                    <a {{datasonde|raw}} href="{{ bookmark.item.url|replace({'#login#': username}) }}" target="{{ bookmark.item.target }}">
                                 {% endif %}
 
                                 <div class="item-link clearfix">
@@ -138,11 +143,11 @@
                                 <a  style="cursor:pointer"  onClick="delBookmark({{ bookmark.id }})"  class="item-heart"><i style="color: #FFF" class="fa fa-trash" title="Supprimer le favori"></i></a>
 
                                 {% if bookmark.target == 'frame' %}
-                                    <a class="linktosonde" data-sonde="{{ bookmark.title }}" style="cursor:pointer" onClick="showFrameitem('bookmark{{ bookmark.id }}','{{ bookmark.url|replace({'#login#': username}) }}')">
+                                    <a style="cursor:pointer" onClick="showFrameitem('bookmark{{ bookmark.id }}','{{ bookmark.url|replace({'#login#': username}) }}')">
                                 {% elseif bookmark.target == "_self" %}
-                                    <a class="linktosonde" data-sonde="{{ bookmark.title }}" href="{{ bookmark.url|replace({'#login#': username}) }}" target="{% if access=="user" %}_top{% else %}{{ bookmark.target }}{% endif %}">
+                                    <a href="{{ bookmark.url|replace({'#login#': username}) }}" target="{% if access=="user" %}_top{% else %}{{ bookmark.target }}{% endif %}">
                                 {% else %}
-                                    <a class="linktosonde" data-sonde="{{ bookmark.title }}" href="{{ bookmark.url|replace({'#login#': username}) }}" target="{{ bookmark.target }}">
+                                    <a href="{{ bookmark.url|replace({'#login#': username}) }}" target="{{ bookmark.target }}">
                                 {% endif %}
 
                                 <div class="item-link clearfix">
@@ -186,12 +191,17 @@
                             {% endif %}
                             
                             {% else %}
+                                {% set datasonde = "" %}
+                                {% if item.clicksonde %}
+                                    {% set datasonde = "class='linktosonde' data-sondetitle='"~item.title~"' data-sondeservice='"~item.clicksondeservice~"'" %}
+                                {% endif %}
+
                                 {% if item.target == 'frame' %}
-                                    <a class="linktosonde" data-sonde="{{ item.title }}" style="cursor:pointer" onClick="showFrameitem({{ item.id }},'{{ item.url|replace({'#login#': username}) }}')">
+                                    <a {{datasonde|raw}} style="cursor:pointer" onClick="showFrameitem({{ item.id }},'{{ item.url|replace({'#login#': username}) }}')">
                                 {% elseif item.target == "_self" %}
-                                    <a class="linktosonde" data-sonde="{{ item.title }}" href="{{ item.url|replace({'#login#': username}) }}" target="{% if access=="user" %}_top{% else %}{{ item.target }}{% endif %}">
+                                    <a {{datasonde|raw}} href="{{ item.url|replace({'#login#': username}) }}" target="{% if access=="user" %}_top{% else %}{{ item.target }}{% endif %}">
                                 {% else %}
-                                    <a class="linktosonde" data-sonde="{{ item.title }}" href="{{ item.url|replace({'#login#': username}) }}" target="{{ item.target }}">
+                                    <a {{datasonde|raw}} href="{{ item.url|replace({'#login#': username}) }}" target="{{ item.target }}">
                                 {% endif %}
                             {% endif %}
 

src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewlink.html.twig

@@ -28,11 +28,11 @@
     <div class="widget widget-mini widget-link" data-id="{{ entity.id }}" loc="{{ entity.loc }}">
         <div class="widgetheader">
             {% if target == 'frame' %}
-                <a class="linktosonde" data-sonde="{{ entity.name }}" style="cursor:pointer; {{ stylelink }}" onClick="showFrameitem('link{{ entity.id }}','{{ url|replace({'#login#': username}) }}')">
+                <a style="cursor:pointer; {{ stylelink }}" onClick="showFrameitem('link{{ entity.id }}','{{ url|replace({'#login#': username}) }}')">
             {% elseif target == "_self" %}
-                <a class="linktosonde" data-sonde="{{ entity.name }}" style="{{ stylelink }}"href="{{ url|replace({'#login#': username}) }}" target="{% if access=="user" %}_top{% else %}{{ target }}{% endif %}">
+                <a style="{{ stylelink }}"href="{{ url|replace({'#login#': username}) }}" target="{% if access=="user" %}_top{% else %}{{ target }}{% endif %}">
             {% else %}
-                <a class="linktosonde" data-sonde="{{ entity.name }}" style="{{ stylelink }}" href="{{ url|replace({'#login#': username}) }}" target="{{ target }}">
+                <a style="{{ stylelink }}" href="{{ url|replace({'#login#': username}) }}" target="{{ target }}">
             {% endif %}   
             {% if entity.icon %}
                 <img src="/{{ alias }}/{{ entity.icon.label }}" class="logo" title="{{entity.name}}" />
@@ -54,11 +54,11 @@
 
         <div class="widgetheader" style="{{ stylewidgetbodyimage }}; height:100%;">
             {% if target == 'frame' %}
-                <a class="linktosonde" data-sonde="{{ entity.name }}" style="cursor:pointer; {{ stylelink }}" onClick="showFrameitem('link{{ entity.id }}','{{ url|replace({'#login#': username}) }}')">
+                <a style="cursor:pointer; {{ stylelink }}" onClick="showFrameitem('link{{ entity.id }}','{{ url|replace({'#login#': username}) }}')">
             {% elseif target == "_self" %}
-                <a class="linktosonde" data-sonde="{{ entity.name }}" style="{{ stylelink }}"href="{{ url|replace({'#login#': username}) }}" target="{% if access=="user" %}_top{% else %}{{ target }}{% endif %}">
+                <a style="{{ stylelink }}"href="{{ url|replace({'#login#': username}) }}" target="{% if access=="user" %}_top{% else %}{{ target }}{% endif %}">
             {% else %}
-                <a class="linktosonde" data-sonde="{{ entity.name }}" style="{{ stylelink }}" href="{{ url|replace({'#login#': username}) }}" target="{{ target }}">
+                <a style="{{ stylelink }}" href="{{ url|replace({'#login#': username}) }}" target="{{ target }}">
             {% endif %}   
             {% if entity.icon %}
                 <img src="/{{ alias }}/{{ entity.icon.label }}" style="max-height: 100%; width: auto; display: block; margin: auto; padding-top: 10px;" />

tmpl/ninegate-init-01.sql

@@ -67,6 +67,7 @@ INSERT IGNORE INTO `sidebar` (`id`, `parent_id`, `roworder`, `label`, `path`, `f
 (3000,	NULL,	3000,	'SYNCHRONISATION',      NULL,	                                    'fa fa-exchange-alt',       'ROLE_ADMIN,ROLE_MODO', 'syncenvole_activate'),
 (3001,	3000,	3001,	'Délégation',           'cadoles_portal_config_syncdelegation',     'fa fa-balance-scale',      'ROLE_ADMIN,ROLE_MODO', 'syncenvole_activate'),
 (3110,	3000,	3110,	'Balado',               'cadoles_portal_config_syncbalado',         'fa fa-microphone',         'ROLE_ADMIN,ROLE_MODO', 'widbalado_activate_syncenvole'),
+(3112,	3000,	3112,	'CdT',                  'cadoles_portal_config_synccdt',            'fa fa-star',               'ROLE_ADMIN,ROLE_MODO', 'widcdt_activate_syncenvole'),
 (3115,	3000,	3115,	'GEPI via Annuaire',    'cadoles_portal_config_syncgepiannu',       'fa fa-tags',               'ROLE_ADMIN,ROLE_MODO', 'widgepi_activate_syncenvole'),
 (3116,	3000,	3116,	'GEPI via SIECLE',      'cadoles_portal_config_syncgepisiecle',     'fa fa-tags',               'ROLE_ADMIN,ROLE_MODO', 'widgepi_activate_syncenvole'),
 (3120,	3000,	3120,	'Limesurvey',           'cadoles_portal_config_synclimesurvey',     'fa fa-question',           'ROLE_ADMIN,ROLE_MODO', 'activate_widlimesurvey'),

tmpl/ninegate-template.yml

@@ -284,6 +284,20 @@ parameters:
     widbalado_activate_syncenvole: false
 %end if
 
+%if %%getVar("ninegate_activate_widcdt", 'non') == "oui" 
+    activate_widcdt: true
+    widcdt_url: %%ninegate_widcdt_url
+    %if %%getVar("poshprofil_typesynchro", "") == "ENT"
+    widcdt_activate_syncenvole: true
+    widcdt_syncenvole: %%ninegate_widcdt_syncenvole  
+    %else
+    widcdt_activate_syncenvole: false
+    %end if      
+%else 
+    activate_widcdt: false
+    widcdt_activate_syncenvole: false
+%end if
+
 %if %%getVar("ninegate_activate_widdokuwiki", 'non') == "oui" 
     activate_widdokuwiki: true
     widdokuwiki_url: %%ninegate_widdokuwiki_url