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

src/ninegate-1.0/src/Cadoles/CoreBundle/Command/data/core-init-01.sql

@@ -8,7 +8,7 @@ INSERT IGNORE INTO `niveau01` (`id`, `label`, `siren`) VALUES
 (-100, 'Interne', 'SIREN');
 
 INSERT IGNORE INTO `user` (`id`, `niveau01_id`, `username`, `firstname`, `lastname`, `password`, `email`, `avatar`, `role`,`siren`,`authlevel`) VALUES
-(-100, -100, 'admin', 'Administrateur', 'draaf', '{SSHA}2oV9M1Ofw14hGll+W1oPHxR7E2SZvzFz
+(-100, -100, 'admin', 'Administrateur', 'draaf', '{SSHA}DaOp1rZbdNu4Njbw+JpKmuufVKXN9s/5
 ', 'admin@ldapbundle.ac-arno.fr', 'admin.jpg', 'ROLE_ADMIN', '130007107', 'simple');
 
 

src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/css/style.css

@@ -127,6 +127,54 @@ body {
     border-bottom: 5px solid #FFF;
 }
 
+.dropdown-submenu {
+    position: relative;
+}
+
+.dropdown-submenu>.dropdown-menu {
+    top: 0;
+    left: 100%;
+    margin-top: -6px;
+    margin-left: -1px;
+    -webkit-border-radius: 0 6px 6px 6px;
+    -moz-border-radius: 0 6px 6px;
+    border-radius: 0 6px 6px 6px;
+}
+
+.dropdown-submenu:hover>.dropdown-menu {
+    display: block;
+}
+
+.dropdown-submenu>a:after {
+    display: block;
+    content: " ";
+    float: right;
+    width: 0;
+    height: 0;
+    border-color: transparent;
+    border-style: solid;
+    border-width: 5px 0 5px 5px;
+    border-left-color: #ccc;
+    margin-top: 5px;
+    margin-right: -10px;
+}
+
+.dropdown-submenu:hover>a:after {
+    border-left-color: #fff;
+}
+
+.dropdown-submenu.pull-left {
+    float: none;
+}
+
+.dropdown-submenu.pull-left>.dropdown-menu {
+    left: -100%;
+    margin-left: 10px;
+    -webkit-border-radius: 6px 0 6px 6px;
+    -moz-border-radius: 6px 0 6px 6px;
+    border-radius: 6px 0 6px 6px;
+} 
+
 /*== SIDEBAR ============================================================================================================================================*/
 
 @media (max-width: 767px) {

src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Include/head.html.twig

@@ -174,6 +174,11 @@
                 .slick .slicklink {
                     font-family: {{ app.session.get('fontfacebody') }};
                 }
+
+                .dropdown-submenu a
+                {
+                    color: #{{ color['main'] }}
+                }                
             </style>
         {% endblock %}
     </head>

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

@@ -37,6 +37,21 @@
     </ul>
 
     <ul id="pagesgroup" class="nav navbar-top-links navbar-left">
+
+    <!-- On regroupe l'ensemble des pages si plus de 10 groupes -->
+    {% set submenu="" %}
+    {% if groupsshared|length > 5 %} 
+        {% set submenu="-submenu" %}
+        <ul id="pagesshared" class="nav navbar-top-links navbar-left">
+            <li class="dropdown">
+                <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
+                    <i class="fa fa-users fa-fw"></i>Mes Groupes
+                    <span class="caret"></span>
+                </a>
+
+                 <ul class="dropdown-menu">
+    {%endif%}
+
     {% for groupshared in groupsshared %}
         {% if groupshared.pagesshared|length == 1 %}
             {% set page = groupshared.pagesshared[0] %}
@@ -60,10 +75,12 @@
             </li>
         {% else %}
             <ul id="pagesshared" class="nav navbar-top-links navbar-left">
-                <li class="dropdown">
+                <li class="dropdown{{submenu}}">
                     <a data-group="{{groupshared.id}}" href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
                         <i class="fa fa-users fa-fw"></i>&nbsp;{{ groupshared.label }}
+                        {%if submenu is empty %}
                         <span class="caret"></span>
+                        {% endif %}
                         {% if groupshared.pagesshared[0].counterread > 0 %}
                             <span id="badge-{{groupshared.id}}" class="badge">{{groupshared.pagesshared[0].counterread}}</span>
                         {% endif %}
@@ -92,6 +109,13 @@
             </ul>
         {% endif %}
     {% endfor %}
+
+    {% if groupsshared|length > 3 %} 
+                    </ul>
+                </li>
+            </ul>
+    {%endif%}
+
     </ul>