From ff5569bcae9369653cbe37ecd5c74a6cfb9fb0cc Mon Sep 17 00:00:00 2001
From: afornerot <afornerot@cadoles.com>
Date: Tue, 9 Jul 2019 11:02:21 +0200
Subject: [PATCH] svg

---
 .../CoreBundle/Command/data/core-init-01.sql  |   2 +-
 .../CoreBundle/Controller/CoreController.php  |   3 +-
 .../Resources/views/File/view.html.twig       |   2 +-
 .../PortalBundle/Command/InitDataCommand.php  |  23 +++-
 .../Controller/BookmarkController.php         |  44 +++++--
 .../Controller/PageController.php             |  92 ++++++++++++---
 .../Controller/PagetemplateController.php     |   4 +-
 .../Controller/PagewidgetController.php       | 108 ++++++++++++++++--
 .../Controller/SlideController.php            |  71 +++++++++---
 .../PortalBundle/Form/BlogShareType.php       |   1 +
 .../PortalBundle/Form/CalendarShareType.php   |   1 +
 .../PortalBundle/Form/PageShareType.php       |   1 +
 .../PortalBundle/Form/PageSubmitType.php      |  31 ++++-
 .../Repository/BlogRepository.php             |  27 +++++
 .../Repository/CalendarRepository.php         |  18 +++
 .../PortalBundle/Resources/config/routing.yml |  10 ++
 .../Resources/views/Bookmark/edit.html.twig   |   4 +-
 .../Resources/views/Page/pages.html.twig      |  99 ++++++++++++----
 .../Resources/views/Page/submit.html.twig     |  32 ++++++
 .../Resources/views/Page/viewwidget.html.twig | 101 ++++++++--------
 .../Resources/views/Pagewidget/constants.twig |  47 ++++----
 .../Resources/views/Pagewidget/edit.html.twig |   2 +-
 .../views/Pagewidget/viewblog.html.twig       |   7 +-
 .../views/Pagewidget/viewcalendar.html.twig   |  10 +-
 .../views/Pagewidget/vieweditor.html.twig     |   2 +-
 .../views/Pagewidget/viewfile.html.twig       |  66 ++++++-----
 .../views/Pagewidget/viewflux.html.twig       |   6 +-
 .../views/Pagewidget/viewinfo.html.twig       |  66 +++++++++++
 .../Resources/views/Slide/edit.html.twig      |   4 +-
 .../Resources/views/Slide/list.html.twig      |   6 +-
 .../web/uploads/icon/icon_info.png            | Bin 0 -> 3543 bytes
 31 files changed, 693 insertions(+), 197 deletions(-)
 create mode 100644 src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewinfo.html.twig
 create mode 100644 src/ninegate-1.0/web/uploads/icon/icon_info.png

diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Command/data/core-init-01.sql b/src/ninegate-1.0/src/Cadoles/CoreBundle/Command/data/core-init-01.sql
index 19653747..a4337b1f 100644
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Command/data/core-init-01.sql
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Command/data/core-init-01.sql
@@ -8,7 +8,7 @@ INSERT IGNORE INTO `niveau01` (`id`, `label`, `siren`) VALUES
 (-100, 'DRAAF', '130007107');
 
 INSERT IGNORE INTO `user` (`id`, `niveau01_id`, `username`, `firstname`, `lastname`, `password`, `email`, `avatar`, `role`,`siren`,`authlevel`) VALUES
-(-100, -100, 'admin', 'Administrateur', 'draaf', '{SSHA}otHXvfP0WOEFQYGgcJCVwAZ8h4HHrHOP
+(-100, -100, 'admin', 'Administrateur', 'draaf', '{SSHA}wAHoMm5DBdK1+YoDHF+e40chzyBR/vhk
 ', 'admin@ldapbundle.ac-arno.fr', 'admin.jpg', 'ROLE_ADMIN', '130007107', 'simple');
 
 
diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/CoreController.php b/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/CoreController.php
index 92d7fe32..d2c6755a 100644
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/CoreController.php
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/CoreController.php
@@ -128,7 +128,8 @@ class CoreController extends Controller
                 'pagesuser'         => $pagesuser,
                 'groupsshared'      => $groupsshared,
                 'canadd'            => $this->get('session')->get('cancreatepage'),
-                'widgets'           => $this->getDoctrine()->getRepository("CadolesPortalBundle:Widget")->getWidgetAccess("user")
+                'widgetsuser'       => $this->getDoctrine()->getRepository("CadolesPortalBundle:Widget")->getWidgetAccess("user"),
+                'widgetsgroup'      => $this->getDoctrine()->getRepository("CadolesPortalBundle:Widget")->getWidgetAccess("group")
             ]);
         }
 
diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/File/view.html.twig b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/File/view.html.twig
index e4d0ccb1..ae24a55c 100644
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/File/view.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/File/view.html.twig
@@ -6,7 +6,7 @@
             <li><a>{{ filename }}</a></li>
         </ul>
 
-        <ul class="nav navbar-top-links navbar-right">
+        <ul class="nav navbar-top-links navbar-right" style="position:static">
             <li><a href="{{ path('cadoles_core_'~access~'_file_download',{'directory':directory,'filename':filename }) }}" style="cursor:pointer"><i class="fa fa-download"></i></a></li>
         </ul>
 
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Command/InitDataCommand.php b/src/ninegate-1.0/src/Cadoles/PortalBundle/Command/InitDataCommand.php
index 677c6cfa..aa3e25af 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Command/InitDataCommand.php
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Command/InitDataCommand.php
@@ -361,7 +361,7 @@ class InitDataCommand extends ContainerAwareCommand
         $entityWidget->setBorder(true);
         $entityWidget->setOpened(true);
         $entityWidget->setAccess(["config","user","group"]);
-        $parameter = json_decode('{"fields": [{"id": "modedesktop", "loc": "col1", "type": "desktopmode", "label": "Mode Affichage", "value": "0", "mandatory": "true"},{"id": "withbookmark", "loc": "col1", "type": "withbookmark", "label": "Avec Favoris", "value": "0", "mandatory": "true"},{"id": "itemcategory", "loc": "col1", "type": "itemcategory", "label": "Catégorie Affichée", "value": "", "mandatory": "false"}]}');
+        $parameter = json_decode('{"fields": [{"id": "modedesktop", "loc": "col1", "type": "desktopmode", "label": "Mode Affichage", "value": "2", "mandatory": "true"},{"id": "withbookmark", "loc": "col1", "type": "withbookmark", "label": "Avec Favoris", "value": "0", "mandatory": "true"},{"id": "itemcategory", "loc": "col1", "type": "itemcategory", "label": "Catégorie Affichée", "value": "", "mandatory": "false"}]}');
         $entityWidget->setParameter($parameter);
         $em->persist($entityWidget);
 
@@ -612,11 +612,30 @@ class InitDataCommand extends ContainerAwareCommand
             $entityWidget->setOpened(true);
             $entityWidget->setAccess(["config","user","group"]);
 
-            $parameter = json_decode('{"fields": [{"id": "modedesktop", "loc": "col1", "type": "desktopmode", "label": "Mode Affichage", "value": "0", "mandatory": "true"},{"id": "Applications", "loc": "col1", "type": "appexternal", "label": "Applications à affichier", "value": "", "mandatory": "false"}]}');
+            $parameter = json_decode('{"fields": [{"id": "modedesktop", "loc": "col1", "type": "desktopmode", "label": "Mode Affichage", "value": "2", "mandatory": "true"},{"id": "Applications", "loc": "col1", "type": "appexternal", "label": "Applications à affichier", "value": "", "mandatory": "false"}]}');
             $entityWidget->setParameter($parameter);
             $em->persist($entityWidget);
         }
 
+        // Widget Information
+        $entityWidget = $em->getRepository('CadolesPortalBundle:Widget')->find(-1860);
+        if(!$entityWidget) $entityWidget = new Widget();
+        $entityicon = $em->getRepository('CadolesPortalBundle:Icon')->findoneby(["label"=>"uploads/icon/icon_info.png"]);
+        $entityWidget->setId(-1860);
+        $entityWidget->setRoworder(13);
+        $entityWidget->setIcon($entityicon);
+        $entityWidget->setName('Information Page');
+        $entityWidget->setDescription("Afficher les informations associées à la page");
+        $entityWidget->setRouteview("cadoles_portal_config_panelwidget_view_info");
+        $entityWidget->setHeight("630");
+        $entityWidget->setAutoajust(true);
+        $entityWidget->setBorder(true);
+        $entityWidget->setOpened(true);
+        $entityWidget->setAccess(["config","user","group"]);
+        $parameter = json_decode('{"fields": []}');
+        $entityWidget->setParameter($parameter);
+        $em->persist($entityWidget);
+
         // Widget Séparateur
         $entityWidget = $em->getRepository('CadolesPortalBundle:Widget')->find(-1600);
         if(!$entityWidget) $entityWidget = new Widget();
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/BookmarkController.php b/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/BookmarkController.php
index 651e3865..9321b816 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/BookmarkController.php
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/BookmarkController.php
@@ -21,6 +21,9 @@ class BookmarkController extends Controller
 
     public function submitAction(Request $request,$idpage,$idwidget,$touser,$access="config")
     {
+        $usage=$request->query->get('usage');
+        $group=$request->query->get('group');
+
         // Initialisation de l'enregistrement
         $em = $this->getDoctrine()->getManager();
         $data = new Bookmark();
@@ -60,7 +63,7 @@ class BookmarkController extends Controller
             $em->flush();
 
             // Retour à la page
-            return $this->redirect($this->generateUrl('cadoles_portal_'.$access.'_page_view',["id"=>$idpage]));
+            return $this->redirect($this->generateUrl('cadoles_portal_'.$access.'_page_view',["id"=>$idpage,"usage"=>$usage,"group"=>$group]));
         }
         
         $icons=$this->getDoctrine()->getRepository("CadolesPortalBundle:Icon")->findBy(["user"=>null]);
@@ -78,11 +81,16 @@ class BookmarkController extends Controller
             'access'            => $access,   
             'idpage'            => $idpage,         
             'form'              => $form->createView(),
