Modification sur le lancement de l'autoplay:

app/Resources/translations/elements.fr.yml

@@ -26,6 +26,8 @@ element:
   link:                 Ouvrir la page d'origine
   edit:
     link:               Modifier
+  autoplay:
+    title:              Lancer avec la lecture automatique
   remove:
     link:               Supprimer
     confirm:

src/Muzich/CoreBundle/Controller/ElementController.php

@@ -1026,7 +1026,7 @@ class ElementController extends Controller
    * @param "filter"|"show"|"favorites" $type
    * @param ~ $data
    */
-  public function getDatasAutoplayAction(Request $request, $type, $data, $show_type = null, $show_id = null)
+  public function getDatasAutoplayAction(Request $request, $element_id, $type, $data, $show_type = null, $show_id = null)
   {
     if (($response = $this->mustBeConnected(true)))
     {
@@ -1041,7 +1041,8 @@ class ElementController extends Controller
       // Pour cette option on utilise le dernier filtre appliqué
       $search_object = $this->getElementSearcher();
       $search_object->update(array(
-        'count' => $this->container->getParameter('autoplay_max_elements')
+        'count' => $this->container->getParameter('autoplay_max_elements'),
+        'id_limit' => $element_id+1
       ));
       $elements = $search_object->getElements($this->getDoctrine(), $this->getUserId());
     }
@@ -1068,7 +1069,8 @@ class ElementController extends Controller
       $search_object->init(array(
         'tags'           => $tags,
         $show_type.'_id' => $show_id,
-        'count'          => $this->container->getParameter('autoplay_max_elements')
+        'count'          => $this->container->getParameter('autoplay_max_elements'),
+        'id_limit' => $element_id+1
       ));
       
       $elements = $search_object->getElements($this->getDoctrine(), $this->getUserId());
@@ -1092,7 +1094,8 @@ class ElementController extends Controller
         'tags'     => $tags,
         'user_id'  => $show_id,
         'favorite' => true,
-        'count'    => $this->container->getParameter('autoplay_max_elements')
+        'count'    => $this->container->getParameter('autoplay_max_elements'),
+        'id_limit' => $element_id+1
       ));
       
       $elements = $search_object->getElements($this->getDoctrine(), $this->getUserId());

src/Muzich/CoreBundle/Controller/SearchController.php

@@ -25,7 +25,7 @@ class SearchController extends Controller
    * @param string $session_id
    * @return Response 
    */
