From 7ecfa45d752230b754079467171d3bc43fe8a58f Mon Sep 17 00:00:00 2001
From: afornerot <afornerot@cadoles.com>
Date: Mon, 12 Jul 2021 12:46:55 +0200
Subject: [PATCH] mise en forme du bage item

---
 .../views/Pagewidget/viewitem.html.twig       | 28 +++++++++++--------
 .../Pagewidget/viewitemessential.html.twig    | 19 +++++++------
 2 files changed, 26 insertions(+), 21 deletions(-)

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 c62aa909..0459d743 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
@@ -180,7 +180,7 @@
                         {%endif%}
 
                         <div class="grid-item {{ stylegrid }}" data-idcategory="bookmark" data-title="{{ bookmark.item.title|lower }}">
-                            <div class="grid-item-content" style="background-color: {{ bookmark.color ? "#"~bookmark.color : '#'~colormain }};">
+                            <div class="grid-item-content" style="background-color: {{ bookmark.item.color ? "#"~bookmark.item.color : '#'~colormain }};">
                                 {% if bookmark.item.content %}
                                 <a  style="cursor:pointer" class="item-preview"><i style="color: #FFF" class="fa fa-info" title="Informations sur ce service"></i></a>
                                 {% endif %}
@@ -207,10 +207,10 @@
 
                                     <div class="grid-item-title">
                                         <h2>{{ bookmark.item.title }}</h2>
+                                        <span>{{ bookmark.item.subtitle|nl2br }}</span>
                                         {% if not bookmark.item.badgeurl is empty %}
-                                            <div class="itembadgeurl badge badge-pill" data-url="{{bookmark.item.badgeurl}}" style="background-color: #449d44;"></div>
-                                        {% endif %}                                          
-                                        <span>{{ bookmark.item.subtitle|nl2br }}</<span>
+                                            <div class="itembadgeurl badge badge-pill" data-url="{{bookmark.item.badgeurl}}" style="background-color: #ffffff; color: {{ bookmark.item.color ? "#"~bookmark.item.color : '#'~colormain }};"></div>
+                                        {% endif %}                                         
                                     </div>                    
                                 </div>
                                 </a>
@@ -236,7 +236,7 @@
                         {% for bookmark in bookmarks %}
                             {% if bookmark.item %}
                                 <div class="grid-item {{ stylegrid }}" data-idcategory="bookmark" data-title="{{ bookmark.item.title|lower }}">
-                                    <div class="grid-item-content" style="background-color: {{ bookmark.color ? "#"~bookmark.color : '#'~colormain }};">
+                                    <div class="grid-item-content" style="background-color: {{ bookmark.item.color ? "#"~bookmark.item.color : '#'~colormain }};">
                                         {% if bookmark.item.content %}
                                         <a  style="cursor:pointer" class="item-preview"><i style="color: #FFF" class="fa fa-info" title="Informations sur ce service"></i></a>
                                         {% endif %}
@@ -263,10 +263,12 @@
 
                                             <div class="grid-item-title">
                                                 <h2>{{ bookmark.item.title }}</h2>
+                                                <span>{{ bookmark.item.subtitle|nl2br }}</span>
                                                 {% if not bookmark.item.badgeurl is empty %}
-                                                    <div class="itembadgeurl badge badge-pill" data-url="{{bookmark.item.badgeurl}}" style="background-color: #449d44;"></div>
-                                                {% endif %}                                                   
-                                                <span>{{ bookmark.item.subtitle|nl2br }}</<span>
+                                                    <div style="margin-top:5px;text-align:center;{% if stylegrid == "grid-list"%} float: right;position: absolute;top: 10px;right: -50px; {%endif%}">
+                                                        <div class="itembadgeurl badge badge-pill" data-url="{{bookmark.item.badgeurl}}" style="background-color: #ffffff; color: {{ bookmark.color ? "#"~bookmark.color : '#'~colormain }};"></div>
+                                                    </div>
+                                                {% endif %}                                                    
                                             </div>                    
                                         </div>
                                         </a>
@@ -301,7 +303,7 @@
 
                                             <div class="grid-item-title">
                                                 <h2>{{ bookmark.title }}</h2>
-                                                <span>{{ bookmark.subtitle|nl2br }}</<span>
+                                                <span>{{ bookmark.subtitle|nl2br }}</span>
                                             </div>                    
                                         </div>
                                         </a>
