summaryrefslogtreecommitdiff
path: root/app/layout
diff options
context:
space:
mode:
authorGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2013-12-27 19:23:11 +0100
committerGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2013-12-27 19:23:11 +0100
commit9f52ab97cb947944546917623d8fe0999d8bda9b (patch)
tree711f1e2b99278fbb4f0be5c8f387633767b5ebb7 /app/layout
parenta1249e56a7151ea20f64ac3091c0a3383d21049c (diff)
Début 0.8-dev
Contribue à https://github.com/marienfressinaud/FreshRSS/issues/126
Diffstat (limited to 'app/layout')
-rw-r--r--app/layout/aside_configure.phtml13
-rw-r--r--app/layout/header.phtml4
2 files changed, 12 insertions, 5 deletions
diff --git a/app/layout/aside_configure.phtml b/app/layout/aside_configure.phtml
index aa46af95d..89f63e36c 100644
--- a/app/layout/aside_configure.phtml
+++ b/app/layout/aside_configure.phtml
@@ -1,8 +1,13 @@
-<div class="nav nav-list aside">
+<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 ('general_and_reading'); ?></a>
+ <a href="<?php echo _url ('configure', 'display'); ?>"><?php echo Minz_Translate::t ('reading_configuration'); ?></a>
+ </li>
+ <li class="item<?php echo Minz_Request::actionName () == 'archiving' ? ' active' : ''; ?>">
+ <a href="<?php echo _url ('configure', 'archiving'); ?>"><?php echo Minz_Translate::t ('archiving_configuration'); ?></a>
</li>
<li class="item<?php echo Minz_Request::actionName () == 'sharing' ? ' active' : ''; ?>">
<a href="<?php echo _url ('configure', 'sharing'); ?>"><?php echo Minz_Translate::t ('sharing'); ?></a>
@@ -10,4 +15,4 @@
<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>
-</div>
+</ul>
diff --git a/app/layout/header.phtml b/app/layout/header.phtml
index 6cb1380a3..bba22508e 100644
--- a/app/layout/header.phtml
+++ b/app/layout/header.phtml
@@ -57,7 +57,9 @@
<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', 'display'); ?>"><?php echo Minz_Translate::t ('general_and_reading'); ?></a></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>