From dedc83e5dd50f7441a4127b2c4a94de24c181081 Mon Sep 17 00:00:00 2001 From: David Roe Date: Wed, 19 Aug 2015 18:52:21 -0700 Subject: [PATCH] Switch links on login page to the register page in Dev VM. (imported from commit 16e285b2d8f3c5124eaef0b20aa1097d4a1934d0) --- templates/zerver/portico.html | 6 +++--- zerver/context_processors.py | 25 +++++++++++++------------ 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/templates/zerver/portico.html b/templates/zerver/portico.html index 634d71826a..726224b5b7 100644 --- a/templates/zerver/portico.html +++ b/templates/zerver/portico.html @@ -27,7 +27,7 @@ hence the name. Log in {% endif %} - {% if not_enterprise %} + {% if deployed and not_enterprise %} Sign up {% elif only_sso %} Log In @@ -59,10 +59,10 @@ hence the name. {% if not only_sso %}
  • ยท
  • - {% if not_enterprise %} + {% if deployed and not_enterprise %} Sign up {% else %} - Sign up + Register {% endif %}
  • {% endif %} diff --git a/zerver/context_processors.py b/zerver/context_processors.py index d24cf28550..76c71817b5 100644 --- a/zerver/context_processors.py +++ b/zerver/context_processors.py @@ -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):