From cd7ee170b8502ea556eaa25e864e848eb2096c30 Mon Sep 17 00:00:00 2001
From: Keegan McAllister <keegan@humbughq.com>
Date: Mon, 24 Sep 2012 10:54:30 -0400
Subject: [PATCH] Move Javascript templates into index.html

...which includes subscriptions.html.

(imported from commit d6297b8b0828fdc1b71393a8549bf2796633a2d0)
---
 templates/zephyr/index.html         | 2 ++
 templates/zephyr/subscriptions.html | 4 ----
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/templates/zephyr/index.html b/templates/zephyr/index.html
index c9dfdc3961..89e34be0e8 100644
--- a/templates/zephyr/index.html
+++ b/templates/zephyr/index.html
@@ -13,6 +13,8 @@
 {% block customhead %}
 
 {% icanhazjs "zephyr" %}
+{% icanhazjs "subscription" %}
+
 {% autoescape off %}
 <link href="/static/styles/pygments.css" rel="stylesheet">
 <script type="text/javascript" src="/static/third/jquery/jquery.form.js"></script>
diff --git a/templates/zephyr/subscriptions.html b/templates/zephyr/subscriptions.html
index 92d41a35d6..d529b0cb53 100644
--- a/templates/zephyr/subscriptions.html
+++ b/templates/zephyr/subscriptions.html
@@ -1,7 +1,3 @@
-{% load jstemplate %}
-
-{% icanhazjs "subscription" %}
-
 <div class="alert" id="subscriptions-status"></div>
 
 <div class="row-fluid">