From d0dc35ca61ec1aabdd6a485d36142a950dd7dbd3 Mon Sep 17 00:00:00 2001
From: afornerot <afornerot@cadoles.com>
Date: Fri, 26 Jul 2019 15:03:32 +0200
Subject: [PATCH] svg

---
 logrotate/ninegate                                        | 2 +-
 .../src/Cadoles/CoreBundle/Controller/GroupController.php | 6 +++---
 .../PortalBundle/Resources/views/Page/pages.html.twig     | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/logrotate/ninegate b/logrotate/ninegate
index 73d6840c..cd7bbd12 100644
--- a/logrotate/ninegate
+++ b/logrotate/ninegate
@@ -1,5 +1,5 @@
 /var/www/html/ninegate/var/logs/*.log {
-   rotate 15
+   rotate 5
    daily
    su www-data
 }
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 6e7b1ff1..56f25a81 100644
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/GroupController.php
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/GroupController.php
@@ -825,7 +825,7 @@ class GroupController extends Controller
             if($group->getPages()->isEmpty()) {
                 $page=$this->getDoctrine()->getRepository("CadolesPortalBundle:Page")->clonePage(null,$group->getPagetemplate());
                 $group->addPage($page);
-                $page->setName("Groupe = ".$group->getLabel());
+                $page->setName($group->getLabel());
                 if($access=="user")$page->setUser($this->getUser());
 
                 $em->persist($page);
@@ -838,7 +838,7 @@ class GroupController extends Controller
                 $calendar=new Calendar();
                 $key = Uuid::uuid4();
 
-                $calendar->setName("Groupe = ".$group->getLabel());
+                $calendar->setName($group->getLabel());
                 $calendar->setKeyvalue($key);                
                 $calendar->addGroup($group);
                 $calendar->setColor($group->getColor());
@@ -853,7 +853,7 @@ class GroupController extends Controller
             if($group->getBlogs()->isEmpty()) {
                 $blog=new Blog();
 
-                $blog->setName("Groupe = ".$group->getLabel());
+                $blog->setName($group->getLabel());
                 $blog->addGroup($group);
                 if($access=="user")$blog->setUser($this->getUser());
 
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Page/pages.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Page/pages.html.twig
index 23d8fd25..5ce457d6 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Page/pages.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Page/pages.html.twig
@@ -29,9 +29,9 @@
             {% endif %}
 
             {% if entity.id is defined and page.id==entity.id %}
-                <li id="menupage-{{page.id}}" class="active" style="cursor:pointer"><a onClick="showPage({{ page.id }},{{ page.pagecategory.id }},'{{ page.canupdate }}','user','{{forcereload}}')">{{ page.name }}</a></li>
+                <li id="menupage-{{page.id}}" class="active" style="cursor:pointer"><a onClick="showPage({{ page.id }},{{ page.pagecategory.id }},'{{ page.canupdate }}','user','{{forcereload}}')"><i class="fa fa-user fa-fw"></i>&nbsp;{{ page.name }}</a></li>
             {% else %}
-                <li id="menupage-{{page.id}}"><a style="cursor:pointer" onClick="showPage({{ page.id }},{{ page.pagecategory.id }},'{{ page.canupdate }}','user','{{forcereload}}')">{{ page.name }}</a></li>
+                <li id="menupage-{{page.id}}"><a style="cursor:pointer" onClick="showPage({{ page.id }},{{ page.pagecategory.id }},'{{ page.canupdate }}','user','{{forcereload}}')"><i class="fa fa-user fa-fw"></i>&nbsp;{{ page.name }}</a></li>
             {% endif %}
         {% endfor %}
     </ul>
@@ -52,7 +52,7 @@
             
             <li id="menupage-{{page.id}}" {{ isactive }}  style="cursor:pointer">
                 <a data-group="{{groupshared.id}}" onClick="showPage({{ page.id }},{{ page.pagecategory.id }},'{{ page.canupdate }}','group','{{forcereload}}','{{groupshared.id}}')">
-                    Groupe = {{ groupshared.label }}
+                    <i class="fa fa-users fa-fw"></i>&nbsp;{{ groupshared.label }}
                     {% if page.counterread > 0 %}
                         <span id="badge-{{groupshared.id}}" class="badge">{{page.counterread}}</span>
                     {% endif %}
@@ -62,7 +62,7 @@
             <ul id="pagesshared" class="nav navbar-top-links navbar-left">
                 <li class="dropdown">
                     <a data-group="{{groupshared.id}}" href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
-                        Groupe = {{ groupshared.label }}
+                        <i class="fa fa-users fa-fw"></i>&nbsp;{{ groupshared.label }}
                         <span class="caret"></span>
                         {% if groupshared.pagesshared[0].counterread > 0 %}
                             <span id="badge-{{groupshared.id}}" class="badge">{{groupshared.pagesshared[0].counterread}}</span>