+            'usage'             => $usage,
+            'group'             => $group
         ]);
     }  
 
     public function updateAction(Request $request,$idpage,$id,$access="config")
     {
+        $usage=$request->query->get('usage');
+        $group=$request->query->get('group');
+
         // Récupération de l'enregistrement courant 
         $em = $this->getDoctrine()->getManager();
         $data=$this->getData($id);
@@ -91,11 +99,19 @@ class BookmarkController extends Controller
         // Vérifier que cet enregistrement est modifiable
         $user=$data->getUser();
         if($user) {
-            if($user!=$this->getUser())  throw $this->createNotFoundException('Permission denied');
+            if($usage=="user")
+                if($user!=$this->getUser())  throw $this->createNotFoundException('Permission denied');
         }
         elseif($access=="user") {
-            $user=$data->getPagewidget()->getPage()->getUser();
-            if($user!=$this->getUser())  throw $this->createNotFoundException('Permission denied');
+            if($usage=="user") {
+                $user=$data->getPagewidget()->getPage()->getUser();
+                if($user!=$this->getUser())  throw $this->createNotFoundException('Permission denied');
+            }
+            else {
+                $groupentity=$this->getDoctrine()->getRepository("CadolesCoreBundle:Group")->find($group);
+                $fgmanager=$this->getDoctrine()->getRepository("CadolesCoreBundle:UserGroup")->findoneby(["user"=>$this->getUser(),"group"=>$groupentity,"fgmanager"=>true]);
+                if(!$fgmanager) throw $this->createNotFoundException('Permission denied');
+            }
         }
 
         // Création du formulaire
@@ -124,7 +140,7 @@ class BookmarkController extends Controller
             $em->flush();
 
             // Retour à la page
-            return $this->redirect($this->generateUrl('cadoles_portal_'.$access.'_page_view',["id"=>$idpage]));
+            return $this->redirect($this->generateUrl('cadoles_portal_'.$access.'_page_view',["id"=>$idpage,"usage"=>$usage,"group"=>$group]));
         }
         
         $icons=$this->getDoctrine()->getRepository("CadolesPortalBundle:Icon")->findBy(["user"=>null]);
@@ -143,11 +159,16 @@ class BookmarkController extends Controller
             'access'            => $access,   
             'idpage'            => $idpage,         
             'form'              => $form->createView(),
+            'usage'             => $usage,
+            'group'             => $group
         ]);
     }
 
     public function deleteAction(Request $request,$idpage,$id,$access="config")
     {
+        $usage=$request->query->get('usage');
+        $group=$request->query->get('group');
+
         // Récupération de l'enregistrement courant 
         $em = $this->getDoctrine()->getManager();
         $data=$this->getData($id);
@@ -159,8 +180,15 @@ class BookmarkController extends Controller
             if($user!=$this->getUser())  throw $this->createNotFoundException('Permission denied');
         }
         elseif($access=="user") {
-            $user=$data->getPagewidget()->getPage()->getUser();
-            if($user!=$this->getUser())  throw $this->createNotFoundException('Permission denied');
+            if($usage=="user") {
+                $user=$data->getPagewidget()->getPage()->getUser();
+                if($user!=$this->getUser())  throw $this->createNotFoundException('Permission denied');
+            }
+            else {
+                $groupentity=$this->getDoctrine()->getRepository("CadolesCoreBundle:Group")->find($group);
+                $fgmanager=$this->getDoctrine()->getRepository("CadolesCoreBundle:UserGroup")->findoneby(["user"=>$this->getUser(),"group"=>$groupentity,"fgmanager"=>true]);
+                if(!$fgmanager) throw $this->createNotFoundException('Permission denied');
+            }
         }
 
 
@@ -170,7 +198,7 @@ class BookmarkController extends Controller
         $em->flush();
         
         // Retour à la page
-        return $this->redirect($this->generateUrl('cadoles_portal_'.$access.'_page_view',["id"=>$idpage]));
+        return $this->redirect($this->generateUrl('cadoles_portal_'.$access.'_page_view',["id"=>$idpage,"usage"=>$usage,"group"=>$group]));
     }
 
     public function heartAction(Request $request)
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/PageController.php b/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/PageController.php
index 6dba0ef5..a8ea77fb 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/PageController.php
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/PageController.php
@@ -7,6 +7,7 @@ use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Doctrine\Common\Collections\ArrayCollection;
 use Symfony\Component\Filesystem\Filesystem;
+use Symfony\Component\Form\FormError;
 
 use Cadoles\PortalBundle\Entity\Page;
 use Cadoles\PortalBundle\Form\PageSubmitType;
@@ -33,12 +34,11 @@ class PageController extends Controller
 
     public function ajaxlistAction(Request $request,$access="config")
     {
-        /*
         // S'assurer que c'est un appel ajax
         if (!$request->isXmlHttpRequest()) {
             return new JsonResponse(array('message' => 'Interdit'), 400);
         }
-        */
+        
         $em = $this->getDoctrine()->getManager();
 
         $start=$request->query->get('start');
@@ -208,7 +208,8 @@ class PageController extends Controller
         else {
             return $this->createForm(PageSubmitType::class, $entity, [
                 "mode"   => "update",
-                "access" => $access
+                "access" => $access,
+                "user" => $this->getUser()
             ]);
         }
     }
@@ -225,15 +226,36 @@ class PageController extends Controller
         $form   = $this->entityForm($entity,$access);
         $form->handleRequest($request);
 
-        if ($form->isValid()) {
+
+        // Sur erreur
+        $this->getErrorForm(null,$form,$request,$entity,"submit");
+        
+        // Sur validation
+        if ($form->get('submit')->isClicked() && $form->isValid()) {  
             $em = $this->getDoctrine()->getManager();
             if($access=="user") $entity->setUser($this->getUser());
-            
-            $em->persist($entity);
-            $em->flush();
 
-            $route=str_replace("_config_","_".$access."_",$this->routeprimary);
-            return $this->redirect($this->generateUrl($route.'_update',["id"=>$entity->getId()]));
+            // Si template on duplique le template
+            if($entity->getPage()) {
+                $page=$em->getRepository("CadolesPortalBundle:Page")->clonePage($this->getUser(),$entity->getPage());
+                $page->setName($entity->getName());
+                $page->setRoworder($entity->getRoworder());
+                $page->setMaxwidth($entity->getMaxwidth());
+                foreach($entity->getGroups() as $group) {
+                    $page->addGroup($group);
+                }
+                $em->persist($page);
+                $em->flush();
+                $route=str_replace("_config_","_".$access."_",$this->routeprimary);
+                return $this->redirect($this->generateUrl($route.'_update',["id"=>$page->getId()]));
+            }
+            else {
+                $em->persist($entity);
+                $em->flush();
+                $route=str_replace("_config_","_".$access."_",$this->routeprimary);
+                return $this->redirect($this->generateUrl($route.'_update',["id"=>$entity->getId()]));
+        
+            }
         }
 
         return $this->render($this->labelentity.':submit.html.twig', [
@@ -420,7 +442,10 @@ class PageController extends Controller
         return $response; 
     }
 
-    public function viewAction($id,$access=null) {
+    public function viewAction(Request $request,$id,$access=null) {
+        // usage soit portal / user / group
+        $usage=$request->query->get('usage');
+        $group=$request->query->get('group');
 
         $em = $this->getDoctrine()->getManager();
         $entity = $em->getRepository($this->labelentity)->find($id);
@@ -457,7 +482,9 @@ class PageController extends Controller
                 'usesidebar'        => ($access=="config"),                    
                 'entity'            => $entity,
                 'access'            => $access,
-                'canupdate'         => $canupdate
+                'canupdate'         => $canupdate,
+                'usage'             => $usage,
+                'group'             => $group
             ]);
         }
 
@@ -470,7 +497,9 @@ class PageController extends Controller
                 'usesidebar'        => ($access=="config"),                    
                 'entity'            => $entity,
                 'access'            => $access,
-                'canupdate'         => $canupdate
+                'canupdate'         => $canupdate,
+                'usage'             => $usage,
+                'group'             => $group
             ]);
         }
 
@@ -482,7 +511,9 @@ class PageController extends Controller
                 'usesidebar'        => ($access=="config"),                    
                 'entity'            => $entity,
                 'access'            => $access,
-                'canupdate'         => $canupdate
+                'canupdate'         => $canupdate,
+                'usage'             => $usage,
+                'group'             => $group
             ]);
         }
         // Type Widgets
@@ -495,7 +526,9 @@ class PageController extends Controller
                 'access'            => $access,
                 'canupdate'         => $canupdate,
                 'mode'              => "view",
-                'widgets'           => $this->getDoctrine()->getRepository("CadolesPortalBundle:Widget")->getWidgetAccess($access)
+                'widgets'           => $this->getDoctrine()->getRepository("CadolesPortalBundle:Widget")->getWidgetAccess($access,'config'),
+                'usage'             => $usage,
+                'group'             => $group
             ]);
         } 
         // Type Editeur
@@ -506,7 +539,9 @@ class PageController extends Controller
                 'usesidebar'        => ($access=="config"),                    
                 'entity'            => $entity,
                 'access'            => $access,
-                'canupdate'         => $canupdate
+                'canupdate'         => $canupdate,
+                'usage'             => $usage,
+                'group'             => $group
             ]);
         }    
 
@@ -538,4 +573,31 @@ class PageController extends Controller
         return new Response($response); 
 
     }
+
+    protected function getErrorForm($id,$form,$request,$data,$mode) {
+        if ($form->get('submit')->isClicked() && $mode=="submit") {
+            $usage = $form->get('usage')->getData();
+
+            // Une page d'usage groupe doit avoir au moins un group de selectionné
+            if($usage=="group"&&$data->getGroups()->isEmpty()) {
+                $form->addError(new FormError('Vous devez selectionner au minimum un groupe'));
+            }
+        }
+
+      
+
+        if ($form->get('submit')->isClicked() && !$form->isValid()) {
+            $this->get('session')->getFlashBag()->clear();
+            $validator = $this->get('validator');
+            $errors = $validator->validate($data);
+            foreach( $errors as $error ) {
+                $request->getSession()->getFlashBag()->add("error", $error->getMessage());
+            }
+
+            $errors = $form->getErrors();
+            foreach( $errors as $error ) {
+                $request->getSession()->getFlashBag()->add("error", $error->getMessage());
+            }
+        }
+    }    
 }
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/PagetemplateController.php b/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/PagetemplateController.php
index 04f65663..a34692af 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/PagetemplateController.php
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/PagetemplateController.php
@@ -283,7 +283,9 @@ class PagetemplateController extends Controller
             'access'            => $access,
             'canupdate'         => $canupdate,
             'mode'              => "viewtemplate",
-            'widgets'           => $this->getDoctrine()->getRepository("CadolesPortalBundle:Widget")->getWidgetAccess($access)
+            'widgets'           => $this->getDoctrine()->getRepository("CadolesPortalBundle:Widget")->getWidgetAccess($access),
+            'usage'             => "config",
+            'group'             => ""
         ]);
     }
 }
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/PagewidgetController.php b/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/PagewidgetController.php
index d4b5cff7..99b877c5 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/PagewidgetController.php
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/PagewidgetController.php
@@ -159,6 +159,8 @@ class PagewidgetController extends Controller
     public function updateAction(Request $request,$idpage,$idwidget,$access="config")
     {
         $by=$request->query->get('by');
+        $usage=$request->query->get('usage');
+        $group=$request->query->get('group');
 
         // Recherche du pagewidget
         $em = $this->getDoctrine()->getManager();
@@ -203,7 +205,7 @@ class PagewidgetController extends Controller
             $em->flush();
 
             if($by=="view")
-                return $this->redirect($this->generateUrl('cadoles_portal_'.$access.'_page_view',["id"=>$idpage]));
+                return $this->redirect($this->generateUrl('cadoles_portal_'.$access.'_page_view',["id"=>$idpage,"usage"=>$usage,"group"=>$group]));
             else
                 return $this->redirect($this->generateUrl('cadoles_portal_'.$access.'_pagetemplate_view',["id"=>$idpage]));
         }