-  protected function searchElementsMore($elements, $message, $session_id)
+  protected function searchElementsMore($context, $autoplay_context, $elements, $message, $session_id)
   {
     
     $data = array();
@@ -34,11 +34,14 @@ class SearchController extends Controller
     if ($count)
     {
       $html = $this->render('MuzichCoreBundle:SearchElement:default.html.twig', array(
-        'user'        => $this->getUser(),
-        'elements'    => $elements
+        'user'             => $this->getUser(),
+        'elements'         => $elements,
+        'display_autoplay'  => $this->getDisplayAutoplayBooleanForContext($context),
+        'autoplay_context' => ($autoplay_context)?$autoplay_context:$context
       ))->getContent();
       
       $data['more_link_href'] = $this->generateUrl('search_elements_more', array(
+        'context'    => $context,
         'id_limit'   => $elements[count($elements)-1]->getId(),
         'session_id' => $session_id
       ));
@@ -59,7 +62,7 @@ class SearchController extends Controller
    * que les paramétres en session). 
    * 
    */
-  public function searchElementsAction($id_limit = null, $session_id = null)
+  public function searchElementsAction($context, $id_limit = null, $session_id = null)
   {
     if (($response = $this->mustBeConnected()))
     {
@@ -125,7 +128,7 @@ class SearchController extends Controller
       
       $elements = $search_object->getElements($this->getDoctrine(), $this->getUserId());
       
-      return $this->searchElementsMore($elements, $message, $session_id);      
+      return $this->searchElementsMore($context, null, $elements, $message, $session_id);      
     }
     else
     {
@@ -142,14 +145,16 @@ class SearchController extends Controller
    * @param int $id_limit
    * @return Response 
    */
-  public function searchElementsShowAction($type, $object_id, $id_limit)
+  public function searchElementsShowAction($context, $type, $object_id, $id_limit)
   {
+    $autoplay_context = null;
     if ($this->getRequest()->isXmlHttpRequest())
     {
       $object = null;
       $param_id =  '';
       if ($type == 'user')
       {
+        $autoplay_context = 'show_user';
         $object = $this->getDoctrine()
           ->getRepository('MuzichCoreBundle:User')
           ->findOneBy(array('id' => $object_id))
@@ -158,6 +163,7 @@ class SearchController extends Controller
       }
       elseif ($type == 'group')
       {
+        $autoplay_context = 'show_group';
         $object = $this->getDoctrine()
           ->getRepository('MuzichCoreBundle:Group')
           ->findOneById($object_id)
@@ -178,7 +184,10 @@ class SearchController extends Controller
 
       $elements = $search->getElements($this->getDoctrine(), $this->getUserId());
       
-      return $this->searchElementsMore($elements,
+      return $this->searchElementsMore(
+        $context,
+        $autoplay_context,
+        $elements,
         $this->trans(
           'elements.ajax.more.noelements', 
           array(), 
@@ -199,7 +208,7 @@ class SearchController extends Controller
    * @param string $string
    * @return Response 
    */
-  public function globalSearchMoreAction(Request $request, $last_id, $string)
+  public function globalSearchMoreAction(Request $request, $context, $last_id, $string)
   {
     if (($response = $this->mustBeConnected(true)))
     {
@@ -214,7 +223,10 @@ class SearchController extends Controller
     
     $elements = $search->getElements($this->getDoctrine(), $this->getUserId());
       
-    return $this->searchElementsMore($elements,
+    return $this->searchElementsMore(
+      $context,
+      $autoplay_context = null,
+      $elements,
       $this->trans(
         'elements.ajax.more.noelements', 
         array(), 

src/Muzich/CoreBundle/Extension/MyTwigExtension.php

@@ -9,10 +9,12 @@ use Symfony\Component\Form\FormView;
 class MyTwigExtension extends \Twig_Extension {
 
   private $translator;
+  protected $params = array();
 
-  public function __construct(Translator $translator)
+  public function __construct(Translator $translator, $params)
   {
     $this->translator = $translator;
+    $this->params = $params;
   }
   
   public function getFilters()
@@ -22,7 +24,8 @@ class MyTwigExtension extends \Twig_Extension {
       'date_or_relative_date'  => new \Twig_Filter_Method($this, 'date_or_relative_date'),
       'date_epurate'           => new \Twig_Filter_Method($this, 'date_epurate'),
       'form_has_errors'        => new \Twig_Filter_Method($this, 'form_has_errors'),
-      'format_score'           => new \Twig_Filter_Method($this, 'format_score')
+      'format_score'           => new \Twig_Filter_Method($this, 'format_score'),
+      'can_autoplay'           => new \Twig_Filter_Method($this, 'can_autoplay')
     );
   }
   
@@ -39,6 +42,15 @@ class MyTwigExtension extends \Twig_Extension {
     return number_format($score, 0, '.', ' ');
   }
   
+  public function can_autoplay($element)
+  {
+    if (in_array($element->getType(), $this->params['autoplay_sites_enabled']))
+    {
+      return true;
+    }
+    return false;
+  }
+  
   protected function datetime2timestamp($string)
   {
     list($date, $time) = explode(' ', $string);

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

@@ -1,28 +1,28 @@
 
 
 search_elements:
-  pattern:  /search-elements
+  pattern:  /search-elements/{context}
   defaults: { _controller: MuzichCoreBundle:Search:searchElements }
   
 search_elements_more:
-  pattern:  /search-elements/{id_limit}/{session_id}
+  pattern:  /search-elements/{context}/{id_limit}/{session_id}
   defaults: { _controller: MuzichCoreBundle:Search:searchElements, session_id: null }
    
 search_elements_show_more_empty:
-  pattern:  /search-elements/show/{type}/{object_id}
+  pattern:  /search-elements/show/{context}/{type}/{object_id}
   defaults: { _controller: MuzichCoreBundle:Search:searchElementsShow }
     
 search_elements_show_more:
-  pattern:  /search-elements/show/{type}/{object_id}/{id_limit}
+  pattern:  /search-elements/show/{context}/{type}/{object_id}/{id_limit}
   defaults: { _controller: MuzichCoreBundle:Search:searchElementsShow }
    
 global_search_elements_empty:
-  pattern:  /global-search-elements/
-  defaults: { _controller: MuzichCoreBundle:Search:globalSearchMore }
+  pattern:  /global-search-elements
+  defaults: { _controller: MuzichCoreBundle:Search:globalSearchMore, context: global_search }
   
 global_search_elements:
-  pattern:  /global-search-elements/{last_id}/{string}
-  defaults: { _controller: MuzichCoreBundle:Search:globalSearchMore }
+  pattern:  /global-search-elements/{context}/{last_id}/{string}
+  defaults: { _controller: MuzichCoreBundle:Search:globalSearchMore, context: global_search }
    
 follow:
   pattern:  /follow/{type}/{id}/{token}
@@ -169,15 +169,15 @@ element_retrieve_api_datas:
   defaults: { _controller: MuzichCoreBundle:Element:getDatasApi }
     
 elements_get_filter_data_autoplay:
-  pattern: /ajax/elements/get/datas/autoplay/{type}/{data}
+  pattern: /ajax/elements/get/datas/autoplay/{element_id}/{type}/{data}
   defaults: { _controller: MuzichCoreBundle:Element:getDatasAutoplay, data: null }
     
 elements_get_filter_data_autoplay_show:
-  pattern: /ajax/show/{show_type}/{show_id}/elements/get/datas/autoplay/{data}
+  pattern: /ajax/show/{show_type}/{show_id}/elements/get/datas/autoplay/{element_id}/{data}
   defaults: { _controller: MuzichCoreBundle:Element:getDatasAutoplay, type: 'show', data: null }
     
 elements_get_filter_data_autoplay_favorite:
-  pattern: /ajax/favorite/{show_type}/{show_id}/elements/get/datas/autoplay/{data}
+  pattern: /ajax/favorite/{show_type}/{show_id}/elements/get/datas/autoplay/{element_id}/{data}
   defaults: { _controller: MuzichCoreBundle:Element:getDatasAutoplay, type: 'favorite', data: null }
     
 element_show_need_tags:

src/Muzich/CoreBundle/Resources/public/js/autoplay.js

@@ -4,16 +4,18 @@ function Autoplay()
   var _playlist = new Array();
   var _player = null;
   var _current_index = 0;
+  var _link = null;
   
-  this.start = function()
+  this.start = function(link)
   {
+    _link = link;
     open_popin_dialog('autoplay');
     initializePlaylist(this.play);
   }
   
   var initializePlaylist = function(callback)
   {
-    JQueryJson($('a#autoplay_launch').attr('href'), {}, function(response){
+    JQueryJson(_link.attr('href'), {}, function(response){
       if (response.status == 'success')
       {
         if (response.data.length)
@@ -131,8 +133,9 @@ $(document).ready(function() {
   
   window.autoplay = new Autoplay();
   
-  $('a#autoplay_launch').click(function(){
-    window.autoplay.start();
+  $('a.autoplay_link').live('click', function(){
+    window.autoplay.start($(this));
+    $('html, body').animate({ scrollTop: 0 }, 'fast');
     return false;
   });
   

src/Muzich/CoreBundle/Resources/public/js/muzich.js

@@ -375,7 +375,11 @@ $(document).ready(function(){
       window.search_tag_prompt_connector.initializeTags([tag]);
       
       form.submit();
+      
     }
+    
+    $('html, body').animate({ scrollTop: 0 }, 'fast');
+    return false;
   });
   
   function element_last_opened(li)
@@ -1604,7 +1608,14 @@ $(document).ready(function(){
     a_more.attr('href', $('input#more_elements_url').val()+'/'+array2json(tags_ids_for_filter));
     
     // On adapte aussi le lien de l'autoplay
-    $('a#autoplay_launch').attr('href', $('input#autoplay_url').val()+'/'+array2json(tags_ids_for_filter));
+    //$('a.autoplay_link').attr('href', $('input#autoplay_url').val()+'/'+array2json(tags_ids_for_filter));
+    //$('a.autoplay_link').each(function(){
+    //  console.debug($(this));
+    //  console.log(
+    //    str_replace('__ELEMENT_ID__', $(this).data('element_id'), $('input#autoplay_url').val()+'/'+array2json(tags_ids_for_filter))
+    //  );
+    //  $(this).attr('href', str_replace('__ELEMENT_ID__', $(this).data('element_id'), $('input#autoplay_url').val()+'/'+array2json(tags_ids_for_filter)));
+    //});
     
     return check_timelaps_and_find_with_tags(link, new Date().getTime(), false);
   }

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

@@ -1,4 +1,4 @@
-<a href="{{ autoplay_path }}" class="button" id="autoplay_launch" 
+<!--<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>
+</a>-->

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

@@ -1,6 +1,12 @@
 {% if display_new_elements is not defined %}
   {% set display_new_elements = false %}
 {% endif %}
+{% if display_autoplay is not defined %}
+  {% set display_autoplay = false %}
+{% endif %}
+{% if autoplay_context is not defined %}
+  {% set autoplay_context = '' %}
+{% endif %}
 
 {% if display_new_elements %}
   <div class="display_more_elements" style="display: none;">
@@ -15,7 +21,7 @@
 {% endif %}
 
 {% if elements|length %}
-  {% if not app.request.isXmlHttpRequest %}<ul class="elements">{% endif %}
+  {% if not app.request.isXmlHttpRequest %}<ul class="elements" data-autoplay_context="{{ autoplay_context }}">{% endif %}
     {% for element in elements %} 
       
       {% include "MuzichCoreBundle:SearchElement:li.element.html.twig" %}

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

@@ -10,6 +10,12 @@
 {% if his_group is not defined %}
   {% set his_group = false %}
 {% endif %}
+{% if display_autoplay is not defined %}
+  {% set display_autoplay = false %}
+{% endif %}
+{% if tag_ids_json is not defined %}
+  {% set tag_ids_json = '[]' %}
+{% endif %}
 
 <table>
   <tr>
@@ -91,6 +97,56 @@
           </a>
         </li>
         
+        {% if display_autoplay and element|can_autoplay %}
+          <li class="element_autoplay">
+            <a title="{{ 'element.autoplay.title'|trans({}, 'elements') }}"
+               data-element_id="{{ element.id }}"
+               class="autoplay_link"
+              {% if autoplay_context == 'home' %}
+                href="{{ path('elements_get_filter_data_autoplay', {
+                  'element_id' : element.id,
+                  'type'       : 'filter'
+                }) }}"
+              {% endif %}
+              {% if autoplay_context == 'show_user' %}
+                href="{{ path('elements_get_filter_data_autoplay_show', {
+                  'element_id' : element.id,
+                  'show_type'  : 'user',
+                  'show_id'    : viewed_user.id, 
+                  'data'       : tag_ids_json
+                }) }}"
+              {% endif %}
+              {% if autoplay_context == 'show_group' %}
+                href="{{ path('elements_get_filter_data_autoplay_show', {
+                  'element_id' : element.id,
+                  'show_type'  : 'group',
+                  'show_id'    : group.id, 
+                  'data'       : tag_ids_json
+                }) }}"
+              {% endif %}
+              {% if autoplay_context == 'favorite_my' %}
+                href="{{ path('elements_get_filter_data_autoplay_favorite', {
+                  'element_id' : element.id,
+                  'show_type'  : 'user',
+                  'show_id'    : app.user.id, 
+                  'data'       : tag_ids_json
+                }) }}"
+              {% endif %}
+              {% if autoplay_context == 'favorite_user' %}
+                href="{{ path('elements_get_filter_data_autoplay_favorite', {
+                  'element_id' : element.id,
+                  'show_type'  : 'user',
+                  'show_id'    : viewed_user.id, 
+                  'data'       : tag_ids_json
+                }) }}"
+              {% endif %}
+               target="_blank"
+            >
+              <img src="{{ asset('/img/1361037350_control_play.png') }}" alt="open in playlist" />
+            </a>
+          </li>
+        {% endif %}
+        
         {% if app.user.id != element.owner.id %}
       
           {% if display_edit_actions %}

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

@@ -24,7 +24,7 @@ class HomeControllerTest extends FunctionalTest
     $this->exist('form[action="'.$url.'"] input[type="submit"]');
     
     // Présence du formulaire de filtrage
-    $this->exist('form[action="'.($url = $this->generateUrl('search_elements')).'"]');
+    $this->exist('form[action="'.($url = $this->generateUrl('search_elements', array('context'=>'home'))).'"]');
     $this->exist('form[action="'.$url.'"] select[id="element_search_form_network"]');
     $this->exist('form[action="'.$url.'"] input[type="submit"]');
     
@@ -737,6 +737,7 @@ class HomeControllerTest extends FunctionalTest
     $id_limit = (int)str_replace('element_', '', $extract[9]);
     
     $url = $this->generateUrl('search_elements_more', array(
+      'context' => 'home',
       'id_limit'  => $id_limit
     ));
     

src/Muzich/CoreBundle/lib/Controller.php

@@ -501,4 +501,15 @@ class Controller extends BaseController
     ;
   }
   
+  protected function getDisplayAutoplayBooleanForContext($context)
+  {
+    if (in_array($context, 
+      $this->container->getParameter('autoplay_contexts')
+    ))
+    {
+      return true;
+    }
+    return false;
+  }
+  
 }

src/Muzich/FavoriteBundle/Controller/FavoriteController.php

@@ -244,6 +244,12 @@ class FavoriteController extends Controller
       return $response;
     }
     
+    $autoplay_context = 'favorite_user';
+    if ($user_id == $this->getUserId())
+    {
+      $autoplay_context = 'favorite_my';
+    }
+    
     $tag_ids = json_decode($tags_ids_json);
     $search_object = new ElementSearcher();
     $tags = null;
@@ -271,14 +277,25 @@ class FavoriteController extends Controller
       'elements'
     );
     
+    $viewed_user = $this->getUser();
+    if ($user_id != $this->getUserId())
+    {
+      $viewed_user = $this->getDoctrine()->getEntityManager()->getRepository('MuzichCoreBundle:User')
+        ->findOneById($user_id, array())->getSingleResult();
+    }
+    
     $elements = $search_object->getElements($this->getDoctrine(), $this->getUserId());
     $count = count($elements);
     $html = '';
     if ($count)
     {
       $html = $this->render('MuzichCoreBundle:SearchElement:default.html.twig', array(
-        'user'        => $this->getUser(),
-        'elements'    => $elements
+        'display_autoplay' => $this->getDisplayAutoplayBooleanForContext($autoplay_context),
+        'autoplay_context' => $autoplay_context,
+        'user'             => $this->getUser(),
+        'elements'         => $elements,
+        'tag_ids_json'     => $tags_ids_json,
+        'viewed_user'      => $viewed_user
       ))->getContent();
     }
     

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

@@ -12,18 +12,13 @@
     {% include "MuzichCoreBundle:Tag:tagsList.favorite.html.twig" with {
       'user_id' : app.user.id
     } %}
-    
-    {% 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" %}
+  {% include "MuzichCoreBundle:SearchElement:default.html.twig" with{
+      'display_autoplay'     : true,
+      'autoplay_context'     : 'favorite_my'
+  } %}
   
   {% if elements|length %}
     {% include "MuzichCoreBundle:SearchElement:more_button.html.twig" with {
@@ -38,10 +33,4 @@
     }%}
   {% endif %}
   
-  <input type="hidden" id="autoplay_url" value="{{ path('elements_get_filter_data_autoplay_favorite', {
-    'show_type'  : 'user',
-    'show_id'    : app.user.id, 
-    'data' : ''
-  }) }}" />
-    
 {% endblock %}

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

