summaryrefslogtreecommitdiff
path: root/app/layout
diff options
context:
space:
mode:
authorGravatar Alexis Degrugillier <github@ainw.org> 2014-04-08 23:26:41 -0400
committerGravatar Alexis Degrugillier <github@ainw.org> 2014-04-08 23:26:41 -0400
commitb55571de8f19fab15202826950184cfcb90d364c (patch)
tree2ea36a991499122a72594df7e65f32711c220e4f /app/layout
parentf6049f3be7b311a78e80d08b2cf01b1eed076db9 (diff)
Split reading configuration page
I splitted the reading configuration page in 2 pages. The display configuration page to prepare for #265 and the reading configuration page. It is just a test, feel free to discard that. I also change some wording to be consistent through out the application.
Diffstat (limited to 'app/layout')
-rw-r--r--app/layout/aside_configure.phtml5
-rw-r--r--app/layout/header.phtml3
2 files changed, 6 insertions, 2 deletions
diff --git a/app/layout/aside_configure.phtml b/app/layout/aside_configure.phtml
index 27f11ab6d..43adeb3c6 100644
--- a/app/layout/aside_configure.phtml
+++ b/app/layout/aside_configure.phtml
@@ -1,7 +1,10 @@
<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 () == 'display' ? ' active' : ''; ?>">
- <a href="<?php echo _url ('configure', 'display'); ?>"><?php echo Minz_Translate::t ('reading_configuration'); ?></a>
+ <a href="<?php echo _url ('configure', 'display'); ?>"><?php echo Minz_Translate::t ('display_configuration'); ?></a>
+ </li>
+ <li class="item<?php echo Minz_Request::actionName () == 'reading' ? ' active' : ''; ?>">
+ <a href="<?php echo _url ('configure', 'reading'); ?>"><?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>
diff --git a/app/layout/header.phtml b/app/layout/header.phtml
index d20f7487f..08aa7715d 100644
--- a/app/layout/header.phtml
+++ b/app/layout/header.phtml
@@ -67,7 +67,8 @@ 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', 'display'); ?>"><?php echo Minz_Translate::t ('reading_configuration'); ?></a></li>
+ <li class="item"><a href="<?php echo _url ('configure', 'display'); ?>"><?php echo Minz_Translate::t ('display_configuration'); ?></a></li>
+ <li class="item"><a href="<?php echo _url ('configure', 'reading'); ?>"><?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>