update category display

diff --git a/app/festival/templates/festival/video_list.html b/app/festival/templates/festival/video_list.html
index e971c2cab7dc70814d5ed6fe0bb13cbb78849af2..9d36a6fd4c86c9b6c48ed92812ca3ceb4cd4ebcd 100644 (file)
--- a/app/festival/templates/festival/video_list.html
+++ b/app/festival/templates/festival/video_list.html
@@ -9,11 +9,14 @@
 {% block main %}
 
 {% if categories %}
-<p>{% trans "Categories" %} :
+<ul class="list-inline tag-cloud">
 {% for category in categories %}
-<a href="{% url "festival-video-list-category" category.slug %}">{{ category }}</a> ({{ category.count }}){% if not forloop.last and categories|length > 1 %} | {% endif %}
+ <li>
+  <a href="{% url "festival-video-list-category" category.slug %}">{{ category }}</a> ({{ category.count }})
+ </li>
 {% endfor %}
-</p>
+</ul>
+<br/>
 {% elif category %}
 <p>{% trans "Videos for the category" %} : {{ category }}</p>
 {% endif %}

diff --git a/app/locale/fr/LC_MESSAGES/django.mo b/app/locale/fr/LC_MESSAGES/django.mo
index 9a60f99d0fc00d382f97eb89204a167e75a4c3a1..aa382bfd15c949adde71aeacdbc9b7a58cb186d5 100644 (file)
Binary files a/app/locale/fr/LC_MESSAGES/django.mo and b/app/locale/fr/LC_MESSAGES/django.mo differ

diff --git a/app/locale/fr/LC_MESSAGES/django.po b/app/locale/fr/LC_MESSAGES/django.po
index c27d13f757b4f2b3011e714de70c4ac2f3ee1b7a..d4854ed081f6becd8eedb172b1d6bbce14b5e947 100644 (file)
--- a/app/locale/fr/LC_MESSAGES/django.po
+++ b/app/locale/fr/LC_MESSAGES/django.po
@@ -341,20 +341,20 @@ msgstr "Auteur:"
 
 #: templates/agenda/event_list.html:49
 msgid "Viewing events tagged"
-msgstr ""
+msgstr "Événements pour le mot clé"
 
 #: templates/agenda/event_list.html:51
 #: templates/agenda/includes/event_location.html:14
 msgid "Viewing events for the location"
-msgstr "Les événements du lieu"
+msgstr "Événements du lieu"
 
 #: templates/agenda/event_list.html:54 templates/agenda/event_list.html:56
 msgid "Viewing events from"
-msgstr "Les événements du"
+msgstr "Événements du"
 
 #: templates/agenda/event_list.html:59
 msgid "Viewing events by"
-msgstr "Les événements par"
+msgstr "Événements par"
 
 #: templates/agenda/event_location_list.html:4
 #: templates/agenda/event_location_list.html:22

diff --git a/app/templates/agenda/event_list.html b/app/templates/agenda/event_list.html
index 596a8e7c62dc25d68b623b491708b4a82fdee334..3b1f660827972296c3891dce407c14b8414ca1bc 100644 (file)
--- a/app/templates/agenda/event_list.html
+++ b/app/templates/agenda/event_list.html
@@ -46,7 +46,7 @@
     {% block event_list_filterinfo %}
     <p>
     {% if tag %}
-        {% trans "Viewing events tagged" %} {{ tag }}
+        {% trans "Viewing events tagged" %} <a href="{% url "event_list_tag" tag.slug %}">{{ tag }}</a>
     {% elif location %}
         {% trans "Viewing events for the location" %} {{ location }}
     {% elif year or month %}
@@ -66,6 +66,25 @@
     {% block event_list_pagecontent %}
     {{ page.richtextpage.content|richtext_filters|safe }}
     {% endblock %}
+    {% else %}
+
+    {% block event_keywords %}
+    {% keywords_for mezzanine_agenda.event as tags %}
+    {% if tags %}
+
+    <ul class="list-inline tag-cloud">
+    {% for tag in tags %}
+    <li>
+        <a href="{% url "event_list_tag" tag.slug %}"
+            class="tag-weight-{{ tag.weight }}">{{ tag }}s</a>
+        ({{ tag.item_count }})
+    </li>
+    {% endfor %}
+    </ul>
+    <br/>
+    {% endif %}
+    {% endblock %}
+
     {% endif %}
 {% endif %}
 

diff --git a/app/templates/agenda/includes/event_card.html b/app/templates/agenda/includes/event_card.html
index 8db6e372515bacccae96635d44209646a7220f14..6ba39ca115e9cf2cfa071751da08548bdd03b9d5 100644 (file)
--- a/app/templates/agenda/includes/event_card.html
+++ b/app/templates/agenda/includes/event_card.html
@@ -43,6 +43,7 @@
 </a>
 {% endblock %}
 
+{% comment %}
 {% block event_list_event_links %}
 <div class="event__detail">
 {% keywords_for event as tags %}
@@ -73,4 +74,6 @@
 </p>
 </div>
 {% endblock %}
+{% endcomment %}
+
 </div>

diff --git a/app/templates/blog/blog_post_list.html b/app/templates/blog/blog_post_list.html
index ac3abe9c7a6db4e3e545c266b44576168b631a5f..eacc5027b7fcc25a6ba0e23c87c7a80dabbb186f 100644 (file)
--- a/app/templates/blog/blog_post_list.html
+++ b/app/templates/blog/blog_post_list.html
@@ -49,7 +49,7 @@
     {% if tag %}
         {% trans "Viewing posts tagged" %} {{ tag }}
     {% else %}{% if category %}
-        {% trans "Viewing posts for the category" %} {{ category }}
+        {% trans "Viewing posts for the category" %} <a href="{% url "blog_post_list_category" category.slug %}">{{ category }}</a>
     {% else %}{% if year or month %}
         {% trans "Viewing posts from" %} {% if month %}{{ month }}, {% endif %}
         {{ year }}
@@ -69,11 +69,14 @@
     {% else %}
         {% blog_categories as categories %}
         {% if categories %}
-        <p>{% trans "Categories" %} :
+        <ul class="list-inline tag-cloud">
         {% for category in categories %}
-        <a href="{% url "blog_post_list_category" category.slug %}">{{ category }}</a> ({{ category.post_count }}){% if not forloop.last and categories|length > 1 %} | {% endif %}
+         <li>
+          <a href="{% url "blog_post_list_category" category.slug %}">{{ category }}</a> ({{ category.post_count }})
+         </li>
         {% endfor %}
-        </p>
+        </ul>
+        <br/>
         {% endif %}
     {% endif %}
 {% endif %}