From 258b2ae4b54c4f93ee7a7884f9ec9e85470e55bd Mon Sep 17 00:00:00 2001 From: Aurélien Bompard Date: Sat, 23 Feb 2013 12:20:36 +0100 Subject: Use django-assets to compress static files --- hyperkitty/templates/base.html | 13 +++++++------ hyperkitty/templates/recent_activities.html | 3 --- hyperkitty/templates/thread.html | 1 - hyperkitty/templates/thread_list.html | 1 - requirements.txt | 3 +++ 5 files changed, 10 insertions(+), 11 deletions(-) diff --git a/hyperkitty/templates/base.html b/hyperkitty/templates/base.html index 8af354c..50f1ffe 100644 --- a/hyperkitty/templates/base.html +++ b/hyperkitty/templates/base.html @@ -1,3 +1,4 @@ +{% load assets %} @@ -7,9 +8,9 @@ - - - + {% assets filters="cssmin", output="gen/hyperkitty.css", "libs/jquery/ui-lightness/jquery-ui-1.10.0.custom.min.css", "libs/bootstrap/bootstrap.min.css", "css/hyperkitty.css" %} + + {% endassets %} {% block additional_stylesheets %} {% endblock %} {% load i18n %} @@ -70,9 +71,9 @@ - - - + {% assets filters="jsmin", output="gen/hyperkitty.js", "libs/jquery/jquery-ui-1.10.0.custom.min.js", "libs/bootstrap/bootstrap.min.js", "libs/jquery.expander.js", "libs/protovis-d3.1.js", "js/hyperkitty.js" %} + + {% endassets %} {% block additionaljs %} {% endblock %} diff --git a/hyperkitty/templates/recent_activities.html b/hyperkitty/templates/recent_activities.html index fe3848c..172b992 100644 --- a/hyperkitty/templates/recent_activities.html +++ b/hyperkitty/templates/recent_activities.html @@ -112,8 +112,5 @@ {% endblock %} -{% block additionaljs %} - -{% endblock %} {# vim: set noet: #} diff --git a/hyperkitty/templates/thread.html b/hyperkitty/templates/thread.html index 6c59d7a..96c6020 100644 --- a/hyperkitty/templates/thread.html +++ b/hyperkitty/templates/thread.html @@ -77,7 +77,6 @@ {% block additionaljs %} -