search: uniform search filters

diff --git a/panikweb/search.py b/panikweb/search.py
index 1b5a0d72a097c4e1fadc3d21e54533fbf0dc914a..f755f3c6182ba860b4776d174a35f7a526f6e5b8 100644 (file)
--- a/panikweb/search.py
+++ b/panikweb/search.py
@@ -142,6 +142,11 @@ class SearchView(FacetedSearchView):
         context['selected_tags'] = [
                 x.split(':', 1)[1] for x in self.request.GET.getlist('selected_facets')
                 if x.startswith('tags_exact')]
+        context['facets']['fields']['categories'] = [x for x in
+                context['facets']['fields']['categories'] if x[1] > 0]
+        context['facets']['fields']['categories'].sort()
+        context['facets']['fields']['tags'] = [x for x in
+                context['facets']['fields']['tags'] if x[1] > 0]
         return context
 
 sqs = SearchQuerySet().models(Emission, Episode, NewsItem).facet('categories').facet('tags')
@@ -180,7 +185,11 @@ class ListenArchivesView(FacetedSearchView):
         context['selected_tags'] = [
                 x.split(':', 1)[1] for x in self.request.GET.getlist('selected_facets')
                 if x.startswith('tags_exact')]
+        context['facets']['fields']['categories'] = [x for x in
+                context['facets']['fields']['categories'] if x[1] > 0]
         context['facets']['fields']['categories'].sort()
+        context['facets']['fields']['tags'] = [x for x in
+                context['facets']['fields']['tags'] if x[1] > 0]
         return context
 
 listenArchives = search_view_factory(ListenArchivesView)
@@ -214,6 +223,11 @@ class NewsArchivesView(FacetedSearchView):
         context['selected_tags'] = [
                 x.split(':', 1)[1] for x in self.request.GET.getlist('selected_facets')
                 if x.startswith('tags_exact')]
+        context['facets']['fields']['news_categories'] = [x for x in
+                context['facets']['fields']['news_categories'] if x[1] > 0]
+        context['facets']['fields']['news_categories'].sort()
+        context['facets']['fields']['tags'] = [x for x in
+                context['facets']['fields']['tags'] if x[1] > 0]
         return context
 
 newsArchives = search_view_factory(NewsArchivesView)

diff --git a/panikweb_templates/static/css/specifics.css b/panikweb_templates/static/css/specifics.css
index 6070deb5cd3ee31acd85201534042586f1d30feb..22721d4222782073c907224cc2635e8338cf67c4 100644 (file)
--- a/panikweb_templates/static/css/specifics.css
+++ b/panikweb_templates/static/css/specifics.css
@@ -1126,9 +1126,11 @@ ul.newsSpecial{
   font-style: italic;
 }
 
