diff --git a/templates/404.html b/templates/404.html index 9f673b847e..0da79abcb0 100644 --- a/templates/404.html +++ b/templates/404.html @@ -9,6 +9,6 @@

We know this is stressful, but we still love you.

-

If you'd like, you can drop us a line to let us know what happened.

+

If you'd like, you can drop us a line to let us know what happened.

{% endblock %} diff --git a/templates/500.html b/templates/500.html index d4286006cd..aa1cef00ed 100644 --- a/templates/500.html +++ b/templates/500.html @@ -14,6 +14,6 @@

Well oops. This one's probably our fault. Sorry about that!

-

If you'd like, you can drop us a line to let us know what happened.

+

If you'd like, you can drop us a line to let us know what happened.

{% endblock %} diff --git a/zerver/context_processors.py b/zerver/context_processors.py index 49580f0b64..6f051bd5a2 100644 --- a/zerver/context_processors.py +++ b/zerver/context_processors.py @@ -7,6 +7,7 @@ def add_settings(request): return { 'full_navbar': settings.FULL_NAVBAR, 'local_server': settings.LOCAL_SERVER, + 'zulip_admin': settings.ZULIP_ADMINISTRATOR, } def add_metrics(request): diff --git a/zproject/local_settings.py b/zproject/local_settings.py index a588af0e60..fdc42c6e76 100644 --- a/zproject/local_settings.py +++ b/zproject/local_settings.py @@ -159,3 +159,5 @@ NAGIOS_RECEIVE_BOT = 'othello@zulip.com' # Our internal deployment has nagios checks for both staging and prod NAGIOS_STAGING_SEND_BOT = 'iago@zulip.com' NAGIOS_STAGING_RECEIVE_BOT = 'cordelia@zulip.com' + +ZULIP_ADMINISTRATOR = 'support@zulip.com' diff --git a/zproject/local_settings_template.py b/zproject/local_settings_template.py index afc32e5690..120ecfd617 100644 --- a/zproject/local_settings_template.py +++ b/zproject/local_settings_template.py @@ -3,6 +3,9 @@ # This is the user-accessible Zulip hostname for this installation EXTERNAL_HOST = '' +# This is the Zulip Administrator email address +ZULIP_ADMINISTRATOR = '' + # These credentials are for communication with the central Zulip deployment manager DEPLOYMENT_ROLE_NAME = '' DEPLOYMENT_ROLE_KEY = '' diff --git a/zproject/settings.py b/zproject/settings.py index fc000a35c3..b1e7caa4a5 100644 --- a/zproject/settings.py +++ b/zproject/settings.py @@ -245,7 +245,8 @@ DEFAULT_SETTINGS = {'TWITTER_CONSUMER_KEY': '', 'ERROR_BOT': None, 'NEW_USER_BOT': None, 'NAGIOS_STAGING_SEND_BOT': None, - 'NAGIOS_STAGING_RECEIVE_BOT': None + 'NAGIOS_STAGING_RECEIVE_BOT': None, + 'ZULIP_ADMINISTRATOR': '' } for setting_name, setting_val in DEFAULT_SETTINGS.iteritems():