Switch links on login page to the register page in Dev VM.

(imported from commit 16e285b2d8f3c5124eaef0b20aa1097d4a1934d0)
This commit is contained in:
David Roe 2015-08-19 18:52:21 -07:00 committed by Tim Abbott
parent 472898cfc6
commit dedc83e5dd
2 changed files with 16 additions and 15 deletions

View File

@ -27,7 +27,7 @@ hence the name.
<a href="{{login_url}}">Log in</a>
{% endif %}
{% if not_enterprise %}
{% if deployed and not_enterprise %}
<a href="{% url 'signup' %}">Sign up</a>
{% elif only_sso %}
<a href="{% url 'login-sso' %}">Log In</a>
@ -59,10 +59,10 @@ hence the name.
{% if not only_sso %}
<li><span class="little-bullet">·</span></li>
<li>
{% if not_enterprise %}
{% if deployed and not_enterprise %}
<a href="{% url 'signup' %}">Sign up</a>
{% else %}
<a href="{% url 'register' %}">Sign up</a>
<a href="{% url 'register' %}">Register</a>
{% endif %}
</li>
{% endif %}

View File

@ -10,19 +10,20 @@ def add_settings(request):
# We use the not_enterprise variable name so that templates
# will render even if the appropriate context is not provided
# to the template
'not_enterprise': not settings.ENTERPRISE,
'zulip_admin': settings.ZULIP_ADMINISTRATOR,
'login_url': settings.HOME_NOT_LOGGED_IN,
'only_sso': settings.ONLY_SSO,
'external_api_path': settings.EXTERNAL_API_PATH,
'external_api_uri': settings.EXTERNAL_API_URI,
'external_uri_scheme': settings.EXTERNAL_URI_SCHEME,
'api_site_required': settings.EXTERNAL_API_PATH != "api.zulip.com",
'not_enterprise': not settings.ENTERPRISE,
'deployed': settings.DEPLOYED,
'zulip_admin': settings.ZULIP_ADMINISTRATOR,
'login_url': settings.HOME_NOT_LOGGED_IN,
'only_sso': settings.ONLY_SSO,
'external_api_path': settings.EXTERNAL_API_PATH,
'external_api_uri': settings.EXTERNAL_API_URI,
'external_uri_scheme': settings.EXTERNAL_URI_SCHEME,
'api_site_required': settings.EXTERNAL_API_PATH != "api.zulip.com",
'email_integration_enabled': settings.EMAIL_GATEWAY_BOT != "",
'email_gateway_example': settings.EMAIL_GATEWAY_EXAMPLE,
'password_auth_enabled': password_auth_enabled(realm),
'dev_auth_enabled': dev_auth_enabled(),
'google_auth_enabled': google_auth_enabled(),
'email_gateway_example': settings.EMAIL_GATEWAY_EXAMPLE,
'password_auth_enabled': password_auth_enabled(realm),
'dev_auth_enabled': dev_auth_enabled(),
'google_auth_enabled': google_auth_enabled(),
}
def add_metrics(request):