Evolution #126: Petites modifs ergonomiques

app/Resources/translations/navigationui.fr.yml

   my_network:           Mon réseau
   my_favorites:         Mes favoris
   my_feeds:             Mes diffusions
+  return:               Retour
   
 top_bar:
   my_account:           Mon compte (%name%)

app/Resources/translations/users.fr.yml

   following:                    Suivi
   notfollow:                    Ne plus suivre
   view_favorites:               Voir les favoris
+  view_profile:                 Voir le profil
   stop_follow:                  Ne plus suivre
   show:
     title:                      Diffusions de %name%

src/Muzich/CoreBundle/Resources/views/Info/about.html.twig

 
 {% block main_content %}
 
+  {% include "MuzichCoreBundle:Menu:containerMenu.html.twig" with {'active': 'myfavorites'} %}
+
   <h1>Découvrez et partagez la musique d'internet</h1>
 
   <p>

src/Muzich/CoreBundle/Resources/views/Info/development.html.twig

 
 {% block main_content %}
 
+  {% include "MuzichCoreBundle:Menu:containerMenu.html.twig" with {'active': 'myfavorites'} %}
+
   <h1>Muzich est en cours de construction</h1>
 
   <p>
-    Actuellement vous utilisez la version <strong>0.2 de</strong> Muzich. De nombreuses 
+    Actuellement vous utilisez la version <strong>0.3</strong> de Muzich. De nombreuses 
     fonctionnalités doivent voir le jours au fur et a mesure du développement.
   </p>
 

src/Muzich/CoreBundle/Resources/views/Info/sites.html.twig

 
 {% block main_content %}
 
+  {% include "MuzichCoreBundle:Menu:containerMenu.html.twig" with {'active': 'myfavorites'} %}
+
   <h1>Liste des sites supportés</h1>
 
   <p>

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

 
-<ul id="top-tabs">
-  <li {% if active == 'public' %} class="active" {% endif %}>
-    <a href="{{ path('home') }}">
-      {{ 'container_menu.the_network'|trans({}, 'navigationui') }}
-    </a>
-  </li>
-  <li {% if active == 'private' %} class="active" {% endif %}>
-    <a href="{{ path('mynetwork_index') }}">
-      {{ 'container_menu.my_network'|trans({}, 'navigationui') }}
-    </a>
-  </li>
-  <li {% if active == 'myfeeds' %} class="active" {% endif %}>
-    <a href="{{ path('show_user', {'slug': app.user.slug}) }}">
-      {{ 'container_menu.my_feeds'|trans({}, 'navigationui') }}
-    </a>
-  </li>
-</ul>
+{% if is_granted("IS_AUTHENTICATED_REMEMBERED") %}
 
-<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>
+  <ul id="top-tabs">
+    <li {% if active == 'public' %} class="active" {% endif %}>
+      <a href="{{ path('home') }}">
+        {{ 'container_menu.the_network'|trans({}, 'navigationui') }}
+      </a>
+    </li>
+    <li {% if active == 'private' %} class="active" {% endif %}>
+      <a href="{{ path('mynetwork_index') }}">
+        {{ 'container_menu.my_network'|trans({}, 'navigationui') }}
+      </a>
+    </li>
+    <li {% if active == 'myfeeds' %} class="active" {% endif %}>
+      <a href="{{ path('show_user', {'slug': app.user.slug}) }}">
+        {{ 'container_menu.my_feeds'|trans({}, 'navigationui') }}
+      </a>
+    </li>
+  </ul>
+
+  <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>
+
+{% else %}
+
+  <ul id="top-tabs" >
+    <li class="active">
+      <a href="{{ path('index') }}">
+        {{ 'container_menu.return'|trans({}, 'navigationui') }}
+      </a>
+    </li>
+  </ul>
+
+{% endif %}

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

 	<meta name="description" content="" />
 	<meta name="keywords" content="" />
 	<meta name="author" content="" />
-  <link href="apple-touch-icon.png" rel="apple-touch-icon">
+  <link href="apple-touch-icon.png" rel="apple-touch-icon" />
   
 	<link href="{{ asset('favicon.ico') }}" rel="icon" type="image/x-icon" />
 	<link href="{{ asset('bundles/muzichcore/css/base.css') }}" rel="stylesheet" media="screen" type="text/css" />

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

 
   {% include "MuzichCoreBundle:Menu:containerMenu.html.twig" with {'active': ''} %}
 
+  <div class="show_options">
+    
+    <a class="button" href="{{ path('show_user', {'slug' : viewed_user.slug}) }}" >
+      {{ 'user.view_profile'|trans({}, 'users') }}
+    </a>
+    
+  </div>
+
   <h2>{{ 'favorites.user_favorites'|trans({'%name%' : viewed_user.name}, 'network') }}</h2>
 
   {% include "MuzichCoreBundle:Tag:tagsList.favorite.html.twig" with {

web/bundles/muzichcore/css/main.css

 
 #container h1
 {
-  
+  margin-top: 11px;
 }
 #container h2
 {
 /**/
 
 ul.tagbox {
-background: #fff;
+
 cursor: text;
 border: none;
 overflow: hidden;
 outline: 0;
 line-height:1.2;
 padding: 3px 0;
-font-size:12px;
+font-size: 105%;
 }
 ul.tagbox a.close {
 position: absolute;
 
 ul.tagbox input[type="text"]
 {
-  height: 14px;
+  height: 16px;
   margin-top: 3px;
-  width: 200px;
+  width: 250px;
   color: #676767;
   font-weight: bold;
 }
 {
   background-color: #D9F7FF;
   text-align: center;
+}
+
+input#element_add_url, input#element_add_name
+{
+  width: 70%;
+  font-size: 110%;
+  font-weight: bold;
+}
+
+label#element_add_url, label#element_add_name
+{
+  
 }

web/bundles/muzichfavorite/css/favorite.css

+div.show_options {
+    float: right;
+}