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

settings: Extract CUSTOM_LOGO_URL.

Browse Source
This commit is contained in:
Tim Abbott
2016-07-18 21:56:45 -07:00
parent de679a23c9
commit 82f78621dd
4 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
templates/zerver/portico.html
View File

@@ -15,8 +15,8 @@
<div class="header-main" id="top_navbar"> <div class="header-main" id="top_navbar">
<div class="column-left"> <div class="column-left">
<div> <div>
{% if zulip_com %} {% if custom_logo_url %}
<a class="brand logo" href="/"><img src="/static/images/logo/zulip-dropbox.png" class="portico-logo" alt="Zulip" content="Zulip" /></a> <a class="brand logo" href="/"><img src="{{ custom_logo_url }}" class="portico-logo" alt="Zulip" content="Zulip" /></a>
{% else %} {% else %}
<a class="brand logo" href="/"><img src="/static/images/logo/zulipcornerlogo@2x.png" class="portico-simple-logo" alt="Zulip" content="Zulip" /></a> <a class="brand logo" href="/"><img src="/static/images/logo/zulipcornerlogo@2x.png" class="portico-simple-logo" alt="Zulip" content="Zulip" /></a>
{% endif %} {% endif %}

1
zerver/context_processors.py
View File

@@ -12,6 +12,7 @@ def add_settings(request):
# to the template # to the template
'not_voyager': not settings.VOYAGER, 'not_voyager': not settings.VOYAGER,
'zulip_com': settings.ZULIP_COM, 'zulip_com': settings.ZULIP_COM,
'custom_logo_url': settings.CUSTOM_LOGO_URL,
'register_link_disabled': settings.REGISTER_LINK_DISABLED, 'register_link_disabled': settings.REGISTER_LINK_DISABLED,
'show_oss_announcement': settings.SHOW_OSS_ANNOUNCEMENT, 'show_oss_announcement': settings.SHOW_OSS_ANNOUNCEMENT,
'zulip_admin': settings.ZULIP_ADMINISTRATOR, 'zulip_admin': settings.ZULIP_ADMINISTRATOR,

1
zproject/local_settings.py
View File

@@ -31,6 +31,7 @@ ZULIP_FRIENDS_LIST_ID = '84b2f3da6b'
SHARE_THE_LOVE = True SHARE_THE_LOVE = True
SHOW_OSS_ANNOUNCEMENT = True SHOW_OSS_ANNOUNCEMENT = True
REGISTER_LINK_DISABLED = True REGISTER_LINK_DISABLED = True
CUSTOM_LOGO_URL = "/static/images/logo/zulip-dropbox.png"
# This can be filled in automatically from the database, maybe # This can be filled in automatically from the database, maybe
DEPLOYMENT_ROLE_NAME = 'zulip.com' DEPLOYMENT_ROLE_NAME = 'zulip.com'

1
zproject/settings.py
View File

@@ -148,6 +148,7 @@ DEFAULT_SETTINGS = {'TWITTER_CONSUMER_KEY': '',
'ZULIP_COM': False, 'ZULIP_COM': False,
'SHOW_OSS_ANNOUNCEMENT': False, 'SHOW_OSS_ANNOUNCEMENT': False,
'REGISTER_LINK_DISABLED': False, 'REGISTER_LINK_DISABLED': False,
'CUSTOM_LOGO_URL': None,
'STATSD_HOST': '', 'STATSD_HOST': '',
'OPEN_REALM_CREATION': False, 'OPEN_REALM_CREATION': False,
'REMOTE_POSTGRES_HOST': '', 'REMOTE_POSTGRES_HOST': '',