@@ -224,6 +226,8 @@ class PagewidgetController extends Controller
             'access'            => $access,   
             'idpage'            => $idpage,         
             'form'              => $form->createView(),
+            'usage'             => $usage,
+            'group'             => $group
         ]);
     }
 
@@ -1210,7 +1214,6 @@ class PagewidgetController extends Controller
             $finder = new Finder();
             $finder->sortByName()->in($directory)->exclude('thumb');
             
-
             foreach ($finder as $file) {
                 $tmp=[];
                 $tmp["name"]=$file->getRelativePathname();
@@ -1281,6 +1284,7 @@ class PagewidgetController extends Controller
             }
         }
 
+        
         // Render
         return $this->render($this->labelentity.':viewgalery.html.twig', [
             'entity'        => $entity,
@@ -1291,7 +1295,10 @@ class PagewidgetController extends Controller
         ]);
     }    
 
-    public function viewcalendarAction($id,$access="config") {
+    public function viewcalendarAction(Request $request,$id,$access="config") {
+        $usage=$request->query->get('usage');
+        $group=$request->query->get('group');
+
         $em = $this->getDoctrine()->getManager();
         $entity = $em->getRepository($this->labelentity)->find($id);
         if (!$entity) throw $this->createNotFoundException('Unable to find entity.');
@@ -1317,9 +1324,16 @@ class PagewidgetController extends Controller
             }
         }
 
-        // On charge le calendrier de l'utilisateur
-        $this->getDoctrine()->getRepository("CadolesPortalBundle:Calendar")->getCalendarsUser($this->getUser(),$calendarssuser,$calendarsadmin,$calendarsshared);
-        $calendars=array_merge($calendarssuser,$calendarsadmin->toArray(),$calendarsshared);        
+        // On récupère soit les calendriers du group en cours soit l'ensemble des calendriers de l'utilisateur
+        if($usage=="group") {
+            $calendars=$em->getRepository("CadolesPortalBundle:Calendar")->getCalendarsGroup($this->getUser(),$group);
+            if($calendars) $firstcalendar=$calendars[0]->getId();
+        }
+        else {
+            $this->getDoctrine()->getRepository("CadolesPortalBundle:Calendar")->getCalendarsUser($this->getUser(),$calendarssuser,$calendarsadmin,$calendarsshared);
+            $calendars=array_merge($calendarssuser,$calendarsadmin->toArray(),$calendarsshared); 
+            $firstcalendar="all";
+        }
 
         // Début & fin
         $start=new \DateTime();
@@ -1362,10 +1376,15 @@ class PagewidgetController extends Controller
             'events'        => $events,
             'nbday'         => $nbday,
             'access'        => $access,
+            'firstcalendar' => $firstcalendar,
+            'usage'         => $usage
         ]);
     }  
 
-    public function viewblogAction($id,$access="config") {
+    public function viewblogAction(Request $request,$id,$access="config") {
+        $usage=$request->query->get('usage');
+        $group=$request->query->get('group');
+
         $em = $this->getDoctrine()->getManager();
         $entity = $em->getRepository($this->labelentity)->find($id);
         if (!$entity) throw $this->createNotFoundException('Unable to find entity.');
@@ -1391,9 +1410,16 @@ class PagewidgetController extends Controller
             }
         }
 
-        // On récupère l'ensemble des blogs de l'utilisateur
-        $em->getRepository("CadolesPortalBundle:Blog")->getBlogsUser($this->getUser(),$blogsuser,$blogsadmin,$blogsshared);
-        $blogs=array_merge($blogsuser,$blogsadmin->toArray(),$blogsshared);
+        // On récupère soit les blogs du group en cours soit l'ensemble des blogs de l'utilisateur
+        if($usage=="group") {
+            $blogs=$em->getRepository("CadolesPortalBundle:Blog")->getBlogsGroup($this->getUser(),$group);
+            if($blogs) $firstblog=$blogs[0]->getId();
+        }
+        else {
+            $em->getRepository("CadolesPortalBundle:Blog")->getBlogsUser($this->getUser(),$blogsuser,$blogsadmin,$blogsshared);
+            $blogs=array_merge($blogsuser,$blogsadmin->toArray(),$blogsshared);
+            $firstblog="all";
+        }
 
         // On récupère les nbarticle de ses blogs
         $em->getRepository("CadolesPortalBundle:Blogarticle")->getBlogsArticles($blogs,0,$nbarticle,$count,$blogarticles);
@@ -1406,6 +1432,8 @@ class PagewidgetController extends Controller
             'blogarticles'  => $blogarticles,
             'nbarticle'     => $nbarticle,
             'access'        => $access,
+            'firstblog'     => $firstblog,
+            'usage'         => $usage
         ]);
     }  
 
@@ -1609,4 +1637,64 @@ class PagewidgetController extends Controller
         ]);
     }     
 
+    public function viewinfoAction(Request $request,$id,$access="config") {
+        $usage=$request->query->get('usage');
+        $group=$request->query->get('group');    
+        $user=$this->getUser();
+
+        $em = $this->getDoctrine()->getManager();
+        $entity = $em->getRepository($this->labelentity)->find($id);
+        if (!$entity) throw $this->createNotFoundException('Unable to find entity.');
+
+        // Permissions
+        if($access=="config") {
+            $canupdate = true;
+        }
+        else {
+            // On s'assure que l'utilisateur à la permission de voir
+            $page=$entity->getPage();
+            $em->getRepository("CadolesPortalBundle:Page")->getPermission($this->getUser(),$page,$cansee,$canupdate);
+            if(!$cansee) throw $this->createNotFoundException('Permission denied');
+        }
+
+        $icon=null;
+        $title=null;
+        $description=null;
+        $members=[];
+        if($usage=="group") {
+            $group=$em->getRepository("CadolesCoreBundle:Group")->find($group);
+            if($group) {
+                $title=$group->getLabel();
+                $description="<strong>Description</strong><br>".$group->getDescription();
+                if($group->getIcon())
+                    $icon="/".$group->getIcon()->getLabel();
+                
+                    
+                foreach($group->getUsers() as $usergroup) {
+                    
+                    array_push($members,$usergroup->getUser());
+                }
+            }
+        }
+        else {
+            $title=$entity->getPage()->getName();
+            $proprio=$entity->getPage()->getUser();
+            if($proprio) {
+                $description="Propriétaire de la page<br>".$proprio->getLastname()." ".$proprio->getLastname();
+                $icon="/uploads/avatar/".$proprio->getAvatar();
+            }
+        }
+        // Render
+        return $this->render($this->labelentity.':viewinfo.html.twig', [
+            'entity'        => $entity,
+            'canadd'        => ($user),
+            'canupdate'     => $canupdate,
+            'usage'         => $usage,
+            'icon'          => $icon,
+            'title'         => $title,
+            'description'   => $description,
+            'members'       => $members
+        ]);
+    }     
+
 }
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/SlideController.php b/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/SlideController.php
index e643142a..7b51e373 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/SlideController.php
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/SlideController.php
@@ -19,8 +19,11 @@ class SlideController extends Controller
     private $labeldata   = 'slide';
     private $labeldatas  = 'slides';
 
-    public function listAction($idpage,$idwidget,$access="config")
+    public function listAction(Request $request,$idpage,$idwidget,$access="config")
     {
+        $usage=$request->query->get('usage');
+        $group=$request->query->get('group');
+
         // On s'assure que le widget existe
         $em = $this->getDoctrine()->getManager();
         $pagewidget = $em->getRepository("CadolesPortalBundle:Pagewidget")->find($idwidget);
@@ -28,8 +31,15 @@ class SlideController extends Controller
 
         // Vérifier que l'on générer un slide
         if($access=="user") {
-            $user=$pagewidget->getPage()->getUser();
-            if($user!=$this->getUser())  throw $this->createNotFoundException('Permission denied');
+            if($usage=="user") {
+                $user=$data->getPagewidget()->getPage()->getUser();
+                if($user!=$this->getUser())  throw $this->createNotFoundException('Permission denied');
+            }
+            else {
+                $groupentity=$this->getDoctrine()->getRepository("CadolesCoreBundle:Group")->find($group);
+                $fgmanager=$this->getDoctrine()->getRepository("CadolesCoreBundle:UserGroup")->findoneby(["user"=>$this->getUser(),"group"=>$groupentity,"fgmanager"=>true]);
+                if(!$fgmanager) throw $this->createNotFoundException('Permission denied');
+            }
         }
         
         // Recherche des slides du widget
@@ -43,12 +53,17 @@ class SlideController extends Controller
             'access'            => $access,
             'idpage'            => $idpage,
             'idwidget'          => $idwidget,
+            'usage'             => $usage,
+            'group'             => $group,
             $this->labeldatas   => $datas
         ]);
     }
 
     public function submitAction(Request $request,$idpage,$idwidget,$access="config")
     {
+        $usage=$request->query->get('usage');
+        $group=$request->query->get('group');
+
         // Initialisation de l'enregistrement
         $em = $this->getDoctrine()->getManager();
         $data = new Slide();
@@ -60,8 +75,15 @@ class SlideController extends Controller
 
         // Vérifier que l'on générer un slide
         if($access=="user") {
-            $user=$pagewidget->getPage()->getUser();
-            if($user!=$this->getUser())  throw $this->createNotFoundException('Permission denied');
+            if($usage=="user") {
+                $user=$data->getPagewidget()->getPage()->getUser();
+                if($user!=$this->getUser())  throw $this->createNotFoundException('Permission denied');
+            }
+            else {
+                $groupentity=$this->getDoctrine()->getRepository("CadolesCoreBundle:Group")->find($group);
+                $fgmanager=$this->getDoctrine()->getRepository("CadolesCoreBundle:UserGroup")->findoneby(["user"=>$this->getUser(),"group"=>$groupentity,"fgmanager"=>true]);
+                if(!$fgmanager) throw $this->createNotFoundException('Permission denied');
+            }
         }
 
         // Création du formulaire
@@ -83,7 +105,7 @@ class SlideController extends Controller
             $em->flush();
 
             // Retour à la page
-            return $this->redirect($this->generateUrl('cadoles_portal_'.$access.'_slide_list',["idpage"=>$idpage,"idwidget"=>$idwidget]));
+            return $this->redirect($this->generateUrl('cadoles_portal_'.$access.'_slide_list',["idpage"=>$idpage,"idwidget"=>$idwidget,"usage"=>$usage,"group"=>$group]));
         }
         
         return $this->render($this->labelentity.':edit.html.twig', [
@@ -96,12 +118,17 @@ class SlideController extends Controller
             'access'            => $access,   
             'idpage'            => $idpage,    
             'idwidget'          => $idwidget,
+            'usage'             => $usage,
+            'group'             => $group,
             'form'              => $form->createView(),
         ]);
     }  
 
     public function updateAction(Request $request,$idpage,$id,$access="config")
     {
+        $usage=$request->query->get('usage');
+        $group=$request->query->get('group');
+
         // Récupération de l'enregistrement courant 
         $em = $this->getDoctrine()->getManager();
         $data=$this->getData($id);
@@ -109,8 +136,15 @@ class SlideController extends Controller
 
         // Vérifier que cet enregistrement est modifiable
         if($access=="user") {
-            $user=$data->getPagewidget()->getPage()->getUser();
-            if($user!=$this->getUser())  throw $this->createNotFoundException('Permission denied');
+            if($usage=="user") {
+                $user=$data->getPagewidget()->getPage()->getUser();
+                if($user!=$this->getUser())  throw $this->createNotFoundException('Permission denied');
+            }
+            else {
+                $groupentity=$this->getDoctrine()->getRepository("CadolesCoreBundle:Group")->find($group);
+                $fgmanager=$this->getDoctrine()->getRepository("CadolesCoreBundle:UserGroup")->findoneby(["user"=>$this->getUser(),"group"=>$groupentity,"fgmanager"=>true]);
+                if(!$fgmanager) throw $this->createNotFoundException('Permission denied');
+            }
         }
 
         // Création du formulaire
@@ -133,7 +167,7 @@ class SlideController extends Controller
             $em->flush();
 
             // Retour à la page
-            return $this->redirect($this->generateUrl('cadoles_portal_'.$access.'_slide_list',["idpage"=>$idpage,"idwidget"=>$data->getPagewidget()->getId()]));
+            return $this->redirect($this->generateUrl('cadoles_portal_'.$access.'_slide_list',["idpage"=>$idpage,"idwidget"=>$data->getPagewidget()->getId(),"usage"=>$usage,"group"=>$group]));
         }
         
        
