Merge pull request #4343 from wallabag/enhance-material-nav

Enhanced navigation menu in material theme
This commit is contained in:
Jérémy Benoist 2020-04-27 06:08:10 +02:00 committed by GitHub
commit b23d9403ec
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
21 changed files with 59 additions and 40 deletions

View file

@ -141,3 +141,15 @@ nav {
display: none;
}
}
.dropdown-content {
min-width: 300px;
.material-icons {
line-height: initial !important;
}
li > a {
padding: 10px;
}
}

View file

@ -63,6 +63,8 @@ $(document).ready(() => {
container: 'body',
});
$('.dropdown-trigger').dropdown({ hover: false });
initFilters();
initExport();
initRandom();

View file

@ -41,6 +41,7 @@ menu:
filter_entries: 'Filtrer artikler'
# random_entry: Jump to a random entry from that list
# export: 'Export'
# account: 'My account'
search_form:
input_label: 'Indtast søgning'

View file

@ -41,6 +41,7 @@ menu:
filter_entries: 'Artikel filtern'
# random_entry: Jump to a random entry from that list
export: 'Exportieren'
# account: 'My account'
search_form:
input_label: 'Suchbegriff hier eingeben'

View file

@ -41,6 +41,7 @@ menu:
filter_entries: 'Filter entries'
random_entry: Jump to a random entry from that list
export: 'Export'
account: 'My account'
search_form:
input_label: 'Enter your search here'

View file

@ -41,6 +41,7 @@ menu:
filter_entries: 'Filtrar los artículos'
random_entry: 'Ir a un artículo aleatório de esta lista'
export: 'Exportar'
# account: 'My account'
search_form:
input_label: 'Introduzca su búsqueda aquí'

View file

@ -41,6 +41,7 @@ menu:
filter_entries: 'فیلترکردن مقاله‌ها'
# random_entry: Jump to a random entry from that list
export: 'برون‌بری'
# account: 'My account'
search_form:
input_label: 'جستجوی خود را این‌جا بنویسید:'

View file

@ -41,6 +41,7 @@ menu:
filter_entries: "Filtrer les articles"
random_entry: Aller à un article aléatoire de cette liste
export: "Exporter"
account: "Mon compte"
search_form:
input_label: "Saisissez votre terme de recherche"

View file

@ -41,6 +41,7 @@ menu:
filter_entries: 'Filtra contenuti'
# random_entry: Jump to a random entry from that list
export: 'Esporta'
# account: 'My account'
search_form:
input_label: 'Inserisci qui la tua ricerca'

View file

@ -40,6 +40,7 @@ menu:
filter_entries: 'フィルターを使用'
random_entry: このリストの中からランダムに記事に記事を表示
export: 'エクスポート'
# account: 'My account'
search_form:
input_label: '検索内容を入力'

View file

@ -41,6 +41,7 @@ menu:
filter_entries: 'Filtrar los articles'
random_entry: "Sautar a un article a l'azard"
export: 'Exportar'
# account: 'My account'
search_form:
input_label: 'Picatz vòstre mot-clau a cercar aquí'

View file

@ -41,6 +41,7 @@ menu:
filter_entries: 'Filtruj wpisy'
# random_entry: Jump to a random entry from that list
export: 'Eksportuj'
# account: 'My account'
search_form:
input_label: 'Wpisz swoje zapytanie tutaj'

View file

@ -41,6 +41,7 @@ menu:
filter_entries: 'Filtrar os artigos'
random_entry: Ir para um artigo aleatório desta lista
export: 'Exportar'
# account: 'My account'
search_form:
input_label: 'Digite aqui sua pesquisa'

View file

@ -41,6 +41,7 @@ menu:
filter_entries: 'Filtrează articolele'
# random_entry: Jump to a random entry from that list
# export: 'Export'
# account: 'My account'
search_form:
input_label: 'Introdu căutarea ta'

View file

@ -41,6 +41,7 @@ menu:
filter_entries: 'Фильтр записей'
# random_entry: Jump to a random entry from that list
export: 'Экспорт'
# account: 'My account'
search_form:
input_label: 'Введите текст для поиска'

View file

@ -41,6 +41,7 @@ menu:
filter_entries: 'ตัวกรองรายการ'
# random_entry: Jump to a random entry from that list
export: 'นำข้อมูลออก'
# account: 'My account'
search_form:
input_label: 'ค้นหาที่นี้'

View file

@ -41,6 +41,7 @@ menu:
filter_entries: 'Filtrele'
# random_entry: Jump to a random entry from that list
export: 'Dışa Aktar'
# account: 'My account'
search_form:
input_label: 'Aramak istediğiniz herhangi bir şey yazın'

View file

@ -40,6 +40,7 @@ menu:
filter_entries: '筛选项目'
random_entry: '随机跳到该列表中的一个项目'
export: '导出'
# account: 'My account'
search_form:
input_label: '输入搜索关键词'

View file

