summaryrefslogtreecommitdiffstats
path: root/hyperkitty/templates/threads
diff options
context:
space:
mode:
authorAurélien Bompard <aurelien@bompard.org>2013-07-11 16:06:25 +0200
committerAurélien Bompard <aurelien@bompard.org>2013-07-11 16:06:25 +0200
commit510c337117a77591400d7ee1d8d20ffd3ca2f731 (patch)
tree6b9cac799a13c13b54905e29542fa11c342727ae /hyperkitty/templates/threads
parent5b18d42d67afc08f469ec216b1d55adeb19feda8 (diff)
downloadhyperkitty-510c337117a77591400d7ee1d8d20ffd3ca2f731.tar.gz
hyperkitty-510c337117a77591400d7ee1d8d20ffd3ca2f731.tar.xz
hyperkitty-510c337117a77591400d7ee1d8d20ffd3ca2f731.zip
Manage thread categories in the database
Diffstat (limited to 'hyperkitty/templates/threads')
-rw-r--r--hyperkitty/templates/threads/category.html5
-rw-r--r--hyperkitty/templates/threads/right_col.html3
2 files changed, 3 insertions, 5 deletions
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>