Move marketing pages to corporate app.

(imported from commit 70528b544ceb4be12fb02be32889e1b9ca8caeb4)

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'),
 )

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'}),