From 52ad21060b30cb25c5b85b83cd69cfcd0c2b85bf Mon Sep 17 00:00:00 2001
From: afornerot <afornerot@cadoles.com>
Date: Mon, 21 Oct 2019 17:08:46 +0200
Subject: [PATCH] ajustement onboarding + affiche fiche utilisateur sur clique
 avatar

---
 .../CoreBundle/Command/data/core-init-01.sql  |  2 +-
 .../CoreBundle/Controller/CoreController.php  |  4 +-
 .../CoreBundle/Controller/GroupController.php |  6 +--
 .../CoreBundle/Controller/UserController.php  | 12 +++++-
 .../CoreBundle/Resources/config/routing.yml   |  4 ++
 .../Resources/public/themes/transnum/local.js | 42 ++++++++++++-------
 .../Resources/views/Group/list.html.twig      |  2 +-
 .../Resources/views/Group/users.html.twig     |  2 +-
 .../Resources/views/Include/footer.html.twig  | 11 +++++
 .../views/Pagewidget/viewalert.html.twig      |  2 +-
 .../Pagewidget/viewappexternal.html.twig      |  2 +-
 .../views/Pagewidget/viewblog.html.twig       |  2 +-
 .../views/Pagewidget/viewbookmark.html.twig   |  2 +-
 .../views/Pagewidget/viewcalendar.html.twig   |  2 +-
 .../views/Pagewidget/viewchat.html.twig       |  2 +-
 .../views/Pagewidget/viewfile.html.twig       |  2 +-
 .../views/Pagewidget/viewflux.html.twig       |  2 +-
 .../views/Pagewidget/viewframe.html.twig      |  2 +-
 .../views/Pagewidget/viewgalery.html.twig     |  2 +-
 .../views/Pagewidget/viewgroup.html.twig      |  2 +-
 .../Pagewidget/viewgroupmessage.html.twig     |  4 +-
 .../views/Pagewidget/viewinfo.html.twig       |  6 +--
 .../views/Pagewidget/viewitem.html.twig       |  2 +-
 .../Pagewidget/viewitemessential.html.twig    |  2 +-
 .../views/Pagewidget/viewlink.html.twig       |  2 +-
 .../views/Pagewidget/viewseparator.html.twig  |  2 +-
 .../views/Pagewidget/viewslide.html.twig      |  2 +-
 .../views/Pagewidget/viewurl.html.twig        |  2 +-
 .../Resources/views/Chat/client.html.twig     |  6 +--
 29 files changed, 86 insertions(+), 49 deletions(-)

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 6d0b91d6..b14c05b0 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}p8HoeQaUHjlX567Zu5prmDTjQMcKv6zu
+(-100, -100, 'admin', 'Administrateur', 'draaf', '{SSHA}wVosXEVYfrthFQKc0AqqOtZZXDWT3re1
 ', '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 d2c6755a..6609b157 100644
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/CoreController.php
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/CoreController.php
@@ -76,6 +76,7 @@ class CoreController extends Controller
                     foreach($fields as $key => $field) {
                         // Si champs obligatoire
                         if($field["perm"]==2) {
+                            dump($key);
                             switch($key) {
                                 case "firstname": if($user->getFirstname()=="") $toprofil=true; break;
                                 case "visible": if($user->getVisible()=="") $toprofil=true; break;
@@ -93,12 +94,13 @@ class CoreController extends Controller
                                 case "birthcountry": if($user->getBirthcountry()=="") $toprofil=true; break;
                                 case "birthplace": if($user->getBirthplace()=="") $toprofil=true; break;
                             }
+                            dump($toprofil);
                         }
                     }
                 }
 
                 if($toprofil) {
-                    return $this->redirect($this->generateUrl('cadoles_core_profil',array("info"=>"Merci de compléter votre profil")));                    
+                    return $this->redirect($this->generateUrl('cadoles_core_user',array("info"=>"Merci de compléter votre profil")));                    
                 }
             }
 
diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/GroupController.php b/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/GroupController.php
index 6359fd22..4a60d0b9 100644
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/GroupController.php
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/GroupController.php
@@ -188,7 +188,7 @@ class GroupController extends Controller
 
             $userinfo="";
             if($data->getOwner()) {
-                $userinfo.="<img src='/".$this->container->getParameter('alias')."/uploads/avatar/".$data->getOwner()->getAvatar()."' class='avatar' style='margin:0px 5px 0px 0px;display:inline-block;'>";
+                $userinfo.="<img style='cursor:pointer' onClick='seeUser(".$data->getOwner()->getId().")' src='/".$this->container->getParameter('alias')."/uploads/avatar/".$data->getOwner()->getAvatar()."' class='avatar' style='margin:0px 5px 0px 0px;display:inline-block;'>";
                 $userinfo.=$data->getOwner()->getUsername();
             }
 
@@ -331,7 +331,7 @@ class GroupController extends Controller
             $fgmanager="<input type='checkbox' class='switch' onChange='switchManager(".$data->getId().");'>";
 
             // Avatar
-            $avatar="<img src='/".$this->container->getParameter('alias')."/uploads/avatar/".$data->getAvatar()."' style='width:30px;background-color:#337ab7;margin:auto;display:block;'>";
+            $avatar="<img onClick='seeUser(".$data->getId().")' src='/".$this->container->getParameter('alias')."/uploads/avatar/".$data->getAvatar()."' style='width:30px;background-color:#337ab7;margin:auto;display:block;cursor:pointer;'>";
 
             array_push($output["data"],array("DT_RowId"=>"user".$data->getId(),$action,$avatar,$data->getUsername(),$data->getEmail(),$fgmanager));
         }
@@ -463,7 +463,7 @@ class GroupController extends Controller
                 $action.="<a style='cursor:pointer' onClick='delUsers(".$data->getId().")'><i class='fa fa-minus fa-fw'></i></a>";
 
             // Avatar
-            $avatar="<img src='/".$this->container->getParameter('alias')."/uploads/avatar/".$data->getAvatar()."' style='width:30px;background-color:#337ab7;margin:auto;display:block;'>";
+            $avatar="<img onClick='seeUser(".$data->getId().")' src='/".$this->container->getParameter('alias')."/uploads/avatar/".$data->getAvatar()."' style='width:30px;background-color:#337ab7;margin:auto;display:block;cursor:pointer'>";
             
             // Flag manager
             $fgmanager="";
diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/UserController.php b/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/UserController.php
index 55353335..c76d3647 100644
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/UserController.php
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/UserController.php
@@ -270,7 +270,7 @@ class UserController extends Controller
 
             $tmp=array();
             if($access=="config") array_push($tmp,$action);
-            array_push($tmp,"<img src='/".$this->container->getParameter('alias')."/uploads/avatar/".$data->getAvatar()."' class='avatar' style='margin:auto;display:block;'>");
+            array_push($tmp,"<img style='cursor:pointer' onClick='seeUser(".$data->getId().")' src='/".$this->container->getParameter('alias')."/uploads/avatar/".$data->getAvatar()."' class='avatar' style='margin:auto;display:block;'>");
             array_push($tmp,$data->getUsername());
             array_push($tmp,$data->getLastname());
             array_push($tmp,$data->getFirstname());
@@ -735,7 +735,17 @@ class UserController extends Controller
         return $this->updateAction($user->getId(),"user",$request);
     }
 
+    public function viewAction($id, Request $request) 
+    {
+        $user=$this->getData($id);
 
+        return $this->render('CadolesCoreBundle:User:view.html.twig', [
+            'useheader'         => false,
+            'usemenu'           => false,
+            'usesidebar'        => false,               
+            "user"              => $user
+        ]);        
+    }
 
     public function importuserAction(Request $request) {
         if($this->GetParameter("masteridentity")!="SQL")
diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/config/routing.yml b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/config/routing.yml
index b63b1f09..b6fc83ec 100644
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/config/routing.yml
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/config/routing.yml
@@ -265,6 +265,10 @@ cadoles_core_user_users:
     path: /user/users
     defaults: { _controller: CadolesCoreBundle:User:list, access: user }
 
+cadoles_core_user_view:
+    path: /user/view/{id}
+    defaults: { _controller: CadolesCoreBundle:User:view }    
+
 
 #== Niveau01 =============================================================================================================
 cadoles_core_config_niveau01:
diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/transnum/local.js b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/transnum/local.js
index 46cf9921..abb65545 100644
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/transnum/local.js
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/transnum/local.js
@@ -3,24 +3,34 @@
 
 // Instance the tour
 function MyTour() {
+    var template="<div class='popover tour'><div class='arrow'></div><h3 class='popover-title'></h3><div class='popover-content'></div><div class='popover-navigation'><button class='btn btn-sm btn-default' data-role='prev'>« Prec</button><button class='btn btn-sm btn-default' data-role='next'>Suiv »</button><button class='btn btn-sm btn-default' data-role='end'>Fin</button></div></div>";
     var tour = new Tour({
+        name: "tour",
+        template: template,        
         steps: [
-        {
-            element: "#logo",
-            title: "Transnum",
-            content: "Bienvenue sur le portail TRANSNUM"
-        },
-        {
-            element: "#menu-profil",
-            title: "Votre Profil",
-            content: "Vous pouvez modifier les informations vous concernant à cet emplacement"
-        },
-        {
-            element: "#menu-annuaire",
-            title: "Annuaire",
-            content: "Vous pouvez recherche un utilisateur parmis l'annuaire du portail"
-        }        
-    ]});
+            {
+                element: "#logo",
+                title: "Transnum",
+                content: "Bienvenue sur le portail TRANSNUM"
+            },
+            {
+                element: "#menu-profil",
+                title: "Votre Profil",
+                content: "Vous pouvez modifier les informations vous concernant à cet emplacement"
+            },
+            {
+                element: "#menu-annuaire",
+                title: "Annuaire",
+                content: "Vous pouvez recherche un utilisateur parmis l'annuaire du portail"
+            },
+            {
+                element: $("iframe").first().contents().find(".widget-itemessential").find(".widgetheader"), 
+                title: "Bureau",
+                content: "Vos items essentiels, vous pouvez via le bouton + ajouter des items à votre bureau",
+                container: $("iframe").first().contents().find("body")
+            }
+        ]
+    });
     
     // Initialize the tour
     tour.init();
diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Group/list.html.twig b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Group/list.html.twig
index 41cc1222..1704bbfc 100644
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Group/list.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Group/list.html.twig
@@ -72,5 +72,5 @@
                 });               
             }                
         });
-    });
+    }); 
 {% endblock %}
diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Group/users.html.twig b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Group/users.html.twig
index 0a45f67a..544a4e29 100644
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Group/users.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Group/users.html.twig
@@ -148,5 +148,5 @@
                 "user": id,
             }
         });
-    }      
+    }         
 {% endblock %}
diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Include/footer.html.twig b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Include/footer.html.twig
index 5502f568..fc0c5214 100644
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Include/footer.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Include/footer.html.twig
@@ -91,6 +91,17 @@
         {% endif %}
 
         <script>