@@ -148,12 +182,17 @@ class SlideController extends Controller
             'access'            => $access,   
             'idpage'            => $idpage,    
             'idwidget'          => $data->getPagewidget()->getId(),     
+            'usage'             => $usage,
+            'group'             => $group,
             'form'              => $form->createView(),
         ]);
     }
 
     public function deleteAction(Request $request,$idpage,$id,$access="config")
     {
+        $usage=$request->query->get('usage');
+        $group=$request->query->get('group');
+
         // Récupération de l'enregistrement courant 
         $em = $this->getDoctrine()->getManager();
         $data=$this->getData($id);
@@ -161,8 +200,15 @@ class SlideController extends Controller
 
         // Vérifier que cet enregistrement est supprimable
         if($access=="user") {
-            $user=$data->getPagewidget()->getPage()->getUser();
-            if($user!=$this->getUser())  throw $this->createNotFoundException('Permission denied');
+            if($usage=="user") {
+                $user=$data->getPagewidget()->getPage()->getUser();
+                if($user!=$this->getUser())  throw $this->createNotFoundException('Permission denied');
+            }
+            else {
+                $groupentity=$this->getDoctrine()->getRepository("CadolesCoreBundle:Group")->find($group);
+                $fgmanager=$this->getDoctrine()->getRepository("CadolesCoreBundle:UserGroup")->findoneby(["user"=>$this->getUser(),"group"=>$groupentity,"fgmanager"=>true]);
+                if(!$fgmanager) throw $this->createNotFoundException('Permission denied');
+            }
         }
         
         // Widget encours
@@ -174,8 +220,7 @@ class SlideController extends Controller
         $em->flush();
         
         // Retour à la page
-        return $this->redirect($this->generateUrl('cadoles_portal_'.$access.'_slide_list',["idpage"=>$idpage,"idwidget"=>$idwidget]));
-        return $this->redirect($this->generateUrl('cadoles_portal_'.$access.'_page_view',["id"=>$idpage]));
+        return $this->redirect($this->generateUrl('cadoles_portal_'.$access.'_slide_list',["idpage"=>$idpage,"idwidget"=>$idwidget,"usage"=>$usage,"group"=>$group]));
     }
 
     public function uploadAction($access="config")
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Form/BlogShareType.php b/src/ninegate-1.0/src/Cadoles/PortalBundle/Form/BlogShareType.php
index 9c73aec8..4260b41c 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Form/BlogShareType.php
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Form/BlogShareType.php
@@ -35,6 +35,7 @@ class BlogShareType extends AbstractType
                               ->where('g.fgcanshare=:fgcanshare')
                               ->andWhere('g=ug.group')
                               ->andWhere('ug.user=:user')
+                              ->andWhere('ug.fgmanager=:fgcanshare')
                               ->setParameter('fgcanshare',true)
                               ->setParameter('user',$user);
                 },
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Form/CalendarShareType.php b/src/ninegate-1.0/src/Cadoles/PortalBundle/Form/CalendarShareType.php
index c146cfed..63eae56f 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Form/CalendarShareType.php
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Form/CalendarShareType.php
@@ -35,6 +35,7 @@ class CalendarShareType extends AbstractType
                               ->where('g.fgcanshare=:fgcanshare')
                               ->andWhere('g=ug.group')
                               ->andWhere('ug.user=:user')
+                              ->andWhere('ug.fgmanager=:fgcanshare')
                               ->setParameter('fgcanshare',true)
                               ->setParameter('user',$user);
                 },
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Form/PageShareType.php b/src/ninegate-1.0/src/Cadoles/PortalBundle/Form/PageShareType.php
index e3c768fd..25487ee4 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Form/PageShareType.php
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Form/PageShareType.php
@@ -35,6 +35,7 @@ class PageShareType extends AbstractType
                               ->where('g.fgcanshare=:fgcanshare')
                               ->andWhere('g=ug.group')
                               ->andWhere('ug.user=:user')
