integration suite

app/Resources/translations/navigationui.fr.yml

@@ -21,9 +21,10 @@ login:
   display:              J'ai déjà un compte
   
 home:
-  add_element:          Ajouter un élément
+  add_element:          Ajouter un partage
   add_element_box:
-    close:              Fermer
+    close:              Fermer l'ajout d'élément
+    title:              Ajouter un partage
   check_url:            Ajouter
   
 group:

app/Resources/translations/userui.fr.yml

@@ -36,8 +36,12 @@ my_account:
 connexion:
   password_lost:    Mot de passe perdu ?
   
-more:    Afficher plus de résultats
+more:    Plus de résultats
 tags:
+  prompt:
+    help:  |
+            Choissiez un tag dans la liste ci-dessous en cliquant dessus. Pour saisir plusieurs tags
+            renouvellez l'opération pour chacuns d'entre eux.
   help:  |
            Saisissez <strong>une liste de tags</strong> ci-dessous: Entrez 
            <strong>un tag a la fois</strong> et choisissez les a l'aide de 
@@ -73,7 +77,7 @@ filter:
   network: "Résultats de "
   submit:  Filtrer
   clear:   Aucun filtre
-  mytags:  Filtrer avec Tags
+  mytags:  Avec filtre
   network_all:   Réseau global
   network_my:    Mon réseau
   new_comments:     Nvx commentaires
@@ -103,6 +107,7 @@ element_add:
     nothanks:       Non, ne pas diffuser cet élément dans un de mes groupes
   
 element_edit:
+  title:      Modifier un partage
   url:
     name:     Lien
   name:
@@ -145,6 +150,8 @@ element:
       sentence:          Re-partager ce partage dans votre flux ?
       yes:               Oui
       no:                Non
+  share:
+    share_button:        Partager
     
 comment:
   report:

src/Muzich/CoreBundle/Controller/CoreController.php

@@ -129,9 +129,9 @@ class CoreController extends Controller
     
     // Vérifications préléminaires
     if ($user->getPersonalHash() != $token 
-            || !in_array($type, array('user', 'group')) 
-            || !is_numeric($id)
-            || $user->getId() == $id
+        || !in_array($type, array('user', 'group')) 
+        || !is_numeric($id)
+        || ($user->getId() == $id && $type == 'user')
     )
     {
       throw $this->createNotFoundException();

src/Muzich/CoreBundle/Resources/views/Element/ajax.element.edit.html.twig

@@ -12,6 +12,8 @@
     'form_name'     : form_name
   } %}
 
-  <input type="button" value="{{ 'element_edit.cancel.value'|trans({}, 'userui') }}" class="cancel_edit button" />
-  <input type="submit" value="{{ 'element_edit.submit.value'|trans({}, 'userui') }}" class="button" />
+  <div class="inputs">
+    <input type="button" value="{{ 'element_edit.cancel.value'|trans({}, 'userui') }}" class="cancel_edit button" />
+    <input type="submit" value="{{ 'element_edit.submit.value'|trans({}, 'userui') }}" class="button" />
+  </div>
 </form>

src/Muzich/CoreBundle/Resources/views/Element/form.add.html.twig

@@ -17,7 +17,9 @@
   <div class="field fom_add_url">
     {{ form_errors(form.url) }}
     {{ form_widget(form.url, { 'attr': {
-      'placeholder': 'element_add.url.name'|trans({}, 'userui')},
+      'placeholder': 'element_add.url.name'|trans({}, 'userui'),
+      'class': 'niceinput'
+      },
       'type': 'URL'
     }) }}
 
@@ -29,10 +31,13 @@
 
 <div id="form_add_second_part" style="display: none;">
   
-  <span  id="add_url_title">
+  <div  id="add_url_title">
     {{ 'element.add.url_title_step2'|trans({}, 'elements') }}:
     <span id="add_url_title_url"></span>
-  </span>
+  </div>
+  
+  
+  <input type="submit" value="{{ 'element.share.share_button'|trans({}, 'userui') }}" class="button" />
   
   <table>
     <tr>
@@ -44,7 +49,12 @@
       <td style="vertical-align: top;">
         <div class="field fom_add_name">
           {{ form_errors(form.name) }}
-          {{ form_widget(form.name, { 'attr': {'placeholder': 'element_add.name.name'|trans({}, 'userui')} }) }}
+          {{ form_widget(form.name, { 'attr':
+            {
+              'placeholder': 'element_add.name.name'|trans({}, 'userui'),
+              'class' : 'niceinput'
+            }
+          }) }}
         </div>
 
           <p id="form_add_prop_tags_text" style="display: none;">
@@ -52,7 +62,7 @@
           </p>
           <ul id="form_add_prop_tags_api" style="display: none;"></ul>
 
