Modification des menu et ajout de bouton playlists

app/Resources/translations/navigationui.fr.yml

@@ -6,6 +6,7 @@ container_menu:
   my_feeds:             Mes diffusions
   return:               Retour
   need_tags:            Demandes
+  my_playlists:         Mes listes de lecture
   
 top_bar:
   my_account:           Mon compte

app/Resources/translations/users.fr.yml

@@ -3,9 +3,10 @@ user:
   follow:                       Suivre
   following:                    Suivi
   notfollow:                    Ne plus suivre
-  view_favorites:               Voir les favoris
-  view_profile:                 Voir le profil
+  view_favorites:               Favoris
+  view_profile:                 Profil
   stop_follow:                  Ne plus suivre
+  view_playlists:               Listes de lectures
   show:
     title:                      Diffusions de %name%
   reputation:

app/Resources/translations/userui.fr.yml

@@ -141,6 +141,8 @@ tags:
     submit:                 Enregistrer ces tags
 
 submenu:
+  my_content:
+    title:                 Mes contenus
   followed_users:
     title:                  Utilisateurs suivis
     nouser:                Aucun

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

@@ -33,30 +33,15 @@
   {% endif %}
   <li class="separator"></li>
   {% if app.user %}
-    <li class="{% if app.request.get('topmenu') == 'showuser' and app.request.get('slug') == app.user.slug %}selected{% endif %}">
-      <a href="{{ path('show_user', {'slug': app.user.slug}) }}">
-        {{ 'container_menu.my_feeds'|trans({}, 'navigationui') }}
+    <li class="{% if app.request.get('topmenu') == 'playlists' and app.request.get('user_slug') == app.user.slug %}selected{% endif %}">
+      <a href="{{ path('playlists_user', {'user_slug': app.user.slug}) }}">
+        {{ 'container_menu.my_playlists'|trans({}, 'navigationui') }}
       </a>
     </li>
   {% else %}
     <li>
       <a href="#" class="mustbeconnected">
-        {{ 'container_menu.my_feeds'|trans({}, 'navigationui') }}
-      </a>
-    </li>
-  {% endif %}
-  <li class="separator"></li>
-  {% if app.user %}
-    {% if his_group is not defined %}{% set his_group = false %}{% endif %}
-    <li class="{% if app.request.get('topmenu') == 'mygroups' or his_group == true %}selected{% endif %}">
-      <a href="{{ path('groups_own_list') }}" >
-        {{ 'network.mygroups'|trans({}, 'navigationui') }}
-      </a>
-    </li>
-  {% else %}
-    <li>
-      <a href="#" class="mustbeconnected">
-        {{ 'network.mygroups'|trans({}, 'navigationui') }}
+        {{ 'container_menu.my_playlists'|trans({}, 'navigationui') }}
       </a>
     </li>
   {% endif %}

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

@@ -5,6 +5,32 @@
       
       <a href="" class="top_menu_link">
         <div class="blackgradiant">
+            {{ 'submenu.my_content.title'|trans({}, 'userui') }}
+            <div class="dart"></div>
+        </div>
+      </a>
+      
+      <ul class="submenu">
+        <li class="sub_menu_element">
+          <a href="{{ path('show_user', {'slug': app.user.slug}) }}">
+            {{ 'container_menu.my_feeds'|trans({}, 'navigationui') }}
+          </a>
+        </li>
+        <li class="sub_menu_element">
+          <a href="{{ path('groups_own_list') }}">
+            {{ 'network.mygroups'|trans({}, 'navigationui') }}
+          </a>
+        </li>
+      </ul>
+    </li>
+      
+  </ul>
+  
+  <ul class="secondarymenu">
+    <li class="top_menu_element close">
+      
+      <a href="" class="top_menu_link">
+        <div class="blackgradiant">
             {{ 'submenu.followed_users.title'|trans({}, 'userui') }}
             <div class="dart"></div>
         </div>

src/Muzich/HomeBundle/Resources/views/Show/showUser.html.twig

@@ -32,6 +32,10 @@
         {{ 'user.view_favorites'|trans({}, 'users') }}
       </a>
       
+      <a class="button darkbutton" href="{{ path('playlists_user', {'user_slug' : viewed_user.slug}) }}" >
+        {{ 'user.view_playlists'|trans({}, 'users') }}
+      </a>
+      
     </div>
     
     <h1>{{ 'user.show.title'|trans({'%name%' : viewed_user.name}, 'users') }}</h1>

src/Muzich/PlaylistBundle/Resources/config/routing.yml

@@ -1,6 +1,6 @@
 playlists_user:
   pattern: /user/{user_slug}/playlists
-  defaults: { _controller: MuzichPlaylistBundle:Show:user }
+  defaults: { _controller: MuzichPlaylistBundle:Show:user, topmenu: playlists }
 
 playlist:
   pattern: /user/{user_slug}/playlist/{playlist_id}

src/Muzich/PlaylistBundle/Resources/views/Show/show.html.twig

@@ -9,8 +9,7 @@
     <div class="show_options">
       
       <a class="autoplay_playlist button darkbutton" href="{{ path('playlist_datas_for_autoplay', { 'playlist_id' : playlist.id }) }}" >
-        <img src="{{ asset('/img/1361037350_control_play.png') }}" alt="playlist" />
-        <span>{{ 'playlist.read'|trans({}, 'elements') }}</span>
+        {{ 'playlist.read'|trans({}, 'elements') }}
       </a>
 
       {% if app.user %}
@@ -27,13 +26,17 @@
         {% endif %}
       {% endif %}
       
+      <a class="button darkbutton" href="{{ path('playlists_user', {'user_slug' : viewed_user.slug}) }}" >
+        {{ 'user.view_playlists'|trans({}, 'users') }}
+      </a>
+      
     </div>
     
     <h1>{{ playlist.name }}</h1>
-    
+    <!--
     <a href="{{ path('playlists_user', { 'user_slug' : playlist.owner.slug }) }}">
       {{ 'playlist.gotoplaylists'|trans({ '%user_username%' : playlist.owner.username }, 'elements') }}
-    </a>
+    </a>-->
     
     {% include "MuzichCoreBundle:Tag:tag_cloud.html.twig" with {
       'tags' : playlist.tags