From 510c337117a77591400d7ee1d8d20ffd3ca2f731 Mon Sep 17 00:00:00 2001
From: Aurélien Bompard <aurelien@bompard.org>
Date: Thu, 11 Jul 2013 16:06:25 +0200
Subject: Manage thread categories in the database

---
 hyperkitty/templates/threads/category.html  | 5 +++--
 hyperkitty/templates/threads/right_col.html | 3 ---
 2 files changed, 3 insertions(+), 5 deletions(-)

(limited to 'hyperkitty/templates/threads')

diff --git a/hyperkitty/templates/threads/category.html b/hyperkitty/templates/threads/category.html
index e830678..ccacad5 100644
--- a/hyperkitty/templates/threads/category.html
+++ b/hyperkitty/templates/threads/category.html
@@ -1,8 +1,9 @@
 {% load url from future %}
 
-        <a class="label {{category}}">
+        <a class="label" title="Click to edit"
+           {% if category %}style="background-color:{{category.color}}"{% endif %}>
             {% if category %}
-            {{ category|title }}
+            {{ category.name|upper }}
             {% else %}
             No category
             {% endif %}
diff --git a/hyperkitty/templates/threads/right_col.html b/hyperkitty/templates/threads/right_col.html
index c92eabd..5384d03 100644
--- a/hyperkitty/templates/threads/right_col.html
+++ b/hyperkitty/templates/threads/right_col.html
@@ -38,9 +38,6 @@
         <i class="unread icon-eye-close"></i> {{ unread_count }} unread messages
         {% endif %}
     </p>
-    <div id="thread-category">
-        {% include 'threads/category.html' %}
-    </div>
     <div id="tags">
         {% include 'threads/tags.html' %}
     </div>
-- 
cgit