-          <div></div>
+          <div style="clear: both;"></div>
           
           {% include "MuzichCoreBundle:Tag:tagsPrompt.html.twig" with { 
             'form_name'     : form_name
@@ -68,13 +78,6 @@
       </td>
     </tr>
   </table>
-  
-  
-  
-  
-  
-    
-  <input type="submit" value="Partager cette ressource" />
     
 </div>
 

src/Muzich/CoreBundle/Resources/views/Element/form.edit.html.twig

@@ -1,29 +1,34 @@
 {% form_theme form 'MuzichCoreBundle:Form:errors.html.twig' %}
 
+<h2>{{ 'element_edit.title'|trans({}, 'userui') }}</h2>
+
 {{ form_errors(form) }}
 
-<div class="field">
+<fieldset class="edit_url">
   {{ form_errors(form.url) }}
   {{ form_label(form.url, 'element_edit.url.name'|trans({}, 'userui')) }}
-  {{ form_widget(form.url) }}
-</div>
+  {{ form_widget(form.url, {'attr':{'class':'niceinput'}}) }}
+</fieldset>
 
-<div class="field">
+<fieldset class="edit_name">
   {{ form_errors(form.name) }}
   {{ form_label(form.name, 'element_edit.name.name'|trans({}, 'userui')) }}
-  {{ form_widget(form.name) }}
-</div>
+  {{ form_widget(form.name, {'attr':{'class':'niceinput'}}) }}
+</fieldset>
 
+<fieldset class="edit_tags">
+  <label>Tags</label>
   {% include "MuzichCoreBundle:Tag:tagsPrompt.html.twig" with { 
     'form_name'     : form_name
   } %}
+</fieldset>
 
   {{ form_widget(form.tags, { 'attr': {'class': 'tagBox_tags_ids'} }) }}
 
-<div class="field">
+<fieldset class="edit_need_tag">
   {{ form_errors(form.need_tags) }}
   {{ form_widget(form.need_tags) }}
   {{ form_label(form.need_tags, 'element_add.need_tags.name'|trans({}, 'userui')) }}
-</div>
+</fieldset>
 
 {{ form_row(form._token) }}

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

@@ -1,19 +1,41 @@
-<div id="bottomContainer">
-  
-  <a href="{{ path('info_about') }}" >
-    {{ 'bottom_menu.about'|trans({}, 'navigationui') }}
-  </a>
-  
-  -
-  
-  <a href="{{ path('info_development') }}" >
-    {{ 'bottom_menu.development'|trans({}, 'navigationui') }}
-  </a>-
-  
-  <a href="{{ path('info_sites') }}" >
-    {{ 'bottom_menu.sites'|trans({}, 'navigationui') }}
-  </a>
-  
-  
-  
-</div>
+<ul class="footer_pages_links footer_pages_links_sys">
+  <li>
+    <a href="{{ path('info_about') }}" >
+      {{ 'bottom_menu.about'|trans({}, 'navigationui') }}
+    </a>
+  </li>
+  <li>
+    <a href="{{ path('info_development') }}" >
+      {{ 'bottom_menu.development'|trans({}, 'navigationui') }}
+    </a>
+  </li>
+  <li>
+    <a href="{{ path('info_sites') }}" >
+      {{ 'bottom_menu.sites'|trans({}, 'navigationui') }}
+    </a>
+  </li>
+</ul>
+<ul class="footer_pages_links footer_pages_links_how">
+  <li>
+    <a href="" >
+      CGU
+    </a>
+  </li>
+  <li>
+    <a href="" >
+      FAQ
+    </a>
+  </li>
+</ul>
+<ul class="footer_pages_links footer_pages_links_user">
+  <li>
+    <a href="" >
+      Profil
+    </a>
+  </li>
+  <li>
+    <a href="" >
+      Paramètres
+    </a>
+  </li>
+</ul>

src/Muzich/CoreBundle/Resources/views/SearchElement/more_button.html.twig

@@ -3,9 +3,9 @@
 </div>
 
 {% if display_more_button and elements_length %} 
-   <span class="elements_more">
-     <a href="{{ path(more_path) }}" class="elements_more button">
-       {{ 'more'|trans({}, 'userui') }}
-     </a>
-   </span>
+  <a href="{{ path(more_path) }}" class="elements_more">
+    <div>
+      {{ 'more'|trans({}, 'userui') }}
+    </div>
+  </a>
 {% endif %}

src/Muzich/CoreBundle/Resources/views/Tag/tagsList.show.html.twig

@@ -11,7 +11,7 @@
   <ul id="favorite_tags">
     {% for key, tag in tags %}
       <li class="{{ css_list_length_class(key, tags|length) }}" {% if loop.index0 > cloud_tags_limit_to_display %}style="display: none;"{% endif %}>
-        <a id="filtering_tag_{{ tag.id }}" href="#" class="button tag">
+        <a id="filtering_tag_{{ tag.id }}" href="#" class="tag">
           {{ tag.name }}
         </a>
       </li>

src/Muzich/CoreBundle/Resources/views/Tag/tagsPrompt.html.twig

@@ -6,7 +6,7 @@
   <ul class="tagbox"></ul>
   
   <input
-    class="tag_prompt"
+    class="tag_prompt niceinput"
     value=""
     placeholder="{{ 'tags.inputtext.help'|trans({}, 'userui') }}"
   />
@@ -15,14 +15,19 @@
   
   <div id="search_tag_{{ form_name }}" class="search_tag_list" style="display: none;">
     <span class="info"></span>
+    <p class="help">
+      {{ 'tags.prompt.help'|trans({}, 'userui') }}
+    </p>
     <div class="tag_loader_div">
       <img id="tag_loader_{{ form_name }}" class="tag_loader" style="display: none;"
         src="{{ asset('/bundles/muzichcore/img/ajax-loader.gif') }}" alt="loading"/>
     </div>
     <ul class="search_tag_list"></ul>
-    <a class="more button" href="#" style="display: none;">
-      {{ 'tags.search.display_more'|trans({}, 'userui') }}
-    </a>
+    <div class="textcenter">
+      <a class="more button" href="#" style="display: none;">
+        {{ 'tags.search.display_more'|trans({}, 'userui') }}
+      </a>
+    </div>
   </div>
   
 </div>

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

@@ -98,6 +98,79 @@
 
   </head>
   <body>
+    
+    <div id="autoplay" class="popin_block" style="display: none;">
+      
+      <a href="javascript:void(0);" id="autoplay_previous">
+        <img src="{{ asset('/bundles/muzichcore/img/autoplay_previous.png') }}" alt="previous" />
+      </a>
+      
+  <a href="javascript:void(0);" id="autoplay_close" >
+    <img src="{{ asset('/bundles/muzichcore/img/1317386146_cancel.png') }}" alt="close" />
+  </a>
+      
+      <a href="javascript:void(0);" id="autoplay_next">
+        <img src="{{ asset('/bundles/muzichcore/img/autoplay_next.png') }}" alt="next" />
+      </a>
+      
+    <img id="autoplay_element_loader" src="{{ asset('/bundles/muzichcore/img/ajax-loader.gif') }}" alt="loader" />
+    <ul id="autoplay_element"><li class="element" id="autoplay_element_container"></li></ul>
+    <div id="autoplay_player_container">
+      <div id="autoplay_player"></div>
+    </div>
+    <div id="autoplay_player_soundcloud"></div>
+    <div id="autoplay_player_generic" style="display: none;">
+      <div id="jquery_jplayer_1" class="jp-jplayer"></div>
+      <div id="jp_container_1" class="jp-audio">
+        <div class="jp-type-playlist">
+          <div class="jp-gui jp-interface">
+            <ul class="jp-controls">
+              <li><a href="javascript:;" class="jp-previous" tabindex="1">previous</a></li>
+              <li><a href="javascript:;" class="jp-play" tabindex="1">play</a></li>
+              <li><a href="javascript:;" class="jp-pause" tabindex="1">pause</a></li>
+              <li><a href="javascript:;" class="jp-next" tabindex="1">next</a></li>
+              <li><a href="javascript:;" class="jp-stop" tabindex="1">stop</a></li>
+              <li><a href="javascript:;" class="jp-mute" tabindex="1" title="mute">mute</a></li>
+              <li><a href="javascript:;" class="jp-unmute" tabindex="1" title="unmute">unmute</a></li>
+              <li><a href="javascript:;" class="jp-volume-max" tabindex="1" title="max volume">max volume</a></li>
+            </ul>
+            <div class="jp-progress">
+              <div class="jp-seek-bar">
+                <div class="jp-play-bar"></div>
+              </div>
+            </div>
+            <div class="jp-volume-bar">
+              <div class="jp-volume-bar-value"></div>
+            </div>
+            <div class="jp-time-holder">
+              <div class="jp-current-time"></div>
+              <div class="jp-duration"></div>
+            </div>
+            <ul class="jp-toggles" style="display: none;">
+              <li><a href="javascript:;" class="jp-shuffle" tabindex="1" title="shuffle">shuffle</a></li>
+              <li><a href="javascript:;" class="jp-shuffle-off" tabindex="1" title="shuffle off">shuffle off</a></li>
+              <li><a href="javascript:;" class="jp-repeat" tabindex="1" title="repeat">repeat</a></li>
+              <li><a href="javascript:;" class="jp-repeat-off" tabindex="1" title="repeat off">repeat off</a></li>
+            </ul>
+          </div>
+          <div class="jp-playlist">
+            <ul>
+              <li></li>
+            </ul>
+          </div>
+          <div class="jp-no-solution">
+            <span>Update Required</span>
+            To play the media you will need to either update your browser to a recent version or update your <a href="http://get.adobe.com/flashplayer/" target="_blank">Flash plugin</a>.
+          </div>
+        </div>
+      </div>
+    </div>
+    <img id="autoplay_loader" src="{{ asset('/bundles/muzichcore/img/ajax-loader.gif') }}" alt="loader" />
+    <p id="autoplay_noelements_text" style="display: none;">{{ 'elements.autoplay.noelements.text'|trans({}, 'elements') }}</p>
+        
+    <p><span class="sinfo">{{ 'autoplay.limitations_players'|trans({}, 'userui') }}</span></p>
+    
+  </div>
   
     <header id="header">
       <hgroup>
@@ -147,20 +220,20 @@
           </li>
           <li class="separator"></li>
           <li>
-            <a href="" >
-              Mes diffusions
+            <a href="{{ path('show_user', {'slug': app.user.slug}) }}">
+              {{ 'container_menu.my_feeds'|trans({}, 'navigationui') }}
             </a>
           </li>
           <li class="separator"></li>
           <li>
-            <a href="" >
-              Mes groupes
+            <a href="{{ path('groups_own_list') }}" >
+              {{ 'network.mygroups'|trans({}, 'navigationui') }}
             </a>
           </li>
           <li class="separator"></li>
           <li>
-            <a href="" >
-              Mes favoris
+            <a href="{{ path('favorites_my_list') }}" >
+              {{ 'container_menu.my_favorites'|trans({}, 'navigationui') }}
             </a>
           </li>
           <li class="separator"></li>
@@ -172,7 +245,7 @@
       
       <div id="main">
         
-        <div id="mainbox" class="nicebox">
+        <div id="mainbox" class="nicebox {% block mainbox_classes %}{% endblock %}">
           {% block main_content %}{% endblock %}
           {% block fos_user_content %}{% endblock %}
         </div>
@@ -288,7 +361,21 @@
         
     </div>
     
-    
+    <div id="footer">
+      
+      <div id="footer_content">
+      
+        <div id="footer_logo">
+          <img src="{{ asset('/img/icon_minilogo_3.png') }}" alt="footer_logo">
+          <span class="fotter_muzich_big">&copy; MUZI.CH</span>
+          Tous droits réservés muzi.ch 2012 - 2013
+        </div>
+        
+        {% include "MuzichCoreBundle:Info:container.html.twig" %}
+      
+      </div>
+      
+    </div>
     
     
     

src/Muzich/HomeBundle/Resources/views/Home/index.html.twig

@@ -1,22 +1,30 @@
 {% extends "MuzichHomeBundle::layout.html.twig" %}
 
 {% block title %}Réseau{% endblock %}
+{% block mainbox_classes %}mainbox_margintop mainbox_nopadding{% endblock %}
 
 {% block content %}
 
   <a href="#" id="element_add_link" class="button gradient">
-    {{ 'home.add_element'|trans({}, 'navigationui') }} &gt;&gt;
+    {{ 'home.add_element'|trans({}, 'navigationui') }}
+    <img src="{{ asset('/img/icon_dart_right_white.png') }}" alt="" />
+  </a>
+  <a href="#" id="element_add_close_link" class="button gradient" style="display: none;">
+    {{ 'home.add_element_box.close'|trans({}, 'navigationui') }}
+    <img src="{{ asset('/img/icon_dart_left_white.png') }}" alt="" />
   </a>
 
   <ul id="tabs_tag_search_buttons">
-    <li class="selected gradient">
+    <li id="tab_li_tag_search_no_tags" class="{% if search_tags_id|length == 0 %}selected{% endif %} gradient">
       <a id="tabs_tag_search_no_tags" href="#" >
+        <img src="{{ asset('/img/icon_close.png') }}" alt="nofilters" />
         {{ 'filter.clear'|trans({}, 'userui') }}
       </a>
       <div class="dart"></div>
     </li>
-    <li class="gradient">
+    <li id="tab_li_tag_search_with_tags" class="{% if search_tags_id|length %}selected{% endif %} gradient">
       <a id="tabs_tag_search_with_tags" href="#" >
+        <img src="{{ asset('/img/icon_minilogo_2.png') }}" alt="nofilters" />
         {{ 'filter.mytags'|trans({}, 'userui') }}
       </a>
       <div class="dart"></div>
@@ -26,69 +34,68 @@
   <input type="hidden" class="filter_clear_url" value="{{ path('filter_clear') }}" />
   <input type="hidden" class="filter_mytags_url" value="{{ path('filter_mytags') }}" />
 
-  <div id="home_top_tools">
-  
-    <div id="element_add_box" style="display: none;">    
-
-      <a href="#" id="element_add_close_link" class="button">
-        &lt;&lt; {{ 'home.add_element_box.close'|trans({}, 'navigationui') }}
-      </a>
+  <div id="element_add_box" style="display: none;">    
 
-      <form novalidate name="{{ add_form_name }}" 
-        {% if  app.environment != 'test' %}
-          action="{{ path('element_retrieve_api_datas') }}" method="post" {{ form_enctype(add_form) }}
-        {% else %}
-          action="{{ path('element_add') }}" method="post" {{ form_enctype(add_form) }}
-        {% endif %}
-      >
-
-        {% include "MuzichCoreBundle:Element:form.add.html.twig" with { 
-          'form'          : add_form, 
-          'form_name'     : add_form_name
-        } %}
-
-      {% if from_url is defined %}
-      {% if from_url %}
-        <script type="text/javascript">
-          $(document).ready(function(){
-            $('#element_add_box').slideDown("slow");
-            $('#element_add_link').hide();
-            $('form[name="search"]').slideUp();
-            $('img#form_add_loader').show();
-            $('input#element_add_url').val("{{ from_url }}");
-            $('form[name="add"]').submit();
-          });
-        </script>
-      {% endif %}
+    <h2>{{ 'home.add_element_box.title'|trans({}, 'navigationui') }}</h2>
+  
+    <form novalidate name="{{ add_form_name }}" 
+      {% if  app.environment != 'test' %}
+        action="{{ path('element_retrieve_api_datas') }}" method="post" {{ form_enctype(add_form) }}
+      {% else %}
+        action="{{ path('element_add') }}" method="post" {{ form_enctype(add_form) }}
       {% endif %}
+    >
 
-      </form>
-    </div>
-
-    <div id="added_element_to_group" style="display: none;">
-      <img class="loader" style="display: none;" src="{{ asset('/bundles/muzichcore/img/ajax-loader.gif') }}" alt="loading" />
-      <p class="help">
-        {{ 'element_add.added_to_group.sentence'|trans({}, 'userui') }}
-      </p>
-      <ul id="groups_to_add_element"></ul>
-      <p class="cancel">
-        <a href="" class="cancel">
-          {{ 'element_add.added_to_group.nothanks'|trans({}, 'userui') }}
-        </a>
-      </p>
-    </div>
-
-    <form name="{{ search_form_name }}" action="{{ path('search_elements') }}" method="post" {{ form_enctype(search_form) }}>
-
-      {% include "MuzichCoreBundle:SearchElement:form.html.twig" with { 
-        'form_name'               : search_form_name,
-        'search_tags'             : search_tags_id
+      {% include "MuzichCoreBundle:Element:form.add.html.twig" with { 
+        'form'          : add_form, 
+        'form_name'     : add_form_name
       } %}
 
-      <input class="main button" type="submit" value="{{ 'filter.submit'|trans({}, 'userui') }}"/>
+    {% if from_url is defined %}
+    {% if from_url %}
+      <script type="text/javascript">
+        $(document).ready(function(){
+          $('#element_add_box').slideDown("slow");
+          $('#element_add_link').hide();
+          $('form[name="search"]').slideUp();
+          $('img#form_add_loader').show();
+          $('input#element_add_url').val("{{ from_url }}");
+          $('form[name="add"]').submit();
+        });
+      </script>
+    {% endif %}
+    {% endif %}
 
     </form>
+  </div>
+
+  <div id="added_element_to_group" style="display: none;">
+    <img class="loader" style="display: none;" src="{{ asset('/bundles/muzichcore/img/ajax-loader.gif') }}" alt="loading" />
+    <p class="help">
+      {{ 'element_add.added_to_group.sentence'|trans({}, 'userui') }}
+    </p>
+    <ul id="groups_to_add_element"></ul>
+    <p class="cancel">
+      <a href="" class="cancel">
+        {{ 'element_add.added_to_group.nothanks'|trans({}, 'userui') }}
+      </a>
+    </p>
+  </div>
 
+  <div class="top_tools" {% if search_tags_id|length == 0 %}style="display: none;"{% endif %}>
+  
+    <div class="search_tools">
+      <form name="{{ search_form_name }}" action="{{ path('search_elements') }}" method="post" {{ form_enctype(search_form) }}>
+  
+        {% include "MuzichCoreBundle:SearchElement:form.html.twig" with { 
+          'form_name'               : search_form_name,
+          'search_tags'             : search_tags_id
+        } %}
+  
+        <input class="main button" type="submit" value="{{ 'filter.submit'|trans({}, 'userui') }}"/>
+  
+      </form>
+    </div>
 
     <a href="{{ path('elements_get_filter_data_autoplay', {
       'type' : 'filter'

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

@@ -1,90 +1,100 @@
 {% extends "MuzichHomeBundle::layout.html.twig" %}
 
 {% block title %}{{ group.name }}{% endblock %}
+{% block mainbox_classes %}mainbox_nopadding{% endblock %}
 
 {% block content %}
 
-  <div class="show_options">
+  <div class="top_tools">
     
-    {% if his_group %}
-      <a class="button" href="{{ path('group_edit', { 'slug': group.slug }) }}" >
-        {{ 'group.edit'|trans({}, 'groups') }}
+    
+    {% if his_group or group.open %}
+    
+      <a href="#" id="element_add_link" class="button gradient justtopright">
+        {{ 'home.add_element'|trans({}, 'navigationui') }}
+        <img src="{{ asset('/img/icon_dart_right_white.png') }}" alt="" />
+      </a>
+      <a href="#" id="element_add_close_link" class="button gradient justtopright" style="display: none;">
+        {{ 'home.add_element_box.close'|trans({}, 'navigationui') }}
+        <img src="{{ asset('/img/icon_dart_left_white.png') }}" alt="" />
       </a>
+    
     {% endif %}
+
+    <div class="show_options">
       
-    <a href="{{ path('follow', { 'type': 'group', 'id': group.id, 'token': user.personalHash }) }}" 
-       class="follow_link button {% if following %}following{% else %}notfollowing{% endif %}">
-      {% if following %}
-        {{ 'group.following'|trans({}, 'groups') }}
-      {% else %}
-        {{ 'group.follow'|trans({}, 'groups') }}
+      {% if his_group %}
+        <a class="button" href="{{ path('group_edit', { 'slug': group.slug }) }}" >
+          {{ 'group.edit'|trans({}, 'groups') }}
+        </a>
       {% endif %}
-    </a>
+      
+      <a href="{{ path('follow', { 'type': 'group', 'id': group.id, 'token': user.personalHash }) }}" 
+         class="follow_link button darkbutton {% if following %}following{% else %}notfollowing{% endif %}">
+        {% if following %}
+          {{ 'group.following'|trans({}, 'groups') }}
+        {% else %}
+          {{ 'group.follow'|trans({}, 'groups') }}
+        {% endif %}
+      </a>
+      
+    </div>
+      
+    <h1>{{ group.name }}</h1>
     
-  </div>
     
-  <h2>{{ group.name }}</h2>
-  
-  <p class="show_info">
-    {% if count_owned != 0 %}
-    {{ 'show.user.elements.count'|trans({
-      '%count_owned%' : count_owned,
-      '%count_favorited%': count_favorited,
-      '%count_favorited_users%': count_favorited_users
-    }, 'elements') }}
-    {% else %}
-      {{ 'show.user.elements.no_count'|trans({}, 'elements') }}
-    {% endif %}
-    <br />
-    {% if count_followers > 1 %}
-      {{ 'show.user.followers.x_count'|trans({'%count%':count_followers, '%name%':group.name }, 'elements') }}
-    {% elseif count_followers == 0 %}
-      {{ 'show.user.followers.zero_count'|trans({'%name%':group.name }, 'elements') }}
-    {% else %}
-      {{ 'show.user.followers.one_count'|trans({'%count%':count_followers, '%name%':group.name }, 'elements') }}
-    {% endif %}
-  </p>
-  
-  <p class="group_description">
-    {{ group.description }}
-  </p>
-
-  {% include "MuzichCoreBundle:Tag:tagsList.show.html.twig" with {
-    'object_id'   : group.id,
-    'object_type' : 'group'
-  } %}
-  
-  <a href="{{ path('elements_get_filter_data_autoplay_show', {
-        'show_type'  : 'group',
-        'show_id'    : group.id, 
-        'data'       : '[]'
-      }) }}" class="button" id="autoplay_launch" 
-     title="{{ 'elements.autoplay.launch'|trans({}, 'elements') }}" >
-    <img src="{{ asset('/bundles/muzichcore/img/1353494305_player_play.png') }}" alt="" />
-  </a>
-  
-  {% if his_group or group.open %}
+    {% if his_group or group.open %}
+      <div id="element_add_box" style="display: none;">
+    
+        <input type="hidden" id="add_element_group_page" value="{{ group.slug }}" />
+        <form novalidate name="{{ add_form_name }}" action="{{ path('element_add', {'group_slug' : group.slug}) }}" method="post" {{ form_enctype(add_form) }}>
   
