Fix votes, and a javascript error (#37)

4 files changed, 19 insertions, 21 deletions

diff --git a/hyperkitty/static/js/hyperkitty.js b/hyperkitty/static/js/hyperkitty.js
index d5898dc..87d6987 100644
--- a/hyperkitty/static/js/hyperkitty.js
+++ b/hyperkitty/static/js/hyperkitty.js
@@ -54,10 +54,7 @@ function vote(elem, value) {
             likestatus.find(".dislikecount").html(response.dislike);
         },
         error: function(jqXHR, textStatus, errorThrown) {
-            // authentication or double-vote
-            if (jqXHR.status === 403) {
-                alert(jqXHR.responseText);
-            }
+            alert(jqXHR.responseText);
         }
     });
 }
@@ -304,21 +301,6 @@ function setup_months_list() {
     $("#months-list").accordion({ collapsible: true, active: current });
 }
 
-function setup_expander() {
-    $('span.expander').expander({
-        slicePoint: 500,
-        userCollapseText : '\n[-]',
-        expandText : '\n[+]',
-        beforeExpand: function() {
-            $(this).removeClass("collapsed");
-            $(this).addClass("expanded");
-        },
-        onCollapse: function() {
-            $(this).removeClass("expanded");
-            $(this).addClass("collapsed");
-        }
-    });
-}
 
 
 /*
@@ -333,5 +315,4 @@ $(document).ready(function() {
     setup_months_list();
     setup_favorites();
     setup_replies();
-    setup_expander();
 });
diff --git a/hyperkitty/templates/thread_list.html b/hyperkitty/templates/thread_list.html
index c7857c8..cb95daa 100644
--- a/hyperkitty/templates/thread_list.html
+++ b/hyperkitty/templates/thread_list.html
@@ -50,6 +50,23 @@
 
 {% block additionaljs %}
 <script src="{{ STATIC_URL }}libs/jquery.expander.js"></script>
+<script>
+$(document).ready(function() {
+    $('span.expander').expander({
+        slicePoint: 500,
+        userCollapseText : '\n[View Less]',
+        expandText : '\n[View More]',
+        beforeExpand: function() {
+            $(this).removeClass("collapsed");
+            $(this).addClass("expanded");
+        },
+        onCollapse: function() {
+            $(this).removeClass("expanded");
+            $(this).addClass("collapsed");
+        }
+    });
+});
+</script>
 {% endblock %}
 
 {# vim: set noet: #}
diff --git a/hyperkitty/views/message.py b/hyperkitty/views/message.py
index 41e0f16..e64ac5f 100644
--- a/hyperkitty/views/message.py
+++ b/hyperkitty/views/message.py
@@ -37,6 +37,7 @@ from django.contrib.auth.decorators import (login_required,
                                             user_passes_test)
 
 from hyperkitty.lib import get_store, get_months, get_votes
+from hyperkitty.models import Rating
 from forms import *
 
 
diff --git a/hyperkitty/views/pages.py b/hyperkitty/views/pages.py
index 4fc27d4..f86a9aa 100644
--- a/hyperkitty/views/pages.py
+++ b/hyperkitty/views/pages.py
@@ -36,7 +36,6 @@ from django.contrib.auth.decorators import (login_required,
                                             permission_required,
                                             user_passes_test)
 
-from hyperkitty.models import Rating
 from hyperkitty.lib import get_store
 from forms import *