@@ -412,10 +414,12 @@
 
                                     <div class="grid-item-title">
                                         <h2>{{ item.title }}</h2>
+                                        <span>{{ item.subtitle|nl2br }}</span>
                                         {% if not item.badgeurl is empty %}
-                                            <div class="itembadgeurl badge badge-pill" data-url="{{item.badgeurl}}" style="background-color: #449d44;"></div>
-                                        {% endif %}                                           
-                                        <span>{{ item.subtitle|nl2br }}</<span>
+                                            <div style="margin-top:5px;text-align:center;{% if stylegrid == "grid-list"%} float: right;position: absolute;top: 10px;right: -50px; {%endif%}">
+                                                <div class="itembadgeurl badge badge-pill" data-url="{{item.badgeurl}}" style="background-color: #ffffff; color: {{ item.color ? "#"~item.color : '#'~colormain }};"></div>
+                                            </div>
+                                        {% endif %}                                          
                                     </div>                    
                                 </div>
                                 </a>
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 7b17c24c..85c7a5d2 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
@@ -89,7 +89,7 @@
                 {% for bookmark in bookmarks %}
                     {% if bookmark.item %}
                         <div class="grid-item {{ stylegrid }}" data-idcategory="bookmark" data-title="{{ bookmark.item.title|lower }}">
-                            <div class="grid-item-content" style="background-color: {{ bookmark.color ? "#"~bookmark.color : '#'~colormain }};">
+                            <div class="grid-item-content" style="background-color: {{ bookmark.item.color ? "#"~bookmark.item.color : '#'~colormain }};">
                                 {% if bookmark.item.content %}
                                 <a  style="cursor:pointer" class="item-preview"><i style="color: #FFF" class="fa fa-info" title="Informations sur ce service"></i></a>
                                 {% endif %}
@@ -106,9 +106,6 @@
                                 {% endif %}
 
                                 <div class="item-link clearfix">
-                                    {% if not bookmark.item.badgeurl is empty %}
-                                        <span class="badge badge-primary">3</span>
-                                    {% endif %}
                                     <div class="grid-item-logo" title="{{ bookmark.item.subtitle|nl2br }}">
                                         {% if bookmark.item.icon %}
                                             <img class="grid-item-img" src="/{{ alias }}/{{ bookmark.item.icon.label }}">
@@ -119,10 +116,12 @@
 
                                     <div class="grid-item-title">
                                         <h2>{{ bookmark.item.title }}</h2>
+                                        <span>{{ bookmark.item.subtitle|nl2br }}</span>
                                         {% if not bookmark.item.badgeurl is empty %}
-                                            <div class="itembadgeurl badge badge-pill" data-url="{{bookmark.item.badgeurl}}" style="background-color: #449d44;"></div>
+                                            <div style="margin-top:5px;text-align:center;{% if stylegrid == "grid-list"%} float: right;position: absolute;top: 10px;right: -50px; {%endif%}">
+                                                <div class="itembadgeurl badge badge-pill" data-url="{{bookmark.item.badgeurl}}" style="background-color: #ffffff; color: {{ bookmark.item.color ? "#"~bookmark.item.color : '#'~colormain }};"></div>
+                                            </div>
                                         {% endif %}                                        
-                                        <span>{{ bookmark.item.subtitle|nl2br }}</<span>
                                     </div>                    
                                 </div>
                                 </a>
@@ -207,10 +206,12 @@
 
                                 <div class="grid-item-title">
                                     <h2>{{ item.title }}</h2>
+                                    <span>{{ item.subtitle|nl2br }}</span>
                                     {% if not item.badgeurl is empty %}
-                                        <div class="itembadgeurl badge badge-pill" data-url="{{item.badgeurl}}" style="background-color: #449d44;"></div>
-                                    {% endif %}
-                                    <span>{{ item.subtitle|nl2br }}</<span>
+                                        <div style="margin-top:5px;text-align:center;{% if stylegrid == "grid-list"%} float: right;position: absolute;top: 10px;right: -50px; {%endif%}">
+                                            <div class="itembadgeurl badge badge-pill" data-url="{{item.badgeurl}}" style="background-color: #ffffff; color: {{ item.color ? "#"~item.color : '#'~colormain }};"></div>
+                                        </div>
+                                    {% endif %}                                      
                                 </div>                    
                             </div>
                             </a>