diff options
| author | Aurélien Bompard <aurelien@bompard.org> | 2013-02-23 12:20:36 +0100 |
|---|---|---|
| committer | Aurélien Bompard <aurelien@bompard.org> | 2013-02-23 12:20:36 +0100 |
| commit | 258b2ae4b54c4f93ee7a7884f9ec9e85470e55bd (patch) | |
| tree | 031e81a747980c0a84d5bb848f1fb1f9898471f9 /hyperkitty | |
| parent | b37e6a2d3cbbd42bfd93ab3fe4167bfc5f7091d5 (diff) | |
| download | hyperkitty-258b2ae4b54c4f93ee7a7884f9ec9e85470e55bd.tar.gz hyperkitty-258b2ae4b54c4f93ee7a7884f9ec9e85470e55bd.tar.xz hyperkitty-258b2ae4b54c4f93ee7a7884f9ec9e85470e55bd.zip | |
Use django-assets to compress static files
Diffstat (limited to 'hyperkitty')
| -rw-r--r-- | hyperkitty/templates/base.html | 13 | ||||
| -rw-r--r-- | hyperkitty/templates/recent_activities.html | 3 | ||||
| -rw-r--r-- | hyperkitty/templates/thread.html | 1 | ||||
| -rw-r--r-- | hyperkitty/templates/thread_list.html | 1 |
4 files changed, 7 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 %} <!DOCTYPE HTML> <html> <head> @@ -7,9 +8,9 @@ <meta name="author" content="" /> <meta name="dc.language" content="en" /> <link rel="shortcut icon" href="{{ STATIC_URL }}img/favicon.ico" /> - <link rel="stylesheet" media="screen" href="{{ STATIC_URL }}libs/bootstrap/bootstrap.min.css" /> - <link rel="stylesheet" media="screen" href="{{ STATIC_URL }}libs/jquery/ui-lightness/jquery-ui-1.10.0.custom.min.css" /> - <link rel="stylesheet" media="all" href="{{ STATIC_URL }}css/hyperkitty.css" /> + {% 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" %} + <link rel="stylesheet" media="all" href="{{ ASSET_URL }}" /> + {% endassets %} {% block additional_stylesheets %} {% endblock %} </head> {% load i18n %} @@ -70,9 +71,9 @@ </div> <script src="//ajax.googleapis.com/ajax/libs/jquery/1.8.3/jquery.min.js"></script> <script>window.jQuery || document.write('<script src="{{ STATIC_URL }}libs/jquery/jquery-1.8.3.min.js"><\/script>')</script> - <script src="{{ STATIC_URL }}libs/jquery/jquery-ui-1.10.0.custom.min.js"></script> - <script src="{{ STATIC_URL }}libs/bootstrap/bootstrap.min.js"></script> - <script src="{{ STATIC_URL }}js/hyperkitty.js"></script> + {% 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" %} + <script type="text/javascript" src="{{ ASSET_URL }}"></script> + {% endassets %} {% block additionaljs %} {% endblock %} </body> 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 %} -<script src="{{ STATIC_URL }}libs/protovis-d3.1.js"></script> -{% 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 %} -<script src="{{ STATIC_URL }}libs/jquery.expander.js"></script> <script type="text/javascript"> $(document).ready(function() { // hide quotes by default in the thread view diff --git a/hyperkitty/templates/thread_list.html b/hyperkitty/templates/thread_list.html index 9188f51..2e2c5ca 100644 --- a/hyperkitty/templates/thread_list.html +++ b/hyperkitty/templates/thread_list.html @@ -52,7 +52,6 @@ {% endblock %} {% block additionaljs %} -<script src="{{ STATIC_URL }}libs/jquery.expander.js"></script> <script> $(document).ready(function() { $('span.expander').expander({ |