From c785aec29fbc2cb0a62bf7b9f00aecab402e35f2 Mon Sep 17 00:00:00 2001
From: Aurélien Bompard <aurelien@bompard.org>
Date: Sat, 23 Feb 2013 13:21:14 +0100
Subject: jQuery UI does not like to be minified again

It causes javascript errors and 404 errors on images
---
 hyperkitty/templates/base.html | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'hyperkitty')

diff --git a/hyperkitty/templates/base.html b/hyperkitty/templates/base.html
index f25b326..38d04ec 100644
--- a/hyperkitty/templates/base.html
+++ b/hyperkitty/templates/base.html
@@ -8,7 +8,8 @@
 		<meta name="author" content="" />
 		<meta name="dc.language" content="en" />
 		<link rel="shortcut icon" href="{{ STATIC_URL }}img/favicon.ico" />
-		{% 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-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" %}
+		<link rel="stylesheet" media="all" href="{{ STATIC_URL }}libs/jquery/ui-lightness/jquery-ui-1.10.0.custom.min.css" />
+		{% assets filters="cssmin", output="gen/hyperkitty.css", "libs/bootstrap/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" %}
 		<link rel="stylesheet" media="all" href="{{ ASSET_URL }}" />
 		{% endassets %}
 		{% block additional_stylesheets %} {% endblock %}
@@ -71,8 +72,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>
-	{% 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>
+	<script src="{{ STATIC_URL }}libs/jquery/jquery-ui-1.10.0.custom.min.js"></script>
+	{% assets filters="jsmin", output="gen/hyperkitty.js", "libs/bootstrap/bootstrap.min.js", "libs/jquery.expander.js", "libs/protovis-d3.1.js", "js/hyperkitty.js" %}
+	<script src="{{ ASSET_URL }}"></script>
 	{% endassets %}
 	{% block additionaljs %} {% endblock %}
 
-- 
cgit