From 21d28e145152cc7447b64cee54c732787090260e Mon Sep 17 00:00:00 2001
From: Aurélien Bompard <aurelien@bompard.org>
Date: Thu, 11 Jul 2013 17:41:02 +0200
Subject: Improve display of the category on the threads list

---
 hyperkitty/templates/threads/category.html             |  2 +-
 hyperkitty/templates/threads/summary_thread_large.html | 18 +++---------------
 2 files changed, 4 insertions(+), 16 deletions(-)

(limited to 'hyperkitty/templates/threads')

diff --git a/hyperkitty/templates/threads/category.html b/hyperkitty/templates/threads/category.html
index e6e1f03..c315a2e 100644
--- a/hyperkitty/templates/threads/category.html
+++ b/hyperkitty/templates/threads/category.html
@@ -6,7 +6,7 @@
             {% if category %}
             {{ category.name|upper }}
             {% else %}
-            No category
+            no category
             {% endif %}
         </a>
         <form method="post" action="{% url 'thread_set_category' mlist_fqdn=mlist.name threadid=threadid %}">
diff --git a/hyperkitty/templates/threads/summary_thread_large.html b/hyperkitty/templates/threads/summary_thread_large.html
index f03bbbf..05a7e99 100644
--- a/hyperkitty/templates/threads/summary_thread_large.html
+++ b/hyperkitty/templates/threads/summary_thread_large.html
@@ -13,23 +13,8 @@
                        href="{% url 'thread' threadid=thread.thread_id mlist_fqdn=mlist.name %}"
                        >{{ thread.starting_email.subject|strip_subject:mlist }}</a></span>
                 <span class="thread-date">{{ thread|get_date|timesince }}</span>
-                <span class="thread-category">
-                    {% include 'threads/category.html' with category=thread.category_hk category_form=thread.category_form threadid=thread.thread_id %}
-                </span>
             </div>
             <div class="thread-content">
-                {% if thread.category_tag %}
-                <div class="inline-block type type_{{thread.category_tag}}">
-                    <a href="{% url 'search_tag' mlist_fqdn=mlist.name tag=thread.category_tag %}"
-                        >{{thread.category}}</a>
-                </div>
-                {% endif %}
-                {% if thread.category %}
-                <div class="inline-block type type_{{thread.category|lower}}">
-                    <a href="{% url 'search_tag' mlist_fqdn=mlist.name tag=thread.category|lower %}"
-                        >{{thread.category}}</a>
-                </div>
-                {% endif %}
                 <div class="gravatar">
                     {% if thread.starting_email.sender_email %}
                     {% gravatar thread.starting_email.sender_email 40 %}
@@ -44,6 +29,9 @@
                 </div>
             </div>
             <div class="thread-info">
+                <span class="thread-category">
+                    {% include 'threads/category.html' with category=thread.category_hk category_form=thread.category_form threadid=thread.thread_id %}
+                </span>
                 <div class="tags">
                     {% if thread.tags|length %}
                     Tags:
-- 
cgit