4 files changed, 40 insertions, 19 deletions

diff --git a/hyperkitty/static/css/hyperkitty-common.css b/hyperkitty/static/css/hyperkitty-common.css
index 7b3190b..419cb7f 100644
--- a/hyperkitty/static/css/hyperkitty-common.css
+++ b/hyperkitty/static/css/hyperkitty-common.css
@@ -295,3 +295,26 @@ a.thread-new strong {
 .ui-autocomplete-loading {
     background: white url('../img/ajax-loader.gif') right center no-repeat;
 }
+
+
+/*
+ * Categories
+ */
+
+.thread-category {
+    padding: 0;
+    padding-bottom: 10px;
+}
+.thread-category form {
+    margin: 0;
+    display: none;
+}
+.thread-category form select {
+    font-size: 90%;
+    width: 12em;
+}
+.thread-category form .errorlist {
+    display: none; /* Displayed manually */
+}
+
+
diff --git a/hyperkitty/static/css/hyperkitty-message.css b/hyperkitty/static/css/hyperkitty-message.css
index 1e74517..0f7ca20 100644
--- a/hyperkitty/static/css/hyperkitty-message.css
+++ b/hyperkitty/static/css/hyperkitty-message.css
@@ -150,25 +150,14 @@
 
 /* Categories */
 
-#thread-category {
-    padding: 0;
-    padding-bottom: 10px;
+.thread-header .thread-category {
     text-align: center;
 }
-#thread-category form {
-    margin: 0;
-    display: none;
-}
-#thread-category form select {
-    font-size: 90%;
-    width: 12em;
-}
-#thread-category a.label {
+.thread-header .thread-category a.label {
     font-size: 120%;
     line-height: 120%;
 }
 
-
 /* Participants */
 
 #participants {
diff --git a/hyperkitty/static/css/hyperkitty-threadslist.css b/hyperkitty/static/css/hyperkitty-threadslist.css
index 610d603..653d5d7 100644
--- a/hyperkitty/static/css/hyperkitty-threadslist.css
+++ b/hyperkitty/static/css/hyperkitty-threadslist.css
@@ -184,3 +184,10 @@
 .type_test {
     background-color: rgb(200, 171, 55);
 }
+
+
+
+/* Category */
+.thread .thread-category {
+    float: right;
+}
diff --git a/hyperkitty/static/js/hyperkitty-thread.js b/hyperkitty/static/js/hyperkitty-thread.js
index f2c3cd0..2ce664d 100644
--- a/hyperkitty/static/js/hyperkitty-thread.js
+++ b/hyperkitty/static/js/hyperkitty-thread.js
@@ -25,15 +25,16 @@
  */
 
 function setup_category() {
-    $("#thread-category form").submit(function (e) {
+    $(".thread-category form").submit(function (e) {
         e.preventDefault();
+        var widget = $(this).parents(".thread-category").first();
         $.ajax({
             type: "POST",
             //dataType: "json",
             data : $(this).serialize(),
             url: $(this).attr("action"),
             success: function(data) {
-                $("#thread-category").html(data);
+                widget.html(data);
                 setup_category();
             },
             error: function(jqXHR, textStatus, errorThrown) {
@@ -42,12 +43,13 @@ function setup_category() {
             }
         });
     });
-    $("#thread-category a.label").click(function(e) {
+    $(".thread-category a.label").click(function(e) {
         e.preventDefault();
-        $(this).hide();
-        $("#thread-category form").show();
+        $(this).hide()
+            .parents(".thread-category").first()
+            .find("form").show();
     });
-    $("#thread-category form select").change(function() {
+    $(".thread-category form select").change(function() {
         $(this).parents("form").first().submit();
     });
 }