+            function seeUser(id) {
+                {% if app.user %}
+                    $("#mymodal").find(".modal-title").html("FICHE UTILISATEUR");
+                    var url="{{ path('cadoles_core_user_view',{id:'xx'}) }}";
+                    url=url.replace('xx',id);
+
+                    $("#mymodal").find("#framemodal").attr("src",url);
+                    $("#mymodal").modal().show();
+                {% endif %}
+            }   
+
             function inIframe () {
                 try {
                     return window.self !== window.top;
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewalert.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewalert.html.twig
index 9c8c6f9f..9cdfa329 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewalert.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewalert.html.twig
@@ -12,7 +12,7 @@
 {% set stylewidgetbody = constants.mystylewidgetbody(entity) %}
 
 {% if canupdate or alerts|length>0 %}
-<div class="widget {%if entity.border %} widget-bordered {%else%} widget-notbordered {%endif%}" data-id="{{ entity.id }}" loc="{{ entity.loc }}" style="{{ stylewidget }}" height="{{ entity.height }}px">
+<div class="widget {%if entity.border %} widget-bordered {%else%} widget-notbordered {%endif%} widget-alert" 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>
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewappexternal.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewappexternal.html.twig
index f3d359c1..f788e321 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewappexternal.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewappexternal.html.twig
@@ -26,7 +26,7 @@
     {% set colorbodyfont = "color: #" ~ entity.colorbodyfont %}
 {% endif %}
 
-<div class="widget {%if entity.border %} widget-bordered {%else%} widget-notbordered {%endif%}" data-id="{{ entity.id }}" loc="{{ entity.loc }}" style="{{ stylewidget }}" height="{{ entity.height }}px">
+<div class="widget {%if entity.border %} widget-bordered {%else%} widget-notbordered {%endif%} widget-appexternal" data-id="{{ entity.id }}" loc="{{ entity.loc }}" style="{{ stylewidget }}" height="{{ entity.height }}px">
     {% if canupdate or canadd %}
     <div class="widgetmenu">
         {% if canupdate %}
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 4ff9b6c5..6fe66f75 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
@@ -18,7 +18,7 @@
 
 </style>
 
-<div class="widget {%if entity.border %} widget-bordered {%else%} widget-notbordered {%endif%}" data-id="{{ entity.id }}" loc="{{ entity.loc }}" style="{{ stylewidget }}" height="{{ entity.height }}px">
+<div class="widget {%if entity.border %} widget-bordered {%else%} widget-notbordered {%endif%} widget-blog" data-id="{{ entity.id }}" loc="{{ entity.loc }}" style="{{ stylewidget }}" height="{{ entity.height }}px">
     <div class="widgetmenu">
         {% if canupdate %}
             <i class="fa fa-trash fa-fw" onClick="delWidget({{ entity.id }})" style="{{ stylewidgetmenu }}"></i>
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewbookmark.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewbookmark.html.twig
index 122ef29f..ce19d241 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewbookmark.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewbookmark.html.twig
@@ -33,7 +33,7 @@
 {% endif %}
 
 
-<div class="widget {%if entity.border %} widget-bordered {%else%} widget-notbordered {%endif%}" data-id="{{ entity.id }}" loc="{{ entity.loc }}" style="{{ stylewidget }}" height="{{ entity.height }}px">
+<div class="widget {%if entity.border %} widget-bordered {%else%} widget-notbordered {%endif%} widget-bookmark" data-id="{{ entity.id }}" loc="{{ entity.loc }}" style="{{ stylewidget }}" height="{{ entity.height }}px">
     {% if canupdate or canadd %}
     <div class="widgetmenu">
         {% if canupdate %}
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 fd35185a..8936233c 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
@@ -17,7 +17,7 @@
 
 </style>
 
-<div class="widget {%if entity.border %} widget-bordered {%else%} widget-notbordered {%endif%}" data-id="{{ entity.id }}" loc="{{ entity.loc }}" style="{{ stylewidget }}" height="{{ entity.height }}px">
+<div class="widget {%if entity.border %} widget-bordered {%else%} widget-notbordered {%endif%} widget-calendar" data-id="{{ entity.id }}" loc="{{ entity.loc }}" style="{{ stylewidget }}" height="{{ entity.height }}px">
     <div class="widgetmenu">
         {% if canupdate %}
             <i class="fa fa-trash fa-fw" onClick="delWidget({{ entity.id }})" style="{{ stylewidgetmenu }}"></i>
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewchat.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewchat.html.twig
index 7f305876..9efbd242 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewchat.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewchat.html.twig
@@ -24,7 +24,7 @@
 {% endif %}
 
 {% if app.user %}
-<div class="widget {%if entity.border %} widget-bordered  {%else%} widget-notbordered {%endif%}" data-id="{{ entity.id }}" loc="{{ entity.loc }}" style="{{ stylewidget }}" height="{{ entity.height }}px">
+<div class="widget {%if entity.border %} widget-bordered  {%else%} widget-notbordered {%endif%} widget-chat" 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>
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 a55abc79..a49bc642 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
@@ -24,7 +24,7 @@
     {% set colorbodyfont = color['fontcolorhover'] %}
 {% endif %}
 
-<div class="widget {%if entity.border %} widget-bordered {%else%} widget-notbordered {%endif%}" data-id="{{ entity.id }}" loc="{{ entity.loc }}" style="{{ stylewidget }}" height="{{ entity.height }}px">
+<div class="widget {%if entity.border %} widget-bordered {%else%} widget-notbordered {%endif%} widget-file" data-id="{{ entity.id }}" loc="{{ entity.loc }}" style="{{ stylewidget }}" height="{{ entity.height }}px">
     {% if canupdate or canadd %}
     <div class="widgetmenu">
         {% if canupdate %}
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 b8d4d61c..23f552fd 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
@@ -36,7 +36,7 @@
     {% set stylegrid="grid-list" %}
 {% endif %}
 
-<div class="widget {%if entity.border %} widget-bordered {%else%} widget-notbordered {%endif%}" data-id="{{ entity.id }}" loc="{{ entity.loc }}" style="{{ stylewidget }}" height="{{ entity.height }}px">
+<div class="widget {%if entity.border %} widget-bordered {%else%} widget-notbordered {%endif%} widget-flux" 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>
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewframe.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewframe.html.twig
index bf29d63b..262eb0a2 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewframe.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewframe.html.twig
@@ -22,7 +22,7 @@
     {% set colorbodyfont = color['fontcolorhover'] %}
 {% endif %}
 
-<div class="widget {%if entity.border %} widget-bordered {%else%} widget-notbordered {%endif%}" data-id="{{ entity.id }}" loc="{{ entity.loc }}" style="{{ stylewidget }}" height="{{ entity.height }}px">
+<div class="widget {%if entity.border %} widget-bordered {%else%} widget-notbordered {%endif%} widget-frame" 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>
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewgalery.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewgalery.html.twig
index ca74f4e1..6db2b05f 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewgalery.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewgalery.html.twig
@@ -24,7 +24,7 @@
     {% set colorbodyfont = color['fontcolorhover'] %}
 {% endif %}
 
-<div class="widget {%if entity.border %} widget-bordered {%else%} widget-notbordered {%endif%}" data-id="{{ entity.id }}" loc="{{ entity.loc }}" style="{{ stylewidget }}" height="{{ entity.height }}px">
+<div class="widget {%if entity.border %} widget-bordered {%else%} widget-notbordered {%endif%} widget-galery" data-id="{{ entity.id }}" loc="{{ entity.loc }}" style="{{ stylewidget }}" height="{{ entity.height }}px">
     {% if canupdate or canadd %}
     <div class="widgetmenu">
         {% if canupdate %}
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewgroup.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewgroup.html.twig
index 64f36588..9cecdf02 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewgroup.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewgroup.html.twig
@@ -17,7 +17,7 @@
     {% set canadd = true %}
 {% endif %}
 
-<div class="widget {%if entity.border %} widget-bordered {%else%} widget-notbordered {%endif%} widget-editor" data-id="{{ entity.id }}" loc="{{ entity.loc }}" style="{{ stylewidget }}" height="{{ entity.height }}px">
+<div class="widget {%if entity.border %} widget-bordered {%else%} widget-notbordered {%endif%} widget-group" 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/viewgroupmessage.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewgroupmessage.html.twig
index 87be451a..8ffb6889 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewgroupmessage.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewgroupmessage.html.twig
@@ -37,7 +37,7 @@
     {% set stylegrid="grid-list" %}
 {% endif %}
 
-<div class="widget {%if entity.border %} widget-bordered {%else%} widget-notbordered {%endif%}" data-id="{{ entity.id }}" loc="{{ entity.loc }}" style="{{ stylewidget }}" height="{{ entity.height }}px">
+<div class="widget {%if entity.border %} widget-bordered {%else%} widget-notbordered {%endif%} widget-groupmessage" 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>
@@ -75,7 +75,7 @@
                     <div class="grid-item-content">
                         <div class="item-link clearfix">
                             <div class="grid-item-logo">
-                                <img class="grid-item-img avatar" src="/{{alias}}/uploads/avatar/{{message.user.avatar}}" width="100%">
+                                <img style='cursor:pointer' onClick="seeUser({{message.user.id}})" class="grid-item-img avatar" src="/{{alias}}/uploads/avatar/{{message.user.avatar}}" width="100%">
                                 <a onClick="hideMessage({{message.id}})" style="cursor:pointer;" title="Ne plus afficher"><i class="fa fa-eye-slash"></i></a>
                             </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
index 87cfa422..aaa2274f 100644
--- 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
@@ -20,7 +20,7 @@
 {% endif %}
 
 
-<div class="widget {%if entity.border %} widget-bordered {%else%} widget-notbordered {%endif%}" data-id="{{ entity.id }}" loc="{{ entity.loc }}" style="{{ stylewidget }}" height="{{ entity.height }}px">
+<div class="widget {%if entity.border %} widget-bordered {%else%} widget-notbordered {%endif%} widget-info" 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>
@@ -32,7 +32,7 @@
     <div class="widgetheader" style="{{ stylewidgetheader }};">
         {% set style = "width: 90px;display: block;margin: auto; padding: 10px 0px 10px 0px; position: inherit;height: auto;" %}
         {% if icon %}
-            <img src="/{{ alias }}{{ icon }}" class="logo" style="{{ style }}" />
+            <img src="/{{ alias }}{{ icon }}" class="avatar big" style="{{ style }}" />
         {% else %}
             <img src="/{{ alias }}/uploads/icon/icon_users.png" style="{{ style }}" />
         {% endif %}
@@ -55,7 +55,7 @@
                         <div class="grid-item grid-small" style="{{ stylewidgetbodyreverse }};">
                             <div class="grid-item-content">      
                                 <div class="grid-item-logo">
-                                    <img src="/{{ alias }}/uploads/avatar/{{ member.user.avatar}}" class="grid-item-img avatar" height="110" >   
+                                    <img onclick="seeUser({{member.user.id}})" src="/{{ alias }}/uploads/avatar/{{ member.user.avatar}}" class="grid-item-img avatar" height="110" style="cursor:pointer;">   
                                 </div>
                             
                                 <div class="grid-item-title">
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewitem.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewitem.html.twig
index b2820fc0..bebed711 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewitem.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewitem.html.twig
@@ -33,7 +33,7 @@
     {% set username = "" %}
 {% endif %}
 
-<div class="widget {%if entity.border %} widget-bordered {%else%} widget-notbordered {%endif%}" data-id="{{ entity.id }}" loc="{{ entity.loc }}" style="{{ stylewidget }}" height="{{ entity.height }}px">
+<div class="widget {%if entity.border %} widget-bordered {%else%} widget-notbordered {%endif%} widget-item" data-id="{{ entity.id }}" loc="{{ entity.loc }}" style="{{ stylewidget }}" height="{{ entity.height }}px">
     {% if canupdate or canadd %}
     <div class="widgetmenu">
         {% if canupdate %}
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewitemessential.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewitemessential.html.twig
index 7878153e..4f89bf30 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewitemessential.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewitemessential.html.twig
@@ -33,7 +33,7 @@
     {% set username = "" %}
 {% endif %}
 
-<div class="widget {%if entity.border %} widget-bordered {%else%} widget-notbordered {%endif%}" data-id="{{ entity.id }}" loc="{{ entity.loc }}" style="{{ stylewidget }}" height="{{ entity.height }}px">
+<div class="widget {%if entity.border %} widget-bordered {%else%} widget-notbordered {%endif%} widget-itemessential" data-id="{{ entity.id }}" loc="{{ entity.loc }}" style="{{ stylewidget }}" height="{{ entity.height }}px">
     {% if canupdate or canadd %}
     <div class="widgetmenu">
         {% if canupdate %}
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewlink.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewlink.html.twig
index 7061a582..f269f324 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewlink.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewlink.html.twig
@@ -24,7 +24,7 @@
     {% set username = "" %}
 {% endif %}
 
-<div class="widget {%if entity.border %} widget-bordered {%else%} widget-notbordered {%endif%}" data-id="{{ entity.id }}" loc="{{ entity.loc }}" style="{{ stylewidget }}" height="{{ entity.height }}px">
+<div class="widget {%if entity.border %} widget-bordered {%else%} widget-notbordered {%endif%} widget-link" 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/viewseparator.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewseparator.html.twig
index 244a220d..a8e092a2 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewseparator.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewseparator.html.twig
@@ -17,7 +17,7 @@
     {% set colorbodyfont = color['main'] %}
 {% endif %}
 
-<div class="widget {%if entity.border %} widget-bordered {%else%} widget-notbordered {%endif%}" data-id="{{ entity.id }}" loc="{{ entity.loc }}" style="{{ stylewidget }}" height="{{ entity.height }}px">
+<div class="widget {%if entity.border %} widget-bordered {%else%} widget-notbordered {%endif%} widget-separator" 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>
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewslide.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewslide.html.twig
index f711d9b2..6cd473e3 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewslide.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewslide.html.twig
@@ -23,7 +23,7 @@
     {% set username = "" %}
 {% endif %}
 
-<div class="widget {%if entity.border %} widget-bordered {%else%} widget-notbordered {%endif%}" data-id="{{ entity.id }}" loc="{{ entity.loc }}" style="{{ stylewidget }}" height="{{ entity.height }}px">
+<div class="widget {%if entity.border %} widget-bordered {%else%} widget-notbordered {%endif%} widget-slide" data-id="{{ entity.id }}" loc="{{ entity.loc }}" style="{{ stylewidget }}" height="{{ entity.height }}px">
     {% if canupdate or canadd %}
     <div class="widgetmenu">
         {% if canupdate %}
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewurl.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewurl.html.twig
index 9b838ce9..d70fe2ed 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewurl.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewurl.html.twig
@@ -17,7 +17,7 @@
     {% set username = "" %}
 {% endif %}
 
-<div class="widget {%if entity.border %} widget-bordered {%else%} widget-notbordered {%endif%}" data-id="{{ entity.id }}" loc="{{ entity.loc }}" style="{{ stylewidget }}" height="{{ entity.height }}px">
+<div class="widget {%if entity.border %} widget-bordered {%else%} widget-notbordered {%endif%}  widget-url" 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>
diff --git a/src/ninegate-1.0/src/Cadoles/WebsocketBundle/Resources/views/Chat/client.html.twig b/src/ninegate-1.0/src/Cadoles/WebsocketBundle/Resources/views/Chat/client.html.twig
index df414c0d..385cff32 100644
--- a/src/ninegate-1.0/src/Cadoles/WebsocketBundle/Resources/views/Chat/client.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/WebsocketBundle/Resources/views/Chat/client.html.twig
@@ -66,7 +66,7 @@
         {% for message in messages %}
             <div id='message-{{message.id}}'  class='message row'>
                 <div class='msgavatar'>
-                    <img id='user_avatar_img' src='/{{ alias }}/uploads/avatar/{{message.user.avatar}}' class='avatar'><br>
+                    <img style='cursor:pointer' onclick='seeUser({{message.user.id}})' id='user_avatar_img' src='/{{ alias }}/uploads/avatar/{{message.user.avatar}}' class='avatar'><br>
                     {% if fgmanager or message.user == app.user %}
                         <i class='delmessage fa fa-trash fa-fw' data-id='{{message.id}}' style='cursor: pointer;'></i>
                     {% endif %}
@@ -271,7 +271,7 @@
                     if(payload.msg) {
                         html ="<div id='message-"+payload.msg.id+"' class='message row'>";
                         html+="<div class='msgavatar'>";
-                        html+="<img id='user_avatar_img' src='/{{ alias }}/uploads/avatar/"+payload.msg.avatar+"' class='avatar'><br>";
+                        html+="<img style='pointer:cursor' onclick='seeUser("+payload.msg.userid+")' id='user_avatar_img' src='/{{ alias }}/uploads/avatar/"+payload.msg.avatar+"' class='avatar'><br>";
                         if(payload.msg.userid=={{app.user.id}} || '{{ fgmanager }}'=='1') {
                             html+="<i class='delmessage fa fa-trash fa-fw' data-id='"+payload.msg.id+"' style='cursor: pointer;'></i>";
                         }
@@ -445,7 +445,7 @@
                         if(!$("#message-"+data.id).length) {
                             html ="<div id='message-"+data.id+"' class='message row'>";
                             html+="<div class='msgavatar'>";
-                            html+="<img id='user_avatar_img' src='/{{ alias }}/uploads/avatar/"+data.useravatar+"' class='avatar'><br>";
+                            html+="<img style='cursor:pointer' onclick='seeUser("+data.userid+")' id='user_avatar_img' src='/{{ alias }}/uploads/avatar/"+data.useravatar+"' class='avatar'><br>";
                             if(data.userid=={{app.user.id}} || '{{ fgmanager }}'=='1') {
                                 html+="<i class='delmessage fa fa-trash fa-fw' data-id='"+data.id+"' style='cursor: pointer;'></i>";
                             }