Ajout de deux bouton: aucun tags, mes tags

app/Resources/translations/userui.fr.yml

@@ -33,6 +33,8 @@ tags:
 filter:
   network: "Résultats de "
   submit:  Filtrer
+  clear:   Aucun filtre
+  mytags:  Tous mes tags
   
 element_add:
   url:

src/Muzich/CoreBundle/Controller/CoreController.php

@@ -263,4 +263,18 @@ class CoreController extends Controller
     
   }
   
+  public function filterClearAction()
+  {
+    $es = $this->getElementSearcher();
+    $es->update(array('tags' => array()));
+    $this->setElementSearcherParams($es->getParams());
+    return $this->redirect($this->container->get('request')->headers->get('referer'));
+  }
+  
+  public function filterMytagsAction()
+  {
+    $this->getElementSearcher(null, true);
+    return $this->redirect($this->container->get('request')->headers->get('referer'));
+  }
+  
 }

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

@@ -20,6 +20,14 @@ search_tag_ig_by_name:
   pattern: /search/tagid/{string_search}
   defaults: { _controller: MuzichCoreBundle:Search:searchTagId, string_search: null }
 
+filter_clear:
+  pattern: /filter/clear
+  defaults: { _controller: MuzichCoreBundle:Core:filterClear }
+
+filter_mytags:
+  pattern: /filter/my-tags
+  defaults: { _controller: MuzichCoreBundle:Core:filterMytags }
+
 ####
 
 info_about:

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

@@ -6,7 +6,7 @@
     {{ form_label(search_form.network, 'filter.network'|trans({}, 'userui')) }}
     {{ form_widget(search_form.network) }}
   </div>
-
+  
   {% include "MuzichCoreBundle:Tag:tagsPrompt.html.twig" with { 'form_name': form_name } %}
   
   {{ form_row(search_form.tags) }}

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

@@ -2,6 +2,17 @@
 
 <div class="tags_prompt" id="tags_prompt_{{ form_name }}">
   <span class="help">{{ 'tags.help'|trans({}, 'userui') }}</span>
+  
+  {% if display_specials_buttons is defined %}
+    {% if display_specials_buttons == true %}
+      <br />
+      <input class="clear" type="button" value="{{ 'filter.clear'|trans({}, 'userui') }}" />
+      <input type="hidden" class="filter_clear_url" value="{{ path('filter_clear') }}" />
+      <input class="mytags" type="button" value="{{ 'filter.mytags'|trans({}, 'userui') }}" />
+      <input type="hidden" class="filter_mytags_url" value="{{ path('filter_mytags') }}" />
+    {% endif %}
+  {% endif %}
+  
    <input class="tags_prompt_list" id="tags_prompt_list_{{ form_name }}" name="tags" value=""> 
 </div>
 

src/Muzich/CoreBundle/lib/Controller.php

@@ -43,11 +43,11 @@ class Controller extends BaseController
    * 
    * @return  ElementSearcher
    */
-  protected function getElementSearcher($count = null)
+  protected function getElementSearcher($count = null, $force_new = false)
   {
     $session = $this->get("session");
     // Si l'objet n'existe pas encore, a t-on déjà des paramètres de recherche
-    if (!$session->has('user.element_search.params'))
+    if (!$session->has('user.element_search.params') || $force_new)
     {
       // Il nous faut instancier notre premier objet recherche
       // Premièrement on récupère les tags favoris de l'utilisateur

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

@@ -28,13 +28,12 @@
   <form 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
+      'form_name'               : search_form_name,
+      'search_tags'             : search_tags_id,
+      'display_specials_buttons': true
     } %}
-
-    <span class="help">{{ 'tags_filter.help'|trans({}, 'userui') }}</span>
-    <br />
-    <input type="submit" value="{{ 'filter.submit'|trans({}, 'userui') }}"/>
+    
+    <input class="main" type="submit" value="{{ 'filter.submit'|trans({}, 'userui') }}"/>
   </form>
 
   {% include "MuzichCoreBundle:SearchElement:default.html.twig" %}

web/bundles/muzichcore/css/main.css

@@ -436,4 +436,14 @@ span.sinfo
   
   font-size: 85%;
   text-align: center;
+}
+
+input.main
+{
+  font-weight: bold;
+}
+
+input.clear, input.mytags
+{
+  font-size: 80%;
 }

web/bundles/muzichcore/js/muzich.js

@@ -115,20 +115,31 @@ if(typeof(String.prototype.trim) === "undefined")
 
 $(document).ready(function(){
   
- // Affichage un/des embed
- $('a.element_embed_open_link').click(function(){
-   $(this).parent('li.element').find('a.element_embed_open_link').hide();
-   $(this).parent('li.element').find('a.element_embed_close_link').show();
-   $(this).parent('li.element').find('div.element_embed').show();
-   return false;
+   // Affichage un/des embed
+   $('a.element_embed_open_link').click(function(){
+     $(this).parent('li.element').find('a.element_embed_open_link').hide();
+     $(this).parent('li.element').find('a.element_embed_close_link').show();
+     $(this).parent('li.element').find('div.element_embed').show();
+     return false;
+   });
+
+   // Fermeture du embed si demandé
+   $('a.element_embed_close_link').click(function(){
+     $(this).parent('li.element').find('a.element_embed_open_link').show();
+     $(this).parent('li.element').find('a.element_embed_close_link').hide();
+     $(this).parent('li.element').find('div.element_embed').hide();
+     return false;
+   });
+   
+   // Bouton de personalisation du filtre
+   // pour le moment ce ne sotn que des redirection vers des actions
+   $('.tags_prompt input.clear').click(function(){
+     $(location).attr('href', $('input.filter_clear_url').val());
+   });
+   $('.tags_prompt input.mytags').click(function(){
+     $(location).attr('href', $('input.filter_mytags_url').val());
+   });
+   
  });
-
- // Fermeture du embed si demandé
- $('a.element_embed_close_link').click(function(){
-   $(this).parent('li.element').find('a.element_embed_open_link').show();
-   $(this).parent('li.element').find('a.element_embed_close_link').hide();
-   $(this).parent('li.element').find('div.element_embed').hide();
-   return false;
- });
-
- });
+ 
+ 

web/js/tags/jquery.tagBox.js

@@ -172,6 +172,12 @@
               }
               $('input#'+form_name+'_tags').val(array2json(input_values));
             }
+            
+            // Suppression tu tableau js
+            if (inArray(tagsAddeds[form_name], id))
+            {
+              delete tagsAddeds[form_name][id];
+            }
         },
         updateInput : function() {