Improve conf menu (#3880)

* i18n: "account" added

* reordered menu + add logout in the left nav menu

* Update app/i18n/fr/gen.php

Co-authored-by: Alexandre Alapetite <alexandre@alapetite.fr>

20 files changed, 35 insertions, 12 deletions

diff --git a/app/i18n/cz/gen.php b/app/i18n/cz/gen.php
index df2c1e50f..1b3f90e0b 100644
--- a/app/i18n/cz/gen.php
+++ b/app/i18n/cz/gen.php
@@ -146,6 +146,7 @@ return array(
 	),
 	'menu' => array(
 		'about' => 'O aplikaci',
+		'account' => 'Account', // Todo: Transation
 		'admin' => 'Administrace',
 		'archiving' => 'Archivace',
 		'authentication' => 'Přihlášení',
diff --git a/app/i18n/de/gen.php b/app/i18n/de/gen.php
index b1a752b16..13de1d553 100644
--- a/app/i18n/de/gen.php
+++ b/app/i18n/de/gen.php
@@ -146,6 +146,7 @@ return array(
 	),
 	'menu' => array(
 		'about' => 'Über',
+		'account' => 'Account',
 		'admin' => 'Administration',
 		'archiving' => 'Archivierung',
 		'authentication' => 'Authentifizierung',
diff --git a/app/i18n/en-us/gen.php b/app/i18n/en-us/gen.php
index 343979b39..e81e78759 100644
--- a/app/i18n/en-us/gen.php
+++ b/app/i18n/en-us/gen.php
@@ -146,6 +146,7 @@ return array(
 	),
 	'menu' => array(
 		'about' => 'About',
+		'account' => 'Account', // Todo: Transation
 		'admin' => 'Administration',
 		'archiving' => 'Archiving',
 		'authentication' => 'Authentication',
diff --git a/app/i18n/en/gen.php b/app/i18n/en/gen.php
index 2ea167faf..cb48aed64 100644
--- a/app/i18n/en/gen.php
+++ b/app/i18n/en/gen.php
@@ -146,6 +146,7 @@ return array(
 	),
 	'menu' => array(
 		'about' => 'About',
+		'account' => 'Account',
 		'admin' => 'Administration',
 		'archiving' => 'Archiving',
 		'authentication' => 'Authentication',
diff --git a/app/i18n/es/gen.php b/app/i18n/es/gen.php
index 8f416cbfb..c6113cae6 100755
--- a/app/i18n/es/gen.php
+++ b/app/i18n/es/gen.php
@@ -146,6 +146,7 @@ return array(
 	),
 	'menu' => array(
 		'about' => 'Acerca de',
+		'account' => 'Account', // Todo: Transation
 		'admin' => 'Administración',
 		'archiving' => 'Archivo',
 		'authentication' => 'Identificación',
diff --git a/app/i18n/fr/gen.php b/app/i18n/fr/gen.php
index a6a8c541b..0f544d20b 100644
--- a/app/i18n/fr/gen.php
+++ b/app/i18n/fr/gen.php
@@ -146,6 +146,7 @@ return array(
 	),
 	'menu' => array(
 		'about' => 'À propos',
+		'account' => 'Compte',
 		'admin' => 'Administration',
 		'archiving' => 'Archivage',
 		'authentication' => 'Authentification',
diff --git a/app/i18n/he/gen.php b/app/i18n/he/gen.php
index 4d4411341..27c0434d0 100644
--- a/app/i18n/he/gen.php
+++ b/app/i18n/he/gen.php
@@ -146,6 +146,7 @@ return array(
 	),
 	'menu' => array(
 		'about' => 'אודות',
+		'account' => 'Account', // Todo: Transation
 		'admin' => 'ניהול',
 		'archiving' => 'ארכוב',
 		'authentication' => 'Authentication',	// TODO - Translation
diff --git a/app/i18n/it/gen.php b/app/i18n/it/gen.php
index 0214f517f..62bac2db7 100644
--- a/app/i18n/it/gen.php
+++ b/app/i18n/it/gen.php
@@ -146,6 +146,7 @@ return array(
 	),
 	'menu' => array(
 		'about' => 'Informazioni',
+		'account' => 'Account', // Todo: Transation
 		'admin' => 'Amministrazione',
 		'archiving' => 'Archiviazione',
 		'authentication' => 'Autenticazione',
diff --git a/app/i18n/ja/gen.php b/app/i18n/ja/gen.php
index 3c3a2a1b9..b79c53dbb 100644
--- a/app/i18n/ja/gen.php
+++ b/app/i18n/ja/gen.php
@@ -146,6 +146,7 @@ return array(
 	),
 	'menu' => array(
 		'about' => 'FreshRSSについて',
+		'account' => 'Account', // Todo: Transation
 		'admin' => '管理者',
 		'archiving' => 'アーカイブ',
 		'authentication' => '認証',
diff --git a/app/i18n/kr/gen.php b/app/i18n/kr/gen.php
index 9199a2c74..c39d95897 100644
--- a/app/i18n/kr/gen.php
+++ b/app/i18n/kr/gen.php
@@ -146,6 +146,7 @@ return array(
 	),
 	'menu' => array(
 		'about' => '정보',
+		'account' => 'Account', // Todo: Transation
 		'admin' => '관리',
 		'archiving' => '보관',
 		'authentication' => '인증',
diff --git a/app/i18n/nl/gen.php b/app/i18n/nl/gen.php
index 9ee704420..ad72b4b91 100644
--- a/app/i18n/nl/gen.php
+++ b/app/i18n/nl/gen.php
@@ -146,6 +146,7 @@ return array(
 	),
 	'menu' => array(
 		'about' => 'Over',
+		'account' => 'Account', // Todo: Transation
 		'admin' => 'Administratie',
 		'archiving' => 'Archiveren',
 		'authentication' => 'Authenticatie',
diff --git a/app/i18n/oc/gen.php b/app/i18n/oc/gen.php
index 00a9b9eb7..52bddf611 100644
--- a/app/i18n/oc/gen.php
+++ b/app/i18n/oc/gen.php
@@ -146,6 +146,7 @@ return array(
 	),
 	'menu' => array(
 		'about' => 'A prepaus',
+		'account' => 'Account', // Todo: Transation
 		'admin' => 'Administracion',
 		'archiving' => 'Archivar',
 		'authentication' => 'Autentificacion',
diff --git a/app/i18n/pl/gen.php b/app/i18n/pl/gen.php
index 4c7f97001..465b1f013 100644
--- a/app/i18n/pl/gen.php
+++ b/app/i18n/pl/gen.php
@@ -146,6 +146,7 @@ return array(
 	),
 	'menu' => array(
 		'about' => 'O serwisie',
+		'account' => 'Account', // Todo: Transation
 		'admin' => 'Administracja',
 		'archiving' => 'Archiwizacja',
 		'authentication' => 'Uwierzytelnianie',
diff --git a/app/i18n/pt-br/gen.php b/app/i18n/pt-br/gen.php
index 9aafd2dbe..9b7def4fa 100644
--- a/app/i18n/pt-br/gen.php
+++ b/app/i18n/pt-br/gen.php
@@ -146,6 +146,7 @@ return array(
 	),
 	'menu' => array(
 		'about' => 'Sobre',
+		'account' => 'Account', // Todo: Transation
 		'admin' => 'Administração',
 		'archiving' => 'Arquivar',
 		'authentication' => 'Autenticação',
diff --git a/app/i18n/ru/gen.php b/app/i18n/ru/gen.php
index 31026920c..10bcb042b 100644
--- a/app/i18n/ru/gen.php
+++ b/app/i18n/ru/gen.php
@@ -146,6 +146,7 @@ return array(
 	),
 	'menu' => array(
 		'about' => 'О проекте',
+		'account' => 'Account', // Todo: Transation
 		'admin' => 'Администрирование',
 		'archiving' => 'Архивирование',
 		'authentication' => 'Аутентификация',
diff --git a/app/i18n/sk/gen.php b/app/i18n/sk/gen.php
index 664da372d..c495a240d 100644
--- a/app/i18n/sk/gen.php
+++ b/app/i18n/sk/gen.php
@@ -146,6 +146,7 @@ return array(
 	),
 	'menu' => array(
 		'about' => 'O FreshRSS',
+		'account' => 'Account', // Todo: Transation
 		'admin' => 'Administrácia',
 		'archiving' => 'Archivácia',
 		'authentication' => 'Prihlásenie',
diff --git a/app/i18n/tr/gen.php b/app/i18n/tr/gen.php
index cd99bf7ba..baa3a40bd 100644
--- a/app/i18n/tr/gen.php
+++ b/app/i18n/tr/gen.php
@@ -146,6 +146,7 @@ return array(
 	),
 	'menu' => array(
 		'about' => 'Hakkında',
+		'account' => 'Account', // Todo: Transation
 		'admin' => 'Yönetim',
 		'archiving' => 'Arşiv',
 		'authentication' => 'Kimlik doğrulama',
diff --git a/app/i18n/zh-cn/gen.php b/app/i18n/zh-cn/gen.php
index 61c207de1..2efadad54 100644
--- a/app/i18n/zh-cn/gen.php
+++ b/app/i18n/zh-cn/gen.php
@@ -146,6 +146,7 @@ return array(
 	),
 	'menu' => array(
 		'about' => '关于',
+		'account' => 'Account', // Todo: Transation
 		'admin' => '管理',
 		'archiving' => '归档',
 		'authentication' => '认证',
diff --git a/app/layout/aside_configure.phtml b/app/layout/aside_configure.phtml
index 4da160d92..f42d318cb 100644
--- a/app/layout/aside_configure.phtml
+++ b/app/layout/aside_configure.phtml
@@ -1,5 +1,14 @@
 <nav class="nav nav-list aside">
 	<ul>
+		<li class="nav-header"><?= _t('gen.menu.account') ?>: <?= htmlspecialchars(Minz_Session::param('currentUser', '_'), ENT_NOQUOTES, 'UTF-8')?></li>	
+		<li class="item<?= Minz_Request::controllerName() === 'user' && Minz_Request::actionName() === 'profile' ? ' active' : '' ?>">
+			<a href="<?= _url('user', 'profile') ?>"><?= _t('gen.menu.user_profile') ?></a>
+		</li>
+		<li class="item">
+			<a class="signout" href="<?= _url('auth', 'logout') ?>">
+				<?php
+				echo _t('gen.auth.logout'); ?> <?= _i('logout') ?></a>
+		</li>
 		<li class="nav-header"><?= _t('gen.menu.configuration') ?></li>
 		<li class="item<?= Minz_Request::actionName() === 'display' ? ' active' : '' ?>">
 			<a href="<?= _url('configure', 'display') ?>"><?= _t('gen.menu.display') ?></a>
@@ -19,9 +28,6 @@
 		<li class="item<?= Minz_Request::actionName() === 'queries' ? ' active' : '' ?>">
 			<a href="<?= _url('configure', 'queries') ?>"><?= _t('gen.menu.queries') ?></a>
 		</li>
-		<li class="item<?= Minz_Request::controllerName() === 'user' && Minz_Request::actionName() === 'profile' ? ' active' : '' ?>">
-			<a href="<?= _url('user', 'profile') ?>"><?= _t('gen.menu.user_profile') ?></a>
-		</li>
 		<li class="item<?= Minz_Request::controllerName() === 'extension' ? ' active' : '' ?>">
 			<a href="<?= _url('extension', 'index') ?>"><?= _t('gen.menu.extensions') ?></a>
 		</li>
diff --git a/app/layout/header.phtml b/app/layout/header.phtml
index cffb0e009..2c92b9a5c 100644
--- a/app/layout/header.phtml
+++ b/app/layout/header.phtml
@@ -54,6 +54,14 @@ if (FreshRSS_Auth::accessNeedsAction()) {
 			<a class="btn dropdown-toggle" href="#dropdown-configure"><?= _i('configure') ?></a>
 			<ul class="dropdown-menu">
 				<li class="dropdown-close"><a href="#close">❌</a></li>
+				<li class="dropdown-header"><?= _t('gen.menu.account') ?>: <?= htmlspecialchars(Minz_Session::param('currentUser', '_'), ENT_NOQUOTES, 'UTF-8') ?></li>
+				<li class="item"><a href="<?= _url('user', 'profile') ?>"><?= _t('gen.menu.user_profile') ?></a></li>
+				<?php if (FreshRSS_Auth::accessNeedsAction()): ?>
+				<li class="item"><a class="signout" href="<?= _url('auth', 'logout') ?>"><?= _t('gen.auth.logout'); ?><?= _i('logout') ?></a></li>
+				<?php else: ?>
+				<li class="item"><span class="signout">(<?= htmlspecialchars(Minz_Session::param('currentUser', '_'), ENT_NOQUOTES, 'UTF-8') ?>)</span></li>
+				<?php endif; ?>
+				<li class="separator"></li>
 				<li class="dropdown-header"><?= _t('gen.menu.configuration') ?></li>
 				<li class="item"><a href="<?= _url('configure', 'display') ?>"><?= _t('gen.menu.display') ?></a></li>
 				<li class="item"><a href="<?= _url('configure', 'reading') ?>"><?= _t('gen.menu.reading') ?></a></li>
@@ -61,7 +69,6 @@ if (FreshRSS_Auth::accessNeedsAction()) {
 				<li class="item"><a href="<?= _url('configure', 'integration') ?>"><?= _t('gen.menu.sharing') ?></a></li>
 				<li class="item"><a href="<?= _url('configure', 'shortcut') ?>"><?= _t('gen.menu.shortcuts') ?></a></li>
 				<li class="item"><a href="<?= _url('configure', 'queries') ?>"><?= _t('gen.menu.queries') ?></a></li>
-				<li class="item"><a href="<?= _url('user', 'profile') ?>"><?= _t('gen.menu.user_profile') ?></a></li>
 				<li class="item"><a href="<?= _url('extension', 'index') ?>"><?= _t('gen.menu.extensions') ?></a></li>
 				<?= Minz_ExtensionManager::callHook('menu_configuration_entry') ?>
 
@@ -82,14 +89,6 @@ if (FreshRSS_Auth::accessNeedsAction()) {
 				<li class="item"><a href="<?= _url('index', 'logs') ?>"><?= _t('gen.menu.logs') ?></a></li>
 				<li class="item"><a href="<?= _url('index', 'about') ?>"><?= _t('gen.menu.about') ?></a></li>
 				<?= Minz_ExtensionManager::callHook('menu_other_entry') ?>
-
-				<li class="separator"></li>
-				<?php if (FreshRSS_Auth::accessNeedsAction()): ?>
-				<li class="item"><a class="signout" href="<?= _url('auth', 'logout') ?>"><?php
-					echo _i('logout') . ' ' . _t('gen.auth.logout') . ' (' . htmlspecialchars(Minz_Session::param('currentUser', '_'), ENT_NOQUOTES, 'UTF-8') . ')'; ?></a></li>
-				<?php else: ?>
-				<li class="item"><span class="signout">(<?= htmlspecialchars(Minz_Session::param('currentUser', '_'), ENT_NOQUOTES, 'UTF-8') ?>)</span></li>
-				<?php endif; ?>
 			</ul>
 		</div>
 	</nav>