summaryrefslogtreecommitdiffstats
path: root/hyperkitty/templates
diff options
context:
space:
mode:
authorAurélien Bompard <aurelien@bompard.org>2013-08-15 11:11:02 +0000
committerAurélien Bompard <aurelien@bompard.org>2013-08-15 11:11:22 +0000
commita77a567329baf8156a782c2dde8e80f38740a97a (patch)
treee8c149b96ba65236f91e03654b448d52013e0b7a /hyperkitty/templates
parent4c1c013620909a0f3490d1a6582924a567dea455 (diff)
downloadhyperkitty-a77a567329baf8156a782c2dde8e80f38740a97a.tar.gz
hyperkitty-a77a567329baf8156a782c2dde8e80f38740a97a.tar.xz
hyperkitty-a77a567329baf8156a782c2dde8e80f38740a97a.zip
Load subscriptions asynchronously
Diffstat (limited to 'hyperkitty/templates')
-rw-r--r--hyperkitty/templates/base.html3
-rw-r--r--hyperkitty/templates/user_profile.html12
2 files changed, 9 insertions, 6 deletions
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>