19 files changed, 69 insertions, 44 deletions

diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
index 54df2e64..670c7f9d 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'
 
@@ -299,6 +300,7 @@ entry:
         # shared_by_wallabag: "This article has been shared by %username% with <a href='%wallabag_instance%'>wallabag</a>"
     confirm:
         # delete: "Are you sure you want to remove that article?"
+        # delete_entries: "Are you sure you want to remove those articles?"
         # delete_tag: "Are you sure you want to remove that tag from that article?"
     metadata:
         # reading_time: "Estimated reading time"
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
index 549704d0..92984f46 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'
 
@@ -299,6 +300,7 @@ entry:
         shared_by_wallabag: 'Dieser Artikel wurde von %username% mittels <a href="%wallabag_instance%">wallabag</a> geteilt'
     confirm:
         delete: 'Bist du sicher, dass du diesen Artikel löschen möchtest?'
+        # delete_entries: "Are you sure you want to remove those articles?"
         delete_tag: 'Bist du sicher, dass du diesen Tag vom Artikel entfernen möchtest?'
     metadata:
         # reading_time: "Estimated reading time"
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
index a68a7d7d..0a5af085 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'
 
@@ -299,6 +300,7 @@ entry:
         shared_by_wallabag: "This article has been shared by %username% with <a href='%wallabag_instance%'>wallabag</a>"
     confirm:
         delete: "Are you sure you want to remove that article?"
+        delete_entries: "Are you sure you want to remove those articles?"
         delete_tag: "Are you sure you want to remove that tag from that article?"
     metadata:
         reading_time: "Estimated reading time"
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
index c3e3ba81..cdc51a2b 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í'
 
@@ -299,6 +300,7 @@ entry:
         shared_by_wallabag: "Este artículo se ha compartido con <a href='%wallabag_instance%'>wallabag</a>"
     confirm:
         delete: "¿Estás seguro de que quieres eliminar este artículo?"
+        # delete_entries: "Are you sure you want to remove those articles?"
         delete_tag: "¿Estás seguro de que quieres eliminar esta etiqueta de este artículo?"
     metadata:
         reading_time: "Tiempo de lectura estimado"
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
index 4a52a208..581e053a 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: 'جستجوی خود را این‌جا بنویسید:'
 
@@ -299,6 +300,7 @@ entry:
         # shared_by_wallabag: "This article has been shared by %username% with <a href='%wallabag_instance%'>wallabag</a>"
     confirm:
         # delete: "Are you sure you want to remove that article?"
+        # delete_entries: "Are you sure you want to remove those articles?"
         # delete_tag: "Are you sure you want to remove that tag from that article?"
     metadata:
         # reading_time: "Estimated reading time"
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
index 2cfab8cf..2dd92456 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"
 
@@ -299,6 +300,7 @@ entry:
         shared_by_wallabag: "Cet article a été partagé par %username% avec <a href=\"%wallabag_instance%\">wallabag</a>"
     confirm:
         delete: "Voulez-vous vraiment supprimer cet article ?"
+        delete_entries: "Voulez-vous vraiment supprimer ces articles ?"
         delete_tag: "Voulez-vous vraiment supprimer ce tag de cet article ?"
     metadata:
         reading_time: "Durée de lecture estimée"
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
index af1c1fe7..a05a6e6e 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'
 
@@ -299,6 +300,7 @@ entry:
         shared_by_wallabag: "Questo articolo è stato condiviso da %username% con <a href='%wallabag_instance%'>wallabag</a>"
     confirm:
         delete: "Vuoi veramente rimuovere quell'articolo?"
+        # delete_entries: "Are you sure you want to remove those articles?"
         delete_tag: "Vuoi veramente rimuovere quell'etichetta da quell'articolo?"
     metadata:
         # reading_time: "Estimated reading time"
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.ja.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.ja.yml
index f6530a83..9ae4d6bb 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: '検索内容を入力'
 
