mirror of https://github.com/zulip/zulip.git
zerver/navbar.html: Clean up to use 4 space indentation.
This commit is contained in:
Aditya Bansal
Tim Abbott
parent
52c40668bc
commit
fbd0e190d0
|
|
@ -1,172 +1,172 @@
|
||||||
<div id="panels">
|
<div id="panels">
|
||||||
<div id="desktop-notifications-panel" class="alert alert-info">
|
<div id="desktop-notifications-panel" class="alert alert-info">
|
||||||
<span class="close" data-dismiss="alert" aria-label="{{ _('Close') }}">×</span>
|
<span class="close" data-dismiss="alert" aria-label="{{ _('Close') }}">×</span>
|
||||||
<div data-step="1">
|
<div data-step="1">
|
||||||
{% trans %}Zulip needs your permission to
|
{% trans %}Zulip needs your permission to
|
||||||
<a class="request-desktop-notifications alert-link">enable desktop notifications.</a>
|
<a class="request-desktop-notifications alert-link">enable desktop notifications.</a>
|
||||||
{% endtrans %}
|
{% endtrans %}
|
||||||
|
</div>
|
||||||
|
<div data-step="2" style="display: none">
|
||||||
|
{{ _('We strongly recommend enabling desktop notifications. They help Zulip keep your team connected.') }}
|
||||||
|
<span class="buttons">
|
||||||
|
<a class="alert-link request-desktop-notifications">{{ _('Enable notifications') }}</a>
|
||||||
|
•
|
||||||
|
<a class="alert-link exit">{{ _('Ask me later') }}</a>
|
||||||
|
•
|
||||||
|
<a class="alert-link reject-notifications">{{ _('Never ask on this computer') }}</a>
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div data-step="2" style="display: none">
|
|
||||||
{{ _('We strongly recommend enabling desktop notifications. They help Zulip keep your team connected.') }}
|
|
||||||
<span class="buttons">
|
|
||||||
<a class="alert-link request-desktop-notifications">{{ _('Enable notifications') }}</a>
|
|
||||||
•
|
|
||||||
<a class="alert-link exit">{{ _('Ask me later') }}</a>
|
|
||||||
•
|
|
||||||
<a class="alert-link reject-notifications">{{ _('Never ask on this computer') }}</a>
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
<div class="header">
|
<div class="header">
|
||||||
<nav class="header-main rightside-userlist" id="top_navbar">
|
<nav class="header-main rightside-userlist" id="top_navbar">
|
||||||
<div class="column-left">
|
<div class="column-left">
|
||||||
<a class="brand no-style" href="#">
|
<a class="brand no-style" href="#">
|
||||||
<img src="/static/images/logo/zulip-icon-128x128.png" class="nav-logo no-drag" alt=""/>
|
<img src="/static/images/logo/zulip-icon-128x128.png" class="nav-logo no-drag" alt=""/>
|
||||||
<div class="company-name">
|
<div class="company-name">
|
||||||
zulip
|
zulip
|
||||||
</div>
|
</div>
|
||||||
</a>
|
|
||||||
</div>
|
|
||||||
<div class="column-middle" id="navbar-middle">
|
|
||||||
<div class="column-middle-inner">
|
|
||||||
<div id="streamlist-toggle" {%if embedded %} style="visibility: hidden"{% endif %}>
|
|
||||||
<a href="#" id="streamlist-toggle-button" role="button"><i class="icon-vector-reorder"></i>
|
|
||||||
<span id="streamlist-toggle-unreadcount">0</span>
|
|
||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
<div id="searchbox" class="searchbox-rightmargin">
|
<div class="column-middle" id="navbar-middle">
|
||||||
<div id="tab_bar" class="notdisplayed">
|
<div class="column-middle-inner">
|
||||||
|
<div id="streamlist-toggle" {%if embedded %} style="visibility: hidden"{% endif %}>
|
||||||
|
<a href="#" id="streamlist-toggle-button" role="button"><i class="icon-vector-reorder"></i>
|
||||||
|
<span id="streamlist-toggle-unreadcount">0</span>
|
||||||
|
</a>
|
||||||
|
</div>
|
||||||
|
<div id="searchbox" class="searchbox-rightmargin">
|
||||||
|
<div id="tab_bar" class="notdisplayed">
|
||||||
|
</div>
|
||||||
|
<form id="searchbox_form" class="form-search navbar-search">
|
||||||
|
<div id="search_arrows" class="input-append">
|
||||||
|
<input class="search-query input-block-level" id="search_query" type="text" placeholder="{{ _('Search') }}"
|
||||||
|
autocomplete="off" aria-label="{{ _('Search') }}" title="{{ _('Search') }} (/)"/>
|
||||||
|
{# Start the button off disabled since there is no active search #}
|
||||||
|
<button class="btn search_button" type="button" id="search_exit" disabled="disabled" aria-label="{{ _('Exit search') }}"><i class="icon-vector-remove"></i></button>
|
||||||
|
<a class="search_icon" href="#search-operators" data-overlay-trigger="search-operators" title="{{ _('Search help') }}"><i class="icon-vector-search"></i></a>
|
||||||
|
</div>
|
||||||
|
</form>
|
||||||
|
</div>{# /searchbox #}
|
||||||
</div>
|
</div>
|
||||||
<form id="searchbox_form" class="form-search navbar-search">
|
|
||||||
<div id="search_arrows" class="input-append">
|
|
||||||
<input class="search-query input-block-level" id="search_query" type="text" placeholder="{{ _('Search') }}"
|
|
||||||
autocomplete="off" aria-label="{{ _('Search') }}" title="{{ _('Search') }} (/)"/>
|
|
||||||
{# Start the button off disabled since there is no active search #}
|
|
||||||
<button class="btn search_button" type="button" id="search_exit" disabled="disabled" aria-label="{{ _('Exit search') }}"><i class="icon-vector-remove"></i></button>
|
|
||||||
<a class="search_icon" href="#search-operators" data-overlay-trigger="search-operators" title="{{ _('Search help') }}"><i class="icon-vector-search"></i></a>
|
|
||||||
</div>
|
|
||||||
</form>
|
|
||||||
</div>{# /searchbox #}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="column-right">
|
|
||||||
<div id="userlist-toggle">
|
|
||||||
<a href="#" id="userlist-toggle-button" role="button"><i class="icon-vector-group"></i>
|
|
||||||
<span id="userlist-toggle-unreadcount">0</span>
|
|
||||||
</a>
|
|
||||||
</div>
|
</div>
|
||||||
<div id="navbar-buttons" {%if embedded %} style="visibility: hidden"{% endif %}>
|
<div class="column-right">
|
||||||
<ul class="nav" role="navigation">
|
<div id="userlist-toggle">
|
||||||
<li class="dropdown actual-dropdown-menu" id="gear-menu">
|
<a href="#" id="userlist-toggle-button" role="button"><i class="icon-vector-group"></i>
|
||||||
<a id="settings-dropdown" href="#" role="button" class="dropdown-toggle" data-target="nada" data-toggle="dropdown" title="{{ _('Menu') }} (g)">
|
<span id="userlist-toggle-unreadcount">0</span>
|
||||||
<i class="icon-vector-cog"></i><i class="icon-vector-caret-down settings-dropdown-caret"></i>
|
|
||||||
</a>
|
</a>
|
||||||
<ul class="dropdown-menu" role="menu" aria-labelledby="settings-dropdown">
|
</div>
|
||||||
{#
|
<div id="navbar-buttons" {%if embedded %} style="visibility: hidden"{% endif %}>
|
||||||
It is quite ingrained in our frontend code that your Home
|
<ul class="nav" role="navigation">
|
||||||
view is a Bootstrap Nav tab, even though we don't show the tab
|
<li class="dropdown actual-dropdown-menu" id="gear-menu">
|
||||||
anymore
|
<a id="settings-dropdown" href="#" role="button" class="dropdown-toggle" data-target="nada" data-toggle="dropdown" title="{{ _('Menu') }} (g)">
|
||||||
#}
|
<i class="icon-vector-cog"></i><i class="icon-vector-caret-down settings-dropdown-caret"></i>
|
||||||
<li class="invisible" style="display:none;" role="presentation"><a href="#home" data-toggle="tab"></a></li>
|
</a>
|
||||||
<li role="presentation">
|
<ul class="dropdown-menu" role="menu" aria-labelledby="settings-dropdown">
|
||||||
<a href="#streams" role="menuitem">
|
{#
|
||||||
<i class="icon-vector-exchange"></i> {{ _('Manage streams') }}
|
It is quite ingrained in our frontend code that your Home
|
||||||
</a>
|
view is a Bootstrap Nav tab, even though we don't show the tab
|
||||||
</li>
|
anymore
|
||||||
<li role="presentation">
|
#}
|
||||||
<a href="#settings" role="menuitem">
|
<li class="invisible" style="display:none;" role="presentation"><a href="#home" data-toggle="tab"></a></li>
|
||||||
<i class="icon-vector-wrench"></i> {{ _('Settings') }}
|
<li role="presentation">
|
||||||
</a>
|
<a href="#streams" role="menuitem">
|
||||||
</li>
|
<i class="icon-vector-exchange"></i> {{ _('Manage streams') }}
|
||||||
<li class="admin-menu-item" role="presentation">
|
</a>
|
||||||
<a href="#organization" role="menuitem">
|
</li>
|
||||||
<i class="icon-vector-bolt"></i>
|
<li role="presentation">
|
||||||
<span>{{ _('Manage organization') }}</span>
|
<a href="#settings" role="menuitem">
|
||||||
</a>
|
<i class="icon-vector-wrench"></i> {{ _('Settings') }}
|
||||||
</li>
|
</a>
|
||||||
<li class="divider"></li>
|
</li>
|
||||||
<li role="presentation">
|
<li class="admin-menu-item" role="presentation">
|
||||||
<a href="/help" target="_blank" role="menuitem">
|
<a href="#organization" role="menuitem">
|
||||||
<i class="icon-vector-question-sign"></i> {{ _('User documentation') }}
|
<i class="icon-vector-bolt"></i>
|
||||||
</a>
|
<span>{{ _('Manage organization') }}</span>
|
||||||
</li>
|
</a>
|
||||||
<li role="presentation">
|
</li>
|
||||||
<a tabindex="0" role="menuitem" data-overlay-trigger="keyboard-shortcuts">
|
<li class="divider"></li>
|
||||||
<i class="icon-vector-keyboard"></i> {{ _('Keyboard shortcuts') }} (?)
|
<li role="presentation">
|
||||||
</a>
|
<a href="/help" target="_blank" role="menuitem">
|
||||||
</li>
|
<i class="icon-vector-question-sign"></i> {{ _('User documentation') }}
|
||||||
<li role="presentation">
|
</a>
|
||||||
<a tabindex="0" role="menuitem" data-overlay-trigger="markdown-help">
|
</li>
|
||||||
<i class="icon-vector-pencil"></i> {{ _('Message formatting') }}
|
<li role="presentation">
|
||||||
</a>
|
<a tabindex="0" role="menuitem" data-overlay-trigger="keyboard-shortcuts">
|
||||||
</li>
|
<i class="icon-vector-keyboard"></i> {{ _('Keyboard shortcuts') }} (?)
|
||||||
<li role="presentation">
|
</a>
|
||||||
<a tabindex="0" role="menuitem" data-overlay-trigger="search-operators">
|
</li>
|
||||||
<i class="icon-vector-search"></i> {{ _('Search operators') }}
|
<li role="presentation">
|
||||||
</a>
|
<a tabindex="0" role="menuitem" data-overlay-trigger="markdown-help">
|
||||||
</li>
|
<i class="icon-vector-pencil"></i> {{ _('Message formatting') }}
|
||||||
<li class="divider" role="presentation"></li>
|
</a>
|
||||||
<li role="presentation">
|
</li>
|
||||||
<a href="{{ apps_page_url }}" target="_blank" role="menuitem">
|
<li role="presentation">
|
||||||
<i class="icon-vector-desktop"></i> {{ _('Desktop & mobile apps') }}
|
<a tabindex="0" role="menuitem" data-overlay-trigger="search-operators">
|
||||||
</a>
|
<i class="icon-vector-search"></i> {{ _('Search operators') }}
|
||||||
</li>
|
</a>
|
||||||
<li role="presentation">
|
</li>
|
||||||
<a href="/integrations" target="_blank" role="menuitem">
|
<li class="divider" role="presentation"></li>
|
||||||
<i class="icon-vector-github"></i> {{ _('Integrations') }}
|
<li role="presentation">
|
||||||
</a>
|
<a href="{{ apps_page_url }}" target="_blank" role="menuitem">
|
||||||
</li>
|
<i class="icon-vector-desktop"></i> {{ _('Desktop & mobile apps') }}
|
||||||
<li role="presentation">
|
</a>
|
||||||
<a href="/api" target="_blank" role="menuitem">
|
</li>
|
||||||
<i class="icon-vector-sitemap"></i> {{ _('API documentation') }}
|
<li role="presentation">
|
||||||
</a>
|
<a href="/integrations" target="_blank" role="menuitem">
|
||||||
</li>
|
<i class="icon-vector-github"></i> {{ _('Integrations') }}
|
||||||
<li role="presentation">
|
</a>
|
||||||
<a href="/stats" target="_blank" role="menuitem">
|
</li>
|
||||||
<i class="icon-vector-bar-chart"></i>
|
<li role="presentation">
|
||||||
<span>{{ _('Statistics') }}</span>
|
<a href="/api" target="_blank" role="menuitem">
|
||||||
</a>
|
<i class="icon-vector-sitemap"></i> {{ _('API documentation') }}
|
||||||
</li>
|
</a>
|
||||||
<li class="divider" role="presentation"></li>
|
</li>
|
||||||
{% if enable_feedback %}
|
<li role="presentation">
|
||||||
<li role="presentation">
|
<a href="/stats" target="_blank" role="menuitem">
|
||||||
<a href="#feedback" class="feedback" role="menuitem">
|
<i class="icon-vector-bar-chart"></i>
|
||||||
<i class="icon-vector-comment"></i> {{ _('Feedback') }}
|
<span>{{ _('Statistics') }}</span>
|
||||||
</a>
|
</a>
|
||||||
</li>
|
</li>
|
||||||
{% endif %}
|
<li class="divider" role="presentation"></li>
|
||||||
{% if show_invites %}
|
{% if enable_feedback %}
|
||||||
<li role="presentation">
|
<li role="presentation">
|
||||||
<a href="#invite" role="menuitem">
|
<a href="#feedback" class="feedback" role="menuitem">
|
||||||
<i class="icon-vector-plus-sign"></i> {{ _('Invite users') }}
|
<i class="icon-vector-comment"></i> {{ _('Feedback') }}
|
||||||
</a>
|
</a>
|
||||||
</li>
|
</li>
|
||||||
<li class="divider" role="presentation"></li>
|
{% endif %}
|
||||||
{% endif %}
|
{% if show_invites %}
|
||||||
{% if show_webathena %}
|
<li role="presentation">
|
||||||
<li title="{% trans %}Grant Zulip the Kerberos tickets needed to run your Zephyr mirror via Webathena{% endtrans %}" id="webathena_login_menu" role="presentation">
|
<a href="#invite" role="menuitem">
|
||||||
<a href="#webathena" class="webathena_login" role="menuitem">
|
<i class="icon-vector-plus-sign"></i> {{ _('Invite users') }}
|
||||||
<i class="icon-vector-bolt"></i>{{ _('Link with Webathena') }}
|
</a>
|
||||||
</a>
|
</li>
|
||||||
</li>
|
<li class="divider" role="presentation"></li>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
<li role="presentation">
|
{% if show_webathena %}
|
||||||
<a href="#logout" class="logout_button" role="menuitem">
|
<li title="{% trans %}Grant Zulip the Kerberos tickets needed to run your Zephyr mirror via Webathena{% endtrans %}" id="webathena_login_menu" role="presentation">
|
||||||
<i class="icon-vector-off"></i> {{ _('Log out') }}
|
<a href="#webathena" class="webathena_login" role="menuitem">
|
||||||
</a>
|
<i class="icon-vector-bolt"></i>{{ _('Link with Webathena') }}
|
||||||
</li>
|
</a>
|
||||||
{% if show_debug %}
|
</li>
|
||||||
<li role="presentation">
|
{% endif %}
|
||||||
<a href="#debug" data-toggle="tab" role="menuitem">
|
<li role="presentation">
|
||||||
<i class="icon-vector-barcode"></i> {{ _('Debug') }}
|
<a href="#logout" class="logout_button" role="menuitem">
|
||||||
</a>
|
<i class="icon-vector-off"></i> {{ _('Log out') }}
|
||||||
</li>
|
</a>
|
||||||
{% endif %}
|
</li>
|
||||||
|
{% if show_debug %}
|
||||||
|
<li role="presentation">
|
||||||
|
<a href="#debug" data-toggle="tab" role="menuitem">
|
||||||
|
<i class="icon-vector-barcode"></i> {{ _('Debug') }}
|
||||||
|
</a>
|
||||||
|
</li>
|
||||||
|
{% endif %}
|
||||||
|
</ul>
|
||||||
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
</li>
|
</div>
|
||||||
</ul>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</nav>
|
||||||
</nav>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
|
|
@ -108,7 +108,6 @@ def check_html_templates(templates, all_dups):
|
||||||
IGNORE_FILES = [
|
IGNORE_FILES = [
|
||||||
# Temporarily Avoiding cleaning these to avoid merge conflicts for now.
|
# Temporarily Avoiding cleaning these to avoid merge conflicts for now.
|
||||||
'templates/zerver/keyboard_shortcuts.html',
|
'templates/zerver/keyboard_shortcuts.html',
|
||||||
'templates/zerver/navbar.html',
|
|
||||||
# zephyr-mirror.html has some whitespace-dependent formatting
|
# zephyr-mirror.html has some whitespace-dependent formatting
|
||||||
# for code blocks that prevent cleaning it. Might make sense
|
# for code blocks that prevent cleaning it. Might make sense
|
||||||
# to convert it to a /help/ markdown article.
|
# to convert it to a /help/ markdown article.
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue