diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/SondeController.php b/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/SondeController.php index 176e34c1..c6705ea5 100644 --- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/SondeController.php +++ b/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) diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Calendar/view.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Calendar/view.html.twig index d8823939..3347e3c4 100644 --- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Calendar/view.html.twig +++ b/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 %} 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 c2d5e1e6..aec3a6f3 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 @@ -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 %}