Premiere phase de reorganisation du code.

src/Muzich/AdminBundle/Resources/views/Moderate/layout.html.twig

@@ -1,7 +1,7 @@
 {% extends 'MuzichCoreBundle::layout.html.twig' %}
 
 {% block css %}
-	<link href="{{ asset('bundles/muzichmoderate/css/moderate.css') }}" rel="stylesheet" media="screen" type="text/css" />
+  <link href="{{ asset('bundles/muzichmoderate/css/moderate.css') }}" rel="stylesheet" media="screen" type="text/css" />
 {% endblock %}
 {% block js %}
   <script src="{{ asset('bundles/muzichmoderate/js/moderate.js') }}" type="text/javascript"></script>
@@ -9,8 +9,6 @@
 
 {% block main_content %}
   
-  {% include "MuzichCoreBundle:Menu:containerMenu.html.twig" with { 'active': null } %}
-  
   {% block content %}{% endblock %}
   
 {% endblock %}

src/Muzich/CoreBundle/Controller/SearchController.php

@@ -214,12 +214,13 @@ class SearchController extends Controller
     
     $elements = $search->getElements($this->getDoctrine(), $this->getUserId());
       
-    return $this->searchElementsMore($elements, false,
+    return $this->searchElementsMore($elements,
       $this->trans(
         'elements.ajax.more.noelements', 
         array(), 
         'elements'
-      )
+      ),
+      null
     );
   }
     

src/Muzich/CoreBundle/Resources/views/Autoplay/autoplay.html.twig

@@ -0,0 +1,72 @@
+<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>

src/Muzich/CoreBundle/Resources/views/Component/element_add_box.html.twig

@@ -0,0 +1,45 @@
+{% if box_title is not defined %}
+  {% set box_title = '' %}
+{% endif %}
+{% if group_slug is not defined %}
+  {% set group_slug = '' %}
+{% endif %}
+{% if show_add_to_group is not defined %}
+  {% set show_add_to_group = true %}
+{% endif %}
+
+{% if not group_slug %}
+  {% set form_action = path('element_add') %}
+{% else %}
+  {% set form_action = path('element_add', {'group_slug' : group_slug}) %}
+{% endif %}
+
+<div id="element_add_box" style="display: none;">
+  
+  {% if box_title %}
+    <h2>{{ box_title }}</h2>
+  {% endif %}
+  
+  {% if group_slug %}
+    <input type="hidden" id="add_element_group_page" value="{{ group_slug }}" />
+  {% endif %}
+  
+  <form novalidate name="{{ add_form_name }}" 
+    {% if  app.environment != 'test' %}
+      action="{{ path('element_retrieve_api_datas') }}" method="post" {{ form_enctype(add_form) }}
+    {% else %}
+      action="{{ form_action }}" method="post" {{ form_enctype(add_form) }}
+    {% endif %}
+  >
+  
+    {% include "MuzichCoreBundle:Element:form.add.html.twig" with { 
+      'form'          : add_form, 
+      'form_name'     : add_form_name
+    } %}
+  
+  </form>
+</div>
+
+{% if show_add_to_group %}
+  {% include 'MuzichCoreBundle:Component:element_added_to_group.html.twig' %}
+{% endif %}

src/Muzich/CoreBundle/Resources/views/Component/element_add_buttons.html.twig

@@ -0,0 +1,15 @@
+{% if add_class is not defined %}
+  {% set add_class = ''%}
+{% endif %}
+{% if close_class is not defined %}
+  {% set close_class = ''%}
+{% endif %}
+
+<a href="#" id="element_add_link" class="button gradient {{ add_class }}">
+  {{ '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 {{ close_class }}" style="display: none;">
+  {{ 'home.add_element_box.close'|trans({}, 'navigationui') }}
+  <img src="{{ asset('/img/icon_dart_left_white.png') }}" alt="" />
+</a>

src/Muzich/CoreBundle/Resources/views/Component/element_add_buttons_topright.html.twig

@@ -0,0 +1,4 @@
+{% include 'MuzichCoreBundle:Component:element_add_buttons.html.twig' with {
+  'add_class'   : 'justtopright',
+  'close_class' : 'justtopright',
+} %}

src/Muzich/CoreBundle/Resources/views/Component/element_added_to_group.html.twig

@@ -0,0 +1,12 @@
+<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>

src/Muzich/CoreBundle/Resources/views/Component/element_autoplay_button.html.twig

@@ -0,0 +1,4 @@
+<a href="{{ autoplay_path }}" class="button" id="autoplay_launch" 
+   title="{{ 'elements.autoplay.launch'|trans({}, 'elements') }}" >
+  <img src="{{ asset('/bundles/muzichcore/img/1353494305_player_play.png') }}" alt="" />
+</a>

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

@@ -49,11 +49,11 @@
           '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'
-        }%}
+        {% if display_more_button and results.elements|length %}
+          {% include "MuzichCoreBundle:SearchElement:more_button.html.twig" with {
+            'more_path'           : path('global_search_elements_empty')
+          }%}
+        {% endif %}
         
       {% endif %}
         

src/Muzich/CoreBundle/Resources/views/Layout/flash_messages.html.twig

@@ -0,0 +1,16 @@
+{% for key, flash in app.session.getFlashes() %}
+  <div class="{{ key }} message">
+    <a class="message-close" href="javascript:void(0);" title="fermer"><img alt="close" src="{{ asset('bundles/muzichcore/img/1317386146_cancel.png') }}" /></a>
+    <h3>{{ flash|trans({}, 'flash') }}</h3>
+  </div>
+
+  {% if key == 'success' %}
+  <script type="text/javascript" >
+    $(document).ready(function(){
+      window.setTimeout(function(){
+        $('div.success').slideUp();
+      }, 3000);
+    });
+  </script>
+  {% endif %}
+{% endfor %}

