Merge branch 'master' into dist/envole/6/master

src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/SondeController.php

@@ -46,6 +46,7 @@ class SondeController extends Controller
         elseif($route=="cadoles_portal_user_page_view") {
             if($usage=="group") $usagesonde="collaboratif";
             elseif($usage=="user")  $usagesonde="collaboratif";
+            elseif($usage=="accueil")  $usagesonde="accueil";
             else $usagesonde="portail";
         }
         elseif(stripos($route,"cadoles_portal_user_calendar")!==false)

src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Calendar/view.html.twig

@@ -288,7 +288,12 @@
         {% if entity.id is defined %}
             {% for calendar in calendars %} 
                 {% if calendar.id==entity.id %}
-                    showCalendar({{ calendar.id }}, {{ calendar.canadd }});
+                    {% if access=="config" %}
+                        {% set calendarcanadd=true %}
+                    {% else %}
+                        {% set calendarcanadd=calendar.canadd %}
+                    {% endif %}
+                    showCalendar({{ calendar.id }}, {{ calendarcanadd }});
                 {% endif %}
             {% endfor %}
         {% else %}

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

@@ -13,9 +13,12 @@
                 {% set forcereload=page.toreload %}
             {% endif %}
 
+            {% set usage="portal" %}
+            {% if loop.first %} {% set usage="accueil" %} {%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 }}','portal','{{forcereload}}',null,'{{page.name}}')">
+                    <a onClick="showPage({{ page.id }},{{ page.pagecategory.id }},'{{ page.canupdate }}','{{usage}}','{{forcereload}}',null,'{{page.name}}')">
                         {% if page.fonticon %}
                             <i class="{{ page.fonticon }} fa-faw"></i>&nbsp;
                         {% endif %}                    
@@ -258,7 +261,9 @@
         {% if gotoroute is empty %}
             {% for page in pagesadmin %} 
                 {% if page.id==entity.id %}
-                    showPage({{ page.id }}, {{ page.pagecategory.id }},'{{ page.canupdate }}','portal',false,null,'{{page.name}}');
+                    {% set usage="portal" %}
+                    {% if loop.first %} {% set usage="accueil" %} {%endif %}                
+                    showPage({{ page.id }}, {{ page.pagecategory.id }},'{{ page.canupdate }}','{{usage}}',false,null,'{{page.name}}');
                 {% endif %}
             {% endfor %}