Add pictos & distinct search results

diff --git a/panikweb_templates/static/css/type.css b/panikweb_templates/static/css/type.css
index 933b7eb93066af1dbd5324b6d45992449c42adaf..d31fe6287b1b80602f1ee08eb8156aa43b073335 100644 (file)
--- a/panikweb_templates/static/css/type.css
+++ b/panikweb_templates/static/css/type.css
@@ -99,18 +99,19 @@
   content: "\f04a ";
 }
 .icon-communautaire:before {
-  content: "â\96´ "; /* ▴ */
+  content: "â\96²"; /* ▴ */
 }                      
 .icon-musique:before {
-  content: "â\96µ "; /* ▵ */
+  content: "â\96³"; /* ▵ */
 }              
 .icon-creation:before {
-  content: "\f04a "; /* ▴ */
+  content: "○"; /* ○ */
 }                      
 .icon-agenda-culturel:before {
-  content: "\f04a "; /* ▴ */
+  content: "●"; /*  ● */
 }
 .icon-infodebats:before {
-  content: "\f04a "; /* ▴ */
+  content: "■"; /*  ■ */
+  /*content: "□ ";   □ */
 }
 

diff --git a/panikweb_templates/templates/emissions/nav.html b/panikweb_templates/templates/emissions/nav.html
index 5faf357cb3ddcd396275703c20faecea445a6ede..ce5707c1088afa27fd1d6f86547061ec869f242b 100644 (file)
--- a/panikweb_templates/templates/emissions/nav.html
+++ b/panikweb_templates/templates/emissions/nav.html
@@ -32,9 +32,9 @@
                        {% endif %}
                        {% for category in categories %}
                                {% if class = "grid" %}
-                                       <li><button class="check icon-check-empty" data-about="#Main" data-highlight=".{{ category|slugify }}"><span class="icon-{{category|slugify}}"></span>{{ category }}</button></li>
+                                       <li><button class="check icon-check-empty" data-about="#Main" data-highlight=".{{ category|slugify }}">{{ category }}&nbsp;<span class="icon-{{category|slugify}}"></span></button></li>
                                {% else %}
-                                       <li><button class="check icon-check" data-about="#Main" data-toggle=".{{ category|slugify }}"><span class="icon-{{category|slugify}}"></span>{{ category }}</button></li>
+                                       <li><button class="check icon-check" data-about="#Main" data-toggle=".{{ category|slugify }}">{{ category }}&nbsp;<span class="icon-{{category|slugify}}"></span></button></li>
                                {% endif %}
                        {% endfor %}
                        </ul>
@@ -50,7 +50,7 @@
                {% if emission.categories %}
                        <div class="categories">
                        {% for category in emission.categories.all %}
-                               {% if forloop.counter > 1 %} - {% endif %}<span class="icon-{{category|slugify}}"></span><span>{{category}}</span>
+                               <span class="icon-{{category|slugify}}"></span>&nbsp;<span>{{category}}</span>
                        {% endfor%}
                        </div>
                {% endif %}

diff --git a/panikweb_templates/templates/emissions/search_result.html b/panikweb_templates/templates/emissions/search_result.html
index cfc5bd737fc9f3747d84117a453987d39f27000f..b599ef5db53b38ad4f1719a03390864918cfe8c0 100644 (file)
--- a/panikweb_templates/templates/emissions/search_result.html
+++ b/panikweb_templates/templates/emissions/search_result.html
@@ -1 +1,6 @@
-<a href="{% url 'emission-view' slug=result.object.slug %}">{{ result.object.title }}</a>
+<a href="{% url 'emission-view' slug=result.object.slug %}">
+       <span class="icon-microphone" ></span>
+       <strong>{{ result.object.title }}</strong>
+       <br />
+       <span>{{ result.object.subtitle }}</span>
+</a>