src/Muzich/CoreBundle/Resources/views/Layout/footer.html.twig

@@ -0,0 +1,11 @@
+<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>

src/Muzich/CoreBundle/Resources/views/Layout/head.html.twig

@@ -0,0 +1,9 @@
+<meta http-equiv="content-type" content="text/html;charset=utf-8" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="description" content="" />
+<meta name="keywords" content="" />
+<meta name="author" content="Bastien Sevajol" />
+<link href="apple-touch-icon.png" rel="apple-touch-icon" />
+
+{% include 'MuzichCoreBundle:Layout:head_css.html.twig' %}
+{% include 'MuzichCoreBundle:Layout:head_js.html.twig' %}

src/Muzich/CoreBundle/Resources/views/Layout/head_css.html.twig

@@ -0,0 +1,12 @@
+<link href="{{ asset('favicon.ico') }}" rel="icon" type="image/x-icon" />
+<link href="{{ asset('bundles/muzichcore/css/base.css') }}" rel="stylesheet" media="screen" type="text/css" />
+<link href="{{ asset('bundles/muzichcore/css/old.css') }}" rel="stylesheet" media="screen" type="text/css" />
+<link href="{{ asset('css/main.css') }}" rel="stylesheet" media="screen" type="text/css" />
+
+<!--[if gte IE 9]>
+  <style type="text/css">
+    .gradient, .button {
+       filter: none;
+    }
+  </style>
+<![endif]-->

src/Muzich/CoreBundle/Resources/views/Layout/head_js.html.twig