-    <div id="element_add_box" style="display: none;">
+          {% include "MuzichCoreBundle:Element:form.add.html.twig" with { 'form': add_form, 'form_name': add_form_name } %}
   
-      <a href="#" id="element_add_close_link" class="button">
-        &lt;&lt; {{ 'group.add_element_box.close'|trans({}, 'navigationui') }}
-      </a>
-      <input type="hidden" id="add_element_group_page" value="{{ group.slug }}" />
-      <form novalidate name="{{ add_form_name }}" action="{{ path('element_add', {'group_slug' : group.slug}) }}" method="post" {{ form_enctype(add_form) }}>
-
-        {% include "MuzichCoreBundle:Element:form.add.html.twig" with { 'form': add_form, 'form_name': add_form_name } %}
-
-      </form>
-      
-    </div>
+        </form>
+        
+      </div>
+    {% endif %}
+    
+    <p class="show_info">
+      {% if count_owned != 0 %}
+      {{ 'show.user.elements.count'|trans({
+        '%count_owned%' : count_owned,
+        '%count_favorited%': count_favorited,
+        '%count_favorited_users%': count_favorited_users
+      }, 'elements') }}
+      {% else %}
+        {{ 'show.user.elements.no_count'|trans({}, 'elements') }}
+      {% endif %}
+      <br />
+      {% if count_followers > 1 %}
+        {{ 'show.user.followers.x_count'|trans({'%count%':count_followers, '%name%':group.name }, 'elements') }}
+      {% elseif count_followers == 0 %}
+        {{ 'show.user.followers.zero_count'|trans({'%name%':group.name }, 'elements') }}
+      {% else %}
+        {{ 'show.user.followers.one_count'|trans({'%count%':count_followers, '%name%':group.name }, 'elements') }}
+      {% endif %}
+    </p>
+    
+    <p class="group_description">
+      {{ group.description }}
+    </p>
   
