paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-15 11:22:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add a warning when in the zulip.com realm on production

Browse Source 
Display a red warning box to get users to direct users to staging for
the zulip.com (dropbox) realm.

(imported from commit 01ad4209d9247406bc82f5dedaf21371101a1d84)
This commit is contained in:
Jason Michalski
2014-05-21 13:13:27 -07:00
parent 298e008cc2
commit 8c72eddb72
2 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
templates/zerver/right-sidebar.html
View File

@@ -20,6 +20,13 @@
to use <a href="https://zephyr.zulip.com">the web interface</a></span> to use <a href="https://zephyr.zulip.com">the web interface</a></span>
</div> </div>
<div class="alert alert_sidebar alert-error home-error-bar" id="home-error"></div> <div class="alert alert_sidebar alert-error home-error-bar" id="home-error"></div>
{% if send_to_staging %}
<div id="staging-warning"class="alert alert_sidebar alert-error">
<p>This realm uses staging. Please login into
<a href="https://staging.zulip.com/">staging.zulip.com</a>
to be part of the conversation.</p>
</div>
{% endif %}
<div class="alert alert_sidebar alert-error home-error-bar" id="reloading-application"></div> <div class="alert alert_sidebar alert-error home-error-bar" id="reloading-application"></div>
{% if enable_feedback %} {% if enable_feedback %}
<div id="feedback_section"> <div id="feedback_section">

6
zerver/views/__init__.py
View File

@@ -1000,6 +1000,11 @@ def home(request):
(not user_profile.email.lower().endswith("@customer4.invalid"))): (not user_profile.email.lower().endswith("@customer4.invalid"))):
show_invites = False show_invites = False
# Warn users on the zulip.com realm to use staging.
send_to_staging = False
if page_params['domain'] == "zulip.com" and not page_params['staging']:
send_to_staging = True
request._log_data['extra'] = "[%s]" % (register_ret["queue_id"],) request._log_data['extra'] = "[%s]" % (register_ret["queue_id"],)
response = render_to_response('zerver/index.html', response = render_to_response('zerver/index.html',
{'user_profile': user_profile, {'user_profile': user_profile,
@@ -1013,6 +1018,7 @@ def home(request):
'show_webathena': user_profile.realm.domain == "mit.edu", 'show_webathena': user_profile.realm.domain == "mit.edu",
'enable_feedback': settings.ENABLE_FEEDBACK, 'enable_feedback': settings.ENABLE_FEEDBACK,
'embedded': narrow_stream is not None, 'embedded': narrow_stream is not None,
'send_to_staging': send_to_staging,
}, },
context_instance=RequestContext(request)) context_instance=RequestContext(request))
patch_cache_control(response, no_cache=True, no_store=True, must_revalidate=True) patch_cache_control(response, no_cache=True, no_store=True, must_revalidate=True)