From 9849cc91e9aaddb733f57a0591d4dd38f4415e9d Mon Sep 17 00:00:00 2001 From: Keegan McAllister Date: Tue, 28 Aug 2012 16:52:23 -0400 Subject: [PATCH] Move bootstrap.js and jQuery into head (imported from commit 8deddd6178f5612be275509bea0a23d20fb4693c) --- templates/zephyr/base.html | 4 +++- templates/zephyr/index.html | 2 -- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/zephyr/base.html b/templates/zephyr/base.html index 680db16be7..6d09ad08e0 100644 --- a/templates/zephyr/base.html +++ b/templates/zephyr/base.html @@ -6,10 +6,12 @@ Zephyr + {# We need to import jQuery before Bootstrap #} + + -
diff --git a/templates/zephyr/index.html b/templates/zephyr/index.html index 5639a1367b..9a11ca5385 100644 --- a/templates/zephyr/index.html +++ b/templates/zephyr/index.html @@ -7,8 +7,6 @@ {% block content %}

Hello {{ user_profile.user.username }}!

- -