@@ -0,0 +1,72 @@
+
+{% if  app.environment != 'prod' %}  
+  <script src="{{ asset('js/jquery-1.8.2.dev.js') }}" type="text/javascript"></script>
+{% else %}
+  <script src="{{ asset('js/jquery-1.8.2.prod.js') }}" type="text/javascript"></script>
+{% endif %}
+<script src="{{ asset('js/jquery-ui-1.8.7.min.js') }}" type="text/javascript"></script>
+<script src="{{ asset('bundles/muzichcore/js/muzich.js') }}" type="text/javascript"></script>
+<script src="{{ asset('js/lib/TagPrompt.js') }}" type="text/javascript"></script>
+
+<script type="text/javascript" src="{{ asset('js/swfobject.js') }}"></script> 
+
+<script src="http://connect.soundcloud.com/sdk.js"></script>
+<script src="http://w.soundcloud.com/player/api.js"></script>
+
+<script src="{{ asset('bundles/muzichcore/js/autoplay.js') }}" type="text/javascript"></script>
+
+{# jPlayer #}
+<link href="{{ asset('jplayer/skin/blue.monday/jplayer.blue.monday.css') }}" rel="stylesheet" type="text/css" />
+<script type="text/javascript" src="{{ asset('jplayer/js/jquery.jplayer.min.js') }}"></script>
+<script type="text/javascript" src="{{ asset('jplayer/js/jplayer.playlist.min.js') }}"></script>
+
+<script src="{{ asset('js/tags/jquery.autoGrowInput.js') }}" type="text/javascript"></script>
+<script src="{{ asset('js/tags/jquery.tagBox.js') }}" type="text/javascript"></script>
+<script src="{{ asset('js/formdefault/jquery.formdefaults.js') }}" type="text/javascript"></script>
+<script src="{{ asset('js/jquery.form-2.14.js') }}" type="text/javascript"></script>
+<script src="{{ asset('js/jConfirmAction/jconfirmaction.jquery.js') }}" type="text/javascript"></script>
+<script type="text/javascript">
+  string_follow_stop = "{{ 'user.stop_follow'|trans({}, 'users') }}";
+  string_follow_following = "{{ 'user.following'|trans({}, 'users') }}";
+  string_follow_follow = "{{ 'user.follow'|trans({}, 'users') }}";
+  string_tag_add_title = "{{ 'tags.add.title'|trans({}, 'userui') }}";
+  string_tag_add_text = "{{ 'tags.add.text'|trans({}, 'userui') }}";
+  string_tag_add_argument = "{{ 'tags.add.argument'|trans({}, 'userui') }}";
+  string_tag_add_inputs_cancel = "{{ 'tags.add.inputs.cancel'|trans({}, 'userui') }}";
+  string_tag_add_inputs_submit = "{{ 'tags.add.inputs.submit'|trans({}, 'userui') }}";
+  string_element_delete_confirm_sentence = "{{ 'element.remove.confirm.sentence'|trans({}, 'elements') }}";
+  string_element_delete_confirm_yes = "{{ 'element.remove.confirm.yes'|trans({}, 'elements') }}";
+  string_element_delete_confirm_no = "{{ 'element.remove.confirm.no'|trans({}, 'elements') }}";
+  string_comment_delete_confirm_sentence = "{{ 'comment.remove.confirm.sentence'|trans({}, 'elements') }}";
+  string_comment_delete_confirm_yes = "{{ 'comment.remove.confirm.yes'|trans({}, 'elements') }}";
+  string_comment_delete_confirm_no = "{{ 'comment.remove.confirm.no'|trans({}, 'elements') }}";
+  string_tag_addtofav_confirm_sentence = "{{ 'element.tag.addtofav.confirm.sentence'|trans({}, 'elements') }}";
+  string_tag_addtofav_confirm_yes = "{{ 'element.tag.addtofav.confirm.yes'|trans({}, 'elements') }}";
+  string_tag_addtofav_confirm_no = "{{ 'element.tag.addtofav.confirm.no'|trans({}, 'elements') }}";
+  string_elementreport_confirm_sentence = "{{ 'element.report.confirm.sentence'|trans({}, 'userui') }}";
+  string_elementreport_confirm_yes = "{{ 'element.report.confirm.yes'|trans({}, 'userui') }}";
+  string_elementreport_confirm_no = "{{ 'element.report.confirm.no'|trans({}, 'userui') }}";
+  string_commentreport_confirm_sentence = "{{ 'comment.report.confirm.sentence'|trans({}, 'userui') }}";
+  string_commentreport_confirm_yes = "{{ 'comment.report.confirm.yes'|trans({}, 'userui') }}";
+  string_commentreport_confirm_no = "{{ 'comment.report.confirm.no'|trans({}, 'userui') }}";
+  string_elementreshare_confirm_sentence = "{{ 'element.reshare.confirm.sentence'|trans({}, 'userui') }}";
+  string_elementreshare_confirm_yes = "{{ 'element.reshare.confirm.yes'|trans({}, 'userui') }}";
+  string_elementreshare_confirm_no = "{{ 'element.reshare.confirm.no'|trans({}, 'userui') }}";
+  {% autoescape false %}
+  string_search_tag_title = "{{ 'search_tag.title'|trans({}, 'userui') }}";
+  {% endautoescape %}
+
+  url_index = "{{ path('index') }}";
+  url_search_tag = "{{ path('search_tag') }}";
+  url_get_favorites_tags = "{{ path('ajax_get_favorites_tags') }}";
+  url_add_tag = "{{ path('ajax_add_tag') }}";
+  url_element_new_count = "{{ path('element_new_count') }}";
+  url_element_new_get = "{{ path('element_new_get') }}";
+  url_global_search = "{{ path('global_search') }}";
+  url_datas_api = "{{ path('element_retrieve_api_datas') }}";
+  url_element_add = "{{ path('element_add') }}";
+  url_element_dom_get_one_autoplay = "{{ path('element_dom_get_one', {'type':'autoplay'}) }}";
+  url_element_get_stream_data = "{{ path('element_get_stream_data') }}";
+
+  url_img_ajax_loader = "{{ asset('/bundles/muzichcore/img/ajax-loader.gif') }}";
+</script>

src/Muzich/CoreBundle/Resources/views/Layout/header.html.twig

@@ -0,0 +1,21 @@
+<hgroup>
+  {% include "MuzichCoreBundle:Language:languages.html.twig" %}
+  
+  <!--<ul id="parameters"><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>
+  
+  {% include 'MuzichCoreBundle:Menu:access.html.twig' %}
+  
+  {% if app.user %}
+    {% include 'MuzichCoreBundle:Menu:main_menu.html.twig' %}
+  {% endif %}
+  
+</hgroup>

src/Muzich/CoreBundle/Resources/views/Layout/noscript.html.twig

@@ -0,0 +1,10 @@
+<noscript>
+  <div id="noscript_warning">
+    <p>
+      {{ 'noscript.message'|trans({}, 'messages') }}
+      <a href="{{ 'noscript.link_search'|trans({}, 'messages') }}" target="_blank">
+        {{ 'noscript.link_text'|trans({}, 'messages') }}
+      </a>
+    </p>
+  </div>
+</noscript>

src/Muzich/CoreBundle/Resources/views/Layout/side.html.twig

@@ -0,0 +1,16 @@
+{% 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>
+  
+  {#{% include 'MuzichCoreBundle:Layout:social.html.twig' %}#}
+  
+  {% render 'MuzichCoreBundle:Core:renderSideMenu' %}
+
+{% endif %}

src/Muzich/CoreBundle/Resources/views/Layout/social.html.twig

@@ -0,0 +1,19 @@
+<div id="social" class="nicebox">
+  <ul class="social_links">
+    <li>
+      <a href="" >
+        <img src="{{ asset('/img/icon_facebook.png') }}" alt="facebook" />
+      </a>
+    </li>
+    <li>
+      <a href="" >
+        <img src="{{ asset('/img/icon_twitter.png') }}" alt="twitter" />
+      </a>
+    </li>
+    <li>
+      <a href="" >
+        <img src="{{ asset('/img/icon_googleplus.png') }}" alt="google plus" />
+      </a>
+    </li>
+  </ul>
+</div>

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

@@ -0,0 +1,25 @@
+<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>

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

@@ -1,51 +0,0 @@
-<!--
-{% if is_granted("IS_AUTHENTICATED_REMEMBERED") %}
-
-  <ul id="top-tabs">
-    <li {% if active == 'public' %} class="active" {% endif %}>
-      <a href="{{ path('home') }}">
-        {{ 'container_menu.the_network'|trans({}, 'navigationui') }}
-      </a>
-    </li>
-    <li {% if active == 'private' %} class="active" {% endif %}>
-      <a href="{{ path('mynetwork_home') }}">
-        {{ 'container_menu.my_network'|trans({}, 'navigationui') }}
-      </a>
-    </li>
-    <li {% if active == 'needs-tags' %} class="active" {% endif %}>
-      <a href="{{ path('element_show_need_tags') }}">
-        {{ 'container_menu.need_tags'|trans({}, 'navigationui') }}
-      </a>
-    </li>
-  </ul>
-
-  <ul class="top-tabs-right">
-    <li {% if active == 'myfeeds' %} class="active" {% endif %}>
-      <a href="{{ path('show_user', {'slug': app.user.slug}) }}">
-        {{ 'container_menu.my_feeds'|trans({}, 'navigationui') }}
-      </a>
-    </li>
-    <li class="{% if active == 'mygroups' %}active{% endif %}">
-      <a href="{{ path('groups_own_list') }}" >
-        {{ 'network.mygroups'|trans({}, 'navigationui') }}
-      </a>
-    </li>
-    <li class="{% if active == 'myfavorites' %}active{% endif %}">
-      <a href="{{ path('favorites_my_list') }}" >
-        {{ 'container_menu.my_favorites'|trans({}, 'navigationui') }}
-      </a>
-    </li>
-  </ul>
-
-{% else %}
-
-  <ul id="top-tabs" >
-    <li class="active">
-      <a href="{{ path('index') }}">
-        {{ 'container_menu.return'|trans({}, 'navigationui') }}
-      </a>
-    </li>
-  </ul>
-
-{% endif %}
--->

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

@@ -0,0 +1,38 @@
+<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('mynetwork_home') }}" class="my_network" >
+      {{ 'filter.network_my'|trans({}, 'userui') }}
+    </a>
+  </li>
+  <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>
+  <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>
+  </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>

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

@@ -1,3 +1,16 @@
+{% if display_new_elements is not defined %}
+  {% set display_new_elements = false %}
+{% endif %}
+
+{% if display_new_elements %}
+  <div class="display_more_elements" style="display: none;">
+    <span></span>
+  </div>
+{% endif %}
+
+<div class="elements_loader_div">
+  <img class="elements_new_loader" style="display: none;" src="{{ asset('/bundles/muzichcore/img/ajax-loader.gif') }}" alt="loading" />
+</div>
 
 {% if elements|length %}
   {% if not app.request.isXmlHttpRequest %}<ul class="elements">{% endif %}
@@ -46,4 +59,8 @@
     {% endif %}
   </div>
 
-{% endif %}
+{% endif %}
+
+<div class="elements_loader_div">
+  <img class="elements_more_loader" style="display: none;" src="{{ asset('/bundles/muzichcore/img/ajax-loader.gif') }}" alt="loading" />
+</div>

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

@@ -1,19 +1,18 @@
-<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_path_params is not defined %}
-  {% set more_path_params = {} %}
-{% endif %}
-
 {% if link_class is not defined %}
   {% set link_class = '' %}
 {% endif %}
