summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2014-01-22 21:40:28 +0100
committerGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2014-01-22 21:40:28 +0100
commitf4c8b95b831693f66d46f9ae06550b0944280ebe (patch)
tree874e680836c604e2d6898efed53130b0f780e301
parentbc6aba67bbe023c461a47bdf7c0c81d061ca6b5a (diff)
Ordre des entrées de configuration
Implémente https://github.com/marienfressinaud/FreshRSS/issues/374
-rw-r--r--app/layout/aside_configure.phtml7
-rw-r--r--app/layout/header.phtml3
2 files changed, 6 insertions, 4 deletions
diff --git a/app/layout/aside_configure.phtml b/app/layout/aside_configure.phtml
index 89f63e36c..27f11ab6d 100644
--- a/app/layout/aside_configure.phtml
+++ b/app/layout/aside_configure.phtml
@@ -1,8 +1,5 @@
<ul class="nav nav-list aside">
<li class="nav-header"><?php echo Minz_Translate::t ('configuration'); ?></li>
- <li class="item<?php echo Minz_Request::actionName () == 'users' ? ' active' : ''; ?>">
- <a href="<?php echo _url ('configure', 'users'); ?>"><?php echo Minz_Translate::t ('users'); ?></a>
- </li>
<li class="item<?php echo Minz_Request::actionName () == 'display' ? ' active' : ''; ?>">
<a href="<?php echo _url ('configure', 'display'); ?>"><?php echo Minz_Translate::t ('reading_configuration'); ?></a>
</li>
@@ -15,4 +12,8 @@
<li class="item<?php echo Minz_Request::actionName () == 'shortcut' ? ' active' : ''; ?>">
<a href="<?php echo _url ('configure', 'shortcut'); ?>"><?php echo Minz_Translate::t ('shortcuts'); ?></a>
</li>
+ <li class="separator"></li>
+ <li class="item<?php echo Minz_Request::actionName () == 'users' ? ' active' : ''; ?>">
+ <a href="<?php echo _url ('configure', 'users'); ?>"><?php echo Minz_Translate::t ('users'); ?></a>
+ </li>
</ul>
diff --git a/app/layout/header.phtml b/app/layout/header.phtml
index d43f682b0..69b9c65a1 100644
--- a/app/layout/header.phtml
+++ b/app/layout/header.phtml
@@ -67,12 +67,13 @@ if (Minz_Configuration::canLogIn()) {
<ul class="dropdown-menu">
<li class="dropdown-close"><a href="#close">❌</a></li>
<li class="dropdown-header"><?php echo Minz_Translate::t ('configuration'); ?></li>
- <li class="item"><a href="<?php echo _url ('configure', 'users'); ?>"><?php echo Minz_Translate::t ('users'); ?></a></li>
<li class="item"><a href="<?php echo _url ('configure', 'display'); ?>"><?php echo Minz_Translate::t ('reading_configuration'); ?></a></li>
<li class="item"><a href="<?php echo _url ('configure', 'archiving'); ?>"><?php echo Minz_Translate::t ('archiving_configuration'); ?></a></li>
<li class="item"><a href="<?php echo _url ('configure', 'sharing'); ?>"><?php echo Minz_Translate::t ('sharing'); ?></a></li>
<li class="item"><a href="<?php echo _url ('configure', 'shortcut'); ?>"><?php echo Minz_Translate::t ('shortcuts'); ?></a></li>
<li class="separator"></li>
+ <li class="item"><a href="<?php echo _url ('configure', 'users'); ?>"><?php echo Minz_Translate::t ('users'); ?></a></li>
+ <li class="separator"></li>
<li class="item"><a href="<?php echo _url ('index', 'about'); ?>"><?php echo Minz_Translate::t ('about'); ?></a></li>
<li class="item"><a href="<?php echo _url ('index', 'logs'); ?>"><?php echo Minz_Translate::t ('logs'); ?></a></li>
<?php