paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-06 23:13:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Modify /hello to go to register instead of signup on Enterprise

Browse Source 
Also move the urls.py lines to the right place

(imported from commit f9d9805fe599ceffb6cdd1ed572d8656cb0d6d95)
This commit is contained in:
acrefoot
2013-11-21 12:05:25 -05:00
parent fd4565dd67
commit 3a982c7c06
3 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
corporate/urls.py
View File

@@ -12,13 +12,8 @@ urlpatterns = patterns('',
url(r'^zephyr-mirror/$', TemplateView.as_view(template_name='corporate/zephyr-mirror.html')), url(r'^zephyr-mirror/$', TemplateView.as_view(template_name='corporate/zephyr-mirror.html')),
# Marketing # 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'^compare/$', TemplateView.as_view(template_name='corporate/compare.html')),
# signup form
url(r'^signup/$', TemplateView.as_view(template_name='corporate/signup.html'), url(r'^signup/$', TemplateView.as_view(template_name='corporate/signup.html'),
name='signup'), name='signup'),
# TODO: The beta signup view should probably be moved to corporate. # TODO: The beta signup view should probably be moved to corporate.

8
templates/zerver/hello.html
View File

@@ -10,7 +10,11 @@
Finally, workplace chat that actually improves your productivity.* Finally, workplace chat that actually improves your productivity.*
</span> </span>
<span class="footnote">* It's also great for sharing cat pictures.</span> <span class="footnote">* It's also great for sharing cat pictures.</span>
{% if not_enterprise %}
<a href="{% url 'signup' %}" class="main-signup-button btn btn-large btn-info">Sign up now, for free!</a> <a href="{% url 'signup' %}" class="main-signup-button btn btn-large btn-info">Sign up now, for free!</a>
{% else %}
<a href="{% url 'register' %}" class="main-signup-button btn btn-large btn-info">Register now!</a>
{% endif %}
</div> </div>
<img src="/static/images/landing-page/laptop-screenshot.png" class="main-image"> <img src="/static/images/landing-page/laptop-screenshot.png" class="main-image">
</div> </div>
@@ -170,7 +174,11 @@
<div class="app feature-line dark"> <div class="app feature-line dark">
<div class="app-main feature-line-container centered-content"> <div class="app-main feature-line-container centered-content">
{% if not_enterprise %}
<a href="{% url 'signup' %}" class="bottom-signup-button btn btn-large btn-info">Sign up now</a> <a href="{% url 'signup' %}" class="bottom-signup-button btn btn-large btn-info">Sign up now</a>
{% else %}
<a href="{% url 'register' %}" class="bottom-signup-button btn btn-large btn-info">Register now</a>
{% endif %}
</div> </div>
</div> </div>
{% endblock %} {% endblock %}

6
zproject/urls.py
View File

@@ -78,6 +78,12 @@ urlpatterns = patterns('',
url(r'^apps/$', TemplateView.as_view(template_name='zerver/apps.html')), url(r'^apps/$', TemplateView.as_view(template_name='zerver/apps.html')),
url(r'^robots\.txt$', RedirectView.as_view(url='/static/robots.txt')), url(r'^robots\.txt$', RedirectView.as_view(url='/static/robots.txt')),
# Landing page, features pages, signup form, etc.
url(r'^hello/$', TemplateView.as_view(template_name='zerver/hello.html'),
name='landing-page'),
url(r'^new-user/$', RedirectView.as_view(url='/hello')),
url(r'^features/$', TemplateView.as_view(template_name='zerver/features.html')),
) )
# These are used for enterprise development. On a real enterprise instance, # These are used for enterprise development. On a real enterprise instance,