From 522d0c8b0f64d44136899820e692fd654e2d3e88 Mon Sep 17 00:00:00 2001
From: afornerot <afornerot@cadoles.com>
Date: Fri, 4 Oct 2019 11:30:13 +0200
Subject: [PATCH] adaptation de style

---
 .../CoreBundle/Resources/public/css/style.css |  6 +++-
 .../views/Pagewidget/viewfile.html.twig       | 29 +++++++++----------
 .../views/Pagewidget/viewflux.html.twig       |  2 +-
 .../views/Pagewidget/viewinfo.html.twig       | 22 +++++++++-----
 4 files changed, 33 insertions(+), 26 deletions(-)

diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/css/style.css b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/css/style.css
index f611d414..e9814758 100644
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/css/style.css
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/css/style.css
@@ -276,6 +276,10 @@ span.item-drag {
     height: auto;
 }
 
+.grid-item-img {
+    filter: drop-shadow(1px 1px 1px #222);
+}
+
 .grid-item .grid-item-title {
     display: inline-block;
     vertical-align: top;
@@ -436,7 +440,7 @@ a.item-heart {
 .grid .grid-image  {
     width:19.2%;
     height:auto;
-    margin: 1% 0px 0px 0px;
+    /*margin: 1% 0px 0px 0px;*/
 }
 
 .grid .grid-image .item-link {
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 32be8cb6..a55abc79 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
@@ -65,8 +65,8 @@
                     <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  style="color:#{{colorbodyfont}}; cursor:pointer" onClick="delFile('widget-{{ entity.id}}','{{file.name }}')" class="item-delete">
+                                <i style="color:#{{colorbodyfont}}" class="fa fa-trash" title="Supprimer le fichier"></i>
                                 </a>
                             {% endif %}
 
@@ -86,7 +86,7 @@
                                 </div>
 
                                 <div class="grid-item-title">
-                                    <h2 style="{{ stylewidgetbody }}">{{ file.name }}</h2>
+                                    <h2 style="color:#{{colorbodyfont}}">{{ file.name }}</h2>
                                 </div>                    
                             </div>
                             </a>
@@ -95,20 +95,17 @@
                 {% endfor %}
 
                 {% if canadd %}
-                    <div class="grid-item grid-small" style="{{ stylewidgetbodyreverse }}">
-                        <div class="grid-item-content">
-                            <a style="{{ stylewidgetmenu }}" data-toggle="modal" data-target="#mymodal" onClick="ModalLoad('mymodal','Fichiers','{{ path('cadoles_core_'~access~'_file_upload',{'id': 'widget-'~entity.id,'type':'all'}) }}');" title='Ajouter des fichiers'>
-                                <div class="item-link clearfix">
-                                    <div class="grid-item-logo">
-                                        <img class="grid-item-img" height="110" src="/{{ alias }}/uploads/icon/icon_add.png" />
-                                    </div>
-
-                                    <div class="grid-item-title">
-                                        <h2 style="{{ stylewidgetbodyreverse }}">Ajouter un fichier</h2>
-                                    </div>                    
+                    <div class="grid-item grid-small">
+                         <div  data-toggle="modal" data-target="#mymodal" onClick="ModalLoad('mymodal','Fichiers','{{ path('cadoles_core_'~access~'_file_upload',{'id': 'widget-'~entity.id,'type':'all'}) }}');" title='Ajouter des fichiers' class="grid-item-content" style="background-color: #{{color['main']}};cursor:pointer;">
+                            <div class="item-link clearfix">
+                                <div class="grid-item-logo">
+                                    <img class="grid-item-img" height="110" src="/{{ alias }}/uploads/icon/icon_add.png">
                                 </div>
-                            </a>
-                        </div>
+                                <div class="grid-item-title">
+                                    <h2>Ajouter un fichier</h2>
+                                </div>                              
+                            </div>
+                         </div>
                     </div>
                 {% endif %}
             </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 c244127b..b8d4d61c 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
@@ -56,7 +56,7 @@
 
     {% set firstflux="" %}
 
-    {% if fluxs is not empty %}
+    {% if fluxs is defined and fluxs is not empty %}
     <div class="widgetbody" style="{{ stylewidgetbody }} ">
         {% if fluxs is defined %}
             {% if fluxs|length > 1 %}
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 b6ec3979..c06bb14f 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
@@ -19,6 +19,7 @@
     {% set stylelink = "color:#" ~ 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">
     {% if canupdate  %}
     <div class="widgetmenu">
@@ -27,8 +28,8 @@
     </div>
     {% endif %}
 
-
-    <div class="widgetheader" style="{{ stylewidgetbodyimage }}; height:100%;">
+{% set canadd = false %}
+    <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 }}" />
@@ -37,9 +38,11 @@
         {% endif %}
     </div>
 
-    {% set canadd = false %}
+    
     <div class="widgetbody" style="{{ stylewidgetbody }}">
-        <div style="text-align: center;">
+
+            
+        <div style="text-align: center; margin-top:40px;">
             {%if usage=="group" %}<small>Groupe<br></small>{% endif %}
             <span style="font-size:120%">{{ title }}</span><br><br>
             {{ description | raw }}
@@ -56,13 +59,16 @@
                                 </div>
                             
                                 <div class="grid-item-title">
+                                    <h2 style="{{ stylewidgetbodyreverse }};">
+                                    {{ member.user.lastname }} {{ member.user.firstname }}
                                     {%if member.fgmanager%}
-                                        <i style="color: #FFF" class="fa fa-star" title="Manager"></i>
+                                        <br>
+                                        <i style="{{ stylewidgetbodyreverse }};" class="fa fa-star" title="Manager"></i>
                                         {% if member.user==app.user %}
                                             {% set canadd=true %}
                                         {% endif %}
-                                    {%endif%}<br>
-                                    {{ member.user.lastname }} {{ member.user.firstname }}
+                                    {%endif%}                                    
+                                    </h2>
                                 </div>
                             </div>
                         </div>
@@ -78,7 +84,7 @@
         
                             
                                 <div class="grid-item-title">
-                                    Ajouter un membre
+                                    <h2 style="{{ stylewidgetbodyreverse }};">Ajouter un membre</h2>
                                 </div>
                             </div>
                             </a>