Grosse mise à jour du design, pas mal de trucs cassés au niveau du panneau de configuration

1 files changed, 35 insertions, 41 deletions

diff --git a/app/layout/aside.phtml b/app/layout/aside.phtml
index 1432c10ca..f1f14cfc0 100644
--- a/app/layout/aside.phtml
+++ b/app/layout/aside.phtml
@@ -1,50 +1,44 @@
-<div id="main_aside" class="aside">
-	<?php if (!login_is_conf ($this->conf) || is_logged ()) { ?>
-	<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>
-	<?php } ?>
-	
-	<ul id="menu">
-		<li <?php echo Request::controllerName () == 'index' ? 'class="active"' : ''; ?>>
-			<a href="<?php echo Url::display (array ()); ?>">Flux RSS</a>
-		</li>
-		
-		<?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' => 'display')); ?>">Configurer</a>
-		</li>
-		<?php } ?>
-		
-		<?php if (login_is_conf ($this->conf)) { ?>
-		<li>
-			<?php if (!is_logged ()) { ?>
-			<a id="signin" href="#">Connexion</a>
-			<?php } else { ?>
-			<a id="signout" href="#">Déconnexion</a>
-			<?php } ?>
-		</li>
-		<?php } ?>
-	</ul>
-	
+<div class="aside">
 	<?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 class="nb_not_read"><?php echo $this->nb_not_read; ?></span>)</span>
+	<ul class="categories">
+		<li><a class="btn btn-important" href="<?php echo _url ('configure', 'feed'); ?>">Gestion des abonnements</a></li>
+
+		<li class="all">
+			<a class="btn category<?php echo !$this->get ? ' active' : ''; ?>" href="<?php echo _url ('index', 'index'); ?>">
+				<i class="icon all"></i>
+				Tous (<?php echo $this->nb_total; ?>)
+				<span class="notRead"><?php echo $this->nb_not_read; ?> non lu<?php echo $this->nb_not_read > 1 ? 's' : ''; ?></span>
+			</a>
+		</li>
+
+		<li class="favorites">
+			<a class="btn category<?php echo $this->get == 'favoris' ? ' active' : ''; ?>" href="<?php echo _url ('index', 'index', 'get', 'favoris'); ?>">
+				<i class="icon bookmark"></i>
+				Favoris (<?php echo $this->nb_favorites; ?>)
 			</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>
-		
+
 		<?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 $feeds = $cat->feeds (); $catNotRead = $cat->nbNotRead (); ?>
+		<li>
+			<a class="btn category<?php echo $this->get == $cat->id () ? ' active' : ''; ?>" href="<?php echo _url ('index', 'index', 'get', 'c_' . $cat->id ()); ?>">
 				<?php echo $cat->name (); ?>
-				<span><?php echo $cat->nbNotRead (); ?> non lu</span>
+				<span class="notRead"><?php echo $catNotRead ?> non lu<?php echo $catNotRead > 1 ? 's' : ''; ?></span>
 			</a>
+
+			<?php if (!empty ($feeds)) { ?>
+			<ul class="feeds">
+				<?php foreach ($feeds as $feed) { ?>
+				<li>
+					<img src="http://www.google.com/s2/favicons?domain=<?php echo get_domain ($feed->website ()); ?>" alt="" />
+					<a class="feed" href="<?php echo _url ('index', 'index', 'get', 'f_' . $feed->id ()); ?>">
+						<?php echo $feed->name(); ?>
+						<!--<span>X non lu</span>-->
+					</a>
+				</li>
+				<?php } ?>
+			</ul>
+			<?php } ?>
 		</li>
 		<?php } ?>
 	</ul>