From a77a567329baf8156a782c2dde8e80f38740a97a Mon Sep 17 00:00:00 2001
From: Aurélien Bompard <aurelien@bompard.org>
Date: Thu, 15 Aug 2013 11:11:02 +0000
Subject: Load subscriptions asynchronously

---
 hyperkitty/templates/base.html         |  3 ++-
 hyperkitty/templates/user_profile.html | 12 +++++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

(limited to 'hyperkitty/templates')

diff --git a/hyperkitty/templates/base.html b/hyperkitty/templates/base.html
index 393bb80..e7d5303 100644
--- a/hyperkitty/templates/base.html
+++ b/hyperkitty/templates/base.html
@@ -10,7 +10,8 @@
         <meta name="dc.language" content="en" />
         <link rel="shortcut icon" href="{{ STATIC_URL }}hyperkitty/img/favicon.ico" />
         <link rel="stylesheet" media="all" href="{{ STATIC_URL }}hyperkitty/libs/jquery/smoothness/jquery-ui-1.10.3.custom.min.css" />
-        {% assets filters="cssrewrite,cssmin", output="gen/hyperkitty.css", "hyperkitty/libs/bootstrap/css/bootstrap.min.css", "hyperkitty/css/hyperkitty-base.css", "hyperkitty/css/hyperkitty-common.css", "hyperkitty/css/hyperkitty-index.css", "hyperkitty/css/hyperkitty-user.css", "hyperkitty/css/hyperkitty-overview.css", "hyperkitty/css/hyperkitty-threadslist.css", "hyperkitty/css/hyperkitty-message.css" %}
+        <link rel="stylesheet" media="all" href="{{ STATIC_URL }}hyperkitty/libs/bootstrap/css/bootstrap.min.css" />
+        {% assets filters="cssrewrite,cssmin", output="gen/hyperkitty.css", "hyperkitty/css/hyperkitty-base.css", "hyperkitty/css/hyperkitty-common.css", "hyperkitty/css/hyperkitty-index.css", "hyperkitty/css/hyperkitty-user.css", "hyperkitty/css/hyperkitty-overview.css", "hyperkitty/css/hyperkitty-threadslist.css", "hyperkitty/css/hyperkitty-message.css" %}
         <link rel="stylesheet" media="all" href="{{ ASSET_URL }}" />
         {% endassets %}
         {% block additional_stylesheets %} {% endblock %}
diff --git a/hyperkitty/templates/user_profile.html b/hyperkitty/templates/user_profile.html
index 1d25499..e6cb8bd 100644
--- a/hyperkitty/templates/user_profile.html
+++ b/hyperkitty/templates/user_profile.html
@@ -93,18 +93,19 @@
 
     <div id="views">
         <img alt="Loading..." class="ajaxloader" src="{{ STATIC_URL }}hyperkitty/img/ajax-loader.gif" />
-        <div class="ajaxcontent"></div>
+        <div class="ajaxcontent" data-load-from="{% url 'user_last_views' %}"></div>
     </div>
 
 
     <div id="votes">
         <img alt="Loading..." class="ajaxloader" src="{{ STATIC_URL }}hyperkitty/img/ajax-loader.gif" />
-        <div class="ajaxcontent"></div>
+        <div class="ajaxcontent" data-load-from="{% url 'user_votes' %}"></div>
     </div>
 
 
     <div id="subscriptions">
-    {% include "fragments/user_subscriptions.html" %}
+        <img alt="Loading..." class="ajaxloader" src="{{ STATIC_URL }}hyperkitty/img/ajax-loader.gif" />
+        <div class="ajaxcontent" data-load-from="{% url 'user_subscriptions' %}"></div>
     </div>
 
     </div>
@@ -118,8 +119,9 @@
     $(document).ready(function() {
         // Load the last views
         $(".tabbed").tabs();
-        update_user_profile_part("#views div.ajaxcontent", "{% url 'user_last_views' %}");
-        update_user_profile_part("#votes div.ajaxcontent", "{% url 'user_votes' %}");
+        $("div.ajaxcontent").each(function() {
+            update_user_profile_part($(this));
+        });
     });
 </script>
 
-- 
cgit