From 090d09a95a35b93560280c9a67210b06f5e335d0 Mon Sep 17 00:00:00 2001
From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Thu, 21 Apr 2016 12:17:23 +0200
Subject: [PATCH] update category display

---
 .../templates/festival/video_list.html        |   9 +++++---
 app/locale/fr/LC_MESSAGES/django.mo           | Bin 3227 -> 3283 bytes
 app/locale/fr/LC_MESSAGES/django.po           |   8 +++----
 app/templates/agenda/event_list.html          |  21 +++++++++++++++++-
 app/templates/agenda/includes/event_card.html |   3 +++
 app/templates/blog/blog_post_list.html        |  11 +++++----
 6 files changed, 40 insertions(+), 12 deletions(-)

diff --git a/app/festival/templates/festival/video_list.html b/app/festival/templates/festival/video_list.html
index e971c2ca..9d36a6fd 100644
--- 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
GIT binary patch
delta 1338
zcmZA1O-PhM9LMp$`DE&9rdA^M@?@FzzV>2P5<w&cM#OfMV$%o7*F|^j5^Wv~f(&s9
z589zTgisV1MS9#zP(m0*9g?6+hlD_HLG}Hu)4_(B`8+fG%sl^@d7d3Be_x)QFY)df
z=>%mHWhu+-Jig7QBIT|&E5tm^#WGxjzO%*|#(etgF%M6pkLNH4yHVp4Sd2GtyIInP
zx$x+CjvDyNnRflNsEOxrEq-zSz#`hePyvN_iheIe1zhP2J5M6nny7SN1dDmTUEyLK
z9dRVvAeAP*<J#j`MtcGk`3!EwSuDi`+<;j`u?5Sp1nW=>I*VF)1i96kk!&qgc|6}b
zxX=m{$YSg!>c(5Bof&eDxZg)n0p3Tg^a&Q=4C;ZeQS;0>KcQAUkD7M@+d1YXOlk#}
z8KnsOoY#@xY!JydL>0nO=LGJg{S@`!k4Uy}R2y*t5244ZG*3M$pi|C9*WZ-S{%fl)
z(xDZ#p(eP73hXXw;)ke}K1OZzH0u6$sPSKsY>Te_8+BhXQLo2p)I1HS{zg<_%^~(*
zZ+$BrdIttj14d8}c!ZnrrSk(;&|XAMP{i^xUj?e|yLJsKpjy{%K!(^EB-;fl9mS<2
z7dqnrwMFfyKw_vf8$eAojM{-Q)WAv9{m)PVzd!}>202=*rT7#Ddz_-NM<@zbNpmZu
zzGoM79phq0rny{ILbYr2jb`3zJyfZFndS54T3^I&ijM1F+RKHuc^_q$>(m#dbRZS=
zDysBvqomNcQR>tn>8(;aN;#Z*;FVT|Gi|dy&i#0hqQ58Bnn^WNpFMw7VbC9R$NT(v
zw5=^@o%)&6;YHH7`_q%%L09I7ShUwxbhIY?&Z|M<|IU@|SWlwY?+pB|p19xAnVw9I
HhyMHp;6#V(

delta 1271
zcmZwHO>B%o9LMp0?L*mBwp*&J*oW$>mo2)iR#eh74ieIE5J9|lQ>5K=)#6ari8OJ0
z^dv6gvN&Kbg1zXWr@D}EpiUA}2W}b%zQ1;ym^?F|nR%X>=RY&g?wk0XcyTi3jT&hu
zc?J1fm01tI3{jANdS*2^jq|a3E*YcF2B(i<`de@TrqRbvoQKCz<Fi<cIczd3+I1?-
zZTC?FOU|<Eub?J=g^O^)`2iQxo<arm%k_tNn*xqGeP=6j*)9sr(~Y&f-wslV($R}t
zR-n+t!>)Y`m(dPTkw3%)R<I5~;wt=sF^m$87Se=TaSFL*8RW7~3f<p>Vcu^&R0!UV
zpdLJl+L1nIzq_AD1$G&=!kf4dM^O{rL(TKZ`4qL%XQ+9{@jS=-8Wng4gNll9KNWch
zxo0Pk%larHn0H>qB<&H@iytGGRVeCl9Md?7nkUA&DWK&}AJv~k?Nn=+{nv`R=+FcQ
zP?4QQO+1WR=?z?pw^7eOKuz!*xopC<-=m(J!X;Qm^qQw0)$gMM$e=#<-4XU*4<4nX
z0S8e5jNnSVi;egKHSis3r#`v%7uWud3S`=~J+_Cc)u47NPN5@6qK-C&+L^XvRP^z+
zqt0qCYNEram7hTk%%cWeK?Qsb6;Oa2scj+qWCg3FvD<>rp~OHtwYBPUX$|TSmG}Y9
ze7bsr(vDfI4Hc$7_w{6L$=|e*iuQ67xy5zr=b_XZ<h{mb{go&w&ei1YYLGf+u?(hz
zCth9iX4kX9nZm7P{r9l2nY6C_)$`|+6V<1^u6@}df2?$Atdz?RWOEmX{J~Qf?4Qow
Qg5Q5GTln9N;BDmh9|_BItN;K2

diff --git a/app/locale/fr/LC_MESSAGES/django.po b/app/locale/fr/LC_MESSAGES/django.po
index c27d13f7..d4854ed0 100644
--- 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 596a8e7c..3b1f6608 100644
--- 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 8db6e372..6ba39ca1 100644
--- 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 ac3abe9c..eacc5027 100644
--- 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 %}
-- 
2.39.5