paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-10-31 12:03:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Re-enable mobile app advertisements in /apps.html.

Browse Source
This commit is contained in:
Tim Abbott
2016-08-02 16:44:40 -07:00
parent 99da259130
commit 5f275c9868
2 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
templates/zerver/apps.html
View File

@@ -7,10 +7,8 @@
<h3 class="apps-instructions-header">{% trans %}Installation instructions{% endtrans %}</h3> <h3 class="apps-instructions-header">{% trans %}Installation instructions{% endtrans %}</h3>
<ul class="nav nav-tabs" id="apps-tabs"> <ul class="nav nav-tabs" id="apps-tabs">
{% if not_voyager %}
<li class="active"><a href="#android" data-toggle="tab">Android</a></li> <li class="active"><a href="#android" data-toggle="tab">Android</a></li>
<li><a href="#iphone" data-toggle="tab">iPhone</a></li> <li><a href="#iphone" data-toggle="tab">iPhone</a></li>
{% endif %}
<li><a href="#electron" data-toggle="tab">Cross-platform desktop</a></li> <li><a href="#electron" data-toggle="tab">Cross-platform desktop</a></li>
<li><a href="#mac" data-toggle="tab">Mac</a></li> <li><a href="#mac" data-toggle="tab">Mac</a></li>
<li><a href="#linux" data-toggle="tab">Linux</a></li> <li><a href="#linux" data-toggle="tab">Linux</a></li>
@@ -19,7 +17,6 @@
</ul> </ul>
<div class="tab-content"> <div class="tab-content">
{% if not_voyager %}
<div class="tab-pane active" id="android"> <div class="tab-pane active" id="android">
<img class="screenshot android-screenshot pull-left" src="/static/images/app-screenshots/zulip-android.png" alt="screenshot of the Zulip app on Android" /> <img class="screenshot android-screenshot pull-left" src="/static/images/app-screenshots/zulip-android.png" alt="screenshot of the Zulip app on Android" />
@@ -46,7 +43,6 @@
</a> </a>
</div> </div>
{% endif %}
<div class="tab-pane" id="electron"> <div class="tab-pane" id="electron">
<p>{% trans %}The beta version <p>{% trans %}The beta version
of <a href="https://github.com/zulip/zulip-electron">our new of <a href="https://github.com/zulip/zulip-electron">our new

4
zerver/context_processors.py
View File

@@ -8,10 +8,6 @@ from zproject.backends import (password_auth_enabled, dev_auth_enabled,
def add_settings(request): def add_settings(request):
realm = request.user.realm if hasattr(request.user, "realm") else None realm = request.user.realm if hasattr(request.user, "realm") else None
return { return {
# We use the not_voyager variable name so that templates
# will render even if the appropriate context is not provided
# to the template
'not_voyager': not settings.VOYAGER,
'custom_logo_url': settings.CUSTOM_LOGO_URL, '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,