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

settings: Remove ABOUT_LINK_DISABLED.

Browse Source 
Was introduced in 0f4bbc8, I think because the /team page was unfinished at
the time.
This commit is contained in:
Rishi Gupta
2017-11-16 14:45:09 -08:00
committed by Tim Abbott
parent d9c2f613e3
commit f0807353ae
3 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
templates/zerver/footer.html
View File

@@ -6,10 +6,7 @@
<li><a href="/why-zulip/">{{ _("Why Zulip") }}</a></li> <li><a href="/why-zulip/">{{ _("Why Zulip") }}</a></li>
<li><a href="/features/">{{ _("Features") }}</a></li> <li><a href="/features/">{{ _("Features") }}</a></li>
<li><a href="/plans/">{{ _("Plans &amp; pricing") }}</a></li> <li><a href="/plans/">{{ _("Plans &amp; pricing") }}</a></li>
{% if about_link_disabled %}
{% else %}
<li><a href="/team/">{{ _("Team") }}</a></li> <li><a href="/team/">{{ _("Team") }}</a></li>
{% endif %}
</ul> </ul>
</section> </section>
<section> <section>

3
zerver/context_processors.py
View File

@@ -69,14 +69,12 @@ def zulip_default_context(request):
register_link_disabled = settings.REGISTER_LINK_DISABLED register_link_disabled = settings.REGISTER_LINK_DISABLED
login_link_disabled = settings.LOGIN_LINK_DISABLED login_link_disabled = settings.LOGIN_LINK_DISABLED
about_link_disabled = settings.ABOUT_LINK_DISABLED
find_team_link_disabled = settings.FIND_TEAM_LINK_DISABLED find_team_link_disabled = settings.FIND_TEAM_LINK_DISABLED
if (settings.ROOT_DOMAIN_LANDING_PAGE if (settings.ROOT_DOMAIN_LANDING_PAGE
and get_subdomain(request) == Realm.SUBDOMAIN_FOR_ROOT_DOMAIN): and get_subdomain(request) == Realm.SUBDOMAIN_FOR_ROOT_DOMAIN):
register_link_disabled = True register_link_disabled = True
login_link_disabled = True login_link_disabled = True
about_link_disabled = True
find_team_link_disabled = False find_team_link_disabled = False
apps_page_url = 'https://zulipchat.com/apps/' apps_page_url = 'https://zulipchat.com/apps/'
@@ -106,7 +104,6 @@ def zulip_default_context(request):
'custom_logo_url': settings.CUSTOM_LOGO_URL, 'custom_logo_url': settings.CUSTOM_LOGO_URL,
'register_link_disabled': register_link_disabled, 'register_link_disabled': register_link_disabled,
'login_link_disabled': login_link_disabled, 'login_link_disabled': login_link_disabled,
'about_link_disabled': about_link_disabled,
'terms_of_service': settings.TERMS_OF_SERVICE, 'terms_of_service': settings.TERMS_OF_SERVICE,
'privacy_policy': settings.PRIVACY_POLICY, 'privacy_policy': settings.PRIVACY_POLICY,
'login_url': settings.HOME_NOT_LOGGED_IN, 'login_url': settings.HOME_NOT_LOGGED_IN,

1
zproject/settings.py
View File

@@ -287,7 +287,6 @@ DEFAULT_SETTINGS.update({
'EMAIL_DELIVERER_DISABLED': False, 'EMAIL_DELIVERER_DISABLED': False,
'REGISTER_LINK_DISABLED': None, 'REGISTER_LINK_DISABLED': None,
'LOGIN_LINK_DISABLED': False, 'LOGIN_LINK_DISABLED': False,
'ABOUT_LINK_DISABLED': False,
'FIND_TEAM_LINK_DISABLED': True, 'FIND_TEAM_LINK_DISABLED': True,
# What domains to treat like the root domain # What domains to treat like the root domain