@@ -279,6 +280,7 @@ entry:
         shared_by_wallabag: "これは %username% と <a href='%wallabag_instance%'>Wallabag</a> によって共有された記事です。"
     confirm:
         delete: "記事を削除してよろしいですか？"
+        # delete_entries: "Are you sure you want to remove those articles?"
         delete_tag: "記事からタグを削除してよろしいですか？"
     metadata:
         reading_time: "推定読書時間"
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
index 33eb81d9..2c7af685 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í'
 
@@ -299,6 +300,7 @@ entry:
         shared_by_wallabag: "Aqueste article es estat partejat per <a href='%wallabag_instance%'>wallabag</a>"
     confirm:
         delete: "Sètz segur de voler suprimir aqueste article ?"
+        # delete_entries: "Are you sure you want to remove those articles?"
         delete_tag: "Sètz segur de voler levar aquesta etiqueta de l'article ?"
     metadata:
         reading_time: "Temps de lectura estimat"
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
index c09ef47a..877ff4aa 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'
 
@@ -299,6 +300,7 @@ entry:
         shared_by_wallabag: "Ten artykuł został udostępniony przez <a href='%wallabag_instance%'>wallabag</a>"
     confirm:
         delete: "Czy jesteś pewien, że chcesz usunąć ten artykuł?"
+        # delete_entries: "Are you sure you want to remove those articles?"
         delete_tag: "Czy jesteś pewien, że chcesz usunąć ten tag, z tego artykułu?"
     metadata:
         # reading_time: "Estimated reading time"
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
index 293a4e44..fc7239d9 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'
 
@@ -298,7 +299,8 @@ entry:
     public:
         shared_by_wallabag: "Este artigo foi compartilhado pelo <a href='%wallabag_instance%'>wallabag</a>"
     confirm:
-        delete: Tem certeza de que deseja remover este artigo?"
+        delete: Tem certeza de que deseja remover este artigo?
+        # delete_entries: "Are you sure you want to remove those articles?"
         delete_tag: "Tem certeza de que deseja remover este tag deste artigo?"
     metadata:
         reading_time: "Tempo estimado de leitura"
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
index 3c605709..9b0cea50 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'
 
@@ -299,6 +300,7 @@ entry:
         # shared_by_wallabag: "This article has been shared by %username% with <a href='%wallabag_instance%'>wallabag</a>"
     confirm:
         # delete: "Are you sure you want to remove that article?"
+        # delete_entries: "Are you sure you want to remove those articles?"
         # delete_tag: "Are you sure you want to remove that tag from that article?"
     metadata:
         # reading_time: "Estimated reading time"
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.ru.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.ru.yml
index eead4ec6..f593a037 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: 'Введите текст для поиска'
 
@@ -299,6 +300,7 @@ entry:
         shared_by_wallabag: "Запись была опубликована <a href='%wallabag_instance%'>wallabag</a>"
     confirm:
         # delete: "Are you sure you want to remove that article?"
+        # delete_entries: "Are you sure you want to remove those articles?"
         # delete_tag: "Are you sure you want to remove that tag from that article?"
     metadata:
         # reading_time: "Estimated reading time"
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.th.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.th.yml
index 8d2b05f3..fa013e55 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: 'ค้นหาที่นี้'
 
@@ -299,6 +300,7 @@ entry:
         shared_by_wallabag: "บทความนี้จะมีการแชร์โดย %username% กับ <a href='%wallabag_instance%'>wallabag</a>"
     confirm:
         delete: "คุณแน่ใจหรือไม่ว่าคุณต้องการลบบทความนี้?"
+        # delete_entries: "Are you sure you want to remove those articles?"
         delete_tag: "คุณแน่ใจหรือไม่ว่าคุณต้องการลบแท็กจากบทความนี้?"
     metadata:
         # reading_time: "Estimated reading time"
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
index dfbc3010..f69f3c32 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'
 