+{% if more_url_path is not defined %}
+  {% set more_url_path = '' %}
+{% endif %}
 
-{% if display_more_button and elements_length %} 
-  <a href="{{ path(more_path, more_path_params) }}" class="elements_more {{ link_class }}">
-    <div>
-      {{ 'more'|trans({}, 'userui') }}
-    </div>
-  </a>
-{% endif %}
+{% if more_url_path %}
+  <input type="hidden" id="more_elements_url" value="{{ more_url_path }}" />
+{% endif %}
+<a
+  href="{{ more_path }}"
+  class="elements_more {{ link_class }}"
+>
+  <div>
+    {{ 'more'|trans({}, 'userui') }}
+  </div>
+</a>

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

@@ -1,291 +1,25 @@
 <!doctype html>
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr">
+<html>
   <head>
     <title>Muzi.ch - {% block title %}{% endblock %}</title>
-    <meta http-equiv="content-type" content="text/html;charset=utf-8" />
-    <meta http-equiv="Content-Style-Type" content="text/css" />
-    <meta name="description" content="" />
-    <meta name="keywords" content="" />
-    <meta name="author" content="" />
-    <link href="apple-touch-icon.png" rel="apple-touch-icon" />
-
-    <link href="{{ asset('favicon.ico') }}" rel="icon" type="image/x-icon" />
-    <link href="{{ asset('bundles/muzichcore/css/base.css') }}" rel="stylesheet" media="screen" type="text/css" />
-    <link href="{{ asset('bundles/muzichcore/css/old.css') }}" rel="stylesheet" media="screen" type="text/css" />
-    <link href="{{ asset('css/main.css') }}" rel="stylesheet" media="screen" type="text/css" />
-
-    <!--[if gte IE 9]>
-      <style type="text/css">
-        .gradient, .button {
-           filter: none;
-        }
-      </style>
-    <![endif]-->
-    
+    {% include 'MuzichCoreBundle:Layout:head.html.twig' %}
     {% block css %}{% endblock %}
