aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/Wallabag
diff options
context:
space:
mode:
authorJérémy Benoist <j0k3r@users.noreply.github.com>2020-04-27 06:08:10 +0200
committerGitHub <noreply@github.com>2020-04-27 06:08:10 +0200
commitb23d9403ece494a60ecba5867bb68c94ec497052 (patch)
treea6a9e1c296d6f9bfa3ada4c912a07569b5285498 /src/Wallabag
parent0e8a0f77d0b643a884e6687bd9c463267852a970 (diff)
parentd9a68f6ced3f510e5a52d5f857ca9c19aed8924b (diff)
downloadwallabag-b23d9403ece494a60ecba5867bb68c94ec497052.tar.gz
wallabag-b23d9403ece494a60ecba5867bb68c94ec497052.tar.zst
wallabag-b23d9403ece494a60ecba5867bb68c94ec497052.zip
Merge pull request #4343 from wallabag/enhance-material-nav
Enhanced navigation menu in material theme
Diffstat (limited to 'src/Wallabag')
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.da.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.de.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.en.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.es.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.it.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.ja.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.ru.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.th.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.zh.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig65
17 files changed, 43 insertions, 38 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
index 54df2e64..4f8b071f 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
@@ -41,6 +41,7 @@ menu:
41 filter_entries: 'Filtrer artikler' 41 filter_entries: 'Filtrer artikler'
42 # random_entry: Jump to a random entry from that list 42 # random_entry: Jump to a random entry from that list
43 # export: 'Export' 43 # export: 'Export'
44 # account: 'My account'
44 search_form: 45 search_form:
45 input_label: 'Indtast søgning' 46 input_label: 'Indtast søgning'
46 47
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
index 549704d0..4c701223 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
@@ -41,6 +41,7 @@ menu:
41 filter_entries: 'Artikel filtern' 41 filter_entries: 'Artikel filtern'
42 # random_entry: Jump to a random entry from that list 42 # random_entry: Jump to a random entry from that list
43 export: 'Exportieren' 43 export: 'Exportieren'
44 # account: 'My account'
44 search_form: 45 search_form:
45 input_label: 'Suchbegriff hier eingeben' 46 input_label: 'Suchbegriff hier eingeben'
46 47
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
index a68a7d7d..c314bb1d 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
@@ -41,6 +41,7 @@ menu:
41 filter_entries: 'Filter entries' 41 filter_entries: 'Filter entries'
42 random_entry: Jump to a random entry from that list 42 random_entry: Jump to a random entry from that list
43 export: 'Export' 43 export: 'Export'
44 account: 'My account'
44 search_form: 45 search_form:
45 input_label: 'Enter your search here' 46 input_label: 'Enter your search here'
46 47
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
index c3e3ba81..e42be021 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
@@ -41,6 +41,7 @@ menu:
41 filter_entries: 'Filtrar los artículos' 41 filter_entries: 'Filtrar los artículos'
42 random_entry: 'Ir a un artículo aleatório de esta lista' 42 random_entry: 'Ir a un artículo aleatório de esta lista'
43 export: 'Exportar' 43 export: 'Exportar'
44 # account: 'My account'
44 search_form: 45 search_form:
45 input_label: 'Introduzca su búsqueda aquí' 46 input_label: 'Introduzca su búsqueda aquí'
46 47
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
index 4a52a208..1bbcda23 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
@@ -41,6 +41,7 @@ menu:
41 filter_entries: 'فیلترکردن مقاله‌ها' 41 filter_entries: 'فیلترکردن مقاله‌ها'
42 # random_entry: Jump to a random entry from that list 42 # random_entry: Jump to a random entry from that list
43 export: 'برون‌بری' 43 export: 'برون‌بری'
44 # account: 'My account'
44 search_form: 45 search_form:
45 input_label: 'جستجوی خود را این‌جا بنویسید:' 46 input_label: 'جستجوی خود را این‌جا بنویسید:'
46 47
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
index 2cfab8cf..3aa1f657 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
@@ -41,6 +41,7 @@ menu:
41 filter_entries: "Filtrer les articles" 41 filter_entries: "Filtrer les articles"
42 random_entry: Aller à un article aléatoire de cette liste 42 random_entry: Aller à un article aléatoire de cette liste
43 export: "Exporter" 43 export: "Exporter"
44 account: "Mon compte"
44 search_form: 45 search_form:
45 input_label: "Saisissez votre terme de recherche" 46 input_label: "Saisissez votre terme de recherche"
46 47
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
index af1c1fe7..933eac85 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
@@ -41,6 +41,7 @@ menu:
41 filter_entries: 'Filtra contenuti' 41 filter_entries: 'Filtra contenuti'
42 # random_entry: Jump to a random entry from that list 42 # random_entry: Jump to a random entry from that list
43 export: 'Esporta' 43 export: 'Esporta'
44 # account: 'My account'
44 search_form: 45 search_form:
45 input_label: 'Inserisci qui la tua ricerca' 46 input_label: 'Inserisci qui la tua ricerca'
46 47
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.ja.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.ja.yml
index f6530a83..ce18732d 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.ja.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.ja.yml
@@ -40,6 +40,7 @@ menu:
40 filter_entries: 'フィルターを使用' 40 filter_entries: 'フィルターを使用'
41 random_entry: このリストの中からランダムに記事に記事を表示 41 random_entry: このリストの中からランダムに記事に記事を表示
42 export: 'エクスポート' 42 export: 'エクスポート'
43 # account: 'My account'
43 search_form: 44 search_form:
44 input_label: '検索内容を入力' 45 input_label: '検索内容を入力'
45 46
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
index 59dd9b22..ae2b8c55 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
@@ -41,6 +41,7 @@ menu:
41 filter_entries: 'Filtrar los articles' 41 filter_entries: 'Filtrar los articles'
42 random_entry: "Sautar a un article a l'azard" 42 random_entry: "Sautar a un article a l'azard"
43 export: 'Exportar' 43 export: 'Exportar'
44 # account: 'My account'
44 search_form: 45 search_form:
45 input_label: 'Picatz vòstre mot-clau a cercar aquí' 46 input_label: 'Picatz vòstre mot-clau a cercar aquí'
46 47
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
index c09ef47a..3b174981 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
@@ -41,6 +41,7 @@ menu:
41 filter_entries: 'Filtruj wpisy' 41 filter_entries: 'Filtruj wpisy'
42 # random_entry: Jump to a random entry from that list 42 # random_entry: Jump to a random entry from that list
43 export: 'Eksportuj' 43 export: 'Eksportuj'
44 # account: 'My account'
44 search_form: 45 search_form:
45 input_label: 'Wpisz swoje zapytanie tutaj' 46 input_label: 'Wpisz swoje zapytanie tutaj'
46 47
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
index 293a4e44..e2eaf25d 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
@@ -41,6 +41,7 @@ menu:
41 filter_entries: 'Filtrar os artigos' 41 filter_entries: 'Filtrar os artigos'
42 random_entry: Ir para um artigo aleatório desta lista 42 random_entry: Ir para um artigo aleatório desta lista
43 export: 'Exportar' 43 export: 'Exportar'
44 # account: 'My account'
44 search_form: 45 search_form:
45 input_label: 'Digite aqui sua pesquisa' 46 input_label: 'Digite aqui sua pesquisa'
46 47
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
index 3c605709..0b744108 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
@@ -41,6 +41,7 @@ menu:
41 filter_entries: 'Filtrează articolele' 41 filter_entries: 'Filtrează articolele'
42 # random_entry: Jump to a random entry from that list 42 # random_entry: Jump to a random entry from that list
43 # export: 'Export' 43 # export: 'Export'
44 # account: 'My account'
44 search_form: 45 search_form:
45 input_label: 'Introdu căutarea ta' 46 input_label: 'Introdu căutarea ta'
46 47
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.ru.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.ru.yml
index eead4ec6..3c1a8596 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.ru.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.ru.yml
@@ -41,6 +41,7 @@ menu:
41 filter_entries: 'Фильтр записей' 41 filter_entries: 'Фильтр записей'
42 # random_entry: Jump to a random entry from that list 42 # random_entry: Jump to a random entry from that list
43 export: 'Экспорт' 43 export: 'Экспорт'
44 # account: 'My account'
44 search_form: 45 search_form:
45 input_label: 'Введите текст для поиска' 46 input_label: 'Введите текст для поиска'
46 47
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.th.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.th.yml
index 8d2b05f3..29025d2e 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.th.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.th.yml
@@ -41,6 +41,7 @@ menu:
41 filter_entries: 'ตัวกรองรายการ' 41 filter_entries: 'ตัวกรองรายการ'
42 # random_entry: Jump to a random entry from that list 42 # random_entry: Jump to a random entry from that list
43 export: 'นำข้อมูลออก' 43 export: 'นำข้อมูลออก'
44 # account: 'My account'
44 search_form: 45 search_form:
45 input_label: 'ค้นหาที่นี้' 46 input_label: 'ค้นหาที่นี้'
46 47
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
index dfbc3010..62f7be02 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
@@ -41,6 +41,7 @@ menu:
41 filter_entries: 'Filtrele' 41 filter_entries: 'Filtrele'
42 # random_entry: Jump to a random entry from that list 42 # random_entry: Jump to a random entry from that list
43 export: 'Dışa Aktar' 43 export: 'Dışa Aktar'
44 # account: 'My account'
44 search_form: 45 search_form:
45 input_label: 'Aramak istediğiniz herhangi bir şey yazın' 46 input_label: 'Aramak istediğiniz herhangi bir şey yazın'
46 47
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.zh.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.zh.yml
index f48ce37a..da125371 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.zh.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.zh.yml
@@ -40,6 +40,7 @@ menu:
40 filter_entries: '筛选项目' 40 filter_entries: '筛选项目'
41 random_entry: '随机跳到该列表中的一个项目' 41 random_entry: '随机跳到该列表中的一个项目'
42 export: '导出' 42 export: '导出'
43 # account: 'My account'
43 search_form: 44 search_form:
44 input_label: '输入搜索关键词' 45 input_label: '输入搜索关键词'
45 46
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig
index d9b6d190..59705e89 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig
@@ -62,45 +62,9 @@
62 <li class="bold {% if activeRoute == 'all' %}active{% endif %}"> 62 <li class="bold {% if activeRoute == 'all' %}active{% endif %}">
63 <a class="waves-effect" href="{{ path('all') }}">{{ 'menu.left.all_articles'|trans }} <span class="numberItems grey-text">{{ count_entries('all') }}</span></a> 63 <a class="waves-effect" href="{{ path('all') }}">{{ 'menu.left.all_articles'|trans }} <span class="numberItems grey-text">{{ count_entries('all') }}</span></a>
64 </li> 64 </li>
65 <li class="bold border-bottom {% if currentRoute == 'tags' %}active{% endif %}"> 65 <li class="bold {% if currentRoute == 'tags' %}active{% endif %}">
66 <a class="waves-effect" href="{{ path('tag') }}">{{ 'menu.left.tags'|trans }} <span class="numberItems grey-text">{{ count_tags() }}</span></a> 66 <a class="waves-effect" href="{{ path('tag') }}">{{ 'menu.left.tags'|trans }} <span class="numberItems grey-text">{{ count_tags() }}</span></a>
67 </li> 67 </li>
68 <li class="bold {% if currentRoute == 'config' %}active{% endif %}">
69 <a class="waves-effect" href="{{ path('config') }}">{{ 'menu.left.config'|trans }}</a>
70 </li>
71 {% if craue_setting('restricted_access') %}
72 <li class="bold {% if currentRoute starts with 'site_credentials_' %}active{% endif %}">
73 <a class="waves-effect" href="{{ path('site_credentials_index') }}">{{ 'menu.left.site_credentials'|trans }}</a>
74 </li>
75 {% endif %}
76 {% if is_granted('ROLE_SUPER_ADMIN') %}
77 <li class="bold {% if currentRoute starts with 'user_' %}active{% endif %}">
78 <a class="waves-effect" href="{{ path('user_index') }}">{{ 'menu.left.users_management'|trans }}</a>
79 </li>
80
81 <li class="bold {% if currentRoute == 'craue_config_settings_modify' %}active{% endif %}">
82 <a class="waves-effect" href="{{ path('craue_config_settings_modify') }}">{{ 'menu.left.internal_settings'|trans }}</a>
83 </li>
84
85 <li class="bold border-bottom {% if currentRoute == 'ignore_origin_instance_rules_index' %}active{% endif %}">
86 <a class="waves-effect" href="{{ path('ignore_origin_instance_rules_index') }}">{{ 'menu.left.ignore_origin_instance_rules'|trans }}</a>
87 </li>
88 {% endif %}
89 <li class="bold {% if currentRoute == 'import' %}active{% endif %}">
90 <a class="waves-effect" href="{{ path('import') }}">{{ 'menu.left.import'|trans }}</a>
91 </li>
92 <li class="bold {% if currentRoute == 'developer' %}active{% endif %}">
93 <a class="waves-effect" href="{{ path('developer') }}">{{ 'menu.left.developer'|trans }}</a>
94 </li>
95 <li class="bold {% if currentRoute == 'howto' %}active{% endif %}">
96 <a class="waves-effect" href="{{ path('howto') }}">{{ 'menu.left.howto'|trans }}</a>
97 </li>
98 <li class="bold {% if currentRoute == 'quickstart' %}active{% endif %}">
99 <a class="waves-effect" href="{{ path('quickstart') }}">{{ 'menu.left.quickstart'|trans }}</a>
100 </li>
101 <li class="bold">
102 <a class="waves-effect icon icon-power" href="{{ path('fos_user_security_logout') }}">{{ 'menu.left.logout'|trans }}</a>
103 </li>
104 </ul> 68 </ul>
105 <div class="nav-panels"> 69 <div class="nav-panels">
106 <div class="nav-panel-actions nav-panel-item"> 70 <div class="nav-panel-actions nav-panel-item">
@@ -128,7 +92,6 @@
128 <i class="material-icons">casino</i> 92 <i class="material-icons">casino</i>
129 </a> 93 </a>
130 </li> 94 </li>
131 {% endif %}
132 <li id="button_filters"> 95 <li id="button_filters">
133 <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"> 96 <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">
134 <i class="material-icons">filter_list</i> 97 <i class="material-icons">filter_list</i>
@@ -139,7 +102,33 @@
139 <i class="material-icons">file_download</i> 102 <i class="material-icons">file_download</i>
140 </a> 103 </a>
141 </li> 104 </li>
105 {% endif %}
106 <li class="bold">
107 <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">
108 <i class="material-icons" id="news_link">account_circle</i>
109 </a>
110 </li>
142 </ul> 111 </ul>
112 <ul id="dropdown-account" class="dropdown-content">
113 <li><a href="{{ path('config') }}"><i class="material-icons">settings</i> {{ 'menu.left.config'|trans }}</a></li>
114 <li><a href="{{ path('developer') }}"><i class="material-icons">smartphone</i> {{ 'menu.left.developer'|trans }}</a></li>
115 <li><a href="{{ path('import') }}"><i class="material-icons">import_export</i> {{ 'menu.left.import'|trans }}</a></li>
116 {% if craue_setting('restricted_access') %}
117 <li><a href="{{ path('site_credentials_index') }}"><i class="material-icons">vpn_key</i> {{ 'menu.left.site_credentials'|trans }}</a></li>
118 {% endif %}
119 <li class="divider"></li>
120 {% if is_granted('ROLE_SUPER_ADMIN') %}
121 <li><a href="{{ path('user_index') }}"><i class="material-icons">people</i>{{ 'menu.left.users_management'|trans }}</a></li>
122 <li><a href="{{ path('craue_config_settings_modify') }}"><i class="material-icons">settings</i> {{ 'menu.left.internal_settings'|trans }}</a></li>
123 <li><a href="{{ path('ignore_origin_instance_rules_index') }}"><i class="material-icons">build</i> {{ 'menu.left.ignore_origin_instance_rules'|trans }}</a></li>
124 {% endif %}
125 <li class="divider"></li>
126 <li><a href="{{ path('howto') }}"><i class="material-icons">live_help</i> {{ 'menu.left.howto'|trans }}</a></li>
127 <li><a href="{{ path('quickstart') }}"><i class="material-icons">assistant_photo</i> {{ 'menu.left.quickstart'|trans }}</a></li>
128 <li class="divider"></li>
129 <li><a href="{{ path('fos_user_security_logout') }}"><i class="material-icons">input</i> {{ 'menu.left.logout'|trans }}</a></li>
130 </ul>
131
143 </div> 132 </div>
144 {{ render(controller("WallabagCoreBundle:Entry:searchForm", {'currentRoute': currentRoute})) }} 133 {{ render(controller("WallabagCoreBundle:Entry:searchForm", {'currentRoute': currentRoute})) }}
145 {{ render(controller("WallabagCoreBundle:Entry:addEntryForm")) }} 134 {{ render(controller("WallabagCoreBundle:Entry:addEntryForm")) }}