adaptation de look

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

@@ -133,10 +133,9 @@
 
 
 
-            <div id="page-wrapper" class="{% if maxwidth is defined and maxwidth %} page-maxed {% endif %}" style="min-height:1200px; {% if not usesidebar %}  margin:0px; {% endif %}">
+            <div id="page-wrapper" class="{% if maxwidth is defined and maxwidth %} page-maxed {% endif %}" style="min-height:1200px; {% if not usesidebar %}  margin:0px; {% endif %}{% if not useheader %}  background-color:transparent; padding: 5px 25px 10px 15px; {% endif %} ">
                 <div class="container-fluid">
                     <div class="row">
-
                     {% block pagewrapper %}
 
                     {% endblock %}

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

@@ -1860,6 +1860,7 @@ class PagewidgetController extends Controller
             $group=$em->getRepository("CadolesCoreBundle:Group")->find($group);
             if($group) {
                 $title=$group->getLabel();
+                if($group->getDescription())
                     $description="<strong>Description</strong><br>".$group->getDescription();
                 if($group->getIcon())
                     $icon="/".$group->getIcon()->getLabel();

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

@@ -167,7 +167,7 @@
 
         {% if canupdate %}
             // Mettre une taille mini de colonne sinon on ne pourra pas déplacer le widget dans la colonne
-            $(".colcontainer .col").css("min-height","100px");
+            $(".colcontainer .col").css("min-height","80px");
 
             // Cursor move sur les widgets header
             $(".widgetheader").css("cursor","move");

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

@@ -46,6 +46,7 @@
         <span class="title">{{ entity.name }}</span>
     </div>
 
+    {% if blogarticles|length >= 1 %}
         <div class="widgetbody" style="{{ stylewidgetbody }}">
             <div class="grid clearfix">
                 {% for blogarticle in blogarticles %}
@@ -68,6 +69,7 @@
                 {% endfor %}
             </div>
         </div>
+    {% endif %}
 </div>
 
 

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

@@ -47,8 +47,8 @@
         <span class="title">{{ entity.name }}</span>
     </div>
 
-    <div class="widgetbody" style="{{ stylewidgetbody }} {% if not entity.border %} padding-top:10px; {% endif %}">
     {% if bookmarks is not empty %}
+        <div class="widgetbody" style="{{ stylewidgetbody }} {% if not entity.border %} padding-top:10px; {% endif %}">
             <div class="bookmark-container">
                 <div class="grid clearfix">
                     <div class="grid-sizer {{ stylegrid }}"></div>
@@ -88,17 +88,9 @@
                     {% endfor %}
                 </div>
             </div>
-        {% else %}
-            <div class="bookmark-container" style="display:none">
-                <h3 class="grid-title" data-idcategory="bookmark" style="{{ colorbodyfont }}">Favoris</h3>
-                <div class="grid clearfix">
-                    <div class="grid-sizer {{ stylegrid }}"></div>
-                    <div class="grid-gutter-sizer"></div>
-                </div>
         </div>
     {% endif %}
 </div>
-</div>
 
 
 

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

@@ -45,6 +45,7 @@
 
     {% set firstflux="" %}
 
+    {% if events|length >= 1 %}
         <div class="widgetbody" style="{{ stylewidgetbody }}">
             {% set monthsel = "" %}
             {% for i in 0..(nbday-1) %}
@@ -79,6 +80,7 @@
 
             {% endfor %}
         </div>
+    {% endif %}
 </div>
 
 

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

@@ -10,6 +10,7 @@
 {% set stylewidgetheader = constants.mystylewidgetheader(entity) %}
 {% set stylewidgetbody = constants.mystylewidgetbody(entity) %}
 {% set stylewidgetbodyimage = constants.mystylewidgetbodyimage(entity) %}
+{% set stylewidgetbodyreverse = constants.mystylewidgetbodyreverse(entity) %}
 
 {% set color = app.session.get('color') %}
 
@@ -43,16 +44,15 @@
             {{ 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 member in members %}
-                        <div class="grid-item grid-small">
+                        <div class="grid-item grid-small" style="{{ stylewidgetbodyreverse }};">
-                            
-
                             <div class="grid-item-content">      
-                                <img src="/{{ alias }}/uploads/avatar/{{ member.user.avatar}}" class="avatar">   
+                                <div class="grid-item-logo">
+                                    <img src="/{{ alias }}/uploads/avatar/{{ member.user.avatar}}" class="grid-item-img avatar" height="110" >   
+                                </div>
                             
                                 <div class="grid-item-title">
                                     {%if member.fgmanager%}<i style="color: #FFF" class="fa fa-star" title="Manager"></i>{%endif%}<br>

src/ninegate-1.0/src/Cadoles/WebsocketBundle/Resources/views/Chat/client.html.twig

@@ -3,14 +3,14 @@
 {% block localstyle %}
     {% if framed %}
         {% if border %}
-            #page-wrapper {
+            #page-wrapper:last-of-type {
-                padding: 5px 25px 10px 15px;
+                //padding: 5px 25px 10px 15px;
-                background: transparent;
+                //background: transparent;
             }
         {% else %}
             #page-wrapper {
-                padding: 5px 25px 0px 15px;
+                //padding: 5px 25px 0px 15px;
-                background: transparent;
+                //background: transparent;
             }
         {% endif %}
     {% else %}