-    {% if  app.environment != 'prod' %}  
-    <script src="{{ asset('js/jquery-1.8.2.dev.js') }}" type="text/javascript"></script>
-    {% else %}
-    <script src="{{ asset('js/jquery-1.8.2.prod.js') }}" type="text/javascript"></script>
-    {% endif %}
-    <script src="{{ asset('js/jquery-ui-1.8.7.min.js') }}" type="text/javascript"></script>
-    <script src="{{ asset('bundles/muzichcore/js/muzich.js') }}" type="text/javascript"></script>
-    <script src="{{ asset('js/lib/TagPrompt.js') }}" type="text/javascript"></script>
-
-    <script type="text/javascript" src="{{ asset('js/swfobject.js') }}"></script> 
-    
-    <script src="http://connect.soundcloud.com/sdk.js"></script>
-    <script src="http://w.soundcloud.com/player/api.js"></script>
-
-    <script src="{{ asset('bundles/muzichcore/js/autoplay.js') }}" type="text/javascript"></script>
-
-    {# jPlayer #}
-    <link href="{{ asset('jplayer/skin/blue.monday/jplayer.blue.monday.css') }}" rel="stylesheet" type="text/css" />
-    <script type="text/javascript" src="{{ asset('jplayer/js/jquery.jplayer.min.js') }}"></script>
-    <script type="text/javascript" src="{{ asset('jplayer/js/jplayer.playlist.min.js') }}"></script>
-
-    <script src="{{ asset('js/tags/jquery.autoGrowInput.js') }}" type="text/javascript"></script>
-    <script src="{{ asset('js/tags/jquery.tagBox.js') }}" type="text/javascript"></script>
-    <script src="{{ asset('js/formdefault/jquery.formdefaults.js') }}" type="text/javascript"></script>
-    <script src="{{ asset('js/jquery.form-2.14.js') }}" type="text/javascript"></script>
-    <script src="{{ asset('js/jConfirmAction/jconfirmaction.jquery.js') }}" type="text/javascript"></script>
-    <script type="text/javascript">
-      string_follow_stop = "{{ 'user.stop_follow'|trans({}, 'users') }}";
-      string_follow_following = "{{ 'user.following'|trans({}, 'users') }}";
-      string_follow_follow = "{{ 'user.follow'|trans({}, 'users') }}";
-      string_tag_add_title = "{{ 'tags.add.title'|trans({}, 'userui') }}";
-      string_tag_add_text = "{{ 'tags.add.text'|trans({}, 'userui') }}";
-      string_tag_add_argument = "{{ 'tags.add.argument'|trans({}, 'userui') }}";
-      string_tag_add_inputs_cancel = "{{ 'tags.add.inputs.cancel'|trans({}, 'userui') }}";
-      string_tag_add_inputs_submit = "{{ 'tags.add.inputs.submit'|trans({}, 'userui') }}";
-      string_element_delete_confirm_sentence = "{{ 'element.remove.confirm.sentence'|trans({}, 'elements') }}";
-      string_element_delete_confirm_yes = "{{ 'element.remove.confirm.yes'|trans({}, 'elements') }}";
-      string_element_delete_confirm_no = "{{ 'element.remove.confirm.no'|trans({}, 'elements') }}";
-      string_comment_delete_confirm_sentence = "{{ 'comment.remove.confirm.sentence'|trans({}, 'elements') }}";
-      string_comment_delete_confirm_yes = "{{ 'comment.remove.confirm.yes'|trans({}, 'elements') }}";
-      string_comment_delete_confirm_no = "{{ 'comment.remove.confirm.no'|trans({}, 'elements') }}";
-      string_tag_addtofav_confirm_sentence = "{{ 'element.tag.addtofav.confirm.sentence'|trans({}, 'elements') }}";
-      string_tag_addtofav_confirm_yes = "{{ 'element.tag.addtofav.confirm.yes'|trans({}, 'elements') }}";
-      string_tag_addtofav_confirm_no = "{{ 'element.tag.addtofav.confirm.no'|trans({}, 'elements') }}";
-      string_elementreport_confirm_sentence = "{{ 'element.report.confirm.sentence'|trans({}, 'userui') }}";
-      string_elementreport_confirm_yes = "{{ 'element.report.confirm.yes'|trans({}, 'userui') }}";
-      string_elementreport_confirm_no = "{{ 'element.report.confirm.no'|trans({}, 'userui') }}";
-      string_commentreport_confirm_sentence = "{{ 'comment.report.confirm.sentence'|trans({}, 'userui') }}";
-      string_commentreport_confirm_yes = "{{ 'comment.report.confirm.yes'|trans({}, 'userui') }}";
-      string_commentreport_confirm_no = "{{ 'comment.report.confirm.no'|trans({}, 'userui') }}";
-      string_elementreshare_confirm_sentence = "{{ 'element.reshare.confirm.sentence'|trans({}, 'userui') }}";
-      string_elementreshare_confirm_yes = "{{ 'element.reshare.confirm.yes'|trans({}, 'userui') }}";
-      string_elementreshare_confirm_no = "{{ 'element.reshare.confirm.no'|trans({}, 'userui') }}";
-      {% autoescape false %}
-      string_search_tag_title = "{{ 'search_tag.title'|trans({}, 'userui') }}";
-      {% endautoescape %}
-
-      url_index = "{{ path('index') }}";
-      url_search_tag = "{{ path('search_tag') }}";
-      url_get_favorites_tags = "{{ path('ajax_get_favorites_tags') }}";
-      url_add_tag = "{{ path('ajax_add_tag') }}";
-      url_element_new_count = "{{ path('element_new_count') }}";
-      url_element_new_get = "{{ path('element_new_get') }}";
-      url_global_search = "{{ path('global_search') }}";
-      url_datas_api = "{{ path('element_retrieve_api_datas') }}";
-      url_element_add = "{{ path('element_add') }}";
-      url_element_dom_get_one_autoplay = "{{ path('element_dom_get_one', {'type':'autoplay'}) }}";
-      url_element_get_stream_data = "{{ path('element_get_stream_data') }}";
-
-      url_img_ajax_loader = "{{ asset('/bundles/muzichcore/img/ajax-loader.gif') }}";
-    </script>
     {% block js %}{% endblock %}
-
   </head>
   <body>
     
-    <noscript>
-    <div id="noscript_warning">
-      <p>
-        {{ 'noscript.message'|trans({}, 'messages') }}
-        <a href="{{ 'noscript.link_search'|trans({}, 'messages') }}" target="_blank">
-          {{ 'noscript.link_text'|trans({}, 'messages') }}
-        </a>
-      </p>
-    </div>
-  </noscript>
-    
-    <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>
+    {% include 'MuzichCoreBundle:Layout:noscript.html.twig' %}
+    {% include 'MuzichCoreBundle:Autoplay:autoplay.html.twig' %}
   
   <div id="container">
   
     <div id="main_content">
       
       <header id="header">
-        <hgroup>
-            {% include "MuzichCoreBundle:Language:languages.html.twig" %}
-            <!--
-          <ul id="parameters"><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">
-            {% 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 class="separator"></li>
-            <li class="{% if network_public == '0' and not ids_display %}selected{% endif %}">
-              <a href="{{ path('mynetwork_home') }}" class="my_network" >
-                {{ 'filter.network_my'|trans({}, 'userui') }}
-              </a>
-            </li>
-            <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>
-            <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>
-            </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 %}
-          
-        </hgroup>
+        {% include 'MuzichCoreBundle:Layout:header.html.twig' %}
       </header>
       
-      {% for key, flash in app.session.getFlashes() %}
-        <div class="{{ key }} message">
-          <a class="message-close" href="javascript:void(0);" title="fermer"><img alt="close" src="{{ asset('bundles/muzichcore/img/1317386146_cancel.png') }}" /></a>
-          <h3>{{ flash|trans({}, 'flash') }}</h3>
-        </div>
-
-        {% if key == 'success' %}
-        <script type="text/javascript" >
-          $(document).ready(function(){
-            window.setTimeout(function(){
-              $('div.success').slideUp();
-            }, 3000);
-          });
-        </script>
-        {% endif %}
-      {% endfor %}
+      {% include 'MuzichCoreBundle:Layout:flash_messages.html.twig' %}
       
       <div id="content">
         
@@ -299,42 +33,7 @@
         </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="" >
-                    <img src="{{ asset('/img/icon_facebook.png') }}" alt="facebook" />
-                  </a>
-                </li>
-                <li>
-                  <a href="" >
-                    <img src="{{ asset('/img/icon_twitter.png') }}" alt="twitter" />
-                  </a>
-                </li>
-                <li>
-                  <a href="" >
-                    <img src="{{ asset('/img/icon_googleplus.png') }}" alt="google plus" />
-                  </a>
-                </li>
-              </ul>
-            </div>-->
-            
-            {% render 'MuzichCoreBundle:Core:renderSideMenu' %}
-          
-          {% endif %}
-          
+          {% include 'MuzichCoreBundle:Layout:side.html.twig' %}
         </aside>
           
       </div>
@@ -342,19 +41,7 @@
     </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>
-      
+      {% include 'MuzichCoreBundle:Layout:footer.html.twig' %}
     </div>
     
   </div>

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

@@ -13,30 +13,29 @@
       '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>
+    {% include 'MuzichCoreBundle:Component:element_autoplay_button.html.twig' with {
+      'autoplay_path' : path('elements_get_filter_data_autoplay_favorite', {
+        'show_type'  : 'user',
+        'show_id'    : app.user.id, 
+        'data'       : '[]'
+      })
+    } %}
   
   </div>
   
   {% 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 elements|length %}
-    <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>
+    {% include "MuzichCoreBundle:SearchElement:more_button.html.twig" with {
+      'more_path'     : path('favorite_get', {
+        'user_id': app.user.id,
+        'tags_ids_json' : '[]'
+      }),
+      'more_url_path' : path('favorite_get', {
+        'user_id': app.user.id,
+        'tags_ids_json' : ''
+      })
+    }%}
   {% endif %}
   
   <input type="hidden" id="autoplay_url" value="{{ path('elements_get_filter_data_autoplay_favorite', {

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

@@ -21,30 +21,29 @@
       '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:Component:element_autoplay_button.html.twig' with {
+      'autoplay_path' : path('elements_get_filter_data_autoplay_favorite', {
+        'show_type'  : 'user',
+        'show_id'    : viewed_user.id, 
+        'data'       : '[]'
+      })
+    } %}
     
   </div>
 
   {% 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 elements|length %}