-    <a href="#" id="element_add_link" class="button">
-      {{ 'group.add_element'|trans({}, 'navigationui') }} &gt;&gt;
+    {% include "MuzichCoreBundle:Tag:tagsList.show.html.twig" with {
+      'object_id'   : group.id,
+      'object_type' : 'group'
+    } %}
+    
+    <a href="{{ path('elements_get_filter_data_autoplay_show', {
+          'show_type'  : 'group',
+          'show_id'    : group.id, 
+          'data'       : '[]'
+        }) }}" class="button" id="autoplay_launch" 
+       title="{{ 'elements.autoplay.launch'|trans({}, 'elements') }}" >
+      <img src="{{ asset('/bundles/muzichcore/img/1353494305_player_play.png') }}" alt="" />
     </a>
-    <br />
-  
-  {% endif %}
+    
+  </div>
   
   {% include "MuzichCoreBundle:SearchElement:default.html.twig" with {'no_group_name' : true} %}
     
@@ -94,7 +104,6 @@
     
   {% if more_count is defined %} 
   {% if elements|length %}
-   <span class="elements_more">
      <input type="hidden" id="more_elements_url" value="{{ path('show_elements_get', {
         'type'          : 'group',
         'object_id'     : group.id, 
@@ -104,10 +113,11 @@
         'type'          : 'group',
         'object_id'     : group.id, 
         'tags_ids_json' : '[]'
-      }) }}" class="elements_more button" >
-       {{ 'more'|trans({}, 'userui') }}
+      }) }}" class="elements_more" >
+       <div>
+        {{ 'more'|trans({}, 'userui') }}
+      </div>
      </a>
-   </span>
   {% endif %}
   {% endif %}
   

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

@@ -1,124 +1,131 @@
 {% extends "MuzichHomeBundle::layout.html.twig" %}
 
 {% block title %}{{ viewed_user.name }}{% endblock %}
+{% block mainbox_classes %}mainbox_nopadding{% endblock %}
 
 {% block content %}
 
-  <div class="show_options">
+  <div class="top_tools">
     
