From f597b8d1c9a97776f64c573157d04fc9832734d6 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Wed, 13 Mar 2013 20:20:03 +0100
Subject: Amélioration design navigation en liste + diverses ajouts design
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/layout/aside_configure.phtml | 31 +++++++++++++++----------------
 app/layout/aside_feed.phtml      | 38 ++++++++++++++++++--------------------
 app/layout/aside_flux.phtml      |  2 +-
 3 files changed, 34 insertions(+), 37 deletions(-)

(limited to 'app/layout')

diff --git a/app/layout/aside_configure.phtml b/app/layout/aside_configure.phtml
index 225026810..cc81479e9 100644
--- a/app/layout/aside_configure.phtml
+++ b/app/layout/aside_configure.phtml
@@ -1,17 +1,16 @@
-<div class="aside">
-	<ul>
-		<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 () == 'categorize' ? 'class="active"' : ''; ?>>
-			<a href="<?php echo Url::display (array ('c' => 'configure', 'a' => 'categorize')); ?>">Catégories</a>
-		</li>
-		<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>
-	</ul>
+<div class="nav nav-list aside">
+	<li class="nav-header">Configuration</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 () == 'categorize' ? 'class="active"' : ''; ?>>
+		<a href="<?php echo Url::display (array ('c' => 'configure', 'a' => 'categorize')); ?>">Catégories</a>
+	</li>
+	<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>
 </div>
diff --git a/app/layout/aside_feed.phtml b/app/layout/aside_feed.phtml
index 98a82d6a7..a45c64e18 100644
--- a/app/layout/aside_feed.phtml
+++ b/app/layout/aside_feed.phtml
@@ -1,20 +1,18 @@
-<div class="aside">
-	<ul>
-		<li><h2>Vox flux RSS</h2></li>
-		<?php if (!login_is_conf ($this->conf) || is_logged ()) { ?>
-		<li><form id="add_rss" method="post" action="<?php echo Url::display (array ('c' => 'feed', 'a' => 'add')); ?>">
-			<input type="url" name="url_rss" placeholder="Ajouter un flux RSS" />
-			<input type="submit" value="+" />
-		</form></li>
-		<?php } ?>
-		<?php if (!empty ($this->feeds)) { ?>
-		<?php foreach ($this->feeds as $feed) { ?>
-		<li <?php echo ($this->flux && $this->flux->id () == $feed->id ()) ? 'class="active"' : ''; ?>>
-			<a href="<?php echo Url::display (array ('c' => 'configure', 'a' => 'feed', 'params' => array ('id' => $feed->id ()))); ?>"><?php echo $feed->name (); ?></a>
-		</li>
-		<?php } ?>
-		<?php } else { ?>
-		<li class="disable"><span>Aucun flux</span></li>
-		<?php } ?>
-	</ul>
-</div>
+<ul class="nav nav-list aside">
+	<li class="nav-header">Vos flux RSS</li>
+
+	<?php if (!empty ($this->feeds)) { ?>
+	<?php foreach ($this->feeds as $feed) { ?>
+	<li <?php echo ($this->flux && $this->flux->id () == $feed->id ()) ? 'class="active"' : ''; ?>>
+		<a href="<?php echo Url::display (array ('c' => 'configure', 'a' => 'feed', 'params' => array ('id' => $feed->id ()))); ?>"><?php echo $feed->name (); ?></a>
+	</li>
+	<?php } ?>
+	<?php } else { ?>
+	<li class="disable">Aucun flux</li>
+	<?php } ?>
+
+	<li><form id="add_rss" method="post" action="<?php echo Url::display (array ('c' => 'feed', 'a' => 'add')); ?>">
+		<input type="url" name="url_rss" placeholder="Ajouter un flux RSS" />
+		<input type="submit" value="+" />
+	</form></li>
+</ul>
diff --git a/app/layout/aside_flux.phtml b/app/layout/aside_flux.phtml
index f1f14cfc0..916b03331 100644
--- a/app/layout/aside_flux.phtml
+++ b/app/layout/aside_flux.phtml
@@ -1,4 +1,4 @@
-<div class="aside">
+<div class="aside aside_flux">
 	<?php if (isset ($this->cat_aside)) { ?>
 	<ul class="categories">
 		<li><a class="btn btn-important" href="<?php echo _url ('configure', 'feed'); ?>">Gestion des abonnements</a></li>
-- 
cgit v1.2.3