From c3d176a48041a9a0933c10a7f56728d310da0315 Mon Sep 17 00:00:00 2001
From: Steve Howell <steve@zulip.com>
Date: Wed, 6 Nov 2013 07:02:47 -0500
Subject: [PATCH] Move marketing pages to corporate app.

(imported from commit 70528b544ceb4be12fb02be32889e1b9ca8caeb4)
---
 corporate/urls.py                             | 15 ++++++++++++++-
 templates/{zerver => corporate}/compare.html  |  0
 templates/{zerver => corporate}/features.html |  0
 templates/{zerver => corporate}/hello.html    |  0
 templates/{zerver => corporate}/signup.html   |  0
 zproject/urls.py                              | 12 +-----------
 6 files changed, 15 insertions(+), 12 deletions(-)
 rename templates/{zerver => corporate}/compare.html (100%)
 rename templates/{zerver => corporate}/features.html (100%)
 rename templates/{zerver => corporate}/hello.html (100%)
 rename templates/{zerver => corporate}/signup.html (100%)

diff --git a/corporate/urls.py b/corporate/urls.py
index c9fff1fc55..3de0066451 100644
--- a/corporate/urls.py
+++ b/corporate/urls.py
@@ -1,5 +1,5 @@
 from django.conf.urls import patterns, url
-from django.views.generic import TemplateView
+from django.views.generic import TemplateView, RedirectView
 
 urlpatterns = patterns('',
     # Job postings
@@ -10,4 +10,17 @@ urlpatterns = patterns('',
     url(r'^zephyr/$', TemplateView.as_view(template_name='corporate/zephyr.html')),
     url(r'^mit/$', TemplateView.as_view(template_name='corporate/mit.html')),
     url(r'^zephyr-mirror/$', TemplateView.as_view(template_name='corporate/zephyr-mirror.html')),
+
+    # Marketing
+    # Landing page, features pages, signup form, etc.
+    url(r'^hello/$', TemplateView.as_view(template_name='corporate/hello.html'),
+                                         name='landing-page'),
+    url(r'^new-user/$', RedirectView.as_view(url='/hello')),
+    url(r'^features/$', TemplateView.as_view(template_name='corporate/features.html')),
+    url(r'^compare/$', TemplateView.as_view(template_name='corporate/compare.html')),
+
+    url(r'^signup/$', TemplateView.as_view(template_name='corporate/signup.html'),
+                                         name='signup'),
+    # TODO: The beta signup view should probably be moved to corporate.
+    url(r'^signup/sign-me-up$', 'zerver.views.beta_signup_submission', name='beta-signup-submission'),
 )
diff --git a/templates/zerver/compare.html b/templates/corporate/compare.html
similarity index 100%
rename from templates/zerver/compare.html
rename to templates/corporate/compare.html
diff --git a/templates/zerver/features.html b/templates/corporate/features.html
similarity index 100%
rename from templates/zerver/features.html
rename to templates/corporate/features.html
diff --git a/templates/zerver/hello.html b/templates/corporate/hello.html
similarity index 100%
rename from templates/zerver/hello.html
rename to templates/corporate/hello.html
diff --git a/templates/zerver/signup.html b/templates/corporate/signup.html
similarity index 100%
rename from templates/zerver/signup.html
rename to templates/corporate/signup.html
diff --git a/zproject/urls.py b/zproject/urls.py
index 81ee0aa57f..24ef3185d5 100644
--- a/zproject/urls.py
+++ b/zproject/urls.py
@@ -54,17 +54,7 @@ urlpatterns = patterns('',
     url(r'^terms/$',   TemplateView.as_view(template_name='zerver/terms.html')),
     url(r'^privacy/$', TemplateView.as_view(template_name='zerver/privacy.html')),
 
-    # "About Zulip" information
-    url(r'^new-user/$', RedirectView.as_view(url='/hello')),
-    url(r'^features/$', TemplateView.as_view(template_name='zerver/features.html')),
-    url(r'^compare/$', TemplateView.as_view(template_name='zerver/compare.html')),
-
-    # Landing page, signup form, and nice register URL
-    url(r'^hello/$', TemplateView.as_view(template_name='zerver/hello.html'),
-                                         name='landing-page'),
-    url(r'^signup/$', TemplateView.as_view(template_name='zerver/signup.html'),
-                                         name='signup'),
-    url(r'^signup/sign-me-up$', 'zerver.views.beta_signup_submission', name='beta-signup-submission'),
+    # Login/registration
     url(r'^register/$', 'zerver.views.accounts_home', name='register'),
     url(r'^login/$',  'zerver.views.login_page', {'template_name': 'zerver/login.html'}),