inte suite

app/Resources/FOSUserBundle/translations/FOSUserBundle.fr.yml

@@ -14,8 +14,8 @@ group:
 # Security
 security:
     login:
-        username: "Nom d'utilisateur:"
-        password: "Mot de passe:"
+        username: "Identifiant (adresse email)"
+        password: "Mot de passe"
         remember_me: Rester connecté
         submit: Connexion
 

app/Resources/translations/groups.fr.yml

@@ -12,3 +12,5 @@ group:
   notfollow:                    Ne plus suivre
   remove:
     link:                       Supprimer le groupe
+  form:
+    submit:                     Enregistrer le groupe

app/Resources/translations/navigationui.fr.yml

@@ -8,7 +8,7 @@ container_menu:
   need_tags:            Demandes
   
 top_bar:
-  my_account:           Mon compte (%name%)
+  my_account:           Mon compte
   logout:               Déconnexion
   
 network:

app/Resources/translations/userui.fr.yml

@@ -2,6 +2,11 @@ login:
   remember_me:
     label:     Rester connecté
 
+security:
+  login:
+    username: "Identifiant (adresse email)"
+    password: "Mot de passe"
+
 start:
   title:       Inscription terminé
   titleh2:     Bienvenue sur Muzich !
@@ -72,7 +77,20 @@ tags:
     display_more:           Des tags ont été cachés, cliquez ici pour les afficher tous
     filter:
       text:                 Chercher un tag parmis la liste
-           
+  favorites:
+    submit:                 Enregistrer ces tags
+
+submenu:
+  followed_users:
+    title:                  Utilisateurs suivis
+    nouser:                Aucun
+  followed_groups:
+    title:                  Groupes suivis
+    nouser:                Aucun
+  follower_users:
+    title:                  Suivis par
+    nouser:                Aucun
+
 filter:
   network: "Résultats de "
   submit:  Filtrer
@@ -172,6 +190,18 @@ need_tags:
                          Les utilisateurs ayant partagés leurs découvertes ont
                          demandé de l'aide pour tagger correctement leurs partages.
                          Gagnez en réputation en leurs proposants les tags qui conviennent !
+register:
+  title:                 Création d'un compte
+registration:
+  submit:                Procéder a l'inscription
 
 autoplay:
-  limitations_players:   La lecture automatique ne supporte actuellement que les lecteurs youtube, soundcloud et jamendo.
+  limitations_players:   La lecture automatique ne supporte actuellement que les lecteurs youtube, soundcloud et jamendo.
+
+events:
+  view:
+    title:
+      comments:          Commentaires
+      nvxfav:            Mis en favoris
+      tagsprop:          Proposition de tags
+      

src/Muzich/CoreBundle/Controller/CoreController.php

@@ -680,8 +680,7 @@ class CoreController extends Controller
     
     $html = $this->render('MuzichCoreBundle:SearchElement:default.html.twig', array(
       'user'        => $this->getUser(),
-      'elements'    => $es->getElements($this->getDoctrine(), $this->getUserId()),
-      'invertcolor' => false
+      'elements'    => $es->getElements($this->getDoctrine(), $this->getUserId())
     ))->getContent();
 
     return $this->jsonResponse(array(
@@ -703,4 +702,21 @@ class CoreController extends Controller
     )));
   }
   
+  public function renderSideMenuAction()
+  {
+    $user = $this->getUser(true, array('join' => array(
+      'followeds_users', 'followers_users', 'followeds_groups'
+    )), true);
+    
+    
+    return $this->render(
+      'MuzichCoreBundle:Menu:side_menu.html.twig', 
+      array(
+        'followeds_users'  => $user->getFollowedsUsers(),
+        'followeds_groups' =>  $user->getFollowedGroups(),
+        'followers_users'  => $user->getFollowersUsers()
+      )
+    );
+  }
+  
 }

src/Muzich/CoreBundle/Controller/ElementController.php

@@ -412,8 +412,7 @@ class ElementController extends Controller
     // On en fait un rendu graphique
     $html_elements = $this->render('MuzichCoreBundle:SearchElement:default.html.twig', array(
       'user'        => $this->getUser(),
-      'elements'    => $elements,
-      'invertcolor' => false
+      'elements'    => $elements
     ))->getContent();
     
     // On calcule le nouveau compte de nouveaux

src/Muzich/CoreBundle/Controller/SearchController.php

@@ -21,22 +21,27 @@ class SearchController extends Controller
    * par defalt de la liste d'élément.
    * 
    * @param Collection $elements
-   * @param boolean $invertcolors
    * @param sring $message
+   * @param string $session_id
    * @return Response 
    */
-  protected function searchElementsMore($elements, $invertcolors, $message)
+  protected function searchElementsMore($elements, $message, $session_id)
   {
     
+    $data = array();
     $end = (($count = count($elements)) < $this->container->getParameter('search_ajax_more'));
     $html = '';
     if ($count)
     {
       $html = $this->render('MuzichCoreBundle:SearchElement:default.html.twig', array(
         'user'        => $this->getUser(),
-        'elements'    => $elements,
-        'invertcolor' => $invertcolors
+        'elements'    => $elements
       ))->getContent();
+      
+      $data['more_link_href'] = $this->generateUrl('search_elements_more', array(
+        'id_limit'   => $elements[count($elements)-1]->getId(),
+        'session_id' => $session_id
+      ));
     }
     
     return $this->jsonResponse(array(
@@ -44,7 +49,8 @@ class SearchController extends Controller
       'count'   => $count,
       'message' => $message,
       'html'    => $html,
-      'end'     => $end
+      'end'     => $end,
+      'data'    => $data
     ));
   }
   
@@ -53,7 +59,7 @@ class SearchController extends Controller
    * que les paramétres en session). 
    * 
    */
-  public function searchElementsAction($id_limit = null, $invertcolors = false)
+  public function searchElementsAction($id_limit = null, $session_id = null)
   {
     if (($response = $this->mustBeConnected()))
     {
@@ -61,7 +67,7 @@ class SearchController extends Controller
     }
     
     $request = $this->getRequest();
-    $search_object = $this->getElementSearcher();
+    $search_object = $this->getElementSearcher(null, false, $session_id);
     
     $search_form = $this->getSearchForm($search_object);
     
@@ -89,7 +95,7 @@ class SearchController extends Controller
     }
     
     if ($this->getRequest()->isXmlHttpRequest())
