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

dicos/91_ninegate.xml

@@ -74,6 +74,8 @@
 
             <variable type='oui/non' name='ninegate_syncldap' description="Synchroniser Ninegate vers votre annuaire"><value>non</value></variable>
             <variable type='string' name='ninegate_ldaptemplate' description="Modèle d'annuaire"><value>scribe</value></variable>
+            <variable type='oui/non' name='ninegate_scribegroup' description="Considérer les classes/options comme des groupes de travail"><value>oui</value></variable>
+            <variable type='oui/non' name='ninegate_scribemaster' description="Placer les professeurs comme manager des groupes classes/options"><value>oui</value></variable>
 
             <variable type='string' name='ninegate_pwdadmin' description="Mot de passe du compte admin durant l'instance (idem valeur Cadoles ldap)" mandatory='True'><value>cadoles</value></variable>
             <variable type='string' name='ninegate_organization' description="Nom de l'organisation principale (idem valeur Cadoles ldap)" mandatory='True'><value>cadoles</value></variable>
@@ -398,6 +400,8 @@
 
             <target type='variable'>ninegate_syncldap</target>
             <target type='variable'>ninegate_ldaptemplate</target>
+            <target type='variable'>ninegate_scribegroup</target>
+            <target type='variable'>ninegate_scribemaster</target>
 
             <target type='variable'>ninegate_pwdadmin</target>
             <target type='variable'>ninegate_organization</target>
@@ -517,6 +521,17 @@
         </auto>
 
 
+        
+        <!-- AFFICHAGE EN FONCTION DU MODE SCRIBE -->
+            <condition name='hidden_if_not_in' source='ninegate_ldaptemplate'>
+                <param>scribe</param>
+
+                <target type='variable'>ninegate_scribegroup</target>
+                <target type='variable'>ninegate_scribemaster</target>
+            </condition>
+
+        
+        
         <!-- AFFICHAGE EN FONCTION DU MODULE PORTAL -->
         <condition name='hidden_if_in' source='ninegate_activate_portal'>
             <param>non</param>

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

@@ -101,6 +101,8 @@ class SynchroCommand extends Command
                 $ldap_lastname      = $this->container->getParameter('ldap_lastname');
                 $ldap_email         = $this->container->getParameter('ldap_email');
                 $ldap_usersadmin    = $this->container->getParameter('ldap_usersadmin');
+                $scribe_group       = $this->container->getParameter('scribe_group');
+                $scribe_master      = $this->container->getParameter('scribe_master');
                 $fieldstoread       = array($ldap_username,$ldap_firstname,$ldap_lastname,$ldap_email);
                 $ldapusers          = array();
                 $ldapmails          = array();
@@ -119,7 +121,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,true);
+                    if(!$simulate) $this->addmodGroup($label,$ldapfilter,$scribe_group);
 
                     // Responsables
                     $ldapfilter="(&(uid=*)(ENTPersonProfils=responsable))";
@@ -131,7 +133,7 @@ class SynchroCommand extends Command
                     $ldapfilter="(&(uid=*)(ENTPersonProfils=administratif))";
                     $label="PROFIL - Administratifs";
                     $this->writeln("    - $label");
-                    if(!$simulate) $this->addmodGroup($label,$ldapfilter,true);
+                    if(!$simulate) $this->addmodGroup($label,$ldapfilter,$scribe_group);
 
                     // Classes
                     $this->writeln('');
@@ -143,7 +145,7 @@ class SynchroCommand extends Command
 
                         $label="CLASSE - ".$result["cn"];
                         $this->writeln("    - $label");
-                        if(!$simulate) $this->addmodGroup($label,$ldapfilter,true);                        
+                        if(!$simulate) $this->addmodGroup($label,$ldapfilter,$scribe_group);                        
                     }
 
                     // Options
@@ -156,7 +158,7 @@ class SynchroCommand extends Command
 
                         $label="OPTION - ".$result["cn"];
                         $this->writeln("    - $label");
-                        if(!$simulate) $this->addmodGroup($label,$ldapfilter,true);                        
+                        if(!$simulate) $this->addmodGroup($label,$ldapfilter,$scribe_group);                        
                     }
 
                     // Groupes
@@ -169,7 +171,7 @@ class SynchroCommand extends Command
 
                         $label="GROUPE - ".$result["cn"];
                         $this->writeln("    - $label");
-                        if(!$simulate) $this->addmodGroup($label,$ldapfilter,true);                        
+                        if(!$simulate) $this->addmodGroup($label,$ldapfilter,$scribe_group);                        
                     }
                 }
 