+                              ->andWhere('ug.fgmanager=:fgcanshare')
                               ->setParameter('fgcanshare',true)
                               ->setParameter('user',$user);
                 },
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Form/PageSubmitType.php b/src/ninegate-1.0/src/Cadoles/PortalBundle/Form/PageSubmitType.php
index 17dd2fec..1fd03b1e 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Form/PageSubmitType.php
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Form/PageSubmitType.php
@@ -20,6 +20,7 @@ class PageSubmitType extends AbstractType
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $access=$options["access"];
+        $user=$options['user'];
 
         $builder
             ->add('submit', SubmitType::class, [
@@ -60,10 +61,10 @@ class PageSubmitType extends AbstractType
                 Select2EntityType::class, array(
                     'label' => "Modèle de Page",
                     'disabled' => ($options["mode"]=="delete"?true:false),
-                    "required"    => false,
+                    'required'    => false,
                     'multiple' => false,
                     'remote_route' => 'cadoles_portal_user_pagetemplate_ajax_selectlist',
-                    'class' => 'Cadoles\PortalBundle\Entity\PageTemplate',
+                    'class' => 'Cadoles\PortalBundle\Entity\Page',
                     'req_params' => ['usage' => 'parent.children[usage]'],
                     'primary_key' => 'id',
                     'text_property' => 'name',
@@ -74,11 +75,32 @@ class PageSubmitType extends AbstractType
                     'cache' => false,
                     'cache_timeout' => 60000, // if 'cache' is true
                     'language' => 'fr',
-                    'placeholder' => 'Selectionner un modèle de page',
+                    'placeholder' => '-- Selectionner un modèle de page --',
                     'attr' => array("class" => "form-control", "style" => "margin-bottom:15px")
                 )
             )         
 
+            ->add('groups', EntityType::class, [
+                'label'         => 'Partager avec les Groupes',
+                'class'         => 'CadolesCoreBundle:Group',
+                'choice_label'  => 'label',
+                'required'      => false,
+                'multiple'      => true,
+                'expanded'      => true,
+                'placeholder'   => '-- Selectionner un groupe --',
+                'query_builder' => function(EntityRepository $er) use ($user) {
+                    return $er->createQueryBuilder('g')
+                              ->select('g')
+                              ->From('CadolesCoreBundle:UserGroup','ug')
+                              ->where('g.fgcanshare=:fgcanshare')
+                              ->andWhere('g=ug.group')
+                              ->andWhere('ug.user=:user')
+                              ->andWhere('ug.fgmanager=:fgcanshare')
+                              ->setParameter('fgcanshare',true)
+                              ->setParameter('user',$user);
+                },
+            ])
+
             ->add('roworder', IntegerType::class, [
                 'label'         => 'Ordre',
             ])                
@@ -94,7 +116,8 @@ class PageSubmitType extends AbstractType
         $resolver->setDefaults([
             'data_class' => 'Cadoles\PortalBundle\Entity\Page',
             'mode' => 'string',
-            'access' => 'string'
+            'access' => 'string',
+            'user' => 'Cadoles\CoreBundle\Entity\User'
         ]);
     }
 }
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Repository/BlogRepository.php b/src/ninegate-1.0/src/Cadoles/PortalBundle/Repository/BlogRepository.php
index f8343e4c..41fc8eea 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Repository/BlogRepository.php
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Repository/BlogRepository.php
@@ -9,6 +9,33 @@ use Cadoles\PortalBundle\Entity\Pagecategory;
 
 class BlogRepository extends EntityRepository
 {
+
+    // getBlogsGroup
+    // $user                = l'utilisateur en cours    
+    // $groupid             = id du group 
+    
+    public function getBlogsGroup($user,$groupid)
+    {
+        $blogsshared=$this->createQueryBuilder('blog')
+                ->from('CadolesCoreBundle:Group','g')
+                ->andWhere('g MEMBER OF blog.groups')
+                ->andWhere('g.id=:id')
+                ->setParameter('id',$groupid)
+                ->addOrderBy('blog.name', 'ASC')                    
+                ->getQuery()->getResult();
+
+        
+        // Permission sur les blogs
+        if($blogsshared) {
+            foreach($blogsshared as $blogshared) {
+                $blogshared->setCanupdate(false);
+                $blogshared->setCanadd($this->getInwriter($user,$blogshared));
+            }
+        }
+
+        return $blogsshared;
+    }
+
     // getBlogsUser
     // $user                = l'utilisateur en cours
     // &$blogsuser          = les blogs de l'utilisateur
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Repository/CalendarRepository.php b/src/ninegate-1.0/src/Cadoles/PortalBundle/Repository/CalendarRepository.php
index 8edf73a8..6fc928f0 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Repository/CalendarRepository.php
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Repository/CalendarRepository.php
@@ -9,6 +9,24 @@ use Cadoles\PortalBundle\Entity\Pagecategory;
 
 class CalendarRepository extends EntityRepository
 {
+
+    // getCalendarsGroup
+    // $user                = l'utilisateur en cours
+    // $groupid             = id du group 
+    
+    public function getCalendarsGroup($user,$groupid)
+    {
+        $calendarsshared=$this->createQueryBuilder('calendar')
+                ->from('CadolesCoreBundle:Group','g')
+                ->andWhere('g MEMBER OF calendar.groups')
+                ->andWhere('g.id=:id')
+                ->setParameter('id',$groupid)
+                ->addOrderBy('calendar.name', 'ASC')                    
+                ->getQuery()->getResult();
+        
+        return $calendarsshared;
+    }
+
     // getCalendarsUser
     // $user                = l'utilisateur en cours
     // &$calendarsuser      = les calendars de l'utilisateur
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/config/routing.yml b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/config/routing.yml
index 06ce3c66..2f1c2a8a 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/config/routing.yml
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/config/routing.yml
@@ -748,6 +748,12 @@ cadoles_portal_config_panelwidget_view_appexternal:
     path: /config/pagewidget/view/appexternal/{id}
     defaults: { _controller: CadolesPortalBundle:Pagewidget:viewappexternal, access: config }   
 
+cadoles_portal_config_panelwidget_view_info:
+    path: /config/pagewidget/view/info/{id}
+    defaults: { _controller: CadolesPortalBundle:Pagewidget:viewinfo, access: config }   
+
+    
+
 #-- Access user    
 cadoles_portal_user_pagewidget_widget_sumbit:
     path: /user/pagewidget/submit/{idpage}/{idwidgettype}
@@ -836,3 +842,7 @@ cadoles_portal_user_panelwidget_view_calculator:
 cadoles_portal_user_panelwidget_view_appexternal:
     path: /pagewidget/view/appexternal/{id}
     defaults: { _controller: CadolesPortalBundle:Pagewidget:viewappexternal, access: user }   
+
+cadoles_portal_user_panelwidget_view_info:
+    path: /pagewidget/view/info/{id}
+    defaults: { _controller: CadolesPortalBundle:Pagewidget:viewinfo, access: user }   
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Bookmark/edit.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Bookmark/edit.html.twig
index 325b4c73..c1d2eb6a 100755
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Bookmark/edit.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Bookmark/edit.html.twig
@@ -14,11 +14,11 @@
     {% if access=="config" %}
         <a class="btn btn-default" href="{{ path('cadoles_portal_config_page_view',{id:idpage}) }}">Annuler</a>
     {% else %}
-        <a class="btn btn-default" href="{{ path('cadoles_portal_user_page_view',{id:idpage}) }}">Annuler</a>
+        <a class="btn btn-default" href="{{ path('cadoles_portal_user_page_view',{id:idpage,usage:usage,group:group}) }}">Annuler</a>
     {% endif %}
 
     {% if mode=="update" %}
-    <a href={{ path('cadoles_portal_'~access~'_bookmark_delete',{'idpage':idpage,'id':entity.id  }) }}
+    <a href={{ path('cadoles_portal_'~access~'_bookmark_delete',{'idpage':idpage,'id':entity.id,usage:usage,group:group}) }}
         class="btn btn-danger pull-right"
         data-method="delete" data-csrf="_token:{{ 'csrf' }}"
         data-confirm="Êtes-vous sûr de vouloir supprimer cet item ?">
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Page/pages.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Page/pages.html.twig
index b0a4a068..8911f561 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Page/pages.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Page/pages.html.twig
@@ -14,9 +14,9 @@
             {% endif %}
 
             {% if entity.id is defined and page.id==entity.id %}
-                <li id="menupage-{{page.id}}" class="active" style="cursor:pointer"><a onClick="showPage({{ page.id }},{{ page.pagecategory.id }},'{{ page.canupdate }}',{{forcereload}})">{{ page.name }}</a></li>
+                <li id="menupage-{{page.id}}" class="active" style="cursor:pointer"><a onClick="showPage({{ page.id }},{{ page.pagecategory.id }},'{{ page.canupdate }}','portal',{{forcereload}})">{{ page.name }}</a></li>
             {% else %}
-                <li id="menupage-{{page.id}}"><a style="cursor:pointer" onClick="showPage({{ page.id }},{{ page.pagecategory.id }},'{{ page.canupdate }}',{{forcereload}})">{{ page.name }}</a></li>
+                <li id="menupage-{{page.id}}"><a style="cursor:pointer" onClick="showPage({{ page.id }},{{ page.pagecategory.id }},'{{ page.canupdate }}','portal',{{forcereload}})">{{ page.name }}</a></li>
             {% endif %}
         {% endfor %}
     </ul>
@@ -29,9 +29,9 @@
             {% endif %}
 
             {% if entity.id is defined and page.id==entity.id %}
-                <li id="menupage-{{page.id}}" class="active" style="cursor:pointer"><a onClick="showPage({{ page.id }},{{ page.pagecategory.id }},'{{ page.canupdate }}',{{forcereload}})">{{ page.name }}</a></li>
+                <li id="menupage-{{page.id}}" class="active" style="cursor:pointer"><a onClick="showPage({{ page.id }},{{ page.pagecategory.id }},'{{ page.canupdate }}','user',{{forcereload}})">{{ page.name }}</a></li>
             {% else %}
-                <li id="menupage-{{page.id}}"><a style="cursor:pointer" onClick="showPage({{ page.id }},{{ page.pagecategory.id }},'{{ page.canupdate }}',{{forcereload}})">{{ page.name }}</a></li>
+                <li id="menupage-{{page.id}}"><a style="cursor:pointer" onClick="showPage({{ page.id }},{{ page.pagecategory.id }},'{{ page.canupdate }}','user',{{forcereload}})">{{ page.name }}</a></li>
             {% endif %}
         {% endfor %}
     </ul>
@@ -46,9 +46,9 @@
             {% endif %}            
 
             {% if entity.id is defined and page.id==entity.id %}
-                <li id="menupage-{{page.id}}" class="active" style="cursor:pointer"><a onClick="showPage({{ page.id }},{{ page.pagecategory.id }},'{{ page.canupdate }}',{{forcereload}})">Groupe = {{ groupshared.label }}</a></li>
+                <li id="menupage-{{page.id}}" class="active" style="cursor:pointer"><a onClick="showPage({{ page.id }},{{ page.pagecategory.id }},'{{ page.canupdate }}','group',{{forcereload}},{{groupshared.id}})">Groupe = {{ groupshared.label }}</a></li>
             {% else %}
-                <li id="menupage-{{page.id}}"><a style="cursor:pointer" onClick="showPage({{ page.id }},{{ page.pagecategory.id }},'{{ page.canupdate }}',{{forcereload}})">Groupe = {{ groupshared.label }}</a></li>
+                <li id="menupage-{{page.id}}"><a style="cursor:pointer" onClick="showPage({{ page.id }},{{ page.pagecategory.id }},'{{ page.canupdate }}','group',{{forcereload}},{{groupshared.id}})">Groupe = {{ groupshared.label }}</a></li>
             {% endif %}
         {% else %}
             <ul id="pagesshared" class="nav navbar-top-links navbar-left">
@@ -62,9 +62,9 @@
                             {% endif %}
 
                             {% if entity.id is defined and page.id==entity.id %}
-                                <li id="menupage-{{page.id}}" class="active" style="cursor:pointer"><a onClick="showPage({{ page.id }},{{ page.pagecategory.id }},'{{ page.canupdate }}',{{forcereload}})">{{ page.name }}</a></li>
+                                <li id="menupage-{{page.id}}" class="active" style="cursor:pointer"><a onClick="showPage({{ page.id }},{{ page.pagecategory.id }},'{{ page.canupdate }}','group',{{forcereload}},{{groupshared.id}})">{{ page.name }}</a></li>
                             {% else %}
-                                <li id="menupage-{{page.id}}"><a style="cursor:pointer" onClick="showPage({{ page.id }},{{ page.pagecategory.id }},'{{ page.canupdate }}',{{forcereload}})">{{ page.name }}</a></li>
+                                <li id="menupage-{{page.id}}"><a style="cursor:pointer" onClick="showPage({{ page.id }},{{ page.pagecategory.id }},'{{ page.canupdate }}','group',{{forcereload}},{{groupshared.id}})">{{ page.name }}</a></li>
                             {% endif %}
                         {% endfor %}
                     </ul>
@@ -82,14 +82,15 @@
         <a id="menuupdate" style="cursor:pointer;display:none" onclick="updatePage()" title='Modifier une page'><i class='fa fa-file fa-fw'></i></a>
         <a id="menushare" style="cursor:pointer;display:none" onclick="sharePage()" title='Partager une page'><i class='fa fa-share-alt fa-fw'></i></a>
         <a id="menudelete" style="cursor:pointer;display:none" onclick="deletePage()" title='Supprimer une page'><i class='fa fa-trash fa-fw'></i></a>
-        <a id="menuwidget" style='cursor:pointer;display:none' data-toggle='modal' data-target='#selwidget' title='Ajouter un widget'><i class='fa fa-cubes fa-fw'></i></a>
+        <a id="menuwidgetuser" style='cursor:pointer;display:none' data-toggle='modal' data-target='#selwidgetuser' title='Ajouter un widget'><i class='fa fa-cubes fa-fw'></i></a>
+        <a id="menuwidgetgroup" style='cursor:pointer;display:none' data-toggle='modal' data-target='#selwidgetgroup' title='Ajouter un widget'><i class='fa fa-cubes fa-fw'></i></a>
     </div>
 {% endblock %}
 
 {% block pagewrapper %}
     <div id="pagecontainer" style="margin: 0px -30px;"></div>
 
-    <div id="selwidget" class="modal fade bs-item-modal" tabindex="-1" role="dialog" aria-labelledby="myLargeModalLabel" aria-hidden="true">
+    <div id="selwidgetuser" class="modal fade bs-item-modal" tabindex="-1" role="dialog" aria-labelledby="myLargeModalLabel" aria-hidden="true">
         <div class="modal-dialog modal-lg">
             <div class="modal-content">
                 <div class="modal-header">
@@ -100,7 +101,7 @@
                 <div class="modal-body">
                     <div class="form-group row clearfix">
                         <div class="col-md-12" style="margin-bottom:15px">
-                            <a onclick="$('#selwidget').modal('hide');" class="btn btn-default">
+                            <a onclick="$('#selwidgetuser').modal('hide');" class="btn btn-default">
                                 Annuler
                             </a>
                         </div>  
@@ -116,7 +117,7 @@
                             </thead>
 
                             <tbody>
-                                {% for widget in widgets %}
+                                {% for widget in widgetsuser %}
                                     <tr>
                                         <td>
                                             <a onClick="selWidget({{ widget.id }})" style="cursor:pointer;">
@@ -134,7 +135,54 @@
                 </div>
             </div>
         </div>
-    </div>    
+    </div>   
+
+    <div id="selwidgetgroup" class="modal fade bs-item-modal" tabindex="-1" role="dialog" aria-labelledby="myLargeModalLabel" aria-hidden="true">
+        <div class="modal-dialog modal-lg">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+                    <h4 class="modal-title">SELECTIONNER UN WIDGET</h4>
+                </div>
+
+                <div class="modal-body">
+                    <div class="form-group row clearfix">
+                        <div class="col-md-12" style="margin-bottom:15px">
+                            <a onclick="$('#selwidgetgroup').modal('hide');" class="btn btn-default">
+                                Annuler
+                            </a>
+                        </div>  
+
+                        <div class="dataTable_wrapper col-md-12">
+                        <table id="dataTables" class="table table-bordered table-striped table-hover">  
+                            <thead>
+                            <tr>
+                                <th width="100px">#</th>
+                                <th>Nom</th>
+                                <th class="no-sort">Description</th>
+                            </tr>
+                            </thead>
+
+                            <tbody>
+                                {% for widget in widgetsgroup %}
+                                    <tr>
+                                        <td>
+                                            <a onClick="selWidget({{ widget.id }})" style="cursor:pointer;">
+                                                <img id="widgettype-{{ widget.id }}" class="grid-item-img" height="40" src="/{{ alias }}/{{ widget.icon.label }}" style="padding:2px">
+                                            </a>
+                                        </td>
+                                        <td>{{ widget.name }}</td>
+                                        <td>{{ widget.description }}</td>
+                                    </tr>
+                                {% endfor %}  
+                            </tbody>
+                        </table>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>     
 {% endblock %}
 
 {% block localjavascript %}
@@ -143,20 +191,20 @@
     $('document').ready(function(){
         {% for page in pagesadmin %} 
             {% if page.id==entity.id %}
-                showPage({{ page.id }}, {{ page.pagecategory.id }},{{ page.canupdate }});
+                showPage({{ page.id }}, {{ page.pagecategory.id }},'{{ page.canupdate }}','portal');
             {% endif %}
         {% endfor %}
         
         {% for page in pagesuser %} 
             {% if page.id==entity.id %}
-                showPage({{ page.id }}, {{ page.pagecategory.id }},{{ page.canupdate }});
+                showPage({{ page.id }}, {{ page.pagecategory.id }},'{{ page.canupdate }}','user');
             {% endif %}
         {% endfor %}      
         
         {% for groupshared in groupsshared %}
             {% for page in groupshared.pagesshared %}
                 {% if page.id==entity.id %}
-                    showPage({{ page.id }}, {{ page.pagecategory.id }},{{ page.canupdate }});
+                    showPage({{ page.id }}, {{ page.pagecategory.id }},'{{ page.canupdate }}','group',true,{{groupshared.id}});
                 {% endif %}
             {% endfor %}       
         {% endfor %}   
@@ -182,7 +230,7 @@
         }); 
 
         // Initialisation du tableau des widgets selectionnable à la création
-        $('#dataTables').DataTable({
+        $('.table').DataTable({
             columnDefs: [ { "targets": 'no-sort', "orderable": false }, { "targets": 0, "className": "text-center" } ],
             responsive: true,
             iDisplayLength: 10,
@@ -233,7 +281,7 @@
     }
 
     // Affichages des pages
-    function showPage(id,catid,canupdate,forcereload) {
+    function showPage(id,catid,canupdate,usage,forcereload,groupid) {
         // Sauvegarder la page en cours
         idpage=id;
 
@@ -244,8 +292,10 @@
         $(".navbar-top-links li").removeClass("active");
         $("#menupage-"+id).addClass("active");
         
-        var url="{{ path('cadoles_portal_user_page_view',{id:'xx'}) }}";
+        var url="{{ path('cadoles_portal_user_page_view',{id:'xx',usage:'yy','group':'zz'}) }}";
         url=url.replace('xx',id);
+        url=url.replace('yy',usage);
+        url=url.replace('zz',groupid);
 
         // Si force le rechargement et frame existante on la détruit
         if(forcereload&&$("#page-"+id).length)
@@ -263,7 +313,8 @@
         $("#menuupdate").hide();
         $("#menushare").hide();
         $("#menudelete").hide();
-        $("#menuwidget").hide();
+        $("#menuwidgetuser").hide();
+        $("#menuwidgetgroup").hide();
 
         if(canupdate) {
             $("#menuupdate").show();
@@ -272,8 +323,12 @@
         }
 
         // Si page de type widget on affiche la selection des widgets à insérer
-        if($("#page-"+id).data('category')==2&&canupdate)
-            $("#menuwidget").show();    
+        if($("#page-"+id).data('category')==2&&canupdate) {
+            if(usage=="user") $("#menuwidgetuser").show();    
+            if(usage=="group") $("#menuwidgetgroup").show();    
+
+        }
+            
 
         // On resize les frame
         resizeFrame();
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Page/submit.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Page/submit.html.twig
index 579e065d..bb9d582c 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Page/submit.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Page/submit.html.twig
@@ -41,9 +41,41 @@
         <div class="panel-body">
             {{ form_row(form.name) }}
             {{ form_row(form.pagecategory) }}
+            {{ form_row(form.usage) }}
+            <div id="pagegroup">{{ form_row(form.page) }}</div>
+            <div id="groupworkgroup">{{ form_row(form.groups) }}</div>
             {{ form_row(form.roworder) }}
             {{ form_row(form.maxwidth) }}
         </div>
     </div>
 {{ form_end(form) }}
 {% endblock %}
+
+{% block localjavascript %}
+    $('document').ready(function(){
+        hideshow();
+    });
+
+    $(document.body).on("change","#page_submit_pagecategory",function(){
+        hideshow();
+    });
+
+    $(document.body).on("change","#page_submit_usage",function(){
+        hideshow();
+    });
+
+    function hideshow() {
+        if($("#page_submit_pagecategory").val()==2)
+            $("#pagegroup").show();
+        else {
+            $("#pagegroup").hide();
+        }
+
+        if($("#page_submit_usage").val()=="group")
+            $("#groupworkgroup").show();
+        else {
+            $("#groupworkgroup").hide();
+        }        
+    }       
+
+{% endblock %}
\ No newline at end of file
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Page/viewwidget.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Page/viewwidget.html.twig
index bb578ae7..ef9dff8c 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Page/viewwidget.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Page/viewwidget.html.twig
@@ -1,7 +1,6 @@
 
 {% extends '@CadolesCore/base.html.twig' %}
 
-
 {% block pagewrapper %}
     {% if access=="config" %}
         <div class="pagemenu">
@@ -26,56 +25,58 @@
 
     <div id="tolocalize" style="display:none">
         {% for pagewidget in entity.pagewidgets %}
-            {{ render(url(pagewidget.widget.routeview|replace({'_config_':'_'~access~'_'}),{id:pagewidget.id,by:mode})) }}
+            {{ render(url(pagewidget.widget.routeview|replace({'_config_':'_'~access~'_'}),{id:pagewidget.id,by:mode,usage:usage,group:group})) }}
         {% endfor %}
     </div>
 
-    <div id="selwidget" class="modal fade bs-item-modal" tabindex="-1" role="dialog" aria-labelledby="myLargeModalLabel" aria-hidden="true">
-        <div class="modal-dialog modal-lg">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-                    <h4 class="modal-title">SELECTIONNER UN WIDGET</h4>
-                </div>
+    {% if access=="config" %}
+        <div id="selwidget" class="modal fade bs-item-modal" tabindex="-1" role="dialog" aria-labelledby="myLargeModalLabel" aria-hidden="true">
+            <div class="modal-dialog modal-lg">
+                <div class="modal-content">
+                    <div class="modal-header">
+                        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+                        <h4 class="modal-title">SELECTIONNER UN WIDGET</h4>
+                    </div>
 
-                <div class="modal-body">
-                    <div class="form-group row clearfix">
-                        <div class="col-md-12" style="margin-bottom:15px">
-                            <a onclick="$('#selwidget').modal('hide');" class="btn btn-default">
-                                Annuler
-                            </a>
-                        </div>  
+                    <div class="modal-body">
+                        <div class="form-group row clearfix">
+                            <div class="col-md-12" style="margin-bottom:15px">
+                                <a onclick="$('#selwidget').modal('hide');" class="btn btn-default">
+                                    Annuler
+                                </a>
+                            </div>  
 
-                        <div class="dataTable_wrapper col-md-12">
-                        <table id="dataTables" class="table table-bordered table-striped table-hover">  
-                            <thead>
-                            <tr>
-                                <th width="100px">#</th>
-                                <th>Nom</th>
-                                <th class="no-sort">Description</th>
-                            </tr>
-                            </thead>
+                            <div class="dataTable_wrapper col-md-12">
+                            <table id="dataTables" class="table table-bordered table-striped table-hover">  
+                                <thead>
+                                <tr>
+                                    <th width="100px">#</th>
+                                    <th>Nom</th>
+                                    <th class="no-sort">Description</th>
+                                </tr>
+                                </thead>
 
-                            <tbody>
-                                {% for widget in widgets %}
-                                    <tr>
-                                        <td>
-                                            <a onClick="selWidget({{ widget.id }})" style="cursor:pointer;">
-                                                <img id="widgettype-{{ widget.id }}" class="grid-item-img" height="40" src="/{{ alias }}/{{ widget.icon.label }}" style="padding:2px">
-                                            </a>
-                                        </td>
-                                        <td>{{ widget.name }}</td>
-                                        <td>{{ widget.description }}</td>
-                                    </tr>
-                                {% endfor %}  
-                            </tbody>
-                        </table>
+                                <tbody>
+                                    {% for widget in widgets %}
+                                        <tr>
+                                            <td>
+                                                <a onClick="selWidget({{ widget.id }})" style="cursor:pointer;">
+                                                    <img id="widgettype-{{ widget.id }}" class="grid-item-img" height="40" src="/{{ alias }}/{{ widget.icon.label }}" style="padding:2px">
+                                                </a>
+                                            </td>
+                                            <td>{{ widget.name }}</td>
+                                            <td>{{ widget.description }}</td>
+                                        </tr>
+                                    {% endfor %}  
+                                </tbody>
+                            </table>
+                            </div>
                         </div>
                     </div>
                 </div>
             </div>
         </div>
-    </div>
+    {% endif %}
 {% endblock %}
 
 {% block localjavascript %}
@@ -254,6 +255,9 @@
         });        
         {% endif %}
 
+        // balise h des widget editor
+        $(".widget-editor .widgetbody :header").css("color",$(".widgetbody").css("color"));
+
         // cacher le loader
         $("#loader").hide();
     });
@@ -314,9 +318,11 @@
 
     // Modifciation d'un widget
     function modWidget(idwidget) {
-        var url="{{ path('cadoles_portal_'~access~'_pagewidget_widget_update',{idpage:entity.id,idwidget:'xx','by':mode})}}";
 
+        var url="{{ path('cadoles_portal_'~access~'_pagewidget_widget_update',{idpage:entity.id,idwidget:'xx',group:group,usage:usage,by:mode})}}";
         url=url.replace('xx',idwidget);
+        url=url.replace(/&amp;/g,"&");
+
         $(location).attr('href', url);
     }
 
@@ -339,18 +345,21 @@
 
     // Ajout d'un bookmark
     function addBookmark(idwidget,touser) {
-        var url="{{ path('cadoles_portal_'~access~'_bookmark_submit',{idpage:entity.id,idwidget:'xx',touser:'yy'})}}";
+        var url="{{ path('cadoles_portal_'~access~'_bookmark_submit',{idpage:entity.id,idwidget:'xx',touser:'yy',group:group,usage:usage,by:mode})}}";
         url=url.replace('xx',idwidget);
         url=url.replace('yy',touser);
+        url=url.replace(/&amp;/g,"&");
 
         $(location).attr('href', url);
     }
 
     // Modifciation d'un bookmark
     function modBookmark(idbookmark) {
-        var url="{{ path('cadoles_portal_'~access~'_bookmark_update',{idpage:entity.id,id:'xx'})}}";
+        var url="{{ path('cadoles_portal_'~access~'_bookmark_update',{idpage:entity.id,id:'xx',group:group,usage:usage,by:mode})}}";
 
         url=url.replace('xx',idbookmark);
+        url=url.replace(/&amp;/g,"&");
+
         $(location).attr('href', url);
     }
 
@@ -391,9 +400,11 @@
 
     // Liste des slides
     function listSlide(idwidget) {
-        var url="{{ path('cadoles_portal_'~access~'_slide_list',{idpage:entity.id,idwidget:'xx'})}}";
+        var url="{{ path('cadoles_portal_'~access~'_slide_list',{idpage:entity.id,idwidget:'xx',group:group,usage:usage,by:mode})}}";
+        
         url=url.replace('xx',idwidget);
-
+        url=url.replace(/&amp;/g,"&");
+        
         $(location).attr('href', url);
     }    
 
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/constants.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/constants.twig
index e5ede852..66aaa9c3 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/constants.twig
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/constants.twig
@@ -79,17 +79,14 @@
         {% set colorheaderfont = color['fontcolorhover'] %}
     {% endif %}
 
-    {% set colorbodyback = entity.colorbodyback %}
-    {% if colorbodyback is null %}
-        {% set colorbodyback = color['main'] %}
+    {% if colorheaderfont == colorheaderback %}
+        {% if colorheaderfont == color['main'] %}
+            {% set colorheaderfont=color['fontcolorhover'] %}
+        {% else %}
+            {% set colorheaderfont=color['main'] %}
+        {% endif %}    
     {% endif %}
 
-    {% set colorbodyfont = entity.colorbodyfont %}
-    {% if colorbodyfont is null %}
-        {% set colorbodyfont = color['fontcolorhover'] %}
-    {% endif %}
-
-
     {% set stylewidgetmenu = "" %}
     {% set stylewidgetmenu = stylewidgetmenu ~ "color: #" ~ colorheaderfont ~ "; " %}
     {% set stylewidgetmenu = stylewidgetmenu ~ "cursor: pointer; " %}
@@ -112,14 +109,12 @@
         {% set colorheaderfont = color['fontcolorhover'] %}
     {% endif %}
 
-    {% set colorbodyback = entity.colorbodyback %}
-    {% if colorbodyback is null %}
-        {% set colorbodyback = color['main'] %}
-    {% endif %}
-
-    {% set colorbodyfont = entity.colorbodyfont %}
-    {% if colorbodyfont is null %}
-        {% set colorbodyfont = color['fontcolorhover'] %}
+    {% if colorheaderfont == colorheaderback %}
+        {% if colorheaderfont == color['main'] %}
+            {% set colorheaderfont=color['fontcolorhover'] %}
+        {% else %}
+            {% set colorheaderfont=color['main'] %}
+        {% endif %}    
     {% endif %}
 
     {% set stylewidgetheader = "" %}
@@ -135,16 +130,6 @@
 {% macro mystylewidgetbody(entity) %}
     {% set color = app.session.get('color') %}
 
-    {% set colorheaderback = entity.colorheaderback %}
-    {% if colorheaderback is null %}
-        {% set colorheaderback = color['main'] %}
-    {% endif %}
-
-    {% set colorheaderfont = entity.colorheaderfont %}
-    {% if colorheaderfont is null %}
-        {% set colorheaderfont = color['fontcolorhover'] %}
-    {% endif %}
-
     {% set colorbodyback = entity.colorbodyback %}
     {% if colorbodyback is null %}
         {% set colorbodyback = color['main'] %}
@@ -155,6 +140,14 @@
         {% set colorbodyfont = color['fontcolorhover'] %}
     {% endif %}
 
+    {% if colorbodyfont == colorbodyback %}
+        {% if colorbodyfont == color['main'] %}
+            {% set colorbodyfont=color['fontcolorhover'] %}
+        {% else %}
+            {% set colorbodyfont=color['main'] %}
+        {% endif %}    
+    {% endif %}
+
     {% set stylewidgetbody = "" %}
     {% set stylewidgetbody = stylewidgetbody ~ "background-color: #" ~ colorbodyback ~ "; " %}
     {% set stylewidgetbody = stylewidgetbody ~ "color: #" ~ colorbodyfont ~ "; " %}
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/edit.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/edit.html.twig
index bafc45f0..0f2a1de6 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/edit.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/edit.html.twig
@@ -21,7 +21,7 @@
         {% endif %}    
     {% else %}
         {% if mode=="update" %}
-            <a class="btn btn-default" href="{{ path('cadoles_portal_user_page_view',{id:idpage}) }}">Annuler</a>
+            <a class="btn btn-default" href="{{ path('cadoles_portal_user_page_view',{id:idpage,usage:usage,group:group}) }}">Annuler</a>
         {% else %}
             <a class="btn btn-default" href="{{ path('cadoles_core_home',{id:idpage}) }}">Annuler</a>
         {% endif %}    
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewblog.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewblog.html.twig
index db665da3..70142331 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewblog.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewblog.html.twig
@@ -46,7 +46,12 @@
         {% if access=="config" %}
         <a href='{{ path('cadoles_portal_config_blog') }}' style="{{ stylewidgetmenu }}"><i class="fa fa-paper-plane fa-fw"></i></a>
         {% else %}
-        <a onClick="showFrameitem('blog','{{ path('cadoles_portal_user_blog_view') }}',true)" style="{{ stylewidgetmenu }}"><i class="fa fa-paper-plane fa-fw"></i></a>
+        {% set idblog = "" %}
+        {% set url=  path('cadoles_portal_user_blog_view') %}
+        {% if usage=="group" and firstblog is defined %}
+            {% set url=  path('cadoles_portal_user_blog_view',{id:firstblog}) %}
+        {% endif %}
+        <a onClick="showFrameitem('blog','{{ url }}',true)" style="{{ stylewidgetmenu }}"><i class="fa fa-paper-plane fa-fw"></i></a>
         {% endif %}
     </div>
 
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewcalendar.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewcalendar.html.twig
index 0fb68618..5413908c 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewcalendar.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewcalendar.html.twig
@@ -24,9 +24,13 @@
             <i class="fa fa-file fa-fw" onClick="modWidget({{ entity.id }})" style="{{ stylewidgetmenu }}"></i>
         {% endif %}
         {% if access=="config" %}
-        <a href='{{ path('cadoles_portal_config_calendar') }}' style="{{ stylewidgetmenu }}"><i class="fa fa-paper-plane fa-fw"></i></a>
-        {% else %}        
-        <a onClick="showFrameitem('calendar','{{ path('cadoles_portal_'~access~'_calendar_view') }}',true)" style="{{ stylewidgetmenu }}"><i class="fa fa-calendar fa-fw"></i></a>
+            <a href='{{ path('cadoles_portal_config_calendar') }}' style="{{ stylewidgetmenu }}"><i class="fa fa-paper-plane fa-fw"></i></a>
+        {% else %}       
+            {% set url=  path('cadoles_portal_'~access~'_calendar_view') %}
+            {% if usage=="group" and firstcalendar is defined %}
+                {% set url=  path('cadoles_portal_'~access~'_calendar_view',{id:firstcalendar}) %}
+            {% endif %}         
+            <a onClick="showFrameitem('calendar','{{url }}',true)" style="{{ stylewidgetmenu }}"><i class="fa fa-calendar fa-fw"></i></a>
         {% endif %}
     </div>
 
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/vieweditor.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/vieweditor.html.twig
index 028c948c..098a1741 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/vieweditor.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/vieweditor.html.twig
@@ -10,7 +10,7 @@
 {% set stylewidgetheader = constants.mystylewidgetheader(entity) %}
 {% set stylewidgetbody = constants.mystylewidgetbody(entity) %}
 
-<div class="widget {%if entity.border %} widget-bordered {%endif%}" data-id="{{ entity.id }}" loc="{{ entity.loc }}" style="{{ stylewidget }}" height="{{ entity.height }}px">
+<div class="widget {%if entity.border %} widget-bordered {%endif%} widget-editor" data-id="{{ entity.id }}" loc="{{ entity.loc }}" style="{{ stylewidget }}" height="{{ entity.height }}px">
     {% if canupdate %}
     <div class="widgetmenu">
         {% if canupdate %}
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewfile.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewfile.html.twig
index 70452a34..10baa7bf 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewfile.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewfile.html.twig
@@ -49,43 +49,47 @@
     </div>
 
     <div class="widgetbody" style="{{ stylewidgetbody }}">
-        <div class="grid clearfix">
-            {% for file in files|sort %}
-                {% if loop.index==1 %}
-                    <div class="grid-sizer  grid-small"></div>
-                    <div class="grid-gutter-sizer"></div>
-                {% endif %}
+        {% if files|length >= 1 %}
+            <div class="grid clearfix">
+                {% for file in files|sort %}
+                    {% if loop.index==1 %}
+                        <div class="grid-sizer  grid-small"></div>
+                        <div class="grid-gutter-sizer"></div>
+                    {% endif %}
 
-                <div class="grid-item grid-small">
-                    <div class="grid-item-content">
-                        {% if canadd %}
-                            <a  style="cursor:pointer" onClick="delFile('widget-{{ entity.id}}','{{file.name }}')" class="item-delete"><i style="color: #FFF" class="fa fa-trash" title="Supprimer le fichier"></i></a>
-                        {% endif %}
+                    <div class="grid-item grid-small">
+                        <div class="grid-item-content">
+                            {% if canadd %}
+                                <a  style="{{ stylewidgetbody }} cursor:pointer" onClick="delFile('widget-{{ entity.id}}','{{file.name }}')" class="item-delete">
+                                <i style="{{ stylewidgetbody }}" class="fa fa-trash" title="Supprimer le fichier"></i>
+                                </a>
+                            {% endif %}
 
-                        {% if file.minefamily=="text" or file.minefamily=="image" or file.minetype == "application/pdf" %}
-                            <a style="cursor:pointer" onClick="showFrameitem('file-{{entity.id}}-{{loop.index}}','{{ path('cadoles_core_'~access~'_file_view',{'directory':'widget-'~entity.id,'filename':file.name }) }}')">
-                        {% else %}
-                            <a style="cursor:pointer" href="{{ path('cadoles_core_'~access~'_file_download',{'directory':'widget-'~entity.id,'filename':file.name }) }}">
-                        {% endif %}
-                        <div class="item-link clearfix">
-                            <div class="grid-item-logo">
-                                {% if file.thumb is not empty %}
-                                    <img class="grid-item-img" height="110" src="{{ file.thumb }}">
-                                {% else %}
+                            {% if file.minefamily=="text" or file.minefamily=="image" or file.minetype == "application/pdf" %}
+                                <a style="cursor:pointer" onClick="showFrameitem('file-{{entity.id}}-{{loop.index}}','{{ path('cadoles_core_'~access~'_file_view',{'directory':'widget-'~entity.id,'filename':file.name }) }}')">
+                            {% else %}
+                                <a style="cursor:pointer" href="{{ path('cadoles_core_'~access~'_file_download',{'directory':'widget-'~entity.id,'filename':file.name }) }}">
+                            {% endif %}
+                            <div class="item-link clearfix">
+                                <div class="grid-item-logo">
+                                    {% if file.thumb is not empty %}
+                                        <img class="grid-item-img" height="110" src="{{ file.thumb }}">
+                                    {% else %}
 
-                                    <img class="grid-item-img" height="110" src="/{{ alias }}/bundles/cadolescore/images/files/_blank.png">
-                                {% endif %}
+                                        <img class="grid-item-img" height="110" src="/{{ alias }}/bundles/cadolescore/images/files/_blank.png">
+                                    {% endif %}
+                                </div>
+
+                                <div class="grid-item-title">
+                                    <h2 style="{{ stylewidgetbody }}">{{ file.name }}</h2>
+                                </div>                    
                             </div>
-
-                            <div class="grid-item-title">
-                                <h2>{{ file.name }}</h2>
-                            </div>                    
+                            </a>
                         </div>
-                        </a>
                     </div>
-                </div>
-            {% endfor %}
-        </div>
+                {% endfor %}
+            </div>
+        {% endif %}
     </div>
 </div>
 
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewflux.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewflux.html.twig
index a17818a7..f242367a 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewflux.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewflux.html.twig
@@ -59,7 +59,7 @@
     <div class="widgetbody" style="{{ stylewidgetbody }}">
         {% if fluxs is defined %}
             {% if fluxs|length > 1 %}
-                <div class="cat-list-feed" onClick="showFlux({{ entity.id}},'all')" style="background-color: #{{ color['main'] }}">Tout</div>
+                <div class="cat-list-feed" onClick="showFlux({{ entity.id}},'all')" style="color:#{{ color['fontcolorhover'] }}; background-color: #{{ color['main'] }}">Tout</div>
 
                 {% for flux in fluxs %}
                     {% set stylefeed = "background-color: #" ~ color['main']  ~ ";" %}
@@ -67,7 +67,7 @@
                         {% set stylefeed = "background-color: #" ~ flux.color ~ ";" %}
                     {% endif %}
 
-                    <div class="cat-list-feed" onClick="showFlux({{ entity.id}},{{ flux.id }})" style="{{ stylefeed }}">{{ flux.title }}</div>
+                    <div class="cat-list-feed" onClick="showFlux({{ entity.id}},{{ flux.id }})" style="{{ stylefeed }} color:#{{ color['fontcolorhover'] }};">{{ flux.title }}</div>
                 {% endfor %}
             {% else %}
                 <p></p>
@@ -99,7 +99,7 @@
                             <img src="{{feed.image}}" width="100%">
                         {% endif %}
                         <div class="caption" style="{{ stylecolor }}">
-                            <h1 class="grid-preview-title" style="color: #{{ colorbodyback }};">{{ feed.title }}</h1>
+                            <h1 class="grid-preview-title" style="{{ stylewidgetbody }};padding:0px;">{{ feed.title }}</h1>
                             <small>le {{ feed.date|date("d/m/Y à H:i") }}</small><br>
                             {{ feed.description | nl2br }}
                         </div>
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewinfo.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewinfo.html.twig
new file mode 100644
index 00000000..f8a665a5
--- /dev/null
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewinfo.html.twig
@@ -0,0 +1,66 @@
+{% set theme = app.session.get('theme') %}
+{% if theme is not empty %}
+    {{ include('@Theme/'~theme~'/function.html.twig') }}
+{% endif %}
+
+{% import "@CadolesPortal/Pagewidget/constants.twig" as constants %}
+
+{% set stylewidget = constants.mystylewidget(entity) %}
+{% set stylewidgetmenu = constants.mystylewidgetmenu(entity) %}
+{% set stylewidgetheader = constants.mystylewidgetheader(entity) %}
+{% set stylewidgetbody = constants.mystylewidgetbody(entity) %}
+{% set stylewidgetbodyimage = constants.mystylewidgetbodyimage(entity) %}
+
+{% set color = app.session.get('color') %}
+
+{% set stylelink = "color:#" ~ entity.colorheaderfont %}
+{% if entity.colorheaderfont is null %}
+    {% set stylelink = "color:#" ~ color['fontcolorhover'] %}
+{% endif %}
+
+<div class="widget {%if entity.border %} widget-bordered {%endif%}" data-id="{{ entity.id }}" loc="{{ entity.loc }}" style="{{ stylewidget }}" height="{{ entity.height }}px">
+    {% if canupdate  %}
+    <div class="widgetmenu">
+        <i class="fa fa-trash fa-fw" onClick="delWidget({{ entity.id }})" style="{{ stylewidgetmenu }}"></i>
+        <i class="fa fa-file fa-fw" onClick="modWidget({{ entity.id }})" style="{{ stylewidgetmenu }}"></i>
+    </div>
+    {% endif %}
+
+
+    <div class="widgetheader" style="{{ stylewidgetbodyimage }}; height:100%;">
+        {% if icon %}
+            <img src="/{{ alias }}{{ icon }}" style="max-width: 90px; border-radius: 100%; width: auto; display: block; margin: auto; padding-top: 10px;" />
+        {% else %}
+            <img src="/{{ alias }}/uploads/icon/icon_users.png" style="max-height: 100%; width: auto; display: block; margin: auto; padding-top: 10px;" />
+        {% endif %}
+    </div>
+
+    <div class="widgetbody" style="{{ stylewidgetbody }}">
+        <div style="text-align: center;">
+            {%if usage=="group" %}<small>Groupe<br></small>{% endif %}
+            <span style="font-size:120%">{{ title }}</span><br><br>
+            {{ description | raw }}
+           
+            {%if usage=="group" %}
+                <br><br><br>
+                <div class="grid clearfix">
+                    <div class="grid-sizer  grid-small"></div>
+                    <div class="grid-gutter-sizer"></div>                
+                    {% for user in members %}
+                        <div class="grid-item grid-small">
+                            <div class="grid-item-content">                    
+                                <img src="/{{ alias }}/uploads/avatar/{{ user.avatar}}" class="avatar">
+                            </div>
+                            <div class="grid-item-title">
+                                {{ user.lastname }} {{ user.firstname }}
+                            </div>
+                        </div>
+                    {% endfor %}
+                </div>
+            {% endif %}
+        </div>
+    </div>
+</div>
+
+
+
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Slide/edit.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Slide/edit.html.twig
index 47824410..cb1d266d 100755
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Slide/edit.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Slide/edit.html.twig
@@ -11,10 +11,10 @@
     </h1>
 
     {{ form_widget(form.submit) }}
-    <a class="btn btn-default" href="{{ path('cadoles_portal_'~access~'_slide_list',{'idpage':idpage,'idwidget':idwidget  }) }}">Annuler</a>
+    <a class="btn btn-default" href="{{ path('cadoles_portal_'~access~'_slide_list',{'idpage':idpage,'idwidget':idwidget,'usage':usage,'group':group}) }}">Annuler</a>
 
     {% if mode=="update" %}
-    <a href={{ path('cadoles_portal_'~access~'_slide_delete',{'idpage':idpage,'id':entity.id  }) }}
+    <a href={{ path('cadoles_portal_'~access~'_slide_delete',{'idpage':idpage,'id':entity.id,'usage':usage,'group':group}) }}
         class="btn btn-danger pull-right"
         data-method="delete" data-csrf="_token:{{ 'csrf' }}"
         data-confirm="Êtes-vous sûr de vouloir supprimer cet item ?">
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Slide/list.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Slide/list.html.twig
index 4ba8d163..56079f8a 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Slide/list.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Slide/list.html.twig
@@ -7,14 +7,14 @@
     {% if access=="config" %}
         <a class="btn btn-default" href="{{ path('cadoles_portal_config_page_view',{id:idpage}) }}">Retour</a>
     {% else %}
-        <a class="btn btn-default" href="{{ path('cadoles_portal_user_page_view',{id:idpage}) }}">Retour</a>
+        <a class="btn btn-default" href="{{ path('cadoles_portal_user_page_view',{id:idpage,usage:usage,group:group}) }}">Retour</a>
     {% endif %}        
-        <a class="btn btn-success" href={{ path('cadoles_portal_'~access~'_slide_submit',{idpage:idpage,idwidget:idwidget}) }}>Ajouter</a>
+        <a class="btn btn-success" href={{ path('cadoles_portal_'~access~'_slide_submit',{idpage:idpage,idwidget:idwidget,usage:usage,group:group}) }}>Ajouter</a>
     </p>
         
 
     {% for slide in slides %}
-        <a href="{{ path('cadoles_portal_'~access~'_slide_update', {idpage : idpage, id : slide.id}) }}"><img class="icon" height="200px" src="/{{ alias }}/{{ slide.image }}"></a>
+        <a href="{{ path('cadoles_portal_'~access~'_slide_update', {idpage:idpage,id:slide.id,usage:usage,group:group}) }}"><img class="icon" height="200px" src="/{{ alias }}/{{ slide.image }}"></a>
     {% endfor %}
 {% endblock %}
 
diff --git a/src/ninegate-1.0/web/uploads/icon/icon_info.png b/src/ninegate-1.0/web/uploads/icon/icon_info.png
new file mode 100644
index 0000000000000000000000000000000000000000..81b674bb980ab1f586178438a712e80331bc0fb2
GIT binary patch
literal 3543
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
Rmhk`p002ovPDHLkV1jk0!(;#e

literal 0
HcmV?d00001