Cadoles
/
ninegate
20
0
Fork 0
Code Issues 29 Pull Requests Projects 1 Releases Wiki Activity

svg

This commit is contained in:
afornerot 2019-07-26 15:03:32 +02:00
parent 8147233340
commit d0dc35ca61
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
logrotate/ninegate
View File

@ -1,5 +1,5 @@
/var/www/html/ninegate/var/logs/*.log {
rotate 15
rotate 5
daily
su www-data
}

6
src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/GroupController.php
View File

@ -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());

8
src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Page/pages.html.twig
View File

@ -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>