From a3a4ce32f0596ff0bf48c7cc04292389e0d9627d Mon Sep 17 00:00:00 2001 From: Aurélien Bompard Date: Thu, 11 Jul 2013 19:44:22 +0200 Subject: Move static files into the hyperkitty prefix --- hyperkitty/templates/base.html | 12 ++++++------ hyperkitty/templates/index.html | 4 ++-- hyperkitty/templates/login.html | 6 +++--- hyperkitty/templates/thread.html | 2 +- hyperkitty/templates/user_profile.html | 4 ++-- 5 files changed, 14 insertions(+), 14 deletions(-) (limited to 'hyperkitty/templates') diff --git a/hyperkitty/templates/base.html b/hyperkitty/templates/base.html index c8987bf..48ab126 100644 --- a/hyperkitty/templates/base.html +++ b/hyperkitty/templates/base.html @@ -8,9 +8,9 @@ {% block title %}{{ app_name|title }}{% endblock %} - - - {% assets filters="cssrewrite,cssmin", output="gen/hyperkitty.css", "libs/bootstrap/css/bootstrap.min.css", "css/hyperkitty-base.css", "css/hyperkitty-common.css", "css/hyperkitty-index.css", "css/hyperkitty-user.css", "css/hyperkitty-overview.css", "css/hyperkitty-threadslist.css", "css/hyperkitty-message.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" %} {% endassets %} {% block additional_stylesheets %} {% endblock %} @@ -92,9 +92,9 @@ - - - {% assets filters="rjsmin", output="gen/hyperkitty.js", "libs/bootstrap/js/bootstrap.min.js", "libs/jquery.expander.js", "libs/d3.v2.min.js", "libs/jquery.hotkeys.js", "js/hyperkitty-common.js", "js/hyperkitty-frontpage.js", "js/hyperkitty-overview.js", "js/hyperkitty-thread.js", "js/hyperkitty-userprofile.js" %} + + + {% assets filters="rjsmin", output="gen/hyperkitty.js", "hyperkitty/libs/bootstrap/js/bootstrap.min.js", "hyperkitty/libs/jquery.expander.js", "hyperkitty/libs/d3.v2.min.js", "hyperkitty/libs/jquery.hotkeys.js", "hyperkitty/js/hyperkitty-common.js", "hyperkitty/js/hyperkitty-frontpage.js", "hyperkitty/js/hyperkitty-overview.js", "hyperkitty/js/hyperkitty-thread.js", "hyperkitty/js/hyperkitty-userprofile.js" %} {% endassets %} {% block additionaljs %} {% endblock %} diff --git a/hyperkitty/templates/index.html b/hyperkitty/templates/index.html index 181edb2..fc711b2 100644 --- a/hyperkitty/templates/index.html +++ b/hyperkitty/templates/index.html @@ -26,7 +26,7 @@

{{ mlist.name }}

- Loading... + Loading... {% if forloop.counter|divisibleby:"4" %} @@ -40,7 +40,7 @@ - + {% endblock %} diff --git a/hyperkitty/templates/login.html b/hyperkitty/templates/login.html index 248ee18..683c3bb 100644 --- a/hyperkitty/templates/login.html +++ b/hyperkitty/templates/login.html @@ -24,12 +24,12 @@ Login using Persona {% elif backend == "openid" %} OpenID + src="{{ STATIC_URL }}hyperkitty/img/login/openid.png" alt="OpenID" />
{% csrf_token %} @@ -42,7 +42,7 @@ {% else %} {{ backend|title }} {% endif %} diff --git a/hyperkitty/templates/thread.html b/hyperkitty/templates/thread.html index 04e9522..09aa8d6 100644 --- a/hyperkitty/templates/thread.html +++ b/hyperkitty/templates/thread.html @@ -56,7 +56,7 @@ {% if is_bot %} {% include 'ajax/replies.html' %} {% else %} - Loading... + Loading... {% endif %} diff --git a/hyperkitty/templates/user_profile.html b/hyperkitty/templates/user_profile.html index 1a12846..667e252 100644 --- a/hyperkitty/templates/user_profile.html +++ b/hyperkitty/templates/user_profile.html @@ -81,13 +81,13 @@
- Loading... + Loading...
- Loading... + Loading...
-- cgit