-    { 
+    {
       if ($form_submited && !$id_limit)
       {
         $message = $this->trans(
@@ -112,14 +118,14 @@ class SearchController extends Controller
       }
       
       // template qui apelle doSearchElementsAction 
-      $search = $this->getElementSearcher();
-      $search->update(array(
+      $search_object->update(array(
         'count'    => $this->container->getParameter('search_ajax_more'),
         'id_limit' => $id_limit
       ));
-      $elements = $search->getElements($this->getDoctrine(), $this->getUserId());
       
-      return $this->searchElementsMore($elements, $invertcolors, $message);      
+      $elements = $search_object->getElements($this->getDoctrine(), $this->getUserId());
+      
+      return $this->searchElementsMore($elements, $message, $session_id);      
     }
     else
     {
@@ -134,10 +140,9 @@ class SearchController extends Controller
    * @param string $type
    * @param string $object_id
    * @param int $id_limit
-   * @param boolean $invertcolors
    * @return Response 
    */
-  public function searchElementsShowAction($type, $object_id, $id_limit, $invertcolors)
+  public function searchElementsShowAction($type, $object_id, $id_limit)
   {
     if ($this->getRequest()->isXmlHttpRequest())
     {
@@ -173,7 +178,7 @@ class SearchController extends Controller
 
       $elements = $search->getElements($this->getDoctrine(), $this->getUserId());
       
-      return $this->searchElementsMore($elements, $invertcolors,
+      return $this->searchElementsMore($elements,
         $this->trans(
           'elements.ajax.more.noelements', 
           array(), 

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

@@ -5,15 +5,15 @@ search_elements:
   defaults: { _controller: MuzichCoreBundle:Search:searchElements }
   
 search_elements_more:
-  pattern:  /search-elements/{id_limit}/{invertcolors}
-  defaults: { _controller: MuzichCoreBundle:Search:searchElements }
+  pattern:  /search-elements/{id_limit}/{session_id}
+  defaults: { _controller: MuzichCoreBundle:Search:searchElements, session_id: null }
    
 search_elements_show_more_empty:
   pattern:  /search-elements/show/{type}/{object_id}
   defaults: { _controller: MuzichCoreBundle:Search:searchElementsShow }
     
 search_elements_show_more:
-  pattern:  /search-elements/show/{type}/{object_id}/{id_limit}/{invertcolors}
+  pattern:  /search-elements/show/{type}/{object_id}/{id_limit}
   defaults: { _controller: MuzichCoreBundle:Search:searchElementsShow }
    
 global_search_elements_empty:

src/Muzich/CoreBundle/Resources/views/GlobalSearch/form.html.twig

@@ -1,12 +1,14 @@
-<form action="{{ path('global_search') }}" method="post" {{ form_enctype(form) }}>
+<div class="seachboxcontainer">
+  <form action="{{ path('global_search') }}" method="post" {{ form_enctype(form) }}>
     
-  {% form_theme form 'MuzichCoreBundle:Form:errors.html.twig' %}
-  {{ form_errors(form) }}
-
-  {{ form_errors(form.string) }}
-  {{ form_widget(form.string) }}
-  <input type="submit" class="button" value="{{ 'search.form.submit_value'|trans({}, 'network') }}" />
-  
-  {{ form_rest(form) }}
-
-</form>
+    {% form_theme form 'MuzichCoreBundle:Form:errors.html.twig' %}
+    {{ form_errors(form) }}
+    {{ form_errors(form.string) }}
+    {{ form_widget(form.string) }}
+    {{ form_rest(form) }}
+    
+    <a href="#" class="global_search_link">
+      <img src="{{ asset('/img/icon_search.png') }}" alt="search" />
+    </a>
+  </form>
+</div>

src/Muzich/CoreBundle/Resources/views/GlobalSearch/results.html.twig

@@ -1,66 +1,68 @@
 {% extends "MuzichCoreBundle::layout.html.twig" %}
 
 {% block title %}Recherche{% endblock %}
+{% block mainbox_classes %}mainbox_padding{% endblock %}
 
 {% block main_content %}
 
-  {% include "MuzichCoreBundle:Menu:containerMenu.html.twig" with {'active': null} %}
-  
   <div id="results_search_form">
     {% include "MuzichCoreBundle:GlobalSearch:form.html.twig" with {'form': form } %}
   </div>
   
-  {% if results.users|length or results.groups|length or results.elements|length %}
+  <div class="global_search_results">
+    {% if results.users|length or results.groups|length or results.elements|length %}
+    
+      {% if results.users %}
   
-    {% if results.users %}
-
-      <b>{{ 'search.users'|trans({}, 'network') }}</b>
-      
-      <ul id="search_users" class="inline">
-      {% for user in results.users %} 
-        <li>
-          <a href="{{ path('show_user', { 'slug': user.slug }) }}">{{ user.username }}</a>
-        </li>
-      {% endfor %}
-      </ul>
-
-    {% endif %}
+        <b>{{ 'search.users'|trans({}, 'network') }}</b>
+        
+        <ul id="search_users" class="inline">
+        {% for user in results.users %} 
+          <li>
+            <a href="{{ path('show_user', { 'slug': user.slug }) }}">{{ user.username }}</a>
+          </li>
+        {% endfor %}
+        </ul>
   
-    {% if results.groups %}
-
-      <b>{{ 'search.groups'|trans({}, 'network') }}</b>
-      
-      <ul id="search_groups" class="inline">
-      {% for group in results.groups %} 
-        <li>
-          <a href="{{ path('show_group', { 'slug': group.slug }) }}">{{ group.name }}</a>
-        </li>
-      {% endfor %}
-      </ul>
-
-    {% endif %}
+      {% endif %}
+    
+      {% if results.groups %}
   
-    {% if results.elements %}
-
-      <b>{{ 'search.elements'|trans({}, 'network') }}</b>
-      
-      {% include "MuzichCoreBundle:SearchElement:default.html.twig" with {
-        'noelements_filter' : true,
-        'elements'          : results.elements
-      }%}
-      
-      {% include "MuzichCoreBundle:SearchElement:more_button.html.twig" with {
-        'display_more_button' : display_more_button,
-        'elements_length'     : results.elements|length,
-        'more_path'           : 'global_search_elements_empty'
-      }%}
-      
+        <b>{{ 'search.groups'|trans({}, 'network') }}</b>
+        
+        <ul id="search_groups" class="inline">
+        {% for group in results.groups %} 
+          <li>
+            <a href="{{ path('show_group', { 'slug': group.slug }) }}">{{ group.name }}</a>
+          </li>
+        {% endfor %}
+        </ul>
+  
+      {% endif %}
+    
+      {% if results.elements %}
+  
+        <b>{{ 'search.elements'|trans({}, 'network') }}</b>
+        
+        {% include "MuzichCoreBundle:SearchElement:default.html.twig" with {
+          'noelements_filter' : true,
+          'elements'          : results.elements
+        }%}
+        
+        {% include "MuzichCoreBundle:SearchElement:more_button.html.twig" with {
+          'display_more_button' : display_more_button,
+          'elements_length'     : results.elements|length,
+          'more_path'           : 'global_search_elements_empty'
+        }%}
+        
+      {% endif %}
+        
+    {% elseif app.request.getMethod == 'POST' %}
+        <p>
+          {{ 'global_search.no_results'|trans({}, 'userui') }}
+        </p>
     {% endif %}
-      
-  {% elseif app.request.getMethod == 'POST' %}
-      <p>
-        {{ 'global_search.no_results'|trans({}, 'userui') }}
-      </p>
-  {% endif %}
-
+  
+  </div>
+  
 {% endblock %}

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

@@ -27,15 +27,17 @@
     </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>
+{% if app.user %}
+  <ul class="footer_pages_links footer_pages_links_user">
+    <li>
+      <a href="" >
+        Profil
+      </a>
+    </li>
+    <li>
+      <a href="" >
+        Paramètres
+      </a>
+    </li>
+  </ul>
+{% endif %}

src/Muzich/CoreBundle/Resources/views/Language/languages.html.twig

@@ -1,4 +1,4 @@
-<div id="choose_language">
-  <a href="{{ path('change_language', {'language' : 'fr'}) }}">fr</a> |
-  <a href="{{ path('change_language', {'language' : 'en'}) }}">en</a>
+<div id="languages">
+  <a href="{{ path('change_language', {'language' : 'fr'}) }}">FR</a>
+  <a href="{{ path('change_language', {'language' : 'en'}) }}">EN</a>
 </div>

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

@@ -0,0 +1,90 @@
+<div id="secondarymenu" class="nicebox">
+  
+  <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>
+      </a>
+      
+      <ul class="submenu">
+        {% if followeds_users %}
+          {% for user in followeds_users %}
+            <li class="sub_menu_element">
+              <a href="{{ path('show_user', { 'slug': user.slug }) }}">
+                {{ user.username }}
+              </a>
+            </li>
+          {% endfor %}
+        {% else %}
+          <li class="sub_menu_element">
+            {{ 'submenu.followed_users.nouser'|trans({}, 'userui') }}
+          </li>
+        {% endif %}
+      </ul>
+    </li>
+      
+  </ul>
+  
+  <ul class="secondarymenu">
+    <li class="top_menu_element close">
+      
+      <a href="" class="top_menu_link">
+        <div class="blackgradiant">
+            {{ 'submenu.followed_groups.title'|trans({}, 'userui') }}
+            <div class="dart"></div>
+        </div>
+      </a>
+      
+      <ul class="submenu">
+        {% if followeds_groups %}
+          {% for group in followeds_groups %}
+            <li class="sub_menu_element">
+              <a href="{{ path('show_group', { 'slug': group.slug }) }}">
+                {{ group.name }}
+              </a>
+            </li>
+          {% endfor %}
+        {% else %}
+          <li class="sub_menu_element">
+            {{ 'submenu.followed_groups.nouser'|trans({}, 'userui') }}
+          </li>
+        {% endif %}
+      </ul>
+    </li>
+      
+  </ul>
+  
+  <ul class="secondarymenu">
+    <li class="top_menu_element close">
+      
+      <a href="" class="top_menu_link">
+        <div class="blackgradiant">
+            {{ 'submenu.follower_users.title'|trans({}, 'userui') }}
+            <div class="dart"></div>
+        </div>
+      </a>
+      
+      <ul class="submenu">
+        {% if followers_users %}
+          {% for user in followers_users %}
+            <li class="sub_menu_element">
+              <a href="{{ path('show_user', { 'slug': user.slug }) }}">
+                {{ user.username }}
+              </a>
+            </li>
+          {% endfor %}
+        {% else %}
+          <li class="sub_menu_element">
+            {{ 'submenu.follower_users.nouser'|trans({}, 'userui') }}
+          </li>
+        {% endif %}
+      </ul>
+    </li>
+      
+  </ul>
+  
+</div>

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

@@ -80,19 +80,7 @@
       
     </td>
     <td class="element_content">
-      
-      <span class="element_name">
-        {% if element.embed %}
-          <a href="#" class="element_open element_name_embed_open_link">
-            {{ element.name }}
-          </a>
-        {% else %}
-          <a href="{{ element.url }}" class="element_open" target="_blank">
-            {{ element.name }}
-          </a>
-        {% endif %}
-      </span> 
-      
+            
       <ul class="element_links_actions" class="gradient">
         <li class="element_link">
           <a title="{{ 'element.link'|trans({}, 'elements') }}" class="element_link" href="{{ element.url }}" target="_blank">
@@ -166,9 +154,17 @@
         
       </ul>
       
-      
-      
-      
+      <span class="element_name">
+        {% if element.embed %}
+          <a href="#" class="element_open element_name_embed_open_link">
+            {{ element.name }}
+          </a>
+        {% else %}
+          <a href="{{ element.url }}" class="element_open" target="_blank">
+            {{ element.name }}
+          </a>
+        {% endif %}
+      </span>
       
       <br />
       {% autoescape false %}

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

@@ -2,8 +2,16 @@
   <img class="elements_more_loader" style="display: none;" src="{{ asset('/bundles/muzichcore/img/ajax-loader.gif') }}" alt="loading" />
 </div>
 
+{% if more_path_params is not defined %}
+  {% set more_path_params = {} %}
+{% endif %}
+
+{% if link_class is not defined %}
+  {% set link_class = '' %}
+{% endif %}
+
 {% if display_more_button and elements_length %} 
-  <a href="{{ path(more_path) }}" class="elements_more">
+  <a href="{{ path(more_path, more_path_params) }}" class="elements_more {{ link_class }}">
     <div>
       {{ 'more'|trans({}, 'userui') }}
     </div>

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

@@ -11,5 +11,5 @@
 
   {{ form_row(form._token) }}
 
-  <input type="submit" class="button" />
+  <input type="submit" class="button" value="{{ 'tags.favorites.submit'|trans([], 'userui') }}" />
 </form>

src/Muzich/CoreBundle/Resources/views/Tag/tagsList.favorite.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>
@@ -24,5 +24,4 @@
       {{ 'tags.cloud.display_more'|trans({}, 'userui') }}
     </a>
   {% endif %}
-  
 {% endif %}

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

@@ -172,193 +172,145 @@
     
   </div>
   
-    <header id="header">
-      <hgroup>
-        <ul id="parameters">
-          <li>
-            <a href="" class="languages">
-              FR
-            </a>
-          </li>
-          <li>
-            <a href="">
-              <img src="{{ asset('img/header_icon_params.png') }}" alt="parameters" />
-            </a>
-          </li>
-        </ul>
-        <a id="header_logo" href="{{ path('index') }}" title="">
-          <img src="{{ asset('img/header_logo.png') }}" alt="logo" />
-        </a>
-        <ul id="register_and_login">
-          <li>
-            <a href="" class="left">
-              Devenir membre
-            </a>
-          </li>
-          <li>
-            <a href="" class="right">
-              Connexion
-            </a>
-          </li>
-        </ul>
-        <ul id="header_menu">
-          
-          {% if network_public is not defined %}
-            {% set network_public = '' %}
-          {% endif %}
-          
-          <li class="{% if network_public == '1' and not ids_display %}selected{% endif %}">
-            <a href="{{ path('home') }}" class="all_network">
-              {{ 'filter.network_all'|trans({}, 'userui') }}
-            </a>
-          </li>
-          <li class="separator"></li>
-          <li class="{% if network_public == '0' and not ids_display %}selected{% endif %}">
-            <a href="{{ path('home') }}" class="my_network" >
-              {{ 'filter.network_my'|trans({}, 'userui') }}
-            </a>
-          </li>
-          <li class="separator"></li>
-          <li>
-            <a href="{{ path('show_user', {'slug': app.user.slug}) }}">
-              {{ 'container_menu.my_feeds'|trans({}, 'navigationui') }}
-            </a>
-          </li>
-          <li class="separator"></li>
-          <li>
-            <a href="{{ path('groups_own_list') }}" >
-              {{ 'network.mygroups'|trans({}, 'navigationui') }}
-            </a>
-          </li>
-          <li class="separator"></li>
-          <li>
-            <a href="{{ path('favorites_my_list') }}" >
-              {{ 'container_menu.my_favorites'|trans({}, 'navigationui') }}
-            </a>
-          </li>
-          <li class="separator"></li>
-        </ul>
-      </hgroup>
-    </header>
-    
-    <div id="content">
+  <div id="container">
+  
+    <div id="main_content">
       
-      <div id="main">
-        
-        <div id="mainbox" class="nicebox {% block mainbox_classes %}{% endblock %}">
-          {% block main_content %}{% endblock %}
-          {% block fos_user_content %}{% endblock %}
-        </div>
-        
-      </div>
-        
-      <aside id="sidebar">
-        
-        <div id="user_statusbox" class="nicebox">
-          {% if is_granted("IS_AUTHENTICATED_REMEMBERED") %}
-            {% render "MuzichUserBundle:Event:infoBar" %}
-          {% endif %}
-        </div>
-        
-        <div id="searchbox" class="nicebox">
-          <div class="seachboxcontainer">
-            <form>
-              <input type="text" />
+      <header id="header">
+        <hgroup>
+            {% include "MuzichCoreBundle:Language:languages.html.twig" %}
+            <!--
+          <ul id="parameters"><li>
               <a href="">
-                <img src="{{ asset('/img/icon_search.png') }}" alt="search" />
+                <img src="{{ asset('img/header_icon_params.png') }}" alt="parameters" />
               </a>
-            </form>
-          </div>
-        </div>
-        
-        <div id="social" class="nicebox">
-          <ul class="social_links">
-            <li>
-              <a href="" >
-                <img src="{{ asset('/img/icon_facebook.png') }}" alt="facebook" />
+            </li></ul>-->
+          
+          <a id="header_logo" href="{{ path('index') }}" title="">
+            <img src="{{ asset('img/header_logo.png') }}" alt="logo" />
+          </a>
+          <ul id="register_and_login">
+            {% if not app.user %}
+              <!--<li>
+                <a href="" class="left">
+                  Devenir membre
+                </a>
+              </li>
+              <li>
+                <a href="" class="right">
+                  Connexion
+                </a>
+              </li>-->
+            {% else %}
+              <li>
+                <a href="{{ path('my_account') }}" class="left">
+                  {{ 'top_bar.my_account'|trans({}, 'navigationui') }}
+                </a>
+              </li>
+              <li>
+                <a class="right" href="{{ path('fos_user_security_logout') }}">
+                    {{ 'top_bar.logout'|trans({}, 'navigationui') }}
+                </a>
+              </li>
+            {% endif %}
+          </ul>
+          
+          {% if app.user %}
+          <ul id="header_menu">
+            
+            {% if network_public is not defined %}
+              {% set network_public = '' %}
+            {% endif %}
+            
+            <li class="{% if network_public == '1' and not ids_display %}selected{% endif %}">
+              <a href="{{ path('home') }}" class="all_network">
+                {{ 'filter.network_all'|trans({}, 'userui') }}
               </a>
             </li>
-            <li>
-              <a href="" >
-                <img src="{{ asset('/img/icon_twitter.png') }}" alt="twitter" />
+            <li class="separator"></li>
+            <li class="{% if network_public == '0' and not ids_display %}selected{% endif %}">
+              <a href="{{ path('home') }}" class="my_network" >
+                {{ 'filter.network_my'|trans({}, 'userui') }}
               </a>
             </li>
-            <li>
-              <a href="" >
-                <img src="{{ asset('/img/icon_googleplus.png') }}" alt="google plus" />
+            <li class="separator"></li>
+            <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') }}
               </a>
             </li>
-          </ul>
-        </div>
-        
-        <div id="secondarymenu" class="nicebox">
-          
-          <ul class="secondarymenu">
-            <li class="top_menu_element open">
-              
-              <a href="" class="top_menu_link">
-                <div class="blackgradiant">
-                    Menu element
-                    <div class="dart"></div>
-                </div>
+            <li class="separator"></li>
+            {% 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>
-              
-              <ul class="submenu">
-                <li class="sub_menu_element">
-                  <a href="" >
-                    sub menu element
-                  </a>
-                </li>
-                <li class="sub_menu_element">
-                  <a href="" >
-                    sub menu element
-                  </a>
-                </li>
-                <li class="sub_menu_element">
-                  <a href="" >
-                    sub menu element
-                  </a>
-                </li>
-              </ul>
             </li>
-              
+            <li class="separator"></li>
+            <li class="{% if app.request.get('topmenu') == 'myfavorites' %}selected{% endif %}">
+              <a href="{{ path('favorites_my_list') }}" >
+                {{ 'container_menu.my_favorites'|trans({}, 'navigationui') }}
+              </a>
+            </li>
+            <li class="separator"></li>
           </ul>
+          {% endif %}
           
-          <ul class="secondarymenu">
-            <li class="top_menu_element close">
-              
-              <a href="" class="top_menu_link">
-                <div class="blackgradiant">
-                    Menu element
-                    <div class="dart"></div>
-                </div>
-              </a>
-              
-              <ul class="submenu">
-                <li class="sub_menu_element">
+        </hgroup>
+      </header>
+      
+      <div id="content">
+        
+        <div id="main">
+          
+          <div id="mainbox" class="nicebox {% block mainbox_classes %}{% endblock %}">
+            {% block main_content %}{% endblock %}
+            {% block fos_user_content %}{% endblock %}
+          </div>
+          
+        </div>
+          
+        <aside id="sidebar">
+          
+          {% if app.user %}
+            <div id="user_statusbox" class="nicebox">
+              {% if is_granted("IS_AUTHENTICATED_REMEMBERED") %}
+                {% render "MuzichUserBundle:Event:infoBar" %}
+              {% endif %}
+            </div>
+          
+            <div id="searchbox" class="nicebox">
+              {% render "MuzichCoreBundle:Search:renderGlobalSearchForm" %}
+            </div>
+            
+            <!--<div id="social" class="nicebox">
+              <ul class="social_links">
+                <li>
                   <a href="" >
-                    sub menu element
+                    <img src="{{ asset('/img/icon_facebook.png') }}" alt="facebook" />
                   </a>
                 </li>
-                <li class="sub_menu_element">
+                <li>
                   <a href="" >
-                    sub menu element
+                    <img src="{{ asset('/img/icon_twitter.png') }}" alt="twitter" />
                   </a>
                 </li>
-                <li class="sub_menu_element">
+                <li>
                   <a href="" >
-                    sub menu element
+                    <img src="{{ asset('/img/icon_googleplus.png') }}" alt="google plus" />
                   </a>
                 </li>
               </ul>
-            </li>
-              
-          </ul>
+            </div>-->
+            
+            {% render 'MuzichCoreBundle:Core:renderSideMenu' %}
           
-        </div>
-                
-      </aside>
-        
+          {% endif %}
+          
+        </aside>
+          
+      </div>
+      
     </div>
     
     <div id="footer">
@@ -377,7 +329,7 @@
       
     </div>
     
-    
+  </div>
     
   </body>
 </html>

src/Muzich/CoreBundle/Searcher/ElementSearcher.php

@@ -184,6 +184,11 @@ class ElementSearcher extends Searcher implements SearcherInterface
     return false;
   }
   
+  public function setNoTags()
+  {
+    $this->tags = array();
+  }
+  
   public function getTags($tags_string = false)
   {
     if (!$tags_string)

src/Muzich/CoreBundle/Searcher/ElementSearcherQueryBuilder.php

@@ -273,6 +273,15 @@ class ElementSearcherQueryBuilder
       $this->query_ids->andWhere("e.need_tags  = '1'");
     }
   }
+  
+  private function buildIdsLimits()
+  {
+    if ($this->es->hasIds())
+    {
+      $this->query_ids->andWhere('e.id IN (:limiteds_ids)');
+      $this->parameters_ids['limiteds_ids'] = $this->es->getIds();
+    }
+  }
 
   /**
    *
@@ -313,6 +322,8 @@ class ElementSearcherQueryBuilder
     }
     // Si on recherche des partages en demande de tags
     $this->buildNeedTags();
+    // Si on a fournis des ids dés le départ
+    $this->buildIdsLimits();
     
     $this->query_ids->setParameters($this->parameters_ids);
   }
@@ -325,12 +336,12 @@ class ElementSearcherQueryBuilder
    */
   public function getIdsQuery($disable_limit = false)
   {
-    // Contrôle de la demande
-    if ($this->es->hasIds())
-    {
-      throw new \Exception("Vous demandez un Query_ids avec un ElementSearcher "
-        ."possédant déjà une liste d'ids");
-    }
+    //// Contrôle de la demande
+    //if ($this->es->hasIds())
+    //{
+    //  throw new \Exception("Vous demandez un Query_ids avec un ElementSearcher "
+    //    ."possédant déjà une liste d'ids");
+    //}
     
     if ($this->proceedIdsQuery($disable_limit) === false)
     {
@@ -344,31 +355,22 @@ class ElementSearcherQueryBuilder
   {
     
     // On récupère les ids d'éléments
-    if (!$this->es->hasIds())
+    if (($ids_query = $this->getIdsQuery()) === false)
     {
-      
-      if (($ids_query = $this->getIdsQuery()) === false)
-      {
-        return false;
-      }
-      
-      // On va récupérer les ids en base en fonction des paramètres
-      $q_ids = $ids_query->getArrayResult();
-     
-      $element_ids = array();
-      if (count($q_ids))
-      {
-        // On prépare les ids pour la requete des éléments
-        foreach ($q_ids as $r_id)
-        {
-          $element_ids[] = $r_id['id'];
-        }
-      }
+      return false;
     }
-    else
+    
+    // On va récupérer les ids en base en fonction des paramètres
+    $q_ids = $ids_query->getArrayResult();
+   
+    $element_ids = array();
+    if (count($q_ids))
     {
-      // Les ids sont déjà transmis par la demande
-      $element_ids = $this->es->getIds();
+      // On prépare les ids pour la requete des éléments
+      foreach ($q_ids as $r_id)
+      {
+        $element_ids[] = $r_id['id'];
+      }
     }
     
     if (!count($element_ids))

src/Muzich/CoreBundle/Tests/Controller/HomeControllerTest.php

@@ -736,8 +736,7 @@ class HomeControllerTest extends FunctionalTest
     $id_limit = (int)str_replace('element_', '', $extract[9]);
     
     $url = $this->generateUrl('search_elements_more', array(
-      'id_limit'  => $id_limit,
-      'invertcolors' => 0
+      'id_limit'  => $id_limit
     ));
     
     // We want mooooore

src/Muzich/CoreBundle/lib/Controller.php

@@ -36,9 +36,13 @@ class Controller extends BaseController
    * 
    * @param array $params
    */
-  protected function setElementSearcherParams($params)
+  protected function setElementSearcherParams($params, $session_id = '')
   {
-    $this->get("session")->set('user.element_search.params', $params);
+    if ($session_id != '')
+    {
+      $session_id = '.'.$session_id;
+    }
+    $this->get("session")->set('user.element_search.params'.$session_id, $params);
   }
   
   /**
@@ -51,11 +55,15 @@ class Controller extends BaseController
    * 
    * @return  ElementSearcher
    */
-  protected function getElementSearcher($count = null, $force_new = false)
+  protected function getElementSearcher($count = null, $force_new = false, $session_id = '')
   {
     $session = $this->get("session");
+    if ($session_id != '')
+    {
+      $session_id = '.'.$session_id;
+    }
     // Si l'objet n'existe pas encore, a t-on déjà des paramètres de recherche
-    if (!$session->has('user.element_search.params') || $force_new)
+    if (!$session->has('user.element_search.params'.$session_id) || $force_new)
     {
       // Il nous faut instancier notre premier objet recherche
       // Premièrement on récupère les tags favoris de l'utilisateur
@@ -77,7 +85,7 @@ class Controller extends BaseController
       // Des paramètres existes, on fabrique l'objet recherche
       $this->ElementSearcher = new ElementSearcher();
       // et on l'initatialise avec ces paramétres connus
-      $this->ElementSearcher->init($session->get('user.element_search.params'));
+      $this->ElementSearcher->init($session->get('user.element_search.params'.$session_id));
       if ($count)
       {
         $this->ElementSearcher->update(array('count' => $count));
@@ -88,6 +96,11 @@ class Controller extends BaseController
     return $this->ElementSearcher;
   }
   
+  protected function getNewElementSearcher()
+  {
+    return $this->getElementSearcher(null, true);
+  }
+  
   /**
    * Retourne l'objet User. Il est possible de préciser de quel manière récupérer 
    * l'utilisateur:

src/Muzich/FavoriteBundle/Controller/FavoriteController.php

@@ -237,7 +237,7 @@ class FavoriteController extends Controller
     );
   }
   
-  public function getElementsAction($user_id, $tags_ids_json, $id_limit = null, $invert = false)
+  public function getElementsAction($user_id, $tags_ids_json, $id_limit = null)
   {
     if (($response = $this->mustBeConnected()))
     {
@@ -278,8 +278,7 @@ class FavoriteController extends Controller
     {
       $html = $this->render('MuzichCoreBundle:SearchElement:default.html.twig', array(
         'user'        => $this->getUser(),
-        'elements'    => $elements,
-        'invertcolor' => $invert
+        'elements'    => $elements
       ))->getContent();
     }
     

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

@@ -9,7 +9,7 @@ favorite_remove:
 
 favorites_my_list:
   pattern:   /favorites
-  defaults: { _controller: MuzichFavoriteBundle:Favorite:myList }
+  defaults: { _controller: MuzichFavoriteBundle:Favorite:myList, topmenu: myfavorites }
 
 favorite_user_list:
   pattern:   /user/{slug}/favorites

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

@@ -1,25 +1,28 @@
 {% extends "MuzichFavoriteBundle::layout.html.twig" %}
 
 {% block title %}Mes favoris{% endblock %}
+{% block mainbox_classes %}mainbox_nopadding{% endblock %}
 
 {% block content %}
 
-  {% include "MuzichCoreBundle:Menu:containerMenu.html.twig" with {'active': 'myfavorites'} %}
-
-  <h2>{{ 'favorites.your_favorites'|trans({}, 'network') }}</h2>
-
-  {% include "MuzichCoreBundle:Tag:tagsList.favorite.html.twig" with {
-    'user_id' : app.user.id
-  } %}
+  <div class="top_tools">
+    
+    <h1>{{ 'favorites.your_favorites'|trans({}, 'network') }}</h1>
   
-  <a href="{{ path('elements_get_filter_data_autoplay_favorite', {
-        'show_type'  : 'user',
-        'show_id'    : app.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:Tag:tagsList.favorite.html.twig" with {
+      'user_id' : app.user.id
+    } %}
+    
+    <a href="{{ path('elements_get_filter_data_autoplay_favorite', {
+          'show_type'  : 'user',
+          'show_id'    : app.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>
+  
+  </div>
   
   {% include "MuzichCoreBundle:SearchElement:default.html.twig" %}
     
@@ -28,12 +31,12 @@
   </div>
   
   {% if elements|length %}
-     <span class="elements_more">
-       <input type="hidden" id="more_elements_url" value="{{ path('favorite_get', {'user_id': app.user.id, 'tags_ids_json' : ''}) }}" />
-       <a href="{{ path('favorite_get', {'user_id': app.user.id, 'tags_ids_json' : '[]'}) }}" class="elements_more button">
-         {{ 'more'|trans({}, 'userui') }}
-       </a>
-     </span>
+    <input type="hidden" id="more_elements_url" value="{{ path('favorite_get', {'user_id': app.user.id, 'tags_ids_json' : ''}) }}" />
+    <a href="{{ path('favorite_get', {'user_id': app.user.id, 'tags_ids_json' : '[]'}) }}" class="elements_more">
+      <div>
+       {{ 'more'|trans({}, 'userui') }}
+     </div>
+    </a>
   {% endif %}
   
   <input type="hidden" id="autoplay_url" value="{{ path('elements_get_filter_data_autoplay_favorite', {

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

@@ -1,35 +1,37 @@
 {% extends "MuzichFavoriteBundle::layout.html.twig" %}
 
 {% block title %}Favoris de {{ viewed_user.name }}{% endblock %}
+{% block mainbox_classes %}mainbox_nopadding{% endblock %}
 
 {% block content %}
 
-  {% include "MuzichCoreBundle:Menu:containerMenu.html.twig" with {'active': ''} %}
-
-  <div class="show_options">
+  <div class="top_tools">
     
-    <a class="button" href="{{ path('show_user', {'slug' : viewed_user.slug}) }}" >
-      {{ 'user.view_profile'|trans({}, 'users') }}
+    <div class="show_options">
+      
+      <a class="button darkbutton" href="{{ path('show_user', {'slug' : viewed_user.slug}) }}" >
+        {{ 'user.view_profile'|trans({}, 'users') }}
+      </a>
+      
+    </div>
+  
+    <h1>{{ 'favorites.user_favorites'|trans({'%name%' : viewed_user.name}, 'network') }}</h1>
+  
+    {% include "MuzichCoreBundle:Tag:tagsList.favorite.html.twig" with {
+      'user_id' : viewed_user.id
+    } %}
+    
+    <a href="{{ path('elements_get_filter_data_autoplay_favorite', {
+          '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>
     
   </div>
 
-  <h2>{{ 'favorites.user_favorites'|trans({'%name%' : viewed_user.name}, 'network') }}</h2>
-
-  {% include "MuzichCoreBundle:Tag:tagsList.favorite.html.twig" with {
-    'user_id' : viewed_user.id
-  } %}
-  
-  <a href="{{ path('elements_get_filter_data_autoplay_favorite', {
-        '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">
@@ -37,12 +39,12 @@
   </div>
   
   {% if elements|length %}
-     <span class="elements_more">
-       <input type="hidden" id="more_elements_url" value="{{ path('favorite_get', {'user_id': viewed_user.id, 'tags_ids_json' : ''}) }}" />
-       <a href="{{ path('favorite_get', {'user_id': viewed_user.id, 'tags_ids_json' : '[]'}) }}" class="elements_more button">
-         {{ 'more'|trans({}, 'userui') }}
-       </a>
-     </span>
+    <input type="hidden" id="more_elements_url" value="{{ path('favorite_get', {'user_id': viewed_user.id, 'tags_ids_json' : ''}) }}" />
+    <a href="{{ path('favorite_get', {'user_id': viewed_user.id, 'tags_ids_json' : '[]'}) }}" class="elements_more">
+      <div>
+       {{ 'more'|trans({}, 'userui') }}
+     </div>
+    </a>
   {% endif %}
   
   <input type="hidden" id="autoplay_url" value="{{ path('elements_get_filter_data_autoplay_favorite', {

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

@@ -1,7 +1,7 @@
 
 groups_own_list:
   pattern:  /my-groups
-  defaults: { _controller: MuzichGroupBundle:Default:myList }
+  defaults: { _controller: MuzichGroupBundle:Default:myList, topmenu: mygroups }
 
 group_add:
   pattern:   /my-groups/add

src/Muzich/GroupBundle/Resources/views/Default/edit.html.twig

@@ -1,18 +1,25 @@
 {% extends "MuzichGroupBundle::layout.html.twig" %}
 
 {% block title %}Edition du groupe {{ group.name }}{% endblock %}
+{% block mainbox_classes %}mainbox_padding{% endblock %}
 
 {% block content %}
 
-  <h2>Edition du groupe {{ group.name }}</h2>
+  <div id="group_add_box" style="">
 
-  <form name="{{ form_name }}" action="{{ path('group_update', { 'slug': group.slug }) }}" method="post" {{ form_enctype(form) }}>
-    
-    {% include "MuzichGroupBundle:Form:form.html.twig" %}
-
-    {{ form_widget(form.tags, { 'attr': {'class': 'tagBox_tags_ids'} }) }}
-    
-    <input type="submit" class="button" />
-  </form>
+    <h2>Edition du groupe {{ group.name }}</h2>
+  
+    <form class="nicelabels" name="{{ form_name }}" action="{{ path('group_update', { 'slug': group.slug }) }}" method="post" {{ form_enctype(form) }}>
+      
+      {% include "MuzichGroupBundle:Form:form.html.twig" %}
+  
+      {{ form_widget(form.tags, { 'attr': {'class': 'tagBox_tags_ids'} }) }}
+      
+      <div class="alignright">
+        <input type="submit" class="button" value="{{ 'group.form.submit'|trans({}, 'groups') }}" />
+      </div>
+    </form>
+  
+  </div>
 
 {% endblock %}

src/Muzich/GroupBundle/Resources/views/Default/myList.html.twig

@@ -1,13 +1,23 @@
 {% extends "MuzichGroupBundle::layout.html.twig" %}
 
 {% block title %}{{ 'my_groups.title'|trans({}, 'navigationui') }}{% endblock %}
+{% block mainbox_classes %}mainbox_padding{% endblock %}
 
 {% block content %}
 
-  <a href="#" id="group_add_link" class="button">
-    {{ 'group.add_group'|trans({}, 'navigationui') }} &gt;&gt;
-  </a>
-
+  <div class="top_tools">
+    
+    <a href="#" id="group_add_link" class="button gradient justtopright">
+      {{ 'group.add_group'|trans({}, 'navigationui') }}
+      <img src="{{ asset('/img/icon_dart_right_white.png') }}" alt="" />
+    </a>
+    <a href="#" id="group_add_close_link" class="button gradient justtopright" style="display: none;">
+      {{ 'group.add_group_box.close'|trans({}, 'navigationui') }}
+      <img src="{{ asset('/img/icon_dart_left_white.png') }}" alt="" />
+    </a>
+    
+  </div>
+  
   {% if groups|length %}
 
     {{ 'havegroups.sentence'|trans({}, 'groups') }}
@@ -36,17 +46,15 @@
 
   <div id="group_add_box" style="{% if not open_add_group %}display: none;{% endif %}">
 
-    <a href="#" id="group_add_close_link" class="button">
-      &lt;&lt; {{ 'group.add_group_box.close'|trans({}, 'navigationui') }}
-    </a>
-    
     <h2>{{ 'group.add_group'|trans({}, 'navigationui') }}</h2>
 
-    <form name="{{ form_new_name }}" action="{{ path('group_add') }}" method="post" {{ form_enctype(form_new) }}>
+    <form class="nicelabels" name="{{ form_new_name }}" action="{{ path('group_add') }}" method="post" {{ form_enctype(form_new) }}>
 
       {% include "MuzichGroupBundle:Form:form.html.twig" with { 'form': form_new, 'form_name': form_new_name } %}
 
-      <input type="submit" class="button" />
+      <div class="alignright">
+        <input type="submit" class="button" value="{{ 'group.form.submit'|trans({}, 'groups') }}" />
+      </div>
     </form>
   
   </div>

src/Muzich/GroupBundle/Resources/views/Form/form.html.twig

@@ -2,21 +2,21 @@
 
 {{ form_errors(form) }}
 
-<div class="field">
+<div class="field name">
   {{ form_errors(form.name) }}
   {{ form_label(form.name, 'name'|trans({}, 'groupform')) }}
-  {{ form_widget(form.name) }}
+  {{ form_widget(form.name, {'attr':{'class':'niceinput'}}) }}
 </div>
 
-<div class="field">
+<div class="field description">
   {{ form_errors(form.description) }}
   {{ form_label(form.description, 'description'|trans({}, 'groupform')) }}
-  {{ form_widget(form.description) }}
+  {{ form_widget(form.description, {'attr':{'class':'nicetextbox'}}) }}
 </div>
 
   <i>{{ 'openhelp'|trans({}, 'groupform') }}</i>
 
-<div class="field">
+<div class="field open">
   {{ form_errors(form.open) }}
   {{ form_label(form.open, 'open'|trans({}, 'groupform')) }}
   {{ form_widget(form.open) }}

src/Muzich/HomeBundle/Controller/ShowController.php

@@ -144,7 +144,7 @@ class ShowController extends Controller
     );
   }
   
-  public function getElementsAction($type, $object_id, $tags_ids_json, $id_limit = null, $invert = false)
+  public function getElementsAction($type, $object_id, $tags_ids_json, $id_limit = null)
   {
     if (($response = $this->mustBeConnected()))
     {
@@ -190,8 +190,7 @@ class ShowController extends Controller
     {
       $html = $this->render('MuzichCoreBundle:SearchElement:default.html.twig', array(
         'user'        => $this->getUser(),
-        'elements'    => $elements,
-        'invertcolor' => $invert
+        'elements'    => $elements
       ))->getContent();
     }
     

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

@@ -10,11 +10,11 @@ home_more:
   
 show_user:
   pattern: /user/{slug}
-  defaults: { _controller: MuzichHomeBundle:Show:showUser }
+  defaults: { _controller: MuzichHomeBundle:Show:showUser, topmenu: showuser }
   
 show_user_more:
   pattern: /user/{slug}/more/{count}
-  defaults: { _controller: MuzichHomeBundle:Show:showUser, count: null }
+  defaults: { _controller: MuzichHomeBundle:Show:showUser, count: null, topmenu: showgroup }
   
 show_group:
   pattern: /group/{slug}

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

@@ -24,7 +24,7 @@
     <div class="show_options">
       
       {% if his_group %}
-        <a class="button" href="{{ path('group_edit', { 'slug': group.slug }) }}" >
+        <a class="button darkbutton" href="{{ path('group_edit', { 'slug': group.slug }) }}" >
           {{ 'group.edit'|trans({}, 'groups') }}
         </a>
       {% endif %}

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

@@ -19,7 +19,7 @@
     {% endif %}
     
     <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 %}" >
@@ -31,6 +31,10 @@
         </a>
       {% endif %}
       
+      <a class="button darkbutton" href="{{ path('favorite_user_list', {'slug' : viewed_user.slug}) }}" >
+        {{ 'user.view_favorites'|trans({}, 'users') }}
+      </a>
+      
     </div>
     
     <h1>{{ 'user.show.title'|trans({'%name%' : viewed_user.name}, 'users') }}</h1>

src/Muzich/IndexBundle/Resources/views/Index/index.html.twig

@@ -1,32 +1,28 @@
 {% extends "MuzichIndexBundle::layout.html.twig" %}
 
 {% block title %}{{ 'title.hello'|trans({}, 'navigationui') }}{% endblock %}
+{% block mainbox_classes %}mainbox_margintop mainbox_padding{% endblock %}
 
 {% block content %}
     
-  <div class="hello">
-
+    <a href="#" id="registration_link" class="button gradient">
+      {{ 'registration.display'|trans({}, 'navigationui') }}
+      <img src="{{ asset('/img/icon_dart_right_white.png') }}" alt="" />
+    </a>
+    <a href="#" id="login_link" class="button gradient" style="display: none;">
+      {{ 'login.display'|trans({}, 'navigationui') }}
+      <img src="{{ asset('/img/icon_dart_left_white.png') }}" alt="" />
+    </a>
+    
     <div id="login_box" style="{% if registration_page is defined %}display: none;{% endif %}">
       {% include "MuzichUserBundle:Security:login.html.twig" %}
-        
-      <a href="#" id="registration_link">
-        {{ 'registration.display'|trans({}, 'navigationui') }} &gt;&gt;
-      </a>
     </div>
     
     <div id="registration_box" style="{% if registration_page is not defined %}display: none;{% endif %}">
-      
+      <h1>{{ 'register.title'|trans({}, 'userui') }}</h1>
       <span class="sinfo">{{ 'index.beta.warning'|trans({}, 'userui') }}</span>
-
       {% include "MuzichUserBundle:Registration:register.html.twig" %}
-        
-      <a href="#" id="login_link">
-        &lt;&lt; {{ 'login.display'|trans({}, 'navigationui') }}
-      </a>
     </div>
     
-  </div>
-    
-    
 {% endblock %}
 

src/Muzich/UserBundle/Controller/EventController.php

@@ -53,30 +53,23 @@ class EventController extends Controller
     // A partir d'ici on a ce qu'il faut.
     // On modifie l'Element Searcher en lui donnat les ids correspondant a l'event
     
-    $es = $this->getElementSearcher();
+    $user = $this->getUser();
+    $es = $this->getNewElementSearcher();
+    $es->setNoTags();
     $es->setIds($event->getIds());
     $es->setIdsDisplay($event->getType());
-    $this->setElementSearcherParams($es->getParams());
-    $this->getDoctrine()->getEntityManager()->remove($event);
-    $this->getDoctrine()->getEntityManager()->flush();
     
-    // Si ajax
-    if ($this->getRequest()->isXmlHttpRequest())
-    {
-      $html = $this->render('MuzichCoreBundle:SearchElement:default.html.twig', array(
-        'user'        => $this->getUser(),
-        'elements'    => $es->getElements($this->getDoctrine(), $this->getUserId()),
-        'invertcolor' => false
-      ))->getContent();
-      
-      return $this->jsonResponse(array(
-        'status'  => 'success',
-        'html'    => $html
-      ));
-    }
+    $this->setElementSearcherParams($es->getParams(), $user->getPersonalHash($event->getId()));
+    //$this->getDoctrine()->getEntityManager()->remove($event);
+    //$this->getDoctrine()->getEntityManager()->flush();
+        
+    $elements = $es->getElements($this->getDoctrine(), $this->getUserId());
     
-    // Sinon on redirige vers home
-    return $this->redirect($this->generateUrl('home'));
+    return $this->render('MuzichUserBundle:Event:elements.html.twig', array(
+      'elements'        => $elements,
+      'last_element_id' => $elements[count($elements)-1]->getId(),
+      'event'           => $event
+    ));
   }
-    
+  
 }

src/Muzich/UserBundle/Resources/views/Event/elements.html.twig

@@ -0,0 +1,47 @@
+{% extends "MuzichHomeBundle::layout.html.twig" %}
+
+{% block title %}TODO{% endblock %}
+{% block mainbox_classes %}mainbox_nopadding{% endblock %}
+
+{% block content %}
+
+  <div class="top_tools">
+    
+    {% if event.type == event_const('TYPE_COMMENT_ADDED_ELEMENT') %}
+      
+      <h1>{{ 'events.view.title.comments'|trans({}, 'userui') }}</h1>
+      
+    {% endif %}
+    {% if event.type == event_const('TYPE_FAV_ADDED_ELEMENT') %}
+      
+      <h1>{{ 'events.view.title.nvxfav'|trans({}, 'userui') }}</h1>
+      
+    {% endif %}
+    {% if event.type == event_const('TYPE_TAGS_PROPOSED') %}
+      
+      <h1>{{ 'events.view.title.tagsprop'|trans({}, 'userui') }}</h1>
+      
+    {% endif %}
+    
+  </div>
+
+  <div class="elements_loader_div">
+    <img class="elements_new_loader" style="display: none;" src="{{ asset('/bundles/muzichcore/img/ajax-loader.gif') }}" alt="loading" />
+  </div>
+
+  {% include "MuzichCoreBundle:SearchElement:default.html.twig" with {
+    'noelements_filter' : true 
+  }%}
+    
+  {% include "MuzichCoreBundle:SearchElement:more_button.html.twig" with {
+    'display_more_button' : true,
+    'elements_length'     : elements|length,
+    'more_path'           : 'search_elements_more',
+    'more_path_params'    : {
+      'session_id' : app.user.getPersonalHash(app.request.get('event_id')),
+      'id_limit'   : last_element_id
+    },
+    'link_class'          : 'event_view'
+  }%}
+  
+{% endblock %}

src/Muzich/UserBundle/Resources/views/Registration/register.html.twig

@@ -1,7 +1,7 @@
 <div class="register">
   <form action="{{ path('register') }}" {{ form_enctype(form) }} 
     method="POST" 
-    class="fos_user_registration_register"
+    class="fos_user_registration_register nicelabels"
   >
         
     {% form_theme form 'MuzichCoreBundle:Form:errors.html.twig' %}
@@ -19,25 +19,25 @@
     <div class="field">
       {{ form_errors(form.username) }}
       {{ form_label(form.username, 'username'|trans({}, 'userform')) }}
-      {{ form_widget(form.username) }}
+      {{ form_widget(form.username, {'attr':{'class':'niceinput'}}) }}
     </div>   
         
     <div class="field">
       {{ form_errors(form.email) }}
       {{ form_label(form.email, 'email'|trans({}, 'userform')) }}
-      {{ form_widget(form.email) }}
+      {{ form_widget(form.email, {'attr':{'class':'niceinput'}}) }}
     </div> 
     
     <div class="field">
       {{ form_errors(form.plainPassword.first) }}
       {{ form_label(form.plainPassword.first, 'password.first'|trans({}, 'userform')) }}
-      {{ form_widget(form.plainPassword.first) }}
+      {{ form_widget(form.plainPassword.first, {'attr':{'class':'niceinput'}}) }}
     </div> 
     
     <div class="field">
       {{ form_errors(form.plainPassword.second) }}
       {{ form_label(form.plainPassword.second, 'password.second'|trans({}, 'userform')) }}
-      {{ form_widget(form.plainPassword.second) }}
+      {{ form_widget(form.plainPassword.second, {'attr':{'class':'niceinput'}}) }}
     </div> 
     
     <span class="help">{{ 'help.token'|trans({}, 'userform') }}</span>
@@ -45,13 +45,13 @@
     <div class="field">
       {{ form_errors(form.token) }}
       {{ form_label(form.token, 'token'|trans({}, 'userform')) }}
-      {{ form_widget(form.token) }}
+      {{ form_widget(form.token, {'attr':{'class':'niceinput'}}) }}
     </div> 
 
     {{ form_rest(form) }}
     
-    <div>
-        <input type="submit" class="button" value="{{ 'registration.submit'|trans({}, 'FOSUserBundle') }}" />
+    <div class="alignright">
+        <input type="submit" class="button" value="{{ 'registration.submit'|trans({}, 'userui') }}" />
     </div>
   </form>
 </div>

src/Muzich/UserBundle/Resources/views/Security/login.html.twig

@@ -4,18 +4,24 @@
   {% endif %}
 
   <form action="{{ path("fos_user_security_check") }}" method="post">
-      <label for="username">{{ 'security.login.username'|trans({}, 'FOSUserBundle') }}</label>
-      <input type="text" id="username" name="_username" value="{{ last_username }}" />
+    
+      <input type="text" id="username" name="_username" value="{{ last_username }}"
+        class="niceinput"
+        placeholder="{{ 'security.login.username'|trans({}, 'userui') }}"
+      />
 
-      <label for="password">{{ 'security.login.password'|trans({}, 'FOSUserBundle') }}</label>
-      <input type="password" id="password" name="_password" />
-
-      <br />
-      <input type="checkbox" id="remember_me" name="_remember_me" value="on" />
-      <label for="remember_me">{{ 'login.remember_me.label'|trans({}, 'userui') }}</label>
+      <input type="password" id="password" name="_password"
+        class="niceinput"
+        placeholder="{{ 'security.login.password'|trans({}, 'userui') }}""
+      />
 
       <input type="submit" class="button" id="_submit" name="_submit" value="{{ 'security.login.submit'|trans({}, 'FOSUserBundle') }}" />
+      
+      <div class="textcenter">
+        <input type="checkbox" id="remember_me" name="_remember_me" value="on" />
+        <label for="remember_me">{{ 'login.remember_me.label'|trans({}, 'userui') }}</label>
+        - <a href="{{ path('fos_user_resetting_request') }}">{{ 'connexion.password_lost'|trans({}, 'userui') }}</a>
+      </div>
+
   </form>
 </div>
-
-<a href="{{ path('fos_user_resetting_request') }}">{{ 'connexion.password_lost'|trans({}, 'userui') }}</a>

src/Muzich/UserBundle/Resources/views/User/account.html.twig

@@ -1,6 +1,7 @@
 {% extends "MuzichUserBundle::layout.html.twig" %}
 
 {% block title %}Mon compte{% endblock %}
+{% block mainbox_classes %}mainbox_padding{% endblock %}
 
 {% block content %}
 

src/Muzich/UserBundle/Resources/views/User/start.html.twig

@@ -1,13 +1,14 @@
 {% extends "MuzichUserBundle::layout.html.twig" %}
 
 {% block title %}{{ 'start.title'|trans([], 'userui') }}{% endblock %}
+{% block mainbox_classes %}mainbox_padding mainbox_start{% endblock %}
 
 {% block content %}
 
-  <h2>{{ 'start.titleh2'|trans([], 'userui') }}</h2>
+  <h1>{{ 'start.titleh2'|trans([], 'userui') }}</h1>
   
   <p>
-    {{ 'start.description'|trans([], 'userui') }}</h2>
+    {{ 'start.description'|trans([], 'userui') }}
   </p>
   
   <h3>{{ 'start.tags.title'|trans([], 'userui') }}</h3>

web/bundles/muzichcore/css/old.css

@@ -5,7 +5,7 @@
 }*/
 
 
-#container
+/*#container
 {
   text-align: left;
   position: relative;
@@ -50,7 +50,7 @@
 #container h4
 {
   
-}
+}*/
 
 div.clearboth
 {
@@ -84,18 +84,18 @@ input.button, button.button {
   background-color: #39C9CC;
 }*/
 
-#container a, #autoplay a
+/*#container a, #autoplay a
 {
   text-decoration: none;
   color: #00d0de;
-}
+}*/
 
 #autoplay div.jp-audio a
 {
   color: black;
 }
 
-#container a.button, #autoplay a.button
+/*#container a.button, #autoplay a.button
 {
   color: white;
 }
@@ -132,7 +132,7 @@ input.button, button.button {
   border-radius: 5px 5px 0px 0px;
   -moz-border-radius: 5px 5px 0px 0px;
   -webkit-border-radius: 5px 5px 0px 0px;
-}
+}*/
 
 /* Noscript */
 div#noscript_warning
@@ -184,7 +184,7 @@ div#noscript_warning
   background-color: white;
 }
 
-#container #top-tabs li.active, .top-tabs-right ul.active, .top-tabs-right ul.active li
+/*#container #top-tabs li.active, .top-tabs-right ul.active, .top-tabs-right ul.active li
 {
   background-color: white;
 }
@@ -193,7 +193,7 @@ div#noscript_warning
 {
   text-decoration: none;
   color: black;
-}
+}*/
 
 .top-tabs-right
 {
@@ -547,10 +547,10 @@ background-position: 7px;
   left: 483px;
 }*/
 
-#container li.element a.favorite_link:hover, #autoplay li.element a.favorite_link:hover
+/*#container li.element a.favorite_link:hover, #autoplay li.element a.favorite_link:hover
 {
   text-decoration: none;
-}
+}*/
 
 li.element a.element_open
 {
@@ -590,10 +590,10 @@ li.element img.element_thumbnail
   height: 90px;
 }
 
-#container li.element span.element_name a, #autoplay li.element span.element_name a
+/*#container li.element span.element_name a, #autoplay li.element span.element_name a
 {
   color: black;
-}
+}*/
 
 li.element img.play, li.element img.open
 {
@@ -1004,10 +1004,10 @@ position: absolute;
 
 /* END POPIN BLOCK */
 
-#container a.element_edit_link
+/*#container a.element_edit_link
 {
   text-decoration: none;
-}
+}*/
 
 div.display_more_elements
 {
@@ -1307,7 +1307,7 @@ ul#favorite_tags a.button.highlight
   color: blue;
 }
 
-div#add_url_title
+/*div#add_url_title
 {
   width: 510px;
   font-weight: bold;
@@ -1315,7 +1315,7 @@ div#add_url_title
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
-}
+}*/
 
 div#autoplay
 {

web/bundles/muzichcore/js/muzich.js

@@ -292,9 +292,9 @@ $(document).ready(function(){
       $(this).parent('li').addClass('selected');
     }
     
-    if ($('div#home_top_tools:visible').length)
+    if ($('div.top_tools:visible').length)
     {
-      $('div#home_top_tools').slideUp();
+      $('div.top_tools').slideUp();
     }
     
     // On initialise la liste de tags déjà ajouté
@@ -314,9 +314,9 @@ $(document).ready(function(){
     $(this).parents('ul#tabs_tag_search_buttons').find('li').removeClass('selected');
     $(this).parent('li').addClass('selected');
     
-    if ($('div#home_top_tools:visible').length == 0)
+    if ($('div.top_tools:visible').length == 0)
     {
-      $('div#home_top_tools').slideDown();
+      $('div.top_tools').slideDown();
     }
     
     var form = $('form[name="search"]');
@@ -357,9 +357,9 @@ $(document).ready(function(){
       {
         $('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)
+        if (!$('div.top_tools:visible').length)
         {
-          $('div#home_top_tools').slideDown();
+          $('div.top_tools').slideDown();
         }
       }
       
@@ -517,30 +517,41 @@ $(document).ready(function(){
    // Plus d'éléments
    var last_id = null;
    $('a.elements_more').click(function(){
-     var link = $(this);
-     var last_element = $('ul.elements li.element:last-child');
-     var id_last = str_replace('element_', '', last_element.attr('id'));
-     var invertcolor = 0;
-     if (last_element.hasClass('even'))
-     {
-       invertcolor = 1;
-     }
-     $('img.elements_more_loader').show();
-     
-     var url = link.attr('href')+'/'+id_last+'/'+invertcolor;
-     // Cas exeptionel si on se trouve sur la global_search
-     if ($('div#results_search_form').length)
-     {
-       url = link.attr('href')+id_last+'/'+$('div#results_search_form form input[type="text"]').val();
-     }
-     
-     var old_form_action = $('form[name="search"]').attr('action');
-     $('form[name="search"]').attr('action', url);
+    
+    $('img.elements_more_loader').show();
+    // On fait un cas isolé (pour l'instant!!)
+    if (!$(this).hasClass('event_view'))
+    {
+      var link = $(this);
+      var last_element = $('ul.elements li.element:last-child');
+      var id_last = str_replace('element_', '', last_element.attr('id'));
+      
+      
+      var url = link.attr('href')+'/'+id_last;
+      // Cas exeptionel si on se trouve sur la global_search
+      if ($('div#results_search_form').length)
+      {
+        url = link.attr('href')+id_last+'/'+$('div#results_search_form form input[type="text"]').val();
+      }
+      
+      var old_form_action = $('form[name="search"]').attr('action');
+      $('form[name="search"]').attr('action', url);
+      
+      var data = $('form[name="search"]').serialize();
+      var type = 'POST';
+    }
+    else
+    {
+      var link = $(this);
+      var url = $(this).attr('href');
+      var data = {};
+      var type = 'GET';
+    }
          
      $.ajax({
-       type: 'POST',
+       type: type,
        url: url,
-       data: $('form[name="search"]').serialize(),
+       data: data,
        success: function(response) {
           if (response.status == 'mustbeconnected')
            {
@@ -552,8 +563,13 @@ $(document).ready(function(){
             $('ul.elements').append(response.html);
             $('img.elements_more_loader').hide();
             recolorize_element_list();
+            
+            if (link.hasClass('event_view'))
+            {
+              link.attr('href', response.data.more_link_href);
+            }
           }
-
+          
           if (response.end || response.count < 1)
           {
             $('img.elements_more_loader').hide();
@@ -564,32 +580,12 @@ $(document).ready(function(){
         },
        dataType: "json"
      });
-         
-     $('form[name="search"]').attr('action', old_form_action);
      
-//     $.getJSON(url, function(response) {
-//       if (response.status == 'mustbeconnected')
-//        {
-//          $(location).attr('href', url_index);
-//        }
-//       
-//       if (response.count)
-//       {
-//         $('ul.elements').append(response.html);
-//         $('img.elements_more_loader').hide();
-//         recolorize_element_list();
-//       }
-//       
-//       if (response.end || response.count < 1)
-//       {
-//         $('img.elements_more_loader').hide();
-//         $('ul.elements').after('<div class="no_elements"><p class="no-elements">'+
-//           response.message+'</p></div>');
-//         link.hide();
-//       }
-//     });
-
-     return false;
+     if (!$(this).hasClass('event_view'))
+    {
+      $('form[name="search"]').attr('action', old_form_action);
+    }
+    return false;
    });
    
   tag_box_input_value = $('ul.tagbox input[type="text"]').val();
@@ -1177,7 +1173,7 @@ $(document).ready(function(){
       {
         if ($('a#tabs_tag_search_with_tags').parent('li').hasClass('selected'))
         {
-          $('div#home_top_tools').slideDown();
+          $('div.top_tools').slideDown();
         }
       }
       remove_tags('add');
@@ -2439,6 +2435,38 @@ $(document).ready(function(){
     }
     
   });
+  
+  /* Click sur le bouton de recherche des champs de recherches */
+  $('div.seachboxcontainer a.global_search_link').click(function(){
+    $(this).parents('div.seachboxcontainer').find('form').submit();
+  });
+  
+  /* Ouverture des menus deroulants */
+  $('ul.secondarymenu a.top_menu_link').click(function(){
+    
+    if ($(this).parents('li.top_menu_element').hasClass('close'))
+    {
+      $(this).parents('li.top_menu_element').find('ul.submenu').hide();
+      $(this).parents('li.top_menu_element').removeClass('close');
+      $(this).parents('li.top_menu_element').addClass('open');
+      $(this).parents('li.top_menu_element').find('ul.submenu').slideDown();
+    }
+    else
+    {
+      $(this).parents('li.top_menu_element').removeClass('open');
+      $(this).parents('li.top_menu_element').addClass('close');
+    }
+    
+    return false;
+  });
+
+  $('div#secondarymenu ul.submenu').each(function(){
+    if ($(this).find('li').length > 7)
+    {
+      $(this).css('overflow', 'auto');
+      $(this).css('height', '283px');
+    }
+  });
 
 });
 

web/bundles/muzichgroups/css/groups.css

@@ -5,8 +5,8 @@
   float: right;
 }
 
-#container #group_add_box
+/*#container #group_add_box
 {
   background-color: #e3f6fd;
   padding: 20px;
-}
+}*/

web/bundles/muzichgroups/js/groups.js

@@ -1,9 +1,9 @@
 $(document).ready(function(){
-   
    // Ouverture de la zone "ajouter un group""
    $('#group_add_link').click(function(){
      $('#group_add_box').slideDown("slow");
      $('#group_add_link').hide();
+     $('#group_add_close_link').show();
      return false;
    });   
    
@@ -11,7 +11,7 @@ $(document).ready(function(){
    $('#group_add_close_link').click(function(){
      $('#group_add_box').slideUp("slow");
      $('#group_add_link').show();
+     $(this).hide();
      return false;
-   }); 
-   
+   });
  });

web/bundles/muzichhome/css/home.css

@@ -16,7 +16,7 @@ div.show_options
   text-align: center;
 }
 
-#container a.following
+/*#container a.following
 {
   background: -moz-linear-gradient(top, #08ec00 0%, #10d400 39%, #0a9800 100%);
   background: -webkit-linear-gradient(top, #08ec00 0%, #10d400 39%, #0a9800 100%);
@@ -40,20 +40,20 @@ div.show_options
 
   border: 1px solid #bf0a00;
   text-decoration: none;
-}
+}*/
 
-#container #element_add_link, #container #element_add_close_link
+/*#container #element_add_link, #container #element_add_close_link
 {
   color: white;
   font-size: 120%;
   float: right;
-}
+}*/
 
-#container #element_add_box
+/*#container #element_add_box
 {
   background-color: #e3f6fd;
   padding: 20px;
-}
+}*/
 
 #container div.select_network a
 {

web/bundles/muzichhome/js/home.js

@@ -7,7 +7,7 @@ $(document).ready(function(){
      $('#element_add_close_link').show();
      if ($('a#tabs_tag_search_with_tags').parent('li').hasClass('selected'))
      {
-       $('div#home_top_tools').slideUp();
+       $('div.top_tools').slideUp();
      }
      // Au cas ou firefox garde la valeur step 2:
         $('input#form_add_step').val('1');
@@ -23,7 +23,7 @@ $(document).ready(function(){
      
      if ($('a#tabs_tag_search_with_tags').parent('li').hasClass('selected'))
      {
-       $('div#home_top_tools').slideDown();
+       $('div.top_tools').slideDown();
      }
      
      //form_add_reinit();

web/bundles/muzichindex/css/index.css

@@ -17,11 +17,11 @@
 
 #login_box input[id="username"], #login_box input[id="password"]
 {
-  width: 100px;
+  width: 230px;
 }
 
-#registration_link, #login_link
+/*#registration_link, #login_link
 {
   float: right;
   font-size: 120%;
-}
+}*/

web/bundles/muzichindex/js/index.js

@@ -3,12 +3,16 @@ $(document).ready(function(){
    $('#registration_link').click(function(){
      $('#registration_box').slideDown("slow");
      $('#login_box').slideUp("slow");
+     $(this).hide();
+     $('#login_link').show();
      return false;
    });
    
    $('#login_link').click(function(){
      $('#login_box').slideDown("slow");
      $('#registration_box').slideUp("slow");
+     $('#registration_link').show();
+     $(this).hide();
      return false;
    });
    

web/css/main.css

@@ -9,6 +9,11 @@ body a
   color: #B80C1A;
 }
 
+html, body
+{
+  height:100%;
+}
+
 body a:visited
 {
   text-decoration: none;
@@ -20,6 +25,12 @@ body a img
   text-decoration: none;
 }
 
+div#container
+{
+  position : relative;
+  min-height: 100%;
+}
+
 header#header
 {
   height: 80px;
@@ -84,9 +95,14 @@ header#header hgroup
 {
   background-image: url("/img/header_menu_separator.png");
   background-repeat: no-repeat;
-  width: 3px;
-  padding-left: 1px;
-  padding-right: 1px;
+  width: 5px;
+  padding-left: 0px;
+  padding-right: 0px;
+}
+
+#header_menu li.separator:hover
+{
+  background: none;
 }
 
 #register_and_login
@@ -137,18 +153,17 @@ header#header hgroup
   border-bottom-right-radius: 5px;
 }
 
-#parameters
+/*#parameters
 {
   float: right;
   border-right-width: 0;
   margin-bottom: 0;
-  margin-left: -58px;
-  margin-right: 10px;
-  margin-top: 5px;
-  padding: 0px
-}
+  margin-left: 0;
+  margin-right: 0;
+  margin-top: 8px;
+}*/
 
-#parameters li
+/*#parameters li
 {
   float: left;
   display: inline;
@@ -160,20 +175,61 @@ header#header hgroup
   display: inline;
   font-size: 80%;
   font-weight: bold;
+}*/
+
+div#languages
+{
+  float: right;
+  height: 16px;
+  overflow: hidden;
+  padding: 2px;
+  text-align: center;
+  width: 15px;
+  position: absolute;
+  margin-left: 945px;
+  margin-top: 7px;
+  -moz-border-radius: 3px;
+  -webkit-border-radius: 3px;
+  -khtml-border-radius: 3px;
+  border-radius: 3px;
+}
+
+div#languages a
+{
+  color: white;
+  font-weight: bold;
+  font-size: 11px;
 }
 
-#parameters li a.languages
+div#languages:hover
 {
-  padding-right: 3px;
-  padding-top: 4px;
+  height: auto;
+  background: #474747; /* Old browsers */
+  /* IE9 SVG, needs conditional override of 'filter' to 'none' */
+  background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzQ3NDc0NyIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjAlIiBzdG9wLWNvbG9yPSIjNDc0NzQ3IiBzdG9wLW9wYWNpdHk9IjEiLz4KICAgIDxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzIxMjEyMSIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiMyMTIxMjEiIHN0b3Atb3BhY2l0eT0iMSIvPgogIDwvbGluZWFyR3JhZGllbnQ+CiAgPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNncmFkLXVjZ2ctZ2VuZXJhdGVkKSIgLz4KPC9zdmc+);
+  background: -moz-linear-gradient(top,  #474747 0%, #474747 0%, #212121 100%, #212121 100%); /* FF3.6+ */
+  background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#474747), color-stop(0%,#474747), color-stop(100%,#212121), color-stop(100%,#212121)); /* Chrome,Safari4+ */
+  background: -webkit-linear-gradient(top,  #474747 0%,#474747 0%,#212121 100%,#212121 100%); /* Chrome10+,Safari5.1+ */
+  background: -o-linear-gradient(top,  #474747 0%,#474747 0%,#212121 100%,#212121 100%); /* Opera 11.10+ */
+  background: -ms-linear-gradient(top,  #474747 0%,#474747 0%,#212121 100%,#212121 100%); /* IE10+ */
+  background: linear-gradient(to bottom,  #474747 0%,#474747 0%,#212121 100%,#212121 100%); /* W3C */
+  filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#474747', endColorstr='#212121',GradientType=0 ); /* IE6-8 */
 }
 
+
 #content
 {
   display: table;
   width: 980px;
   margin-right: auto;
   margin-left: auto;
+  padding-bottom: 135px;
+}
+
+#main_content
+{
+  position: relative;
+  min-height: 100%;
 }
 
 #main
@@ -200,6 +256,11 @@ header#header hgroup
   padding: 0px;
 }
 
+#mainbox.mainbox_padding
+{
+  padding: 10px;
+}
+
 #mainbox h1
 {
   margin-top: 10px;
@@ -882,7 +943,7 @@ ul#favorite_tags li
   margin-right: 0px;
 }
 
-#element_add_link, #element_add_close_link
+#element_add_link, #element_add_close_link, #group_add_link, #group_add_close_link, #registration_link, #login_link
 {
   float: right;
   margin-top: -58px;
@@ -903,13 +964,19 @@ ul#favorite_tags li
 
 }
 
-#element_add_link img, #element_add_close_link img
+#registration_link, #login_link
+{
+  margin-right: -10px;
+  margin-top: -68px;
+}
+
+#element_add_link img, #element_add_close_link img, #group_add_link img, #group_add_close_link img, #registration_link img, #login_link img
 {
   margin-bottom: -5px;
     margin-right: -5px;
 }
 
-#element_add_link.justtopright, #element_add_close_link.justtopright
+#element_add_link.justtopright, #element_add_close_link.justtopright, #group_add_link.justtopright, #group_add_close_link.justtopright
 {
   margin-top: 0px;
   margin-right: 0px;
@@ -953,6 +1020,20 @@ form[name="search"] input[type="submit"]
   padding-right: 10px;
 }
 
+.nicetextbox
+{
+  -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;
+  border: medium none;
+  padding: 10px;
+  padding-right: 10px;
+}
+
 input:-moz-placeholder, textarea:-moz-placeholder {
   color: black;
 }
@@ -1047,7 +1128,7 @@ div#form_add_second_part table td
 div#form_add_second_part input[type="submit"]
 {
   float: right;
-  margin-top: -10px;
+  margin-top: -25px;
 }
 
 div#footer
@@ -1058,6 +1139,8 @@ div#footer
   border-top: 4px solid #E51936;
   background-color: #171717;
   text-align: center;
+  position: absolute;
+  bottom:0;
 }
 
 div#footer_content
@@ -1172,7 +1255,7 @@ div.search_tag_list span.info
 
 #container ul.search_tag_list li a
 {
-  color: black;
+  color: #E7E7E7;
 }
 
 #container ul.search_tag_list li a:hover
@@ -1322,6 +1405,16 @@ ul#favorite_tags li a.active
   color: #999999;
 }
 
+ul#favorite_tags li a.highlight
+{
+  color: #E51936;
+}
+
+ul#favorite_tags li a.highlight.active
+{
+  color: #999999;
+}
+
 input#element_add_name
 {
   width: 450px;
@@ -1346,3 +1439,91 @@ div.top_tools div.show_options
   float: right;
   padding: 10px;
 }
+
+div.show_options a
+{
+  color: white;
+}
+
+.nicelabels label
+{
+  display: block;
+  float: left;
+  font-size: 16px;
+  font-weight: bold;
+  padding-top: 6px;
+  width: 100px;
+}
+
+div#group_add_box label
+{
+  width: 110px;
+}
+
+div#group_add_box input#group_name
+{
+  width: 488px;
+}
+
+div#group_add_box textarea#group_description
+{
+  width: 487px;
+  height: 85px;
+}
+
+div#group_add_box input.tag_prompt
+{
+  width: 96%;
+}
+
+div.alignright
+{
+  text-align: right;
+}
+
+div#group_add_box input[type="submit"]
+{
+  margin-top: 10px;
+}
+
+div#registration_box input.niceinput
+{
+  width: 430px;
+}
+
+div#registration_box label
+{
+  width: 170px;
+}
+
+div#registration_box div.field
+{
+  margin-bottom: 5px;
+}
+
+.mainbox_start input.tag_prompt
+{
+  width: 96%;
+}
+
+.mainbox_start input[type="submit"]
+{
+  float: right;
+  margin-right: 7px;
+  margin-top: 10px;
+}
+
+div.global_search_results
+{
+  margin-top: 10px;
+}
+
+div#add_url_title, div.element_title
+{
+  width: 510px;
+  font-weight: bold;
+  font-size: 15px;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}