-.newsFilters .count-0{
-       display:none !important;
+.search-filters {
+  text-align: justify;
 }
+
+
 /****************************************************/
 /**** GRILLE ****/
 /****************************************************/

diff --git a/panikweb_templates/templates/listen/archives.html b/panikweb_templates/templates/listen/archives.html
index 4e50b128cfe3675dbb71877a0d56a5ca97e001c9..4263be2ea07013e96c92f21c48ea2c9e6418cdfe 100644 (file)
--- a/panikweb_templates/templates/listen/archives.html
+++ b/panikweb_templates/templates/listen/archives.html
@@ -11,17 +11,18 @@ pri, ei viris quaestio concludaturque qui, cu copiosae senserit quo. Cu dictas
 officiis has, hinc libris aliquam pro te.
 </p>
 
+       <div class="search-filters">
                {% if facets.fields.categories %}
                <nav>
                    <ul class="custom padded">
                                <li><span class="mainLabel">Genre :</span></li>
                                {% for category in facets.fields.categories %} <li>
                                          {% if category.0 in selected_categories %}
-                                               <a class="check icon-check count-{{ category.1 }}" href="{{ request.get_full_path|remove_category_facet:category.0 }}">
+                                               <a class="check icon-check" href="{{ request.get_full_path|remove_category_facet:category.0 }}">
                                                        {{ category.0 }} | {{ category.1 }}
                                                </a>
                                          {% else %}
-                                               <a class="check icon-check-empty count-{{ category.1 }}" href="{{ request.get_full_path|append_category_facet:category.0 }}">{{ category.0 }} | {{ category.1 }}</a></span>
+                                               <a class="check icon-check-empty" href="{{ request.get_full_path|append_category_facet:category.0 }}">{{ category.0 }} | {{ category.1 }}</a></span>
                                          {% endif %}
                                </li>
                                {% endfor %}
@@ -32,21 +33,22 @@ officiis has, hinc libris aliquam pro te.
                {% if facets.fields.tags %}
                <nav>
                    <ul class="tag-facets custom padded">
-                       <li><span class="mainLabel">Mots clés :</span></li>
+                       <li><span class="mainLabel">Mots-clés :</span></li>
                        {% for tag in facets.fields.tags|slice:":20" %} {# Provide only the top 20 tags #}
                        <li>
                          {% if tag.0 in selected_tags %}
-                               <a class="check icon-check count-{{ tag.1 }}" href="{{ request.get_full_path|remove_tag_facet:tag.0 }}">
+                               <a class="check icon-check" href="{{ request.get_full_path|remove_tag_facet:tag.0 }}">
                                        {{ tag.0 }} <span class="smooth">| {{ tag.1 }}</span>
                                </a>
                          {% else %}
-                               <a class="check icon-check-empty count-{{ tag.1 }}" href="{{ request.get_full_path|append_tag_facet:tag.0 }}">{{ tag.0 }} <span class="smooth">| {{ tag.1 }}</span></a> 
+                               <a class="check icon-check-empty" href="{{ request.get_full_path|append_tag_facet:tag.0 }}">{{ tag.0 }} <span class="smooth">| {{ tag.1 }}</span></a> 
                          {% endif %}
                        </li>
                        {% endfor %}
                    </ul>
                </nav>
                {% endif %}
+       </div> <!-- .search-filters -->
 
 {% endblock %}
 

diff --git a/panikweb_templates/templates/news/archives.html b/panikweb_templates/templates/news/archives.html
index fd6b4331963e1a3966e9d70da9e3f7072992b351..4c3821943e3ed311c6e5ff070f6ba8f65d025cd1 100644 (file)
--- a/panikweb_templates/templates/news/archives.html
+++ b/panikweb_templates/templates/news/archives.html
@@ -3,19 +3,18 @@
 {% load paniktags %}
 {% block title %}Actus - Archives{% endblock %}
 {% block nav %}
-       {% news_nav with klass="archives" %}
-
+       <div class="search-filters">
                {% if facets.fields.news_categories %}
                <nav>
                    <ul class="custom padded">
                                <li><span class="mainLabel">Catégorie :</span></li>
                                {% for category in facets.fields.news_categories %} <li>
                                          {% if category.0 in selected_news_categories %}
-                                               <a class="check icon-check count-{{ category.1 }}" href="{{ request.get_full_path|remove_news_category_facet:category.0 }}">
+                                               <a class="check icon-check" href="{{ request.get_full_path|remove_news_category_facet:category.0 }}">
                                                        {{ category.0 }} <span class="smooth">| {{ category.1 }}</span>
                                                </a>
                                          {% else %}
-                                               <a class="check icon-check-empty count-{{ category.1 }}" href="{{ request.get_full_path|append_news_category_facet:category.0 }}">{{ category.0 }} <span class="smooth">| {{ category.1 }}</span></a>
+                                               <a class="check icon-check-empty" href="{{ request.get_full_path|append_news_category_facet:category.0 }}">{{ category.0 }} <span class="smooth">| {{ category.1 }}</span></a>
                                          {% endif %}
                                </li>
                                {% endfor %}
@@ -26,23 +25,22 @@
                {% if facets.fields.tags %}
                <nav>
                    <ul class="tag-facets custom padded">
-                       <li><span class="mainLabel">Mots clés :</span></li>
+                       <li><span class="mainLabel">Mots-clés :</span></li>
                        {% for tag in facets.fields.tags|slice:":20" %} {# Provide only the top 20 tags #}
                        <li>
                          {% if tag.0 in selected_tags %}
-                               <a class="check icon-check count-{{ tag.1 }}" href="{{ request.get_full_path|remove_tag_facet:tag.0 }}">
+                               <a class="check icon-check" href="{{ request.get_full_path|remove_tag_facet:tag.0 }}">
                                        {{ tag.0 }} <span class="smooth">| {{ tag.1 }}</span>
                                </a>
                          {% else %}
-                               <a class="check icon-check-empty count-{{ tag.1 }}" href="{{ request.get_full_path|append_tag_facet:tag.0 }}">{{ tag.0 }} <span class="smooth">| {{ tag.1 }}</span></a> 
+                               <a class="check icon-check-empty" href="{{ request.get_full_path|append_tag_facet:tag.0 }}">{{ tag.0 }} <span class="smooth">| {{ tag.1 }}</span></a>
                          {% endif %}
                        </li>
                        {% endfor %}
                    </ul>
                </nav>
                {% endif %}
-
-
+       </div>
 {% endblock %}
 
 {% block main %}

diff --git a/panikweb_templates/templates/search/search.html b/panikweb_templates/templates/search/search.html
index 9589d94ccd30b252acaab6efd6c1ce9e352bb547..2aff789a0c990d73ca555ad4a17819b0a6bcc072 100644 (file)
--- a/panikweb_templates/templates/search/search.html
+++ b/panikweb_templates/templates/search/search.html
@@ -14,21 +14,21 @@
     </div>
 </div>
 <div class="wrapper">
-    <div class="newsFilters">
+    <div class="search-filters">
        {% if query or selected_tags %}
                <nav class="">
                    {% if facets.fields.categories %}
                    <ul class="custom padded">
-                               <li><span class="mainLabel">Genre:</span></li>
+                               <li><span class="mainLabel">Genre :</span></li>
                      {# Provide only the top 5 categories #}
                                {% for category in facets.fields.categories|slice:":5" %}
                                <li>
                                          {% if category.0 in selected_categories %}
-                                               <a class="check icon-check count-{{ category.1 }}" href="{{ request.get_full_path|remove_category_facet:category.0 }}">
+                                               <a class="check icon-check" href="{{ request.get_full_path|remove_category_facet:category.0 }}">
                                                        {{ category.0 }} <span class="smooth">| {{ category.1 }}</span>
                                                </a>
                                          {% else %}
-                                               <a class="check icon-check-empty count-{{ category.1 }}" href="{{ request.get_full_path|append_category_facet:category.0 }}"
+                                               <a class="check icon-check-empty" href="{{ request.get_full_path|append_category_facet:category.0 }}"
                             >{{ category.0 }} <span class="smooth">| {{ category.1 }}</span></a></span>
                                          {% endif %}
                                </li>
@@ -39,16 +39,16 @@
                <nav>
                    {% if facets.fields.tags %}
                    <ul class="tag-facets custom padded">
-                               <li><span class="mainLabel">Mots clés:</span></li>
+                               <li><span class="mainLabel">Mots-clés :</span></li>
                      {# Provide only the top 5 tags #}
                        {% for tag in facets.fields.tags|slice:":20" %}
                        <li>
                          {% if tag.0 in selected_tags %}
-                               <a class="check icon-check count-{{ tag.1 }}" href="{{ request.get_full_path|remove_tag_facet:tag.0 }}">
+                               <a class="check icon-check" href="{{ request.get_full_path|remove_tag_facet:tag.0 }}">
                                        {{ tag.0 }} <span class="smooth">| {{ tag.1 }}</span>
                                </a> 
                          {% else %}
-                               <a class="check icon-check-empty count-{{ tag.1 }}" href="{{ request.get_full_path|append_tag_facet:tag.0 }}">{{ tag.0 }} <span class="smooth">| {{ tag.1 }}</span></a> 
+                               <a class="check icon-check-empty" href="{{ request.get_full_path|append_tag_facet:tag.0 }}">{{ tag.0 }} <span class="smooth">| {{ tag.1 }}</span></a>
                          {% endif %}
                        </li>
                        {% endfor %}