@ -62,45 +62,9 @@
<li class="bold {% if activeRoute == 'all' %}active{% endif %}">
<a class="waves-effect" href="{{ path('all') }}">{{ 'menu.left.all_articles'|trans }} <span class="numberItems grey-text">{{ count_entries('all') }}</span></a>
</li>
<li class="bold border-bottom {% if currentRoute == 'tags' %}active{% endif %}">
<li class="bold {% if currentRoute == 'tags' %}active{% endif %}">
<a class="waves-effect" href="{{ path('tag') }}">{{ 'menu.left.tags'|trans }} <span class="numberItems grey-text">{{ count_tags() }}</span></a>
</li>
<li class="bold {% if currentRoute == 'config' %}active{% endif %}">
<a class="waves-effect" href="{{ path('config') }}">{{ 'menu.left.config'|trans }}</a>
</li>
{% if craue_setting('restricted_access') %}
<li class="bold {% if currentRoute starts with 'site_credentials_' %}active{% endif %}">
<a class="waves-effect" href="{{ path('site_credentials_index') }}">{{ 'menu.left.site_credentials'|trans }}</a>
</li>
{% endif %}
{% if is_granted('ROLE_SUPER_ADMIN') %}
<li class="bold {% if currentRoute starts with 'user_' %}active{% endif %}">
<a class="waves-effect" href="{{ path('user_index') }}">{{ 'menu.left.users_management'|trans }}</a>
</li>
<li class="bold {% if currentRoute == 'craue_config_settings_modify' %}active{% endif %}">
<a class="waves-effect" href="{{ path('craue_config_settings_modify') }}">{{ 'menu.left.internal_settings'|trans }}</a>
</li>
<li class="bold border-bottom {% if currentRoute == 'ignore_origin_instance_rules_index' %}active{% endif %}">
<a class="waves-effect" href="{{ path('ignore_origin_instance_rules_index') }}">{{ 'menu.left.ignore_origin_instance_rules'|trans }}</a>
</li>
{% endif %}
<li class="bold {% if currentRoute == 'import' %}active{% endif %}">
<a class="waves-effect" href="{{ path('import') }}">{{ 'menu.left.import'|trans }}</a>
</li>
<li class="bold {% if currentRoute == 'developer' %}active{% endif %}">
<a class="waves-effect" href="{{ path('developer') }}">{{ 'menu.left.developer'|trans }}</a>
</li>
<li class="bold {% if currentRoute == 'howto' %}active{% endif %}">
<a class="waves-effect" href="{{ path('howto') }}">{{ 'menu.left.howto'|trans }}</a>
</li>
<li class="bold {% if currentRoute == 'quickstart' %}active{% endif %}">
<a class="waves-effect" href="{{ path('quickstart') }}">{{ 'menu.left.quickstart'|trans }}</a>
</li>
<li class="bold">
<a class="waves-effect icon icon-power" href="{{ path('fos_user_security_logout') }}">{{ 'menu.left.logout'|trans }}</a>
</li>
</ul>
<div class="nav-panels">
<div class="nav-panel-actions nav-panel-item">
@ -128,7 +92,6 @@
<i class="material-icons">casino</i>
</a>
</li>
{% endif %}
<li id="button_filters">
<a class="nav-panel-menu button-collapse-right tooltipped js-filters-action" data-position="bottom" data-delay="50" data-tooltip="{{ 'menu.top.filter_entries'|trans }}" href="#" data-activates="filters">
<i class="material-icons">filter_list</i>
@ -139,7 +102,33 @@
<i class="material-icons">file_download</i>
</a>
</li>
{% endif %}
<li class="bold">
<a class="wave-effect tooltipped dropdown-button" data-beloworigin="true" data-constrainwidth="false" data-activates="dropdown-account" data-position="bottom" data-delay="50" data-tooltip="{{ 'menu.top.account'|trans }}" href="#" id="news_menu">
<i class="material-icons" id="news_link">account_circle</i>
</a>
</li>
</ul>
<ul id="dropdown-account" class="dropdown-content">
<li><a href="{{ path('config') }}"><i class="material-icons">settings</i> {{ 'menu.left.config'|trans }}</a></li>
<li><a href="{{ path('developer') }}"><i class="material-icons">smartphone</i> {{ 'menu.left.developer'|trans }}</a></li>
<li><a href="{{ path('import') }}"><i class="material-icons">import_export</i> {{ 'menu.left.import'|trans }}</a></li>
{% if craue_setting('restricted_access') %}
<li><a href="{{ path('site_credentials_index') }}"><i class="material-icons">vpn_key</i> {{ 'menu.left.site_credentials'|trans }}</a></li>
{% endif %}
<li class="divider"></li>
{% if is_granted('ROLE_SUPER_ADMIN') %}
<li><a href="{{ path('user_index') }}"><i class="material-icons">people</i>{{ 'menu.left.users_management'|trans }}</a></li>
<li><a href="{{ path('craue_config_settings_modify') }}"><i class="material-icons">settings</i> {{ 'menu.left.internal_settings'|trans }}</a></li>
<li><a href="{{ path('ignore_origin_instance_rules_index') }}"><i class="material-icons">build</i> {{ 'menu.left.ignore_origin_instance_rules'|trans }}</a></li>
{% endif %}
<li class="divider"></li>
<li><a href="{{ path('howto') }}"><i class="material-icons">live_help</i> {{ 'menu.left.howto'|trans }}</a></li>
<li><a href="{{ path('quickstart') }}"><i class="material-icons">assistant_photo</i> {{ 'menu.left.quickstart'|trans }}</a></li>
<li class="divider"></li>
<li><a href="{{ path('fos_user_security_logout') }}"><i class="material-icons">input</i> {{ 'menu.left.logout'|trans }}</a></li>
</ul>
</div>
{{ render(controller("WallabagCoreBundle:Entry:searchForm", {'currentRoute': currentRoute})) }}
{{ render(controller("WallabagCoreBundle:Entry:addEntryForm")) }}

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long