Paginate the list of liked messages in the user profile

3 files changed, 50 insertions, 38 deletions

diff --git a/hyperkitty/templates/ajax/last_views.html b/hyperkitty/templates/ajax/last_views.html
index a3e1786..0a6d97a 100644
--- a/hyperkitty/templates/ajax/last_views.html
+++ b/hyperkitty/templates/ajax/last_views.html
@@ -7,6 +7,7 @@
             <thead>
                 <tr>
                     <th></th>
+                    <th>List</th>
                     <th>Subject</th>
                     <th>Original author</th>
                     <th>Start date</th>
@@ -22,6 +23,7 @@
                         <i class="unread icon-eye-close" title="New comments"></i>
                         {% endif %}
                     </td>
+                    <td>{{ lv.list_address }}</td>
                     <td><a href="{% url 'thread' mlist_fqdn=lv.list_address threadid=lv.threadid %}"
                             >{{ lv.thread.starting_email.subject }}</a></td>
                     <td>{{ lv.thread.starting_email.sender_name }}</td>
diff --git a/hyperkitty/templates/ajax/votes.html b/hyperkitty/templates/ajax/votes.html
new file mode 100644
index 0000000..abe512e
--- /dev/null
+++ b/hyperkitty/templates/ajax/votes.html
@@ -0,0 +1,44 @@
+{% load url from future %}
+{% load i18n %}
+{% load hk_generic %}
+
+    {% if votes %}
+        <table class="table table-striped table-bordered table-condensed">
+            <thead>
+                <tr>
+                    <th>List</th>
+                    <th>Subject</th>
+                    <th>Author</th>
+                    <th>Date</th>
+                    <th>Vote</th>
+                </tr>
+            </thead>
+            <tbody>
+            {% for vote in votes %}
+                <tr>
+                    <td>{{ vote.list_address }}</td>
+                    <td><a href="{% url 'message_index' mlist_fqdn=vote.list_address message_id_hash=vote.messageid %}"
+                            >{{ vote.message.subject }}</a></td>
+                    <td>{{ vote.message.sender_name }}</td>
+                    <td>{{ vote.message|get_date|date:"l, j F Y H:i:s" }}</td>
+                    <td>
+                        <form method="post" class="likeform"
+                              action="{% url 'message_vote' mlist_fqdn=vote.list_address message_id_hash=vote.messageid %}">
+                            {% csrf_token %}
+                            <input type="hidden" name="vote" value="0" />
+                            {% if vote.vote == 1 %}
+                            <span class="youlike">You like it
+                            {% elif vote.vote == -1 %}
+                            <span class="youdislike">You dislike it
+                            {% endif %}
+                            (<a href="#cancelvote" class="cancel">cancel</a>)</span>
+                        </form>
+                    </td>
+                </tr>
+            {% endfor %}
+            </tbody>
+        </table>
+        {% include "paginator.html" with pager=votes page_key="vpage" %}
+    {% else %}
+        <p>No vote yet.</p>
+    {% endif %}
diff --git a/hyperkitty/templates/user_profile.html b/hyperkitty/templates/user_profile.html
index a057fe2..f82f92d 100644
--- a/hyperkitty/templates/user_profile.html
+++ b/hyperkitty/templates/user_profile.html
@@ -75,43 +75,8 @@
 
 
     <h3>Votes</h3>
-    <h4>Up Votes</h4>
-    {% if votes_up %}
-        <ul>
-        {% for vote in votes_up %}
-            <li>
-            {% if vote.message.content|trimString|length > 0 %}
-                <a href="{% url 'message_index' mlist_fqdn=vote.list_address message_id_hash=vote.messageid %}"
-                    >{{ vote.message.subject }}</a> by {{ vote.message.sender_name }}
-                    ({{ vote.message|get_date|date:"l, j F Y H:i:s" }})
-            {% else %}
-                <a href="{% url 'message_index' mlist_fqdn=vote.list_address message_id_hash=vote.messageid %}">Message is empty</a>
-            {% endif %}
-            </li>
-        {% endfor %}
-        </ul>
-    {% else %}
-        <p>No up vote yet.</p>
-    {% endif %}
-
-    <h4>Down Votes</h4>
-    {% if votes_down %}
-        <ul>
-        {% for vote in votes_down %}
-            <li>
-            {% if vote.message.content|trimString|length > 0 %}
-                <a href="{% url 'message_index' mlist_fqdn=vote.list_address message_id_hash=vote.messageid %}"
-                    >{{ vote.message.subject }}</a> by {{ vote.message.sender_name }}
-                    ({{ vote.message|get_date|date:"l, j F Y H:i:s" }})
-            {% else %}
-                <a href="{% url 'message_index' mlist_fqdn=vote.list_address message_id_hash=vote.messageid %}">Message is empty</a>
-            {% endif %}
-            </li>
-        {% endfor %}
-        </ul>
-    {% else %}
-        <p>No down vote yet.</p>
-    {% endif %}
+    <img alt="Loading..." class="ajaxloader" src="{{ STATIC_URL }}img/ajax-loader.gif" />
+    <div class="votes"></div>
 
 </div>
 
@@ -122,7 +87,8 @@
 <script type="text/javascript">
     $(document).ready(function() {
         // Load the last views
-        update_last_views("{% url 'user_last_views' %}");
+        update_user_profile_part(".views", "{% url 'user_last_views' %}");
+        update_user_profile_part(".votes", "{% url 'user_votes' %}");
     });
 </script>