From 8d66c9a925ccd78748e1069deb6c68af8bea188d Mon Sep 17 00:00:00 2001
From: afornerot <afornerot@cadoles.com>
Date: Mon, 22 Jun 2020 10:01:02 +0200
Subject: [PATCH] =?UTF-8?q?resolution=20probl=C3=A8me=20de=20couleur=20du?=
 =?UTF-8?q?=20switch=20(ref=20#155=20#154)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PortalBundle/Controller/PagewidgetController.php      | 2 +-
 .../WebsocketBundle/Resources/views/Chat/client.html.twig | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

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 ac6abe8f..916ff241 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/PagewidgetController.php
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/PagewidgetController.php
@@ -59,7 +59,7 @@ class PagewidgetController extends Controller
                 'param'     => $params,
                 'mode'      => "update",
                 'access'    => $access,
-                'idicon'    => $entity->getIcon()->getId(),
+                'idicon'    => ($entity->getIcon()?$entity->getIcon()->getId():$widgettype->getIcon()->getId()),
                 'method'    => 'POST',
             ]);
         } else {
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 79163199..c379fbca 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
@@ -94,11 +94,11 @@
     <div id="topchat" class='row'>
         {{ form_widget(form.message) }}
         <input id="sendbymail" type="checkbox" style="float:right" class='switch' ></input>            
-        <label class="custom-control-label" for="sendbymail" style="color:#{{ colorbodyback }}">Envoyer par Mail ?</label>
+        <label class="custom-control-label" for="sendbymail" style="color:#{{ colorbodyfont }}">Envoyer par Mail ?</label>
         <a id="sendbtn" class="btn btn-success" style="margin-top:5px; width:100%; margin-bottom:15px">Envoyer</a>
         <div id="useronline" style="margin-bottom:10px"></div>
         <input id="unsee" type="checkbox" style="float:right" class='switch' onChange="switchsee()"></input>
-        <label class="custom-control-label" for="unsee" style="color:#{{ colorbodyback }}">Afficher les messages masqués ?</label>
+        <label class="custom-control-label" for="unsee" style="color:#{{ colorbodyfont }}">Afficher les messages masqués ?</label>
     </div>
         
     
@@ -734,9 +734,9 @@
         
         function addOnline(userid, useravatar, userlastname, userfirstname) {
             if(!$("#online"+userid).length) {
-                html = "<span id='online"+userid+"' style='width:70px; height:105px; display:inline-block; text-align: center; font-size: 10px; color:#{{ colorbodyback }}; text-transform: uppercase; line-height:11px;overflow-wrap: break-word;vertical-align:top;'>";
+                html = "<span id='online"+userid+"' style='width:70px; display:inline-block; text-align: center; font-size: 10px; color:#{{ colorbodyback }}; text-transform: uppercase; line-height:11px;overflow-wrap: break-word;vertical-align:top;'>";
                 html+= "<img style='cursor:pointer; width:40px; height:40px; margin-bottom:5px;' onclick='seeUser("+userid+")' title='"+userlastname+" "+userfirstname+"' id='user_avatar_img' src='/{{ alias }}/uploads/avatar/"+useravatar+"' class='avatar'>";
-                html+= userlastname+" "+userfirstname;
+                html+= "<span style='color:#{{colorbodyfont}}'>"+userlastname+" "+userfirstname+"</span>";
                 html+= "</span>";
                 $("#useronline").append(html);
             }