-    <a class="button" href="{{ path('favorite_user_list', {'slug' : viewed_user.slug}) }}" >
-      {{ 'user.view_favorites'|trans({}, 'users') }}
-    </a>
-    
-    {% if app.user.id != viewed_user.id %}
-      <a href="{{ path('follow', { 'type': 'user', 'id': viewed_user.id, 'token': user.personalHash }) }}" 
-         class="follow_link button {% if following %}following{% else %}notfollowing{% endif %}" >
-        {% if following %}
-          {{ 'user.following'|trans({}, 'users') }}
-        {% else %}
-          {{ 'user.follow'|trans({}, 'users') }}
-        {% endif %}
+    {% if app.user.id == viewed_user.id %}
+      <a href="#" id="element_add_link" class="button gradient justtopright">
+        {{ 'home.add_element'|trans({}, 'navigationui') }}
+        <img src="{{ asset('/img/icon_dart_right_white.png') }}" alt="" />
+      </a>
+      <a href="#" id="element_add_close_link" class="button gradient justtopright" style="display: none;">
+        {{ 'home.add_element_box.close'|trans({}, 'navigationui') }}
+        <img src="{{ asset('/img/icon_dart_left_white.png') }}" alt="" />
       </a>
     {% endif %}
     
-  </div>
+    <div class="show_options">
+      
+      {% if app.user.id != viewed_user.id %}
+        <a href="{{ path('follow', { 'type': 'user', 'id': viewed_user.id, 'token': user.personalHash }) }}" 
+           class="follow_link button darkbutton {% if following %}following{% else %}notfollowing{% endif %}" >
+          {% if following %}
+            {{ 'user.following'|trans({}, 'users') }}
+          {% else %}
+            {{ 'user.follow'|trans({}, 'users') }}
+          {% endif %}
+        </a>
+      {% endif %}
+      
+    </div>
+    
+    <h1>{{ 'user.show.title'|trans({'%name%' : viewed_user.name}, 'users') }}</h1>
   
-
-  <h2>{{ 'user.show.title'|trans({'%name%' : viewed_user.name}, 'users') }}</h2>
-
-  {% if app.user.id == viewed_user.id %}
-    <div id="element_add_box" style="display: none;">    
+    {% if app.user.id == viewed_user.id %}
+      <div id="element_add_box" style="display: none;">    
+      
+        <form novalidate name="{{ add_form_name }}" 
+          {% if  app.environment != 'test' %}
+            action="{{ path('element_retrieve_api_datas') }}" method="post" {{ form_enctype(add_form) }}
+          {% else %}
+            action="{{ path('element_add') }}" method="post" {{ form_enctype(add_form) }}
+          {% endif %}    
+        method="post" {{ form_enctype(add_form) }}>
+  
+          {% include "MuzichCoreBundle:Element:form.add.html.twig" with { 
+            'form'          : add_form, 
+            'form_name'     : add_form_name
+          } %}
+      
+        </form>
+      </div>
+  
+    {% endif %}
     
-      <a href="#" id="element_add_close_link" class="button">
-        &lt;&lt; {{ 'home.add_element_box.close'|trans({}, 'navigationui') }}
-      </a>
-
-      <form novalidate name="{{ add_form_name }}" 
-        {% if  app.environment != 'test' %}
-          action="{{ path('element_retrieve_api_datas') }}" method="post" {{ form_enctype(add_form) }}
-        {% else %}
-          action="{{ path('element_add') }}" method="post" {{ form_enctype(add_form) }}
-        {% endif %}    
-      method="post" {{ form_enctype(add_form) }}>
-
-        {% include "MuzichCoreBundle:Element:form.add.html.twig" with { 
-          'form'          : add_form, 
-          'form_name'     : add_form_name
-        } %}
-
-      </form>
+    <div class="reputation">
+      {{ 'user.reputation.name'|trans({}, 'users') }}: 
+      <span class="score">{{ viewed_user.reputation }}</span>
+      {{ 'user.reputation.txt'|trans({}, 'users') }}
     </div>
-
-    <a href="#" id="element_add_link" class="button">
-      {{ 'home.add_element'|trans({}, 'navigationui') }} &gt;&gt;
+    
+    <p class="show_info">
+      {% if count_owned != 0 %}
+      {{ 'show.user.elements.count'|trans({
+        '%count_owned%' : count_owned,
+        '%count_favorited%': count_favorited,
+        '%count_favorited_users%': count_favorited_users
+      }, 'elements') }}
+      {% else %}
+        {{ 'show.user.elements.no_count'|trans({}, 'elements') }}
+      {% endif %}
+      <br />
+      {% if count_followers > 1 %}
+        {{ 'show.user.followers.x_count'|trans({'%count%':count_followers, '%name%':viewed_user.name }, 'elements') }}
+      {% elseif count_followers == 0 %}
+        {{ 'show.user.followers.zero_count'|trans({'%name%':viewed_user.name }, 'elements') }}
+      {% else %}
+        {{ 'show.user.followers.one_count'|trans({'%count%':count_followers, '%name%':viewed_user.name }, 'elements') }}
+      {% endif %}
+    </p>
+      
+    {% include "MuzichCoreBundle:Tag:tagsList.show.html.twig" with {
+      'object_id'   : viewed_user.id,
+      'object_type' : 'user'
+    } %}
+    
+    <a href="{{ path('elements_get_filter_data_autoplay_show', {
+          'show_type'  : 'user',
+          'show_id'    : viewed_user.id, 
+          'data'       : '[]'
+        }) }}" class="button" id="autoplay_launch" 
+       title="{{ 'elements.autoplay.launch'|trans({}, 'elements') }}" >
+      <img src="{{ asset('/bundles/muzichcore/img/1353494305_player_play.png') }}" alt="" />
     </a>
-  {% endif %}
   
-  <div class="reputation">
-    {{ 'user.reputation.name'|trans({}, 'users') }}: 
-    <span class="score">{{ viewed_user.reputation }}</span>
-    {{ 'user.reputation.txt'|trans({}, 'users') }}
   </div>
   
-  <p class="show_info">
-    {% if count_owned != 0 %}
-    {{ 'show.user.elements.count'|trans({
-      '%count_owned%' : count_owned,
-      '%count_favorited%': count_favorited,
-      '%count_favorited_users%': count_favorited_users
-    }, 'elements') }}
-    {% else %}
-      {{ 'show.user.elements.no_count'|trans({}, 'elements') }}
-    {% endif %}
-    <br />
-    {% if count_followers > 1 %}
-      {{ 'show.user.followers.x_count'|trans({'%count%':count_followers, '%name%':viewed_user.name }, 'elements') }}
-    {% elseif count_followers == 0 %}
-      {{ 'show.user.followers.zero_count'|trans({'%name%':viewed_user.name }, 'elements') }}
-    {% else %}
-      {{ 'show.user.followers.one_count'|trans({'%count%':count_followers, '%name%':viewed_user.name }, 'elements') }}
-    {% endif %}
-  </p>
-    
-  {% include "MuzichCoreBundle:Tag:tagsList.show.html.twig" with {
-    'object_id'   : viewed_user.id,
-    'object_type' : 'user'
-  } %}
-  
-  <a href="{{ path('elements_get_filter_data_autoplay_show', {
-        'show_type'  : 'user',
-        'show_id'    : viewed_user.id, 
-        'data'       : '[]'
-      }) }}" class="button" id="autoplay_launch" 
-     title="{{ 'elements.autoplay.launch'|trans({}, 'elements') }}" >
-    <img src="{{ asset('/bundles/muzichcore/img/1353494305_player_play.png') }}" alt="" />
-  </a>
   
   {% include "MuzichCoreBundle:SearchElement:default.html.twig" %}
-    
+  
   <div class="elements_loader_div">
     <img class="elements_more_loader" style="display: none;" src="{{ asset('/bundles/muzichcore/img/ajax-loader.gif') }}" alt="loading" />
   </div>
   
   {% if more_count is defined %} 
   {% if elements|length %}
-   <span class="elements_more">
-     <input type="hidden" id="more_elements_url" value="{{ path('show_elements_get', {
+    
+    <input type="hidden" id="more_elements_url" value="{{ path('show_elements_get', {
         'type'          : 'user',
         'object_id'     : viewed_user.id, 
         'tags_ids_json' : ''
       }) }}" />
-     <a href="{{ path('show_elements_get', {
+    <a href="{{ path('show_elements_get', {
         'type'          : 'user',
         'object_id'     : viewed_user.id, 
         'tags_ids_json' : '[]'
-      }) }}" class="elements_more button" >
-       {{ 'more'|trans({}, 'userui') }}
-     </a>
-   </span>
+      }) }}" class="elements_more" >
+      <div>
+        {{ 'more'|trans({}, 'userui') }}
+      </div>
+    </a>
+   
   {% endif %}
   {% endif %}