@@ -243,7 +245,8 @@ class SynchroCommand extends Command
                 
                             if($user->getLastname()!=$result[$ldap_lastname]||$user->getFirstname()!=$result[$ldap_firstname]||$user->getEmail()!=$result[$ldap_email]||$toadmin) {
                                 $usermail=$this->em->getRepository('CadolesCoreBundle:User')->findOneBy(array('email' => $result[$ldap_email]));
-                                if($usermail!=$user) {
+                                
+                                if($usermail&&$usermail!=$user) {
                                     array_push($tberrors,"    - Modification dans Bundle impossible     >> ".$result[$ldap_username]." un autre utilisateur a déjà ce mail = ".$result[$ldap_email]);
                                 }
                                 else {
@@ -376,6 +379,62 @@ class SynchroCommand extends Command
                     $this->em->clear();   
                     if($nbusers%1000==0) $this->writelnred("    == Nombre d'utilisateurs traités = $nbusers==");
                 }
+
+                $this->writeln('');
+                $this->writeln('== GROUPS ============================================');
+                // Pour chaque groupe annuaire on s'assure que le groupe existe bien dans l'annuaire
+                $groups=$this->em->getRepository('CadolesCoreBundle:Group')->findBy(["fgtemplate"=>true]);
+                foreach($groups as $group) {
+                    if(stripos($group->getLabel(),"PROFIL - ")===false) {
+                        $results = $this->ldap->search($group->getLdapfilter(), [], $this->ldap_basedn);
+                        if(count($results)==0) {
+                            $this->writeln("    - Suppression dans Bundle  >> ".$group->getLabel());
+                            if(!$simulate) {
+                                if($group->getFgcanshare()) {
+                                    // Sur l'ensemble des pages liés
+                                    $pages=$group->getPages();
+                                    foreach($pages as $page) {
+                                        $getgroups=$page->getGroups();
+                                        // si la page est lié qu'à un seul group on peut la supprimer
+                                        if($getgroups->count()==1)
+                                            $this->em->remove($page);
+                                    }
+                    
+                                    // Sur l'ensemble des calendar liés
+                                    $calendars=$group->getCalendars();
+                                    foreach($calendars as $calendar) {
+                                        $getgroups=$calendar->getGroups();
+                                        // si la page est lié qu'à un seul group on peut la supprimer
+                                        if($getgroups->count()==1)
+                                            $this->em->remove($calendar);
+                                    }                
+                    
+                                    // Sur l'ensemble des blog liés
+                                    $blogs=$group->getBlogs();
+                                    foreach($blogs as $blog) {
+                                        $getgroups=$blog->getGroups();
+                                        // si la page est lié qu'à un seul group on peut la supprimer
+                                        if($getgroups->count()==1)
+                                            $this->em->remove($blog);
+                                    }  
+                                    
+                                    // Sur l'ensemble des project liés
+                                    $projects=$group->getProjects();
+                                    foreach($projects as $project) {
+                                        $getgroups=$project->getGroups();
+                                        // si la page est lié qu'à un seul group on peut la supprimer
+                                        if($getgroups->count()==1)
+                                            $this->em->remove($project);
+                                    }                  
+                                }
+                    
+                                $this->em->remove($group);
+                                $this->em->flush();
+                            }
+                        }
+                    }
+                }
+
             }
         }
         else {
@@ -700,13 +759,13 @@ class SynchroCommand extends Command
         $group=$this->em->getRepository('CadolesCoreBundle:Group')->findOneBy(array('fgtemplate' => true, 'label' => $label));
         if(!$group) {
             $group=new Group();
-            $group->setFgcanshare($fgcanshare);
             $group->setFgcancreatepage(false);
             $group->setFgcancreateblog(false);
             $group->setFgcancreatecalendar(false);
             $group->setFgcancreateproject(false);            
         }
 
+        $group->setFgcanshare($fgcanshare);
         $group->setLabel($label);
         $group->setFgopen(false);
         $group->setFgall(false);
@@ -782,7 +841,8 @@ class SynchroCommand extends Command
         
         // Si modèle scribe 
         $ldap_template = $this->container->getParameter('ldap_template');
-        if($ldap_template=="scribe") {
+        $scribe_master = $this->container->getParameter('scribe_master');
+        if($ldap_template=="scribe"&&$scribe_master) {
             $ldapfilter="(|(&(uid=".$user->getUsername().")(ENTPersonProfils=enseignant))(&(uid=".$user->getUsername().")(typeadmin=0))(&(uid=".$user->getUsername().")(typeadmin=2)))";
             $results = $this->ldap->search($ldapfilter, ['uid'], $this->ldap_basedn);
             if($results) $member->setFgmanager(true);

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

@@ -958,7 +958,7 @@ class GroupController extends Controller
                 // Sur l'ensemble des project liés
                 $projects=$data->getProjects();
                 foreach($projects as $project) {
-                    $groups=$blog->getGroups();
+                    $groups=$project->getGroups();
                     // si la page est lié qu'à un seul group on peut la supprimer
                     if($groups->count()==1)
                         $em->remove($project);

src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/transnum/local.js

@@ -255,7 +255,7 @@ function MyTourGroupe() {
                 element: $("#diviconsel"), 
                 title: "Icône du groupe",
                 placement : "right",
-                content: "Choisissez l'icône pour votre groupe en cliquant sur 'Sélectionner un icône'.",
+                content: "Choisissez l'icône pour votre groupe en cliquant sur 'Sélectionner une icône'.",
             },
 			{
                 element: $("#group_submit"), 
@@ -793,7 +793,7 @@ function AdminGroupSubmit() {
                 element: $("#diviconsel"), 
                 title: "Icône du groupe",
                 placement : "top",
-                content: "Choisissez l'icône pour le groupe en cliquant sur 'Sélectionner un icône'. ",
+                content: "Choisissez l'icône pour le groupe en cliquant sur 'Sélectionner une icône'. ",
             },
 			{
                 element: $("#group_fgcancreatepage"), 
@@ -1876,7 +1876,7 @@ function AdminIcon() {
         steps: [
             {
                 element: $(".btn:first"), 
-                title: "Ajouter une icone",
+                title: "Ajouter une icône",
                 placement : "top",
                 content: "Ajoutez une icône en cliquant sur ce bouton - les icônes sont utilisées pour l'identité des items, des widgets et des groupes. En cliquant sur une icône existante, vous pourrez la supprimer ou la modifier. Essayez de choisir des icônes en phase avec les tendances graphiques du portail... ",
             }, 

src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Core/reconnect.html.twig

@@ -41,7 +41,7 @@
     <div style="width: 400px;margin: auto;text-align: center;margin-top: 50px;">
         <img id="logo" src="/{{ alias }}/{{ app.session.get('logo') }}">
         <h1>{{ app.session.get('appname') }}</h1>
-        <h2>Vous avez perdu votre connection</h2>
+        <h2>Vous avez perdu votre connexion</h2>
         ou
         <h2>Vous n'avez plus accès à cette page</h2>
         <br><br>

src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Group/edit.html.twig

@@ -121,7 +121,7 @@
 
             <div style="text-align:center;padding:0px">
                 {{ form_row(form.idicon) }}
-                <a class="btn btn-success" onClick="selectIcon()" title='Ajouter' style="width:100%">Selectionner un Icône</a>
+                <a class="btn btn-success" onClick="selectIcon()" title='Ajouter' style="width:100%">Selectionner une Icône</a>
                 <a class="btn btn-danger" onClick="delIcon()" title='Détacher' style="width:100%">Détacher l'Icône</a>
             </div>
             <br>       
@@ -219,7 +219,7 @@
     }
 
     function selectIcon() {
-        $("#mymodal").find(".modal-title").html("SELECTIONNER UN ICONE");
+        $("#mymodal").find(".modal-title").html("SELECTIONNER UNE ICONE");
         var url="{{ path('cadoles_portal_user_icon_select') }}";
         $("#mymodal").find("#framemodal").attr("src",url);
         $("#mymodal").modal("show");

src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Group/list.html.twig

@@ -32,7 +32,7 @@
                     <thead>
                     <tr>
                         <th width="160px" class="no-sort">Action</th>
-                        <th class="no-sort text-center">Icone</th>
+                        <th class="no-sort text-center">Icône</th>
                         <th>Label</th>
                         <th>Ouvert</th>
                         <th class="no-sort {% if masteridentity=="SQL" %} no-visible {% endif %}">Filtre</th>

src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Registration/edit.html.twig

@@ -59,7 +59,7 @@
             <div class="col-sm-6">
                 <div class="panel panel-primary">
                     <div class="panel-heading">
-                        <i class="fa fa-key fa-fw"></i> Connection
+                        <i class="fa fa-key fa-fw"></i> Connexion
                     </div>
 
                     <div class="panel-body">

src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/User/edit.html.twig

@@ -66,7 +66,7 @@
         <div class="col-sm-6">
             <div class="panel panel-primary">
                 <div class="panel-heading">
-                    <i class="fa fa-key fa-fw"></i> Connection
+                    <i class="fa fa-key fa-fw"></i> Connexion
                 </div>
 
                 <div class="panel-body">

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

@@ -21,6 +21,7 @@ use Cadoles\PortalBundle\Entity\Appexternal;
 use Cadoles\PortalBundle\Entity\Flux;
 use Cadoles\PortalBundle\Entity\Projecttasktag;
 use Cadoles\PortalBundle\Entity\Projecttaskstatus;
+use Cadoles\PortalBundle\Entity\Alertcategory;
 use Cadoles\PortalBundle\Entity\Itemcategory;
 use Cadoles\PortalBundle\Entity\Item;
 
@@ -95,6 +96,10 @@ class InitDataCommand extends ContainerAwareCommand
         $metadata->setIdGeneratorType(ClassMetadata::GENERATOR_TYPE_NONE);
         $metadata->setIdGenerator(new AssignedGenerator());
 
+        $metadata = $em->getClassMetaData('CadolesPortalBundle:Alertcategory');
+        $metadata->setIdGeneratorType(ClassMetadata::GENERATOR_TYPE_NONE);
+        $metadata->setIdGenerator(new AssignedGenerator());
+
         $metadata = $em->getClassMetaData('CadolesPortalBundle:Itemcategory');
         $metadata->setIdGeneratorType(ClassMetadata::GENERATOR_TYPE_NONE);
         $metadata->setIdGenerator(new AssignedGenerator());
@@ -318,6 +323,21 @@ class InitDataCommand extends ContainerAwareCommand
         }  
 
 
+//== ALERTCATEGORY========================================================================================================================================
+        $output->writeln('  > Creation Alert Category');
+
+        $entityicon = $em->getRepository('CadolesPortalBundle:Icon')->findoneby(["label"=>"uploads/icon/icon_megaphone2.png"]);
+        $entityAlertcategoryapp = $em->getRepository('CadolesPortalBundle:Alertcategory')->find(-100);
+        if(!$entityAlertcategoryapp) {
+            $entityAlertcategoryapp = new Alertcategory();
+            $entityAlertcategoryapp->setId(-100);
+            $entityAlertcategoryapp->setColor("00a996");
+            $entityAlertcategoryapp->setLabel('Annonces');
+            $entityAlertcategoryapp->setIcon($entityicon);
+            $em->persist($entityAlertcategoryapp);
+        }
+
+
 //== ITEMCATEGORY========================================================================================================================================
         $output->writeln('  > Creation Item Category');
 
@@ -1221,7 +1241,7 @@ class InitDataCommand extends ContainerAwareCommand
             $entityWidget->setAutoajust(true);
             $entityWidget->setBorder(false);
             $entityWidget->setOpened(true);
-            $entityWidget->setAccess(["config","user","group"]);
+            $entityWidget->setAccess(["config","group"]);
             $parameter = json_decode('{"fields": []}');
             $entityWidget->setParameter($parameter);
             $em->persist($entityWidget);
@@ -1328,7 +1348,7 @@ class InitDataCommand extends ContainerAwareCommand
         $entityWidget->setOpened(true);
         $entityWidget->setAccess(["config","user","group"]);
         $entityWidget->setColorbodyback("ffffff");
-        $parameter = json_decode('{"fields": [{"id": "seetitle", "loc": "col1", "type": "boolean", "label": "Afficher le titre", "value": "0", "mandatory": "true"},{"id": "seeicon", "loc": "col1", "type": "boolean", "label": "Afficher l\'icone", "value": "0", "mandatory": "true"}]}');
+        $parameter = json_decode('{"fields": [{"id": "seetitle", "loc": "col1", "type": "boolean", "label": "Afficher le titre", "value": "0", "mandatory": "true"},{"id": "seeicon", "loc": "col1", "type": "boolean", "label": "Afficher l\'icône", "value": "0", "mandatory": "true"}]}');
         $entityWidget->setParameter($parameter);
         $em->persist($entityWidget);
 

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

@@ -112,8 +112,9 @@ class BlogController extends Controller
         foreach($datas as $data) {
             $route=str_replace("_config_","_".$access."_",$this->routeprimary);
             $action = "";
+            $action.="<a href='".$this->generateUrl($route.'_update', array('id'=>$data->getId()))."'><i class='fa fa-gear fa-fw fa-2x'></i></a>";
+            $action.="<a href='".$this->generateUrl($route.'_view', array('id'=>$data->getId()))."'><i class='fa fa-eye fa-fw fa-2x'></i></a>";
             $action.="<a href='".$this->generateUrl($route.'_delete', array('id'=>$data->getId()))."' data-method='delete'><i class='fa fa-trash fa-fw fa-2x'></i></a>";
-            $action.="<a href='".$this->generateUrl($route.'_view', array('id'=>$data->getId()))."'><i class='fa fa-eye fa-2x'></i></a>";
 
             $user="";
             if($data->getUser()) {

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

@@ -109,8 +109,9 @@ class CalendarController extends Controller
         foreach($datas as $data) {
             $route=str_replace("_config_","_".$access."_",$this->routeprimary);
             $action = "";
+            $action.="<a href='".$this->generateUrl($route.'_update', array('id'=>$data->getId()))."'><i class='fa fa-gear fa-fw fa-2x'></i></a>";
+            $action.="<a href='".$this->generateUrl($route.'_view', array('id'=>$data->getId()))."'><i class='fa fa-eye fa-fw fa-2x'></i></a>";
             $action.="<a href='".$this->generateUrl($route.'_delete', array('id'=>$data->getId()))."' data-method='delete'><i class='fa fa-trash fa-fw fa-2x'></i></a>";
-            $action.="<a href='".$this->generateUrl($route.'_view', array('id'=>$data->getId()))."'><i class='fa fa-eye fa-2x'></i></a>";
 
             $user="";
             if($data->getUser()) {

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

@@ -123,8 +123,9 @@ class PageController extends Controller
             $route=str_replace("_config_","_".$access."_",$this->routeprimary);
             $action = "";
             //$action.="<a href='".$this->generateUrl($route.'_update', array('id'=>$data->getId()))."'><i class='fa fa-file fa-fw'></i></a>";
+            $action.="<a href='".$this->generateUrl($route.'_update', array('id'=>$data->getId()))."'><i class='fa fa-gear fa-fw fa-2x'></i></a>";
+            $action.="<a href='".$this->generateUrl($route.'_view', array('id'=>$data->getId()))."'><i class='fa fa-eye fa-fw fa-2x'></i></a>";
             $action.="<a href='".$this->generateUrl($route.'_delete', array('id'=>$data->getId()))."' data-method='delete'><i class='fa fa-trash fa-fw fa-2x'></i></a>";
-            $action.="<a href='".$this->generateUrl($route.'_view', array('id'=>$data->getId()))."'><i class='fa fa-eye fa-2x'></i></a>";
 
             $user="";
             if($data->getUser()) {

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

@@ -102,9 +102,9 @@ class PagetemplateController extends Controller
 
             $route=str_replace("_config_","_".$access."_",$this->routeprimary);
             $action = "";
-            //$action.="<a href='".$this->generateUrl($route.'_update', array('id'=>$data->getId()))."'><i class='fa fa-file fa-fw'></i></a>";
+            $action.="<a href='".$this->generateUrl($route.'_update', array('id'=>$data->getId()))."'><i class='fa fa-gear fa-fw fa-2x'></i></a>";
+            $action.="<a href='".$this->generateUrl($route.'_view', array('id'=>$data->getId()))."'><i class='fa fa-eye fa-fw fa-2x'></i></a>";
             $action.="<a href='".$this->generateUrl($route.'_delete', array('id'=>$data->getId()))."' data-method='delete'><i class='fa fa-trash fa-fw fa-2x'></i></a>";
-            $action.="<a href='".$this->generateUrl($route.'_view', array('id'=>$data->getId()))."'><i class='fa fa-eye fa-2x'></i></a>";
 
             array_push($output["data"],[
                 $action,

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

@@ -1603,7 +1603,7 @@ class PagewidgetController extends Controller
         $entity = $em->getRepository($this->labelentity)->find($id);
         if (!$entity) throw $this->createNotFoundException('Unable to find entity.');
 
-        $groupentity=$em->getRepository("CadolesCoreBundle:Group")->find($group);
+        if($group) $groupentity=$em->getRepository("CadolesCoreBundle:Group")->find($group);
 
         // Permissions
         if($access=="config") {

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

@@ -112,8 +112,10 @@ class ProjectController extends Controller
         foreach($datas as $data) {
             $route=str_replace("_config_","_".$access."_",$this->routeprimary);
             $action = "";
+            $action.="<a href='".$this->generateUrl($route.'_update', array('id'=>$data->getId()))."'><i class='fa fa-gear fa-fw fa-2x'></i></a>";
+            $action.="<a href='".$this->generateUrl($route.'_view', array('id'=>$data->getId()))."'><i class='fa fa-eye fa-fw fa-2x'></i></a>";
             $action.="<a href='".$this->generateUrl($route.'_delete', array('id'=>$data->getId()))."' data-method='delete'><i class='fa fa-trash fa-fw fa-2x'></i></a>";
-            $action.="<a href='".$this->generateUrl($route.'_view', array('id'=>$data->getId()))."'><i class='fa fa-eye fa-2x'></i></a>";
+            
 
             $user="";
             if($data->getUser()) {

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

@@ -50,6 +50,13 @@ class Alertcategory
      */
     protected $alerts;
 
+    // A garder pour forcer l'id en init
+    public function setId($id)
+    {
+        $this->id = $id;
+        return $this;
+    }  
+
 
     /**
      * Constructor

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

@@ -11,7 +11,7 @@ use Symfony\Component\Validator\Constraints as Assert;
  * @ORM\Entity
  * @ORM\Table(name="icon")
  * @ORM\HasLifecycleCallbacks
- * @UniqueEntity(fields="label", message="Un Icone existe déjà avec ce label")
+ * @UniqueEntity(fields="label", message="Une Icône existe déjà avec ce label")
  */
 class Icon
 {

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

@@ -57,7 +57,7 @@
 
             <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-success" data-toggle="modal" data-target="#selicon" title='Ajouter' style="width:100%">Selectionner une Icône</a>
                 <a class="btn btn-danger" onClick="delIcon()" title='Détacher' style="width:100%">Détacher l'Icône</a>
             </div>             
         </div>
@@ -68,7 +68,7 @@
             <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>
+                    <h4 class="modal-title">SELECTIONNER UNE ICONE</h4>
                 </div>
 
                 <div class="modal-body">

src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Blog/list.html.twig

@@ -24,7 +24,7 @@
                 <table class="table table-striped table-bordered table-hover" id="dataTables" style="width:100%">
                     <thead>
                         <tr>
-                        <th width="100px" class="no-sort">Action</th>
+                        <th width="120px" class="no-sort">Action</th>
                         <th>Nom</th>
                         <th>Propriétaire</th>
                         </tr>

src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Blog/view.html.twig

@@ -6,7 +6,7 @@
     {% if access=="config" %}
         <div class="pagemenu">
             <a href="{{ path('cadoles_portal_config_blog_view', {id:entity.id})}}">{{ entity.name }}</a>
-            <a href='{{ path('cadoles_portal_config_blog_update', {id:entity.id}) }}' title='Modifier'><i class='fa fa-file fa-fw'></i></a>
+            <a href='{{ path('cadoles_portal_config_blog_update', {id:entity.id}) }}' title='Modifier'><i class='fa fa-gear fa-fw'></i></a>
             <a href='{{ path('cadoles_portal_config_blog_writer', {id:entity.id}) }}' title='Permission'><i class='fa fa-users fa-fw'></i></a>
             <a href='{{ path('cadoles_portal_config_blog_delete', { id: entity.id }) }}' data-method='delete' data-confirm='Êtes-vous sûr de vouloir supprimer ?' title='Supprimer'><i class='fa fa-trash fa-fw'></i></a>
         </div>

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

@@ -69,7 +69,7 @@
 
             <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-success" data-toggle="modal" data-target="#selicon" title='Ajouter' style="width:100%">Selectionner une Icône</a>
                 <a class="btn btn-danger" onClick="delIcon()" title='Détacher' style="width:100%">Détacher l'Icône</a>
             </div>  
         </div>
@@ -80,7 +80,7 @@
             <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>
+                    <h4 class="modal-title">SELECTIONNER UNE ICONE</h4>
                 </div>
 
                 <div class="modal-body">

src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Calendar/list.html.twig

@@ -25,7 +25,7 @@
                 <table class="table table-striped table-bordered table-hover" id="dataTables" style="width:100%">
                     <thead>
                         <tr>
-                        <th width="100px" class="no-sort">Action</th>
+                        <th width="120px" class="no-sort">Action</th>
                         <th>Nom</th>
                         <th>Propriétaire</th>
                         </tr>

src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Calendar/view.html.twig

@@ -6,7 +6,7 @@
     {% if access=="config" %}
         <div class="pagemenu">
             <a href="{{ path('cadoles_portal_config_calendar_view', {id:entity.id})}}">{{ entity.name }}</a>
-            <a href='{{ path('cadoles_portal_config_calendar_update', {id:entity.id}) }}' title='Modifier le panel'><i class='fa fa-file fa-fw'></i></a>
+            <a href='{{ path('cadoles_portal_config_calendar_update', {id:entity.id}) }}' title='Modifier le panel'><i class='fa fa-gear fa-fw'></i></a>
             <a href='{{ path('cadoles_portal_config_calendar_delete', { id: entity.id }) }}' data-method='delete' data-confirm='Êtes-vous sûr de vouloir supprimer ?' title='Supprimer le panel'><i class='fa fa-trash fa-fw'></i></a>
         </div>
     {% else %}

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

@@ -71,7 +71,7 @@
 
             <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-success" data-toggle="modal" data-target="#selicon" title='Ajouter' style="width:100%">Selectionner une Icône</a>
                 <a class="btn btn-danger" onClick="delIcon()" title='Détacher' style="width:100%">Détacher l'Icône</a>
             </div>  
         </div>
@@ -82,7 +82,7 @@
             <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>
+                    <h4 class="modal-title">SELECTIONNER UNE ICONE</h4>
                 </div>
 
                 <div class="modal-body">

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

@@ -25,7 +25,7 @@
                 <table class="table table-striped table-bordered table-hover" id="dataTables" style="width:100%">
                     <thead>
                         <tr>
-                        <th width="100px" class="no-sort">Action</th>
+                        <th width="120px" class="no-sort">Action</th>
                         <th>Ordre</th>
                         <th>Nom</th>
                         <th class="no-sort">Catégorie</th>

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

@@ -6,7 +6,7 @@
         <div class="pagemenu">
             <a href="{{ path('cadoles_portal_config_page_view', {id:entity.id})}}">{{ entity.name }}</a>
 
-            <a href='{{ path('cadoles_portal_config_page_update', {id:entity.id}) }}' title='Modifier le panel'><i class='fa fa-file fa-fw'></i></a>
+            <a href='{{ path('cadoles_portal_config_page_update', {id:entity.id}) }}' title='Modifier le panel'><i class='fa fa-gear fa-fw'></i></a>
             <a href='{{ path('cadoles_portal_config_page_delete', { id: entity.id }) }}' data-method='delete' data-confirm='Êtes-vous sûr de vouloir supprimer ?' title='Supprimer le panel'><i class='fa fa-trash fa-fw'></i></a>
         </div>
     {% endif %}  

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

@@ -16,7 +16,7 @@
         <div class="pagemenu">
             <a href="{{ path('cadoles_portal_config_page_view', {id:entity.id})}}">{{ entity.name }}</a>
 
-            <a href='{{ path('cadoles_portal_config_page_update', {id:entity.id}) }}' title='Modifier le panel'><i class='fa fa-file fa-fw'></i></a>
+            <a href='{{ path('cadoles_portal_config_page_update', {id:entity.id}) }}' title='Modifier le panel'><i class='fa fa-gear fa-fw'></i></a>
             <a href='{{ path('cadoles_portal_config_page_delete', { id: entity.id }) }}' data-method='delete' data-confirm='Êtes-vous sûr de vouloir supprimer ?' title='Supprimer le panel'><i class='fa fa-trash fa-fw'></i></a>
         </div>
     {% endif %}        

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

@@ -11,7 +11,7 @@
 
             <a href="{{ path('cadoles_portal_config_page'~template~'_view', {id:entity.id})}}">{{ entity.name }}</a>
 
-            <a href='{{ path('cadoles_portal_config_page'~template~'_update', {id:entity.id}) }}' title='Modifier le panel'><i class='fa fa-file fa-fw'></i></a>
+            <a href='{{ path('cadoles_portal_config_page'~template~'_update', {id:entity.id}) }}' title='Modifier le panel'><i class='fa fa-gear fa-fw'></i></a>
             <a href='{{ path('cadoles_portal_config_page'~template~'_delete', { id: entity.id }) }}' data-method='delete' data-confirm='Êtes-vous sûr de vouloir supprimer ?' title='Supprimer le panel'><i class='fa fa-trash fa-fw'></i></a>
             <a href='' style='cursor:pointer' data-toggle='modal' data-target='#selwidget' title='Ajouter un widget'><i class='fa fa-cubes fa-fw'></i></a>
         </div>
@@ -25,7 +25,7 @@
 
     <div id="tolocalize" style="display:none">
         {% for pagewidget in entity.pagewidgets %}
-            <!-- {{ url(pagewidget.widget.routeview|replace({'_config_':'_'~access~'_'}),{id:pagewidget.id,by:mode,usage:usage,group:group}) }} -->
+            <a href="{{ url(pagewidget.widget.routeview|replace({'_config_':'_'~access~'_'}),{id:pagewidget.id,by:mode,usage:usage,group:group}) }}"></a>
             {{ render(url(pagewidget.widget.routeview|replace({'_config_':'_'~access~'_'}),{id:pagewidget.id,by:mode,usage:usage,group:group})) }}
         {% endfor %}
     </div>

src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagetemplate/list.html.twig

@@ -29,7 +29,7 @@
                 <table class="table table-striped table-bordered table-hover" id="dataTables" style="width:100%">
                     <thead>
                         <tr>
-                        <th width="100px" class="no-sort">Action</th>
+                        <th width="120px" class="no-sort">Action</th>
                         <th>Ordre</th>
                         <th>Nom</th>
                         <th>Pour</th>

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

@@ -61,7 +61,7 @@
             </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-success" data-toggle="modal" data-target="#selicon" title='Ajouter' style="width:100%">Selectionner une Icône</a>
             </div>  
         </div>
     </div>
@@ -93,7 +93,7 @@
             <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>
+                    <h4 class="modal-title">SELECTIONNER UNE ICONE</h4>
                 </div>
 
                 <div class="modal-body" style="height: 480px; overflow-y: scroll;">

src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Project/list.html.twig

@@ -24,7 +24,7 @@
                 <table class="table table-striped table-bordered table-hover" id="dataTables" style="width:100%">
                     <thead>
                         <tr>
-                        <th width="100px" class="no-sort">Action</th>
+                        <th width="120px" class="no-sort">Action</th>
                         <th>Nom</th>
                         <th>Propriétaire</th>
                         </tr>

src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Project/view.html.twig

@@ -7,7 +7,7 @@
     {% if access=="config" %}
         <div class="pagemenu">
             <a href="{{ path('cadoles_portal_config_project_view', {id:entity.id})}}">{{ entity.name }}</a>
-            <a href='{{ path('cadoles_portal_config_project_update', {id:entity.id}) }}' title='Modifier'><i class='fa fa-file fa-fw'></i></a>
+            <a href='{{ path('cadoles_portal_config_project_update', {id:entity.id}) }}' title='Modifier'><i class='fa fa-gear fa-fw'></i></a>
             <a href='{{ path('cadoles_portal_config_project_writer', {id:entity.id}) }}' title='Permission'><i class='fa fa-users fa-fw'></i></a>
             <a href='{{ path('cadoles_portal_config_project_delete', { id: entity.id }) }}' data-method='delete' data-confirm='Êtes-vous sûr de vouloir supprimer ?' title='Supprimer'><i class='fa fa-trash fa-fw'></i></a>
         </div>

tmpl/ninegate-init-01.sql

@@ -97,7 +97,7 @@ INSERT IGNORE INTO `config` (`order`, `visible`, `changeable`, `required`, `type
 ('006', 0, 1, 0, 'datauser',     	'datauser',		    '',		    			                                    '',				'Parametrage des champs utilisateurs : obligatoire / facultatif / caché'),
 ('007', 0, 1, 0, 'datausers',     	'datausers',	    '',		    			                                    '',				'Parametrage des colonnes visible dans la liste des utilisateurs'),
 
-('010', 1, 1, 1, 'boolean',  		'fgforceconnect',	'0',										                '',				'Forcer la connection afin de rendre votre site privé'),
+('010', 1, 1, 1, 'boolean',  		'fgforceconnect',	'0',										                '',				'Forcer la connexion afin de rendre votre site privé'),
 
 ('040', 1, 1, 1, 'boolean',         'fgheader',	        '1',		    			                                '',				'Utiliser une image en bannière du site'),
 ('041', 1, 1, 1, 'header',          'header',	        'uploads/header/header.png',                                'fgheader',		'Image en bannière du site'),

tmpl/ninegate-template.yml

@@ -184,6 +184,20 @@ parameters:
     ldap_email: mail
     ldap_usersadmin: [admin]
 
+    # Template scribe
+%if %%getVar("ninegate_scribegroup", 'non') == "oui"    
+    scribe_group: true
+%else
+    scribe_group: false 
+%end if
+
+%if %%getVar("ninegate_scribemaster", 'non') == "oui"    
+    scribe_master: true
+%else
+    scribe_master: false
+%end if
+
+
     # Activation Widget
 %if %%getVar("ninegate_activate_widadminer", 'non') == "oui" 
     activate_widadminer: true