-    <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>
+    {% include "MuzichCoreBundle:SearchElement:more_button.html.twig" with {
+      'more_path'     : path('favorite_get', {
+        'user_id': viewed_user.id,
+        'tags_ids_json' : ''
+      }),
+      'more_url_path' : path('favorite_get', {
+        'user_id': viewed_user.id,
+        'tags_ids_json' : ''
+      })
+    }%}
   {% endif %}
   
   <input type="hidden" id="autoplay_url" value="{{ path('elements_get_filter_data_autoplay_favorite', {

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

@@ -1,7 +1,7 @@
 {% extends 'MuzichCoreBundle::layout.html.twig' %}
 
 {% block css %}
-	<link href="{{ asset('bundles/muzichgroups/css/groups.css') }}" rel="stylesheet" media="screen" type="text/css" />
+  <link href="{{ asset('bundles/muzichgroups/css/groups.css') }}" rel="stylesheet" media="screen" type="text/css" />
 {% endblock %}
 {% block js %}
   <script src="{{ asset('bundles/muzichgroups/js/groups.js') }}" type="text/javascript"></script>
@@ -9,8 +9,6 @@
 
 {% block main_content %}
   
-  {% include "MuzichCoreBundle:Menu:containerMenu.html.twig" with { 'active': 'mygroups' } %}
-  
   {% block content %}{% endblock %}
   
 {% endblock %}