@@ -299,6 +300,7 @@ entry:
         # shared_by_wallabag: "This article has been shared by %username% with <a href='%wallabag_instance%'>wallabag</a>"
     confirm:
         # delete: "Are you sure you want to remove that article?"
+        # delete_entries: "Are you sure you want to remove those articles?"
         # delete_tag: "Are you sure you want to remove that tag from that article?"
     metadata:
         # reading_time: "Estimated reading time"
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.zh.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.zh.yml
index f48ce37a..e68b91b7 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: '输入搜索关键词'
 
@@ -279,6 +280,7 @@ entry:
         shared_by_wallabag: "这篇文章由 %username% 于 <a href='%wallabag_instance%'>wallabag</a> 分享"
     confirm:
         delete: "你确定要删除这篇文章吗？"
+        # delete_entries: "Are you sure you want to remove those articles?"
         delete_tag: "你确定要从这篇文章删除该标签吗？"
     metadata:
         reading_time: "预计阅读时间"
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig
index f7912b1c..526e3cbb 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig
@@ -49,7 +49,7 @@
                 <span>
                     <button class="btn cyan darken-1" type="submit" name="toggle-read" title="{{ 'entry.list.toogle_as_read'|trans }}"><i class="material-icons">done</i></button>
                     <button class="btn cyan darken-1" type="submit" name="toggle-star" title="{{ 'entry.list.toogle_as_star'|trans }}" ><i class="material-icons">star</i></button>
-                    <button class="btn cyan darken-1" type="submit" name="delete" title="{{ 'entry.list.delete'|trans }}"><i class="material-icons">delete</i></button>
+                    <button class="btn cyan darken-1" type="submit" name="delete" onclick="return confirm('{{ 'entry.confirm.delete_entries'|trans|escape('js') }}')" title="{{ 'entry.list.delete'|trans }}"><i class="material-icons">delete</i></button>
                 </span>
             {% endif %}
         </li>
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")) }}
diff --git a/src/Wallabag/ImportBundle/Controller/PocketController.php b/src/Wallabag/ImportBundle/Controller/PocketController.php
index 71ceb427..f952867b 100644
--- a/src/Wallabag/ImportBundle/Controller/PocketController.php
+++ b/src/Wallabag/ImportBundle/Controller/PocketController.php
@@ -47,8 +47,12 @@ class PocketController extends Controller
             return $this->redirect($this->generateUrl('import_pocket'));
         }
 
+        $form = $request->request->get('form');
+
         $this->get('session')->set('import.pocket.code', $requestToken);
-        $this->get('session')->set('mark_as_read', $request->request->get('form')['mark_as_read']);
+        if (null !== $form && \array_key_exists('mark_as_read', $form)) {
+            $this->get('session')->set('mark_as_read', $form['mark_as_read']);
+        }
 
         return $this->redirect(
             'https://getpocket.com/auth/authorize?request_token=' . $requestToken . '&redirect_uri=' . $this->generateUrl('import_pocket_callback', [], UrlGeneratorInterface::ABSOLUTE_URL),
@@ -80,11 +84,11 @@ class PocketController extends Controller
         if (true === $pocket->setMarkAsRead($markAsRead)->import()) {
             $summary = $pocket->getSummary();
             $message = $this->get('translator')->trans('flashes.import.notice.summary', [
-                '%imported%' => $summary['imported'],
-                '%skipped%' => $summary['skipped'],
+                '%imported%' => null !== $summary && \array_key_exists('imported', $summary) ? $summary['imported'] : 0,
+                '%skipped%' => null !== $summary && \array_key_exists('skipped', $summary) ? $summary['skipped'] : 0,
             ]);
 
-            if (0 < $summary['queued']) {
+            if (null !== $summary && \array_key_exists('queued', $summary) && 0 < $summary['queued']) {
                 $message = $this->get('translator')->trans('flashes.import.notice.summary_with_queue', [
                     '%queued%' => $summary['queued'],
                 ]);