2 files changed, 34 insertions, 4 deletions

diff --git a/hyperkitty/static/css/hyperkitty-message.css b/hyperkitty/static/css/hyperkitty-message.css
index a960853..2dfb9df 100644
--- a/hyperkitty/static/css/hyperkitty-message.css
+++ b/hyperkitty/static/css/hyperkitty-message.css
@@ -104,7 +104,9 @@
     margin: 0 2px 0 2px;
 }
 
+
 /* Tags */
+
 #tags {
     color: rgb(167, 169, 172);
     margin-top: 2em;
@@ -126,11 +128,28 @@
     margin-left: 5px;
 }
 
+#tags .rmtag {
+    margin: 0;
+    display: inline;
+}
+#tags .rmtag a {
+    visibility: hidden;
+    font-size: 125%;
+}
+#tags:hover .rmtag a {
+    visibility: visible;
+}
+#tags:hover .rmtag a:hover {
+    text-decoration: none;
+}
+
 #add-tag {
     margin-top: 0.3em;
 }
 
+
 /* Participants */
+
 #participants {
     margin-top: 2em;
     color: rgb(167, 169, 172);
diff --git a/hyperkitty/static/js/hyperkitty.js b/hyperkitty/static/js/hyperkitty.js
index ffdf5e1..49bee91 100644
--- a/hyperkitty/static/js/hyperkitty.js
+++ b/hyperkitty/static/js/hyperkitty.js
@@ -77,8 +77,9 @@ function setup_vote(baseElem) {
  * Tagging
  */
 
-function setup_add_tag() {
-    $("#add-tag-form").submit( function () {
+function setup_tags() {
+    function post_tags(e) {
+        e.preventDefault();
         $.ajax({
             type: "POST",
             dataType: "json",
@@ -86,13 +87,23 @@ function setup_add_tag() {
             url: $(this).attr("action"),
             success: function(data) {
                 $("#tags").html(data.html);
+                $("#tags form").submit(post_tags);
+                $("#tags form a").click(function(e) {
+                    e.preventDefault();
+                    $(this).parents("form").first().submit();
+                });
             },
             error: function(jqXHR, textStatus, errorThrown) {
                 // authentication and invalid data
                 alert(jqXHR.responseText);
             }
         });
-        return false;
+    }
+    $("#add-tag-form").submit(post_tags);
+    $("#tags form").submit(post_tags);
+    $("#tags form a").click(function(e) {
+        e.preventDefault();
+        $(this).parents("form").first().submit();
     });
 }
 
@@ -531,7 +542,7 @@ function setup_flash_messages() {
 
 $(document).ready(function() {
     setup_vote();
-    setup_add_tag();
+    setup_tags();
     setup_months_list();
     setup_favorites();
     setup_emails_list();