@@ -21,17 +21,12 @@
       'user_id' : viewed_user.id
     } %}
     
-    {% 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" %}
+  {% include "MuzichCoreBundle:SearchElement:default.html.twig" with{
+      'display_autoplay'     : true,
+      'autoplay_context'     : 'favorite_user'
+  } %}
     
   {% if elements|length %}
     {% include "MuzichCoreBundle:SearchElement:more_button.html.twig" with {
@@ -46,10 +41,4 @@
     }%}
   {% endif %}
   
-  <input type="hidden" id="autoplay_url" value="{{ path('elements_get_filter_data_autoplay_favorite', {
-    'show_type'  : 'user',
-    'show_id'    : viewed_user.id, 
-    'data' : ''
-  }) }}" />
-    
 {% endblock %}

src/Muzich/HomeBundle/Controller/ShowController.php

@@ -156,6 +156,17 @@ class ShowController extends Controller
       throw new \Exception("Wrong Type.");
     }
     
+    $viewed_user = null;
+    if ($type == 'user' && $object_id == $this->getUserId())
+    {
+      $viewed_user = $this->getUser();
+    }
+    else if ($type == 'user')
+    {
+      $viewed_user = $this->getDoctrine()->getEntityManager()->getRepository('MuzichCoreBundle:User')
+        ->findOneById($object_id, array())->getSingleResult();
+    }
+    
     $search_object = new ElementSearcher();
     $tags = null;
     $tag_ids = json_decode($tags_ids_json);
