From 7d44e1c56f782eab950108690955b7456180bc9d Mon Sep 17 00:00:00 2001
From: Keegan McAllister <keegan@humbughq.com>
Date: Tue, 16 Oct 2012 01:24:29 -0400
Subject: [PATCH] Don't include signup.js in login.html

(imported from commit fe36afb1703e706012f1c690d15481a0da204eb3)
---
 templates/zephyr/accounts_home.html         | 2 +-
 templates/zephyr/accounts_send_confirm.html | 2 +-
 templates/zephyr/portico.html               | 2 --
 templates/zephyr/portico_signup.html        | 9 +++++++++
 templates/zephyr/register.html              | 2 +-
 5 files changed, 12 insertions(+), 5 deletions(-)
 create mode 100644 templates/zephyr/portico_signup.html

diff --git a/templates/zephyr/accounts_home.html b/templates/zephyr/accounts_home.html
index e377cd7ddc..8081e79de9 100644
--- a/templates/zephyr/accounts_home.html
+++ b/templates/zephyr/accounts_home.html
@@ -1,4 +1,4 @@
-{% extends "zephyr/portico.html" %}
+{% extends "zephyr/portico_signup.html" %}
 
 {# Home page for not logged-in users. #}
 
diff --git a/templates/zephyr/accounts_send_confirm.html b/templates/zephyr/accounts_send_confirm.html
index 9d1ede07d5..f6cb5a09ad 100644
--- a/templates/zephyr/accounts_send_confirm.html
+++ b/templates/zephyr/accounts_send_confirm.html
@@ -1,4 +1,4 @@
-{% extends "zephyr/portico.html" %}
+{% extends "zephyr/portico_signup.html" %}
 
 {# Displayed after a user attempts to sign up. #}
 
diff --git a/templates/zephyr/portico.html b/templates/zephyr/portico.html
index dbc17d1233..25aee8849b 100644
--- a/templates/zephyr/portico.html
+++ b/templates/zephyr/portico.html
@@ -8,8 +8,6 @@ hence the name.
 {% endcomment %}
 
     {% block customhead %}
-    <script src="https://ajax.aspnetcdn.com/ajax/jquery.validate/1.9/jquery.validate.min.js"></script>
-    <script src="/static/js/signup.js"></script>
     <link href="/static/styles/portico.css?dummy_time={% now "U" %}" rel="stylesheet">
     {% endblock %}
 
diff --git a/templates/zephyr/portico_signup.html b/templates/zephyr/portico_signup.html
new file mode 100644
index 0000000000..76a09956e8
--- /dev/null
+++ b/templates/zephyr/portico_signup.html
@@ -0,0 +1,9 @@
+{% extends "zephyr/portico.html" %}
+
+{# Portico page with signup code #}
+
+{% block customhead %}
+    {{ block.super }}
+    <script src="https://ajax.aspnetcdn.com/ajax/jquery.validate/1.9/jquery.validate.min.js"></script>
+    <script src="/static/js/signup.js"></script>
+{% endblock %}
diff --git a/templates/zephyr/register.html b/templates/zephyr/register.html
index f76313afe0..1ec91a40de 100644
--- a/templates/zephyr/register.html
+++ b/templates/zephyr/register.html
@@ -1,4 +1,4 @@
-{% extends "zephyr/portico.html" %}
+{% extends "zephyr/portico_signup.html" %}
 
 {% comment %}
 Gather other user information, after having confirmed