src/Muzich/HomeBundle/Resources/views/Component/filter_menu.html.twig

@@ -0,0 +1,16 @@
+<ul id="tabs_tag_search_buttons">
+  <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 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>
+  </li>
+</ul>

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

@@ -5,123 +5,61 @@
 
 {% block content %}
 
-  <a href="#" id="element_add_link" class="button gradient">
-    {{ '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 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 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>
-    </li>
-  </ul>
-
-  <input type="hidden" class="filter_clear_url" value="{{ path('filter_clear') }}" />
-  <input type="hidden" class="filter_mytags_url" value="{{ path('filter_mytags') }}" />
-
-  <div id="element_add_box" style="display: none;">    
-
-    <h2>{{ 'home.add_element_box.title'|trans({}, 'navigationui') }}</h2>
+  {% include 'MuzichCoreBundle:Component:element_add_buttons.html.twig' %}
+  {% include 'MuzichHomeBundle:Component:filter_menu.html.twig' %}
   
-    <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 %}
-    {% 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>
+  {% include 'MuzichCoreBundle:Component:element_add_box.html.twig' with {
+    'box_title': 'home.add_element_box.title'|trans({}, 'navigationui')
+  } %}
+
+  {# TODO: Cette partie de javascript ne devra plus exister après la réecriture du code javascript #}
+  {% 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 %}
 
   <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'
-    }) }}" 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:Component:element_autoplay_button.html.twig' with {
+      'autoplay_path' : path('elements_get_filter_data_autoplay', {
+        'type' : 'filter'
+      })
+    } %}
   
   </div>
 
-  <div class="display_more_elements" style="display: none;">
-    <span></span>
-  </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'
+    'noelements_filter'    : true,
+    'display_new_elements' : true
   }%}
   
+  {% if elements|length %}
+    {% include "MuzichCoreBundle:SearchElement:more_button.html.twig" with {
+      'more_path'           : path('search_elements')
+    }%}
+  {% endif %}
+  
 {% endblock %}

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

@@ -10,25 +10,18 @@
     <p>{{ 'need_tags.text_help'|trans({}, 'userui') }}</p>
   </div>
   
-  <div class="display_more_elements" style="display: none;">
-    <span></span>
-  </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" %}
-    
-  {% 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('needstagpage'),
-      'id_limit'   : last_element_id
-    },
-    'link_class'          : 'event_view'
-  }%}
+  {% include "MuzichCoreBundle:SearchElement:default.html.twig" with {
+    'display_new_elements' : true
+  } %}
+  
+  {% if elements|length %}
+    {% include "MuzichCoreBundle:SearchElement:more_button.html.twig" with {
+      'more_path'     : path('search_elements_more', {
+        'session_id' : app.user.getPersonalHash('needstagpage'),
+        'id_limit'   : last_element_id
+      }),
+      'link_class'          : 'event_view'
+    }%}
+  {% endif %}
   
 {% endblock %}

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

@@ -7,18 +7,8 @@
 
   <div class="top_tools">
     
-    
     {% 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>
-    
+      {% include 'MuzichCoreBundle:Component:element_add_buttons_topright.html.twig' %}
     {% endif %}
 
     <div class="show_options">
@@ -42,18 +32,11 @@
       
     <h1>{{ group.name }}</h1>
     
-    
     {% 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) }}>
-  
-          {% include "MuzichCoreBundle:Element:form.add.html.twig" with { 'form': add_form, 'form_name': add_form_name } %}
-  
-        </form>
-        
-      </div>
+      {% include 'MuzichCoreBundle:Component:element_add_box.html.twig' with {
+        'group_slug'        : group.slug,
+        'show_add_to_group' : false
+      } %}
     {% endif %}
     
     <p class="show_info">
@@ -85,40 +68,33 @@
       '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>
+    {% include 'MuzichCoreBundle:Component:element_autoplay_button.html.twig' with {
+      'autoplay_path' : path('elements_get_filter_data_autoplay_show', {
+        'show_type'  : 'group',
+        'show_id'    : group.id, 
+        'data'       : '[]'
+      })
+    } %}
     
   </div>
   
   {% include "MuzichCoreBundle:SearchElement:default.html.twig" with {'no_group_name' : true} %}
-    
-  <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 %}
-     <input type="hidden" id="more_elements_url" value="{{ path('show_elements_get', {
-        'type'          : 'group',
-        'object_id'     : group.id, 
-        'tags_ids_json' : ''
-      }) }}" />
-     <a href="{{ path('show_elements_get', {
-        'type'          : 'group',
-        'object_id'     : group.id, 
-        'tags_ids_json' : '[]'
-      }) }}" class="elements_more" >
-       <div>
-        {{ 'more'|trans({}, 'userui') }}
-      </div>
-     </a>
-  {% endif %}
+    {% if elements|length %}
+      {% include "MuzichCoreBundle:SearchElement:more_button.html.twig" with {
+        'more_path'     : path('show_elements_get', {
+          'type'          : 'group',
+          'object_id'     : group.id, 
+          'tags_ids_json' : '[]'
+        }),
+        'more_url_path' : path('show_elements_get', {
+          'type'          : 'group',
+          'object_id'     : group.id, 
+          'tags_ids_json' : ''
+        })
+      }%}
+    {% endif %}
   {% endif %}
   
   <input type="hidden" id="autoplay_url" value="{{ path('elements_get_filter_data_autoplay_show', {

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