@@ -189,8 +200,12 @@ class ShowController extends Controller
     if ($count)
     {
       $html = $this->render('MuzichCoreBundle:SearchElement:default.html.twig', array(
-        'user'        => $this->getUser(),
-        'elements'    => $elements
+        'display_autoplay' => $this->getDisplayAutoplayBooleanForContext('show_'.$type),
+        'autoplay_context' => 'show_'.$type,
+        'user'             => $this->getUser(),
+        'viewed_user'      => $viewed_user,
+        'elements'         => $elements,
+        'tag_ids_json'     => $tags_ids_json
       ))->getContent();
     }
     

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

@@ -31,7 +31,7 @@
   <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) }}>
+      <form name="{{ search_form_name }}" action="{{ path('search_elements', {'context':'home'}) }}" method="post" {{ form_enctype(search_form) }}>
         
         {% include "MuzichCoreBundle:SearchElement:form.html.twig" with { 
           'form_name'               : search_form_name,
@@ -42,23 +42,19 @@
         
       </form>
     </div>
-
-    {% include 'MuzichCoreBundle:Component:element_autoplay_button.html.twig' with {
-      'autoplay_path' : path('elements_get_filter_data_autoplay', {
-        'type' : 'filter'
-      })
-    } %}
   
   </div>
 
   {% include "MuzichCoreBundle:SearchElement:default.html.twig" with {
     'noelements_filter'    : true,
-    'display_new_elements' : true
+    'display_new_elements' : true,
+    'display_autoplay'     : true,
+    'autoplay_context'     : 'home'
   }%}
   
   {% if elements|length %}
     {% include "MuzichCoreBundle:SearchElement:more_button.html.twig" with {
-      'more_path'           : path('search_elements')
+      'more_path'           : path('search_elements', {'context':'home'})
     }%}
   {% endif %}
   

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

@@ -17,6 +17,7 @@
   {% if elements|length %}
     {% include "MuzichCoreBundle:SearchElement:more_button.html.twig" with {
       'more_path'     : path('search_elements_more', {
+        'context'    : 'need_tags',
         'session_id' : app.user.getPersonalHash('needstagpage'),
         'id_limit'   : last_element_id
       }),

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

@@ -64,16 +64,10 @@
     </p>
   
     {% include "MuzichCoreBundle:Tag:tagsList.show.html.twig" with {
-      'object_id'   : group.id,
-      'object_type' : 'group'
-    } %}
-    
-    {% 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'       : '[]'
-      })
+      'object_id'            : group.id,
+      'object_type'          : 'group',
+      'display_autoplay'     : true,
+      'autoplay_context'     : 'show_group'
     } %}
     
   </div>
@@ -101,10 +95,4 @@
     {% endif %}
   {% endif %}
   
-  <input type="hidden" id="autoplay_url" value="{{ path('elements_get_filter_data_autoplay_show', {
-    'show_type'          : 'group',
-    'show_id'            : group.id, 
-    'data' : ''
-  }) }}" />
-            
 {% endblock %}

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

@@ -73,18 +73,13 @@
       'object_id'   : viewed_user.id,
       'object_type' : 'user'
     } %}
-    
-    {% 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" %}
+  {% include "MuzichCoreBundle:SearchElement:default.html.twig" with {
+    'display_autoplay'     : true,
+    'autoplay_context'     : 'show_user'
+  } %}
   
   {% if more_count is defined %} 
     {% if elements|length %}
@@ -102,11 +97,5 @@
       }%}
     {% endif %}
   {% endif %}
-    
-  <input type="hidden" id="autoplay_url" value="{{ path('elements_get_filter_data_autoplay_show', {
-    'show_type'          : 'user',
-    'show_id'     : viewed_user.id, 
-    'data' : ''
-  }) }}" />
-  
+
 {% endblock %}

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

@@ -58,6 +58,7 @@
   {% if elements|length %}
     {% include "MuzichCoreBundle:SearchElement:more_button.html.twig" with {
       'more_path'     : path('search_elements_more', {
+        'context'    : 'event',
         'session_id' : app.user.getPersonalHash(app.request.get('event_id')),
         'id_limit'   : last_element_id
       }),