From 3a8a6d2d56c468af924936a80e110727bc503594 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Tue, 30 Oct 2012 22:09:53 +0100
Subject: [PATCH] petite correction du menu de gauche

---
 app/layout/aside.phtml | 8 +++++---
 public/theme/base.css  | 8 +++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/layout/aside.phtml b/app/layout/aside.phtml
index 73f797850..7f33bff2f 100644
--- a/app/layout/aside.phtml
+++ b/app/layout/aside.phtml
@@ -32,8 +32,10 @@
 			<?php } ?>
 		</li>
 		<?php } ?>
-		
-		<?php if (isset ($this->cat_aside)) { ?>
+	</ul>
+	
+	<?php if (isset ($this->cat_aside)) { ?>
+	<ul id="categories">
 		<li class="all<?php echo !$this->get ? ' active' : ''; ?>"><a href="<?php echo Url::display (array ()); ?>">Tous <span><?php echo $this->nb_total; ?> article<?php echo $this->nb_total > 1 ? 's' : ''; ?></span></a></li>
 		
 		<li class="favorites<?php echo $this->get == 'favoris' ? ' active' : ''; ?>"><a href="<?php echo Url::display (array ('params' => array ('get' => 'favoris'))); ?>">Favoris <span><?php echo $this->nb_favorites; ?> article<?php echo $this->nb_favorites > 1 ? 's' : ''; ?></span></a></li>
@@ -41,6 +43,6 @@
 		<?php foreach ($this->cat_aside as $cat) { ?>
 		<li class="category<?php echo $this->get == $cat->id () ? ' active' : ''; ?>"><a href="<?php echo Url::display (array ('params' => array ('get' => $cat->id ()))); ?>"><?php echo $cat->name (); ?> <span><?php echo $cat->nbFeed (); ?> flux</span></a></li>
 		<?php } ?>
-		<?php } ?>
 	</ul>
+	<?php } ?>
 </div>
diff --git a/public/theme/base.css b/public/theme/base.css
index 12dff63cd..4e06670c2 100644
--- a/public/theme/base.css
+++ b/public/theme/base.css
@@ -180,13 +180,11 @@ form {
 		#main_aside {
 			position: fixed;
 		}
-		#menu {
-			height: 92%;
+		#categories {
+			height: 69%;
 			overflow: auto;
+			border-top: 1px solid #aaa;
 		}
-			#menu li.all {
-				border-top: 1px solid #aaa;
-			}
 	#main {
 		display: table-cell;
 		height: 100%;