From 2d725b585c67c98a50511eff7f9a39f107fc5eb8 Mon Sep 17 00:00:00 2001
From: Aurélien Bompard <aurelien@bompard.org>
Date: Mon, 14 Jan 2013 13:12:46 +0100
Subject: Update jQuery and Bootstrap

---
 hyperkitty/templates/base.html | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'hyperkitty/templates')

diff --git a/hyperkitty/templates/base.html b/hyperkitty/templates/base.html
index d00358e..515b430 100644
--- a/hyperkitty/templates/base.html
+++ b/hyperkitty/templates/base.html
@@ -7,9 +7,8 @@
 		<meta name="author" content="" />
 		<meta name="dc.language" content="en" />
 		<link rel="shortcut icon" href="{{ STATIC_URL }}img/favicon.ico" />
-		<link rel="stylesheet" type="text/css" media="all" href="{{ STATIC_URL }}css/normalize.css" />
-		<link rel="stylesheet" type="text/css" media="all" href="{{ STATIC_URL }}css/bootstrap.css" />
-		<link rel="stylesheet" type="text/css" media="all" href="{{ STATIC_URL }}css/style.css" />
+		<link rel="stylesheet" media="screen" href="{{ STATIC_URL }}css/bootstrap.min.css" />
+		<link rel="stylesheet" media="all" href="{{ STATIC_URL }}css/hyperkitty.css" />
 		{% block additional_stylesheets %} {% endblock %}
 	</head>
 	{% load i18n %}
@@ -55,7 +54,9 @@
 		</div>
 		{% block footer %} {% endblock %}
 
-	<script src="{{ STATIC_URL }}js/libs/jquery-1.7.1.min.js"></script>
+	<script src="//ajax.googleapis.com/ajax/libs/jquery/1.8.3/jquery.min.js"></script>
+	<script>window.jQuery || document.write('<script src="{{ STATIC_URL }}js/libs/jquery-1.8.3.min.js"><\/script>')</script>
+	<script src="{{ STATIC_URL }}js/libs/bootstrap.min.js"></script>
 	<script src="{{ STATIC_URL }}js/hyperkitty.js"></script>
 	{% block additionaljs %} {% endblock %}
 
-- 
cgit