diff --git a/panikweb_templates/templates/episodes/search_result.html b/panikweb_templates/templates/episodes/search_result.html
index 17557dd6dcff07a88cebae5056ca4bdb25097808..aec789c595942008948b3e3e75256843d66ce6bf 100644 (file)
--- a/panikweb_templates/templates/episodes/search_result.html
+++ b/panikweb_templates/templates/episodes/search_result.html
@@ -1,5 +1,6 @@
 <a href="{% url 'episode-view' emission_slug=result.object.emission.slug slug=result.object.slug %}">
-{{ result.object.emission.title }}
-—
-{{ result.object.title }}
+       <span class="icon-headphones" ></span>
+       <strong>{{ result.object.title }}</strong>
+       <br />
+       <span class="smooth">{{ result.object.emission.title }}</span>
 </a>

diff --git a/panikweb_templates/templates/grid.html b/panikweb_templates/templates/grid.html
index f9c9fd820858785f29610d4d308982ad2f6a129d..289d5e61705b6a4f9edf8b124beb712d3392bc01 100644 (file)
--- a/panikweb_templates/templates/grid.html
+++ b/panikweb_templates/templates/grid.html
@@ -31,8 +31,12 @@
                                        <div class="item {% if not schedule.emission.categories %}nocat{% endif %} {% for category in schedule.emission.categories.all %} {{ category|slugify }}{% endfor %}">
                                        
                                                <strong>
-                                                       <a href="{% url 'emission-view' slug=schedule.emission.slug %}">{{ schedule.emission.title }}</a>
+                                                       <a href="{% url 'emission-view' slug=schedule.emission.slug %}">
+                                                               <span>{{ schedule.emission.title }}</span>                                                                                              
+                                                       </a>
                                                </strong>
+                                               {% if schedule.emission.categories %}<br />{% endif %}
+                                               {% for category in schedule.emission.categories.all %}<span class="icon-{{category|slugify}}"></span>{% endfor%}                                                
                                                <br />
                                                {% if schedule.weeks_string or schedule.time_label %}
                                                {% spaceless %}
@@ -50,6 +54,7 @@
                                                <span>)</span>
                                                {% endspaceless %}
                                                {% endif %}
+                                               
                                        </div>
                                        {% endfor %}
                                      {% else %}

diff --git a/panikweb_templates/templates/news/search_result.html b/panikweb_templates/templates/news/search_result.html
index b5997ac6e690009c1858129e607f6ede2ef27aa7..5c5640d9bd1deef0d7a23e0224028ecdccd97c1f 100644 (file)
--- a/panikweb_templates/templates/news/search_result.html
+++ b/panikweb_templates/templates/news/search_result.html
@@ -1 +1,7 @@
-<a href="{% url 'news-view' slug=result.object.slug %}">{{ result.object.title }}</a>
+<a href="{% url 'news-view' slug=result.object.slug %}">
+       <span class="icon-bullhorn" ></span>
+       <strong>{{ result.object.title }}</strong>
+       {% if result.object.datetime %}
+               <div class="smooth">{{ result.object.datetime|date:"D m/M" }}</div>
+       {% endif %}
+</a>

diff --git a/panikweb_templates/templates/search/search.html b/panikweb_templates/templates/search/search.html
index 790b39402d82533f9c21746ae04723a99fecb34c..18eb84938a0e4dae20a4b201859b9c7507b561fa 100644 (file)
--- a/panikweb_templates/templates/search/search.html
+++ b/panikweb_templates/templates/search/search.html
@@ -55,7 +55,6 @@
        {% if query %}
 <div class="wrapper">
        <div class="padded">
-               <nav>
                {% if not page.object_list %}
                        <div class="big error padded center">Sorry, no result with your query!</div>
                {% endif %}
@@ -83,7 +82,6 @@
                                <a class="button big right" href="?q={{ query }}&amp;page={{ page.next_page_number }}">Résultats suivants &raquo;</a>
                        </div>
                {% endif %}
-               </nav>
        </div>
 </div>
        {% endif %}