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 6918160d..176e34c1 100644 --- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/SondeController.php +++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/SondeController.php @@ -13,7 +13,7 @@ class SondeController extends Controller public function sondeAction() { // Debug sonde - $fgdebug = $this->getParameter("fgdebug"); + $fgdebug = true; // Calcul du login $user=$this->getUser(); diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/css/style.css b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/css/style.css index 76925c6d..548810da 100644 --- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/css/style.css +++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/css/style.css @@ -127,11 +127,6 @@ body { border-bottom: 5px solid #FFF; } -.dropdown-menu { - max-height: 450px; - overflow-y: auto; -} - .dropdown-submenu { position: relative; } @@ -180,6 +175,11 @@ body { border-radius: 6px 0 6px 6px; } +.list-group-item.active, .list-group-item.active:focus, .list-group-item.active:hover { + background-color: #cdcdcd; + border-color: #cdcdcd; +} + /*== SIDEBAR ============================================================================================================================================*/ @media (max-width: 767px) { diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Page/menugroupe.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Page/menugroupe.html.twig new file mode 100644 index 00000000..4b4afe79 --- /dev/null +++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Page/menugroupe.html.twig @@ -0,0 +1,109 @@ + {% if not inmenu %} + + {% else %} + {% for groupshared in groupsshared %} + {% if groupshared.pagesshared|length == 1 %} + {% set page = groupshared.pagesshared[0] %} + {% set forcereload=true %} + {% if page.pagecategory.id==1 %} + {% set forcereload=false %} + {% endif %} + + {% set isactive="" %} + {% if entity.id is defined and page.id==entity.id %} + {% set isactive="class='active'" %} + {% endif %} + + + {% else %} + + {% endif %} + {% endfor %} + {% endif %} \ No newline at end of file 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 ff5a605f..99797a38 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 @@ -70,94 +70,21 @@ + {%else%} + {% set inmenu=true %} + {{ include('@CadolesPortal/Page/menugroupe.html.twig') }} + {% endif %} @@ -172,6 +99,13 @@ + + + + + + + {% endblock %} {% block pagewrapper %} @@ -182,6 +116,29 @@ {% endif %} + {% set nbgroupregrouped=5 %} + {% if groupsshared|length > nbgroupregrouped %} + + {%endif%} +