-  
+    
   <input type="hidden" id="autoplay_url" value="{{ path('elements_get_filter_data_autoplay_show', {
     'show_type'          : 'user',
     'show_id'     : viewed_user.id, 

web/bundles/muzichcore/css/base.css

@@ -61,9 +61,9 @@ a:link {
 a:visited {
   color: #339;
 }
-a:hover, a:focus, a:active {
+/*a:hover, a:focus, a:active {
   color: #00F;
-}
+}*/
 
 /* Pas de bordure autour des images dans les liens */
 a img {

web/bundles/muzichcore/css/old.css

@@ -456,7 +456,7 @@ width: 300px;
 
 /**/
 
-ul.tagbox {
+/*ul.tagbox {
 
 cursor: text;
 border: none;
@@ -466,7 +466,7 @@ margin-left: 0px;
 }
 ul.tagbox li {
 margin:0;
-}
+}*/
 
 /*ul.tagbox li.tag {
   
@@ -601,10 +601,10 @@ li.element img.play, li.element img.open
   
 }
 
-ul.elements, ul#autoplay_element
+/*ul.elements, ul#autoplay_element
 {
   margin-left: 0px;
-}
+}*/
 
 /*ul.elements li.even
 {
@@ -732,11 +732,11 @@ div.tag_loader_div, div.loader
   font-weight: bold;
 }*/
 
-div.no_elements
+/*div.no_elements
 {
   text-align: center;
   background-color: #d9f7ff;
-}
+}*/
 
 /*  Recherche de tags dynamique  */
 
@@ -764,7 +764,7 @@ div.search_tag_list span.info
   background-color: white;
   padding: 2px;
 }
-
+/*
 div.search_tag_list ul.search_tag_list
 {
   list-style-image: none;
@@ -772,9 +772,9 @@ div.search_tag_list ul.search_tag_list
   margin:0;
   list-style-type:none;
   overflow: hidden;
-}
+}*/
 
-div.search_tag_list ul.search_tag_list li
+/*div.search_tag_list ul.search_tag_list li
 {
   float: left;
   margin-right: 4px;
@@ -820,7 +820,7 @@ div.search_tag_list span.info
 #container ul.search_tag_list li a:hover
 {
   text-decoration: none;
-}
+}*/
  
 .elements_loader_div
 {
@@ -883,7 +883,7 @@ div.question .title {
 
 /* Liste de tags */
 
-ul#favorite_tags
+/*ul#favorite_tags
 {
   padding:0;
   margin:0;
@@ -895,7 +895,7 @@ ul#favorite_tags li
   display: inline;
   margin-left: 2px;
   margin-top: 2px;
-  float: left; /*pour IE*/
+  float: left;
 }
 
 ul#favorite_tags li.list_length_big a.button
@@ -910,7 +910,7 @@ ul#favorite_tags li.list_length_medium a.button
   font-size: 15px;
   padding-top: 3px;
   padding-bottom: 3px;
-}
+}*/
 
 a.more
 {
@@ -1015,7 +1015,7 @@ div.display_more_elements
   text-align: center;
 }
 
-input#element_add_url
+/*input#element_add_url
 {
   width: 70%;
   font-size: 110%;
@@ -1027,7 +1027,7 @@ input#element_add_name
   width: 100%;
   font-size: 110%;
   font-weight: bold;
-}
+}*/
 
 label#element_add_url, label#element_add_name
 {
@@ -1307,10 +1307,14 @@ ul#favorite_tags a.button.highlight
   color: blue;
 }
 
-span#add_url_title
+div#add_url_title
 {
+  width: 510px;
   font-weight: bold;
   font-size: 15px;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
 }
 
 div#autoplay

web/bundles/muzichcore/js/muzich.js

@@ -279,6 +279,24 @@ $(document).ready(function(){
   $('#tabs_tag_search_no_tags, a.filter_clear_url').live("click", function(){
     $('img.elements_more_loader').show();
     $('ul.elements').html('');
+    
+    // COde: c tout pouris ce code 
+    if ($(this).hasClass('filter_clear_url'))
+    {
+      $('ul#tabs_tag_search_buttons').find('li').removeClass('selected');
+      $('li#tab_li_tag_search_no_tags').addClass('selected');
+    }
+    else
+    {
+      $(this).parents('ul#tabs_tag_search_buttons').find('li').removeClass('selected');
+      $(this).parent('li').addClass('selected');
+    }
+    
+    if ($('div#home_top_tools:visible').length)
+    {
+      $('div#home_top_tools').slideUp();
+    }
+    
     // On initialise la liste de tags déjà ajouté
     window.search_tag_prompt_connector.initializeTags([]);
     $('div.no_elements').hide();
@@ -293,6 +311,13 @@ $(document).ready(function(){
     
     $('img.elements_more_loader').show();
     $('ul.elements').html('');
+    $(this).parents('ul#tabs_tag_search_buttons').find('li').removeClass('selected');
+    $(this).parent('li').addClass('selected');
+    
+    if ($('div#home_top_tools:visible').length == 0)
+    {
+      $('div#home_top_tools').slideDown();
+    }
     
     var form = $('form[name="search"]');
     
@@ -328,6 +353,17 @@ $(document).ready(function(){
     
     if ($('form[name="search"]').length)
     {
+      if ($('li#tab_li_tag_search_no_tags').hasClass('selected'))
+      {
+        $('ul#tabs_tag_search_buttons').find('li').removeClass('selected');
+        $('li#tab_li_tag_search_with_tags').addClass('selected');
+        if (!$('div#home_top_tools:visible').length)
+        {
+          $('div#home_top_tools').slideDown();
+        }
+      }
+      
+      
       $('img.elements_more_loader').show();
       $('ul.elements').html('');
       
@@ -641,6 +677,7 @@ $(document).ready(function(){
     
     var link = $(this);
     var li = link.parents('li.element');
+    li.addClass('selected');
     // On garde en mémoire l'élément édité en cas d'annulation
     elements_edited[li.attr('id')] = li.html();
     var div_loader = li.find('div.loader');
@@ -685,6 +722,7 @@ $(document).ready(function(){
         if (response.status == 'success')
         {
           li.html(response.html);
+          li.removeClass('selected');
           delete(elements_edited[li.attr('id')]);
         }
         else if (response.status == 'error')
@@ -709,6 +747,7 @@ $(document).ready(function(){
   // Annulation d'un formulaire de modification d'élément
   $('form.edit_element input.cancel_edit').live('click', function(){
     var li = $(this).parents('li.element');
+    li.removeClass('selected');
     li.html(elements_edited[li.attr('id')]);
     delete(elements_edited[li.attr('id')]);
   });
@@ -1104,22 +1143,26 @@ $(document).ready(function(){
   // Selection Réseau global / Mon réseau
   $('a.all_network, a.my_network').live('click', function(){
     
-    $(this).parent('li').parent('ul').find('li').removeClass('selected')
-    
-    if ($(this).hasClass('all_network'))
-    {
-      $(this).parent('li').addClass('selected');
-      $('#element_search_form_network').val('network_public');
-    }
-    else
+    if ($('form[name="search"]').length)
     {
-      $(this).parent('li').addClass('selected');
-      $('#element_search_form_network').val('network_personal');
+      $(this).parent('li').parent('ul').find('li').removeClass('selected')
+      
+      if ($(this).hasClass('all_network'))
+      {
+        $(this).parent('li').addClass('selected');
+        $('#element_search_form_network').val('network_public');
+      }
+      else
+      {
+        $(this).parent('li').addClass('selected');
+        $('#element_search_form_network').val('network_personal');
+      }
+      
+      $('form[name="search"] input[type="submit"]').trigger('click');
+      
+      return false;
     }
-    
-    $('form[name="search"] input[type="submit"]').trigger('click');
-    
-    return false;
+    return true;
   });
   
   function element_add_proceed_json_response(response)
@@ -1132,7 +1175,10 @@ $(document).ready(function(){
       
       if ($('form[name="search"]').length)
       {
-        $('form[name="search"]').slideDown();
+        if ($('a#tabs_tag_search_with_tags').parent('li').hasClass('selected'))
+        {
+          $('div#home_top_tools').slideDown();
+        }
       }
       remove_tags('add');
       recolorize_element_list();
@@ -1161,6 +1207,7 @@ $(document).ready(function(){
       else
       {
         $('a#element_add_link').show();
+        $('a#element_add_close_link').hide();
       }
       
       form_add_hide_errors();
@@ -1516,6 +1563,7 @@ $(document).ready(function(){
    
   $('ul#favorite_tags a.tag').click(function(){
     list_tag_clicked($(this));
+    return false;
   });
   
   last_keypress = 0;
@@ -2025,6 +2073,7 @@ $(document).ready(function(){
       
       $('div#added_element_to_group').slideUp();
       $('a#element_add_link').show();
+      $('a#element_add_close_link').hide();
       
     });
     return false;
@@ -2033,6 +2082,7 @@ $(document).ready(function(){
   $('div#added_element_to_group a.cancel').live('click', function(){
     $('div#added_element_to_group').slideUp();
     $('a#element_add_link').show();
+    $('a#element_add_close_link').show();
     return false;
   });
    
@@ -2086,7 +2136,7 @@ $(document).ready(function(){
       {
         link.attr('href', response.data.a.href);
         img.attr('src', response.data.img.src);
-        link.parents('td.right').find('li.score span.score').html(response.data.element.points);
+        link.parents('ul.element_thumb_actions').find('li.score').text(response.data.element.points);
       }
       
     });

web/bundles/muzichhome/js/home.js

@@ -4,7 +4,11 @@ $(document).ready(function(){
    $('#element_add_link').click(function(){
      $('#element_add_box').slideDown("slow");
      $('#element_add_link').hide();
-     $('form[name="search"]').slideUp();
+     $('#element_add_close_link').show();
+     if ($('a#tabs_tag_search_with_tags').parent('li').hasClass('selected'))
+     {
+       $('div#home_top_tools').slideUp();
+     }
      // Au cas ou firefox garde la valeur step 2:
         $('input#form_add_step').val('1');
     $('form[name="add"]').attr('action', url_datas_api);
@@ -15,7 +19,13 @@ $(document).ready(function(){
    $('#element_add_close_link').click(function(){
      $('#element_add_box').slideUp("slow");
      $('#element_add_link').show();
-     $('form[name="search"]').slideDown();
+     $('#element_add_close_link').hide();
+     
+     if ($('a#tabs_tag_search_with_tags').parent('li').hasClass('selected'))
+     {
+       $('div#home_top_tools').slideDown();
+     }
+     
      //form_add_reinit();
      // copie du contenu de la fonction ci dessus, arrive pas a l'appeler ... huh
      $('div#element_add_box').slideUp();

web/css/main.css

@@ -185,9 +185,26 @@ header#header hgroup
 
 #mainbox
 {
+  margin-top: 25px;
+  /*padding: 10px;*/
+  padding-bottom: 23px;
+}
+
+#mainbox.mainbox_margintop
+{
   margin-top: 80px;
 }
 
+#mainbox.mainbox_nopadding
+{
+  padding: 0px;
+}
+
+#mainbox h1
+{
+  margin-top: 10px;
+}
+
 .nicebox
 {
   -webkit-box-shadow: 0px 0px 2px rgba(0, 0, 0, 0.3);
@@ -199,10 +216,16 @@ header#header hgroup
 aside#sidebar
 {
   display: table-cell;
-	width: 300px;
+  width: 300px;
   vertical-align: top;
 }
 
+ul.elements
+{
+  margin-top: 0px;
+  margin-left: 0px;
+  margin-bottom: 0px;
+}
 
 ul.elements li.element
 {
@@ -212,6 +235,11 @@ ul.elements li.element
   padding: 10px;
 }
 
+ul.elements li.element:last-child
+{
+  
+}
+
 td.element_thumbnail
 {
   background-color: #d5d5d5;
@@ -377,14 +405,14 @@ ul.element_tags .button
 }
 
 .button {
-	display: inline-block;
-	line-height: 1;
-	padding: 4px 7px;
-	font-weight: bold;
-	-moz-border-radius: 3px;
-	-webkit-border-radius: 3px;
-	-khtml-border-radius: 3px;
-	border-radius: 3px;
+  display: inline-block;
+  line-height: 1;
+  padding: 4px 7px;
+  font-weight: bold;
+  -moz-border-radius: 3px;
+  -webkit-border-radius: 3px;
+  -khtml-border-radius: 3px;
+  border-radius: 3px;
   border: 1px solid #2b82ad;
   text-transform : uppercase;
   border: 1px solid #b0b0b0;
@@ -402,7 +430,7 @@ ul.element_tags .button
 
 }
 
-a.button.element_tag, ul.tagbox li.tag
+a.button.element_tag, ul.tagbox li.tag, ul.search_tag_list li, ul#favorite_tags li
 {
   padding: 6px;
   border: none;
@@ -425,9 +453,6 @@ td.element_content li.element_tag a.button, ul.tagbox li.tag
   text-transform : uppercase;
 }
 
-.button:active {
-  background-color: #39c9cc;
-}
 
 .button.active
 {
@@ -798,8 +823,8 @@ div#secondarymenu ul.secondarymenu li.top_menu_element.open ul.submenu
 {
   display: none;
   height: 16px;
-  margin-left: 18px;
-  margin-top: 5px;
+  margin-left: 30px;
+  margin-top: 6px;
   width: 30px;
   background: url("/img/icon_bigtag_choosed.png") no-repeat scroll 0 0 transparent;
   position: absolute;
@@ -824,8 +849,8 @@ ul.tagbox li.tag
   padding-right: 18px;
 }
 
-ul.tagbox li.tag {
-  
+ul.tagbox li.tag, ul#favorite_tags li
+{
   border-radius: 3px 3px 3px 3px;
   display: inline-block;
   font-size: 13px;
@@ -833,10 +858,10 @@ ul.tagbox li.tag {
   line-height: 1;
   margin-bottom: 1px;
   margin-right: 3px;
-	-moz-border-radius: 4px;
-	-webkit-border-radius: 4px;
-	-khtml-border-radius: 4px;
-	border-radius: 4px;
+  -moz-border-radius: 4px;
+  -webkit-border-radius: 4px;
+  -khtml-border-radius: 4px;
+  border-radius: 4px;
 }
 ul.tagbox li.input {display:block; float:left;}
 ul.tagbox input:focus {
@@ -852,7 +877,12 @@ padding: 3px 0;
 font-size: 105%;
 }
 
-#element_add_link
+ul#favorite_tags li
+{
+  margin-right: 0px;
+}
+
+#element_add_link, #element_add_close_link
 {
   float: right;
   margin-top: -58px;
@@ -873,9 +903,22 @@ font-size: 105%;
 
 }
 
-#home_top_tools
+#element_add_link img, #element_add_close_link img
+{
+  margin-bottom: -5px;
+    margin-right: -5px;
+}
+
+#element_add_link.justtopright, #element_add_close_link.justtopright
+{
+  margin-top: 0px;
+  margin-right: 0px;
+}
+
+.top_tools
 {
   padding: 10px;
+  margin-bottom: 10px;
 }
 
 form[name="search"]
@@ -886,28 +929,420 @@ form[name="search"]
 form[name="search"] input[type="submit"]
 {
   float: right;
-  margin-top: -52px;
+  height: 34px;
+  margin-top: -55px;
+}
+
+.top_tools input.tag_prompt
+{
+  text-align: center;
+  width: 518px;
 }
 
-#home_top_tools input.tag_prompt
+.niceinput
 {
   -webkit-box-shadow: inset 0px 0px 2px 3px #c8c8c8;
   box-shadow: inset 0px 0px 2px 3px #c8c8c8; 
   height: 34px;
   -moz-border-radius: 4px;
-	-webkit-border-radius: 4px;
-	-khtml-border-radius: 4px;
-	border-radius: 4px;
+  -webkit-border-radius: 4px;
+   -khtml-border-radius: 4px;
+  border-radius: 4px;
   border: medium none;
   padding-left: 10px;
   padding-right: 10px;
-  text-align: center;
-  width: 518px;
 }
 
 input:-moz-placeholder, textarea:-moz-placeholder {
-    color: black;
+  color: black;
 }
 input::-webkit-input-placeholder, textarea::-webkit-input-placeholder {
-    color: black;
-}
+  color: black;
+}
+
+a.elements_more div
+{
+  height: 32px;
+  width: 100%;
+  padding: 0px;
+  text-align: center;
+  background-image: url("/img/more_result.png");
+  background-repeat: no-repeat;
+  padding-top: 30px;
+  text-transform : uppercase;
+  
+}
+
+a.elements_more
+{
+  color: black;
+  font-weight: bold;
+}
+
+a.elements_more:hover
+{
+  color: black;
+}
+
+div#element_add_box
+{
+  padding: 10px;
+}
+
+#element_add_box h2
+{
+  margin-top: 0px;
+}
+
+div#form_add_first_part #element_add_url
+{
+  height: 29px;
+  width: 485px;
+}
+
+#tabs_tag_search_buttons a
+{
+  padding-left: 5px;
+}
+
+#tabs_tag_search_buttons img
+{
+  float: left;
+}
+
+.muzichlogodecored
+{
+  background-image: url("/img/icon_minilogo_2.png");
+  background-repeat: no-repeat;
+  background-position: left center;
+}
+
+a#autoplay_launch
+{
+  -moz-border-radius: 3px 3px 0px 0px;
+  -webkit-border-radius: 3px 3px 0px 0px;
+  -khtml-border-radius: 3px 3px 0px 0px;
+  padding-bottom: 0px;
+  border-bottom: none;
+  margin-right: -4px;
+  margin-top: -3px;
+}
+
+div#tags_prompt_add
+{
+  width: 465px;
+  
+}
+
+div#tags_prompt_add input.tag_prompt
+{
+  width: 450px;
+}
+
+div#form_add_second_part table td
+{
+  padding: 10px;
+}
+
+div#form_add_second_part input[type="submit"]
+{
+  float: right;
+  margin-top: -10px;
+}
+
+div#footer
+{
+  height: 104px;
+  width: 100%;
+  margin-top: 25px;
+  border-top: 4px solid #E51936;
+  background-color: #171717;
+  text-align: center;
+}
+
+div#footer_content
+{
+  margin-left: auto;
+  margin-right: auto;
+  width: 980px;
+  color: #999999;
+}
+
+div#footer_content a
+{
+  color: #999999;
+}
+
+div#footer_logo
+{
+  line-height: 18px;
+  margin-top: 25px;
+  padding-left: 0;
+  padding-right: 40px;
+  text-align: left;
+  width: 191px;
+  float: left;
+}
+
+div#footer_logo img
+{
+  float: left;
+  padding-right: 10px;
+}
+
+span.fotter_muzich_big
+{
+  font-size: 22px;
+  font-weight: bold;
+}
+
+div#footer_content ul.footer_pages_links
+{
+  float: left;
+  height: 74px;
+  margin-bottom: 0;
+  margin-top: 12px;
+  padding-top: 10px;
+  margin-left: 0;
+  padding-left: 32px;
+  width: 210px;
+  border-left: 1px solid #2F2F2F;
+  text-align: left;
+}
+
+div#footer_content ul.footer_pages_links li
+{
+  list-style-image: url("/img/list_chip_red.png");
+}
+
+
+div.search_tag_list ul.search_tag_list
+{
+  list-style-image: none;
+  padding:0;
+  margin:0;
+  list-style-type:none;
+  overflow: hidden;
+}
+
+div.search_tag_list ul.search_tag_list li
+{
+  float: left;
+  margin-right: 4px;
+  margin-left: 4px;
+  margin-top: 2px;
+  margin-bottom: 2px;
+  padding: 2px 4px 2px 4px;
+  background-color: #d9f7ff;
+  
+  
+  border-radius: 4px;
+  -moz-border-radius: 4px;
+  -webkit-border-radius: 4px;
+  
+  -webkit-box-shadow: #666 0px 2px 3px;
+  -moz-box-shadow: #666 0px 2px 3px;
+  box-shadow: #666 0px 2px 3px;
+}
+
+div.search_tag_list ul.search_tag_list li.new
+{
+  font-weight: bold;
+  background: #e0e0e0;
+  color: black;
+}
+
+div.search_tag_list ul.search_tag_list li.new a
+{
+  color: black;
+}
+  
+
+div.search_tag_list ul.search_tag_list li:hover
+{
+  background-color: #999999;
+}
+
+div.search_tag_list span.info
+{
+  text-shadow: 1px 1px 1px #666;
+  font-weight: bold;
+  font-size: 17px;
+}
+
+#container ul.search_tag_list li a
+{
+  color: black;
+}
+
+#container ul.search_tag_list li a:hover
+{
+  text-decoration: none;
+}
+
+ul.search_tag_list li a
+{
+  color: white;
+}
+
+
+div#search_tag_search a.more
+{
+  color: black;
+}
+
+div#search_tag_search p.help
+{
+  font-size: 11px;
+  font-style: italic;
+}
+
+.textcenter
+{
+  text-align: center;
+}
+
+ul#form_add_prop_tags_api li
+{
+  float: left;
+  list-style-type: none;
+  margin-right: 15px;
+}
+
+ul#form_add_prop_tags_api li:hover
+{
+  text-decoration: underline;
+}
+
+ul.elements li.element.selected
+{
+  background-color: #E7E7E7;
+}
+
+ul.elements li.element h2
+{
+  margin-top: 0px;
+}
+
+ul.elements li.element fieldset
+{
+  margin-bottom: 5px;
+}
+
+ul.elements li.element fieldset.edit_url label, ul.elements li.element fieldset.edit_name label, ul.elements li.element fieldset.edit_tags label
+{
+  display: block;
+  float: left;
+  width: 80px;
+  font-size: 16px;
+  padding-top: 6px;
+  font-weight: bold;
+}
+
+ul.elements li.element fieldset.edit_tags label
+{
+  float: left;
+}
+
+ul.elements li.element fieldset.edit_url input[type="text"], ul.elements li.element fieldset.edit_name input[type="text"]
+{
+  width: 520px;
+  font-size: 100%;
+  height: 30px;
+}
+
+ul.elements li.element fieldset.edit_tags input.tag_prompt
+{
+  width: 600px;
+}
+
+ul.elements li.element div.inputs
+{
+  text-align: right;
+}
+
+div.no_elements
+{
+  text-align: center;
+}
+
+ul#autoplay_element
+{
+  margin: 0px;
+  padding: 0px;
+}
+
+ul#autoplay_element li
+{
+  list-style-type: none;
+}
+
+ul.tagbox {
+
+cursor: text;
+border: none;
+overflow: hidden;
+padding: 0 0 1px 3px;
+margin-left: 0px;
+}
+ul.tagbox li {
+margin:0;
+}
+
+ul#favorite_tags
+{
+  padding:0;
+  margin-top:10px;
+  margin-bottom: 10px;
+  margin-left: 0px;
+  list-style-type:none;
+}
+
+ul#favorite_tags li a
+{
+  color: white;
+}
+
+ul#favorite_tags li.list_length_big a
+{
+  font-size: 16px;
+  padding-top: 2px;
+  padding-bottom: 2px;
+}
+
+ul#favorite_tags li.list_length_medium a
+{
+  font-size: 15px;
+  padding-top: 3px;
+  padding-bottom: 3px;
+}
+
+ul#favorite_tags li a.active
+{
+  color: #999999;
+}
+
+input#element_add_name
+{
+  width: 450px;
+}
+
+.darkbutton {
+  background-color: #585454;
+  padding: 8px 8px 6px 6px;
+  border: 1px solid black;
+  text-transform : uppercase;
+  font-size: 70%;
+  font-weight: bold;
+  
+  background: none;
+  background-color: #555;
+  box-shadow: 0 1px 1px 0 #696465 inset;
+  color: white;
+}
+
+div.top_tools div.show_options
+{
+  float: right;
+  padding: 10px;
+}