Lecture aléatoire sur le profil et sur les favoris

src/Muzich/CoreBundle/Controller/ElementController.php

@@ -1015,6 +1015,11 @@ class ElementController extends Controller
       $tag_ids = json_decode($data);
       $search_object = new ElementSearcher();
       
+      $id_limit = $element_id+1;
+      if ($element_id < 1) {
+          $id_limit = Null;
+      }
+      
       if (count($tag_ids))
       {
         $tags = array();
@@ -1028,7 +1033,7 @@ class ElementController extends Controller
         'tags'           => $tags,
         $show_type.'_id' => $show_id,
         'count'          => $this->container->getParameter('autoplay_max_elements'),
-        'id_limit' => $element_id+1
+        'id_limit' => $id_limit
       ));
       
       $elements = $search_object->getElements($this->getDoctrine(), $this->getUserId(true));
@@ -1047,13 +1052,18 @@ class ElementController extends Controller
           $tags[$id] = $id;
         }
       }
+      
+      $id_limit = $element_id+1;
+      if ($element_id < 1) {
+          $id_limit = Null;
+      }
 
       $search_object->init(array(
         'tags'     => $tags,
         'user_id'  => $show_id,
         'favorite' => true,
         'count'    => $this->container->getParameter('autoplay_max_elements'),
-        'id_limit' => $element_id+1
+        'id_limit' => $id_limit
       ));
       
       $elements = $search_object->getElements($this->getDoctrine(), $this->getUserId(true));
@@ -1063,6 +1073,12 @@ class ElementController extends Controller
     {
       // On récupère les élements
       $autoplaym = new AutoplayManager($elements, $this->container);
+      
+      // Petit hack pour savoir qu'on est en suffle
+      if ($element_id == -1) {
+          $autoplaym->shuffle();
+      }
+      
       $elements_json = $autoplaym->getList();
     }
     

src/Muzich/CoreBundle/Resources/public/css/main.css

@@ -2709,4 +2709,15 @@ div.private_links textarea
   animation-name: clignote;
   animation-duration: 1s;
   animation-iteration-count:infinite;
-}
+}
+
+ul.elements li.inline_actions {
+    float: right;
+    text-align: right;
+}
+
+ul.elements li.inline_actions a.button {
+    margin-left: -30px;
+    margin-top: -15px;
+    position: absolute;
+}

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

@@ -148,7 +148,7 @@ $(document).ready(function() {
     return false;
   });
   
-  $('a.autoplay_playlist').live('click', function(){
+  $('a.autoplay_playlist, a.autoplay_favshow').live('click', function(){
     window.autoplay.start($(this));
     $('html, body').animate({ scrollTop: 0 }, 'fast');
     return false;

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

@@ -10,6 +10,12 @@
 {% if elements_context is not defined %}
   {% set elements_context = '' %}
 {% endif %}
+{% if autoplay_shuffle is not defined %}
+  {% set autoplay_shuffle = '' %}
+{% endif %}
+{% if tag_ids_json is not defined %}
+  {% set tag_ids_json = '[]' %}
+{% endif %}
 
 {% if display_new_elements %}
   <div class="display_more_elements" style="display: none;">
@@ -25,6 +31,34 @@
 
 {% if elements|length %}
   {% if not app.request.isXmlHttpRequest %}<ul class="elements" data-autoplay_context="{{ autoplay_context }}" data-context="{{ elements_context }}">{% endif %}
+    
+    {% if autoplay_shuffle %}
+        <li class="inline_actions">
+            <a class="autoplay_favshow button simpleimg darkbutton" 
+                {% if autoplay_shuffle == 'elements_get_filter_data_autoplay_show' %}
+                    href="{{ path(autoplay_shuffle, {
+                             'element_id' : -1,
+                             'type'       : 'show',
+                             'show_type'  : autoplay_shuffle_show_type,
+                             'show_id'    : viewed_user.id, 
+                             'data'       : tag_ids_json
+                           }) }}"
+                {% endif %}
+                {% if autoplay_shuffle == 'elements_get_filter_data_autoplay_favorite' %}
+                    href="{{ path(autoplay_shuffle, {
+                             'element_id' : -1,
+                             'type'       : 'favorite',
+                             'show_type'  : 'user',
+                             'show_id'    : viewed_user.id, 
+                             'data'       : tag_ids_json
+                           }) }}"
+                {% endif %}
+            >
+              <img src="{{ asset('/img/1372889556_random_shuffle.png') }}" alt="shuffle" />
+            </a>
+        </li>
+    {% endif %}
+      
     {% for element in elements %} 
       
       {% include "MuzichCoreBundle:SearchElement:li.element.html.twig" %}

src/Muzich/FavoriteBundle/Controller/FavoriteController.php

@@ -292,7 +292,8 @@ class FavoriteController extends Controller
         'user'             => $this->getUser(),
         'elements'         => $elements,
         'tag_ids_json'     => $tags_ids_json,
-        'viewed_user'      => $viewed_user
+        'viewed_user'      => $viewed_user,
+        'autoplay_shuffle' => 'elements_get_filter_data_autoplay_favorite'
       ))->getContent();
     }
     

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

@@ -31,6 +31,7 @@
     
     {% include "MuzichCoreBundle:SearchElement:default.html.twig" with{
         'display_autoplay'     : true,
+        'autoplay_shuffle'     : 'elements_get_filter_data_autoplay_favorite',
         'autoplay_context'     : 'favorite_user'
     } %}
     

src/Muzich/HomeBundle/Controller/ShowController.php

@@ -73,7 +73,9 @@ class ShowController extends Controller
       'count_favorited_users' => $count_favorited_users,
       'count_followers' => $count_followers,
       'add_form'        => ($this->getUserId(true) == $viewed_user->getId())?$this->getAddForm()->createView():null,
-      'add_form_name'   => 'add'
+      'add_form_name'   => 'add',
+      'autoplay_shuffle' => 'elements_get_filter_data_autoplay_show',
+      'autoplay_shuffle_show_type' => 'user'
     );
   }
   

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

@@ -82,6 +82,8 @@
   
   {% include "MuzichCoreBundle:SearchElement:default.html.twig" with {
     'display_autoplay'     : true,
+    'autoplay_shuffle'     : 'elements_get_filter_data_autoplay_show',
+    'autoplay_shuffle_show_type': 'user',
     'autoplay_context'     : 'show_user'
   } %}