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:
         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'
 
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:
         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'
 
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:
         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'
 
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:
         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í'
 
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:
         filter_entries: 'فیلترکردن مقاله‌ها'
         # random_entry: Jump to a random entry from that list
         export: 'برون‌بری'
+        # account: 'My account'
     search_form:
         input_label: 'جستجوی خود را این‌جا بنویسید:'
 
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:
         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"
 
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:
         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'
 
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:
         filter_entries: 'フィルターを使用'
         random_entry: このリストの中からランダムに記事に記事を表示
         export: 'エクスポート'
+        # account: 'My account'
     search_form:
         input_label: '検索内容を入力'
 
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:
         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í'
 
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:
         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'
 
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:
         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'
 
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:
         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'
 
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:
         filter_entries: 'Фильтр записей'
         # random_entry: Jump to a random entry from that list
         export: 'Экспорт'
+        # account: 'My account'
     search_form:
         input_label: 'Введите текст для поиска'
 
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:
         filter_entries: 'ตัวกรองรายการ'
         # random_entry: Jump to a random entry from that list
         export: 'นำข้อมูลออก'
+        # account: 'My account'
     search_form:
         input_label: 'ค้นหาที่นี้'
 
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:
         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'
 
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:
         filter_entries: '筛选项目'
         random_entry: '随机跳到该列表中的一个项目'
         export: '导出'
+        # account: 'My account'
     search_form:
         input_label: '输入搜索关键词'
 
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 @@
             <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")) }}