3 files changed, 18 insertions, 0 deletions

diff --git a/hyperkitty/templates/thread.html b/hyperkitty/templates/thread.html
index 491d08a..ee102fa 100644
--- a/hyperkitty/templates/thread.html
+++ b/hyperkitty/templates/thread.html
@@ -77,6 +77,7 @@
 
 <script type="text/javascript">
     $(document).ready(function() {
+        setup_category();
         setup_tags();
         setup_favorites();
         setup_emails_list();
diff --git a/hyperkitty/templates/threads/category.html b/hyperkitty/templates/threads/category.html
new file mode 100644
index 0000000..e830678
--- /dev/null
+++ b/hyperkitty/templates/threads/category.html
@@ -0,0 +1,14 @@
+{% load url from future %}
+
+        <a class="label {{category}}">
+            {% if category %}
+            {{ category|title }}
+            {% else %}
+            No category
+            {% endif %}
+        </a>
+        <form method="post" action="{% url 'thread_set_category' mlist_fqdn=mlist.name threadid=threadid %}">
+            {% csrf_token %}
+            {{ category_form.as_p }}
+        </form>
+
diff --git a/hyperkitty/templates/threads/right_col.html b/hyperkitty/templates/threads/right_col.html
index 5384d03..c92eabd 100644
--- a/hyperkitty/templates/threads/right_col.html
+++ b/hyperkitty/templates/threads/right_col.html
@@ -38,6 +38,9 @@
         <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>