@@ -8,14 +8,7 @@
   <div class="top_tools">
     
     {% 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>
+      {% include 'MuzichCoreBundle:Component:element_add_buttons_topright.html.twig' %}
     {% endif %}
     
     <div class="show_options">
@@ -40,24 +33,7 @@
     <h1>{{ 'user.show.title'|trans({'%name%' : viewed_user.name}, 'users') }}</h1>
   
     {% 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>
-  
+      {% include 'MuzichCoreBundle:Component:element_add_box.html.twig'  %}
     {% endif %}
     
     <div class="reputation">
@@ -91,43 +67,33 @@
       '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:Component:element_autoplay_button.html.twig' with {
+      'autoplay_path' : path('elements_get_filter_data_autoplay_show', {
+        'show_type'  : 'user',
+        'show_id'    : viewed_user.id, 
+        'data'       : '[]'
+      }) 
+    } %}
   
   </div>
   
-  
   {% 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 %}
-    
-    <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', {
-        'type'          : 'user',
-        'object_id'     : viewed_user.id, 
-        'tags_ids_json' : '[]'
-      }) }}" class="elements_more" >
-      <div>
-        {{ 'more'|trans({}, 'userui') }}
-      </div>
-    </a>
-   
-  {% endif %}
+    {% if elements|length %}
+      {% include "MuzichCoreBundle:SearchElement:more_button.html.twig" with {
+        'more_path'     : path('show_elements_get', {
+          'type'          : 'user',
+          'object_id'     : viewed_user.id, 
+          'tags_ids_json' : '[]'
+        }),
+        'more_url_path' : path('show_elements_get', {
+          'type'          : 'user',
+          'object_id'     : viewed_user.id, 
+          'tags_ids_json' : ''
+        })
+      }%}
+    {% endif %}
   {% endif %}
     
   <input type="hidden" id="autoplay_url" value="{{ path('elements_get_filter_data_autoplay_show', {

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

@@ -1,7 +1,7 @@
 {% extends 'MuzichCoreBundle::layout.html.twig' %}
 
 {% block css %}
-	<link href="{{ asset('bundles/muzichhome/css/home.css') }}" rel="stylesheet" media="screen" type="text/css" />
+  <link href="{{ asset('bundles/muzichhome/css/home.css') }}" rel="stylesheet" media="screen" type="text/css" />
 {% endblock %}
 {% block js %}
   <script src="{{ asset('bundles/muzichhome/js/home.js') }}" type="text/javascript"></script>
@@ -9,12 +9,6 @@
 
 {% block main_content %}
   
-    {% if topmenu_active is not defined %}
-      {% include "MuzichCoreBundle:Menu:containerMenu.html.twig" with { 'active': 'public' } %}
-    {% else %}
-      {% include "MuzichCoreBundle:Menu:containerMenu.html.twig" with { 'active': topmenu_active } %}
-    {% endif %}
-  
     {% block content %}{% endblock %}
   
 {% endblock %}

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

@@ -1,13 +1,11 @@
 {% extends 'MuzichCoreBundle::layout.html.twig' %}
 
 {% block css %}
-	<link href="{{ asset('bundles/mynetwork/css/mynetwork.css') }}" rel="stylesheet" media="screen" type="text/css" />
+  <link href="{{ asset('bundles/mynetwork/css/mynetwork.css') }}" rel="stylesheet" media="screen" type="text/css" />
 {% endblock %}
 
 {% block main_content %}
   
-  {% include "MuzichCoreBundle:Menu:containerMenu.html.twig" with { 'active': 'private' } %}
-  
   {% block content %}{% endblock %}
   
 {% endblock %}

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

@@ -49,23 +49,18 @@
     
   </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'
-  }%}
+  {% if elements|length %}
+    {% include "MuzichCoreBundle:SearchElement:more_button.html.twig" with {
+      'more_path'     : path('search_elements_more', {
+        'session_id' : app.user.getPersonalHash(app.request.get('event_id')),
+        'id_limit'   : last_element_id
+      }),
+      'link_class'          : 'event_view'
+    }%}
+  {% endif %}
   
 {% endblock %}

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

@@ -1,16 +1,14 @@
 {% extends 'MuzichCoreBundle::layout.html.twig' %}
 
 {% block css %}
-	<link href="{{ asset('bundles/muzichuser/css/user.css') }}" rel="stylesheet" media="screen" type="text/css" />
+  <link href="{{ asset('bundles/muzichuser/css/user.css') }}" rel="stylesheet" media="screen" type="text/css" />
 {% endblock %}
 {% block js %}
-	<script src="{{ asset('bundles/muzichuser/js/user.js') }}" type="text/javascript"></script>
+  <script src="{{ asset('bundles/muzichuser/js/user.js') }}" type="text/javascript"></script>
 {% endblock %}
 
 {% block main_content %}
   
-    {% include "MuzichCoreBundle:Menu:containerMenu.html.twig" with { 'active': null } %}
-  
     {% block content %}{% endblock %}
   
 {% endblock %}

web/bundles/muzichcore/css/old.css

@@ -1009,11 +1009,11 @@ position: absolute;
   text-decoration: none;
 }*/
 
-div.display_more_elements
+/*div.display_more_elements
 {
   background-color: #D9F7FF;
   text-align: center;
-}
+}*/
 
 /*input#element_add_url
 {

web/css/main.css

@@ -1629,4 +1629,10 @@ li.element_view_propositions_link
 div#results_search_form div.seachboxcontainer input
 {
   width: 570px;
+}
+
+div.display_more_elements
+{
+  padding: 10px;
+  text-align: center;
 }