Evolution #103: Onglet mes groupes

src/Muzich/CoreBundle/Resources/views/Menu/containerMenu.html.twig

@@ -12,26 +12,15 @@
   </li>
 </ul>
 
-{% if mygroups %}
-
-  <ul class="top-tabs-right {% if active == 'mygroups' %}active{% endif %}" id="top-tabs-my-groups" {% if active == 'mygroups' %} class="active" {% endif %}>
-    <li>
-      <a href="{{ path('groups_own_list') }}" >
-        {{ 'network.mygroups'|trans({}, 'navigationui') }}
-      </a>
-    </li>
-  </ul>
-
-{% endif %}
-
-{% if myfavorites %}
-
-  <ul class="top-tabs-right {% if active == 'myfavorites' %}active{% endif %}" id="top-tabs-my-favorites" {% if active == 'myfavorites' %} class="active" {% endif %}>
-    <li>
-      <a href="{{ path('favorites_my_list') }}" >
-        {{ 'container_menu.my_favorites'|trans({}, 'navigationui') }}
-      </a>
-    </li>
-  </ul>
-
-{% endif %}
+<ul class="top-tabs-right">
+  <li class="{% if active == 'mygroups' %}active{% endif %}">
+    <a href="{{ path('groups_own_list') }}" >
+      {{ 'network.mygroups'|trans({}, 'navigationui') }}
+    </a>
+  </li>
+  <li class="{% if active == 'myfavorites' %}active{% endif %}">
+    <a href="{{ path('favorites_my_list') }}" >
+      {{ 'container_menu.my_favorites'|trans({}, 'navigationui') }}
+    </a>
+  </li>
+</ul>

src/Muzich/FavoriteBundle/Resources/views/Favorite/myList.html.twig

@@ -4,11 +4,7 @@
 
 {% block content %}
 
-  {% include "MuzichCoreBundle:Menu:containerMenu.html.twig" with { 
-    'active': 'myfavorites', 
-    'mygroups': false, 
-    'myfavorites': true 
-  } %}
+  {% include "MuzichCoreBundle:Menu:containerMenu.html.twig" with {'active': 'myfavorites'} %}
 
   <h2>{{ 'favorites.your_favorites'|trans({}, 'network') }}</h2>
 

src/Muzich/FavoriteBundle/Resources/views/Favorite/userList.html.twig

@@ -4,11 +4,7 @@
 
 {% block content %}
 
-  {% include "MuzichCoreBundle:Menu:containerMenu.html.twig" with { 
-    'active': '', 
-    'mygroups': false, 
-    'myfavorites': true 
-  } %}
+  {% include "MuzichCoreBundle:Menu:containerMenu.html.twig" with {'active': ''} %}
 
   <h2>{{ 'favorites.user_favorites'|trans({'%name%' : viewed_user.name}, 'network') }}</h2>
 

src/Muzich/GroupBundle/Resources/views/layout.html.twig

@@ -9,7 +9,7 @@
 
 {% block main_content %}
   
-  {% include "MuzichCoreBundle:Menu:containerMenu.html.twig" with { 'active': 'mygroups', 'mygroups': true, 'myfavorites': false } %}
+  {% include "MuzichCoreBundle:Menu:containerMenu.html.twig" with { 'active': 'mygroups' } %}
   
   {% block content %}{% endblock %}
   

src/Muzich/HomeBundle/Resources/views/layout.html.twig

@@ -9,7 +9,7 @@
 
 {% block main_content %}
   
-    {% include "MuzichCoreBundle:Menu:containerMenu.html.twig" with { 'active': 'public', 'mygroups': false, 'myfavorites': true } %}
+    {% include "MuzichCoreBundle:Menu:containerMenu.html.twig" with { 'active': 'public' } %}
   
     {% block content %}{% endblock %}
   

src/Muzich/MynetworkBundle/Resources/views/layout.html.twig

@@ -6,7 +6,7 @@
 
 {% block main_content %}
   
-  {% include "MuzichCoreBundle:Menu:containerMenu.html.twig" with { 'active': 'private', 'mygroups': true, 'myfavorites': false } %}
+  {% include "MuzichCoreBundle:Menu:containerMenu.html.twig" with { 'active': 'private' } %}
   
   {% block content %}{% endblock %}
   

src/Muzich/UserBundle/Resources/views/layout.html.twig

@@ -6,7 +6,7 @@
 
 {% block main_content %}
   
-    {% include "MuzichCoreBundle:Menu:containerMenu.html.twig" with { 'active': null, 'mygroups': false, 'myfavorites': false } %}
+    {% include "MuzichCoreBundle:Menu:containerMenu.html.twig" with { 'active': null } %}
   
     {% block content %}{% endblock %}
   

web/bundles/muzichcore/css/main.css

@@ -101,7 +101,7 @@ input.button, button.button {
   padding: 0;
 }
 
-#container #top-tabs li, .top-tabs-right
+#container #top-tabs li
 {
   float: left;
   margin-left: 0px;
@@ -121,6 +121,34 @@ input.button, button.button {
   -webkit-border-radius: 5px 5px 0px 0px;
 }
 
+.top-tabs-right
+{
+  list-style: none outside none;
+}
+
+.top-tabs-right li
+{
+  float: left;
+  padding-top: 3px;
+  padding-left: 5px;
+  padding-right: 5px;
+  padding-bottom: 3px;
+  
+  background-color: #e9e9e9;
+  
+  border-top: 1px solid #d5d5d5;
+  border-left: 1px solid #d5d5d5;
+  border-right: 1px solid #d5d5d5;
+  border-radius: 5px 5px 0px 0px;
+  -moz-border-radius: 5px 5px 0px 0px;
+  -webkit-border-radius: 5px 5px 0px 0px;
+}
+
+.top-tabs-right li.active
+{
+  background-color: white;
+}
+
 #container #top-tabs li.active, .top-tabs-right ul.active, .top-tabs-right ul.active li
 {
   background-color: white;