From 225fdf2295711752510d879885d7ce3e41b5a5d0 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Wed, 5 Dec 2012 15:58:06 +0100
Subject: Correction design / interface

---
 app/layout/aside.phtml           |  2 +-
 app/layout/configure_aside.phtml | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'app/layout')

diff --git a/app/layout/aside.phtml b/app/layout/aside.phtml
index 61efae7c3..82bd2b051 100644
--- a/app/layout/aside.phtml
+++ b/app/layout/aside.phtml
@@ -13,7 +13,7 @@
 		
 		<?php if (!login_is_conf ($this->conf) || is_logged ()) { ?>
 		<li <?php echo Request::controllerName () == 'configure' ? 'class="active"' : ''; ?>>
-			<a href="<?php echo Url::display (array ('c' => 'configure', 'a' => 'feed')); ?>">Configurer</a>
+			<a href="<?php echo Url::display (array ('c' => 'configure', 'a' => 'display')); ?>">Configurer</a>
 		</li>
 		<?php } ?>
 		
diff --git a/app/layout/configure_aside.phtml b/app/layout/configure_aside.phtml
index c1dbda4f3..b7a8fdeef 100644
--- a/app/layout/configure_aside.phtml
+++ b/app/layout/configure_aside.phtml
@@ -1,20 +1,20 @@
 <div class="aside">
 	<ul id="menu">
 		<li><h2>Configuration</h2></li>
+		<li <?php echo Request::actionName () == 'display' ? 'class="active"' : ''; ?>>
+			<a href="<?php echo Url::display (array ('c' => 'configure', 'a' => 'display')); ?>">Général et affichage</a>
+		</li>
 		<li <?php echo Request::actionName () == 'feed' ? 'class="active"' : ''; ?>>
 			<a href="<?php echo Url::display (array ('c' => 'configure', 'a' => 'feed')); ?>">Flux RSS</a>
 		</li>
 		<li <?php echo Request::actionName () == 'categorize' ? 'class="active"' : ''; ?>>
 			<a href="<?php echo Url::display (array ('c' => 'configure', 'a' => 'categorize')); ?>">Catégories</a>
 		</li>
-		<li <?php echo Request::actionName () == 'display' ? 'class="active"' : ''; ?>>
-			<a href="<?php echo Url::display (array ('c' => 'configure', 'a' => 'display')); ?>">Général et affichage</a>
+		<li <?php echo Request::actionName () == 'shortcut' ? 'class="active"' : ''; ?>>
+			<a href="<?php echo Url::display (array ('c' => 'configure', 'a' => 'shortcut')); ?>">Raccourcis</a>
 		</li>
 		<li <?php echo Request::actionName () == 'importExport' ? 'class="active"' : ''; ?>>
 			<a href="<?php echo Url::display (array ('c' => 'configure', 'a' => 'importExport')); ?>">Import / Export OPML</a>
 		</li>
-		<li <?php echo Request::actionName () == 'shortcut' ? 'class="active"' : ''; ?>>
-			<a href="<?php echo Url::display (array ('c' => 'configure', 'a' => 'shortcut')); ?>">Raccourcis</a>
-		</li>
 	</ul>
 </div>
-- 
cgit v1.2.3