From c62ec2a14428b528e20896d4e62fa08891e1399c Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Tue, 12 Mar 2013 23:24:52 +0100
Subject: Grosse mise à jour du design, pas mal de trucs cassés au niveau du
 panneau de configuration
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/layout/aside.phtml           | 76 ++++++++++++++++++----------------------
 app/layout/configure_aside.phtml |  3 --
 app/layout/header.phtml          | 28 +++++++++++++++
 app/layout/layout.phtml          |  6 +++-
 4 files changed, 68 insertions(+), 45 deletions(-)
 create mode 100644 app/layout/header.phtml

(limited to 'app/layout')

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>
diff --git a/app/layout/configure_aside.phtml b/app/layout/configure_aside.phtml
index b7a8fdeef..26a111045 100644
--- a/app/layout/configure_aside.phtml
+++ b/app/layout/configure_aside.phtml
@@ -4,9 +4,6 @@
 		<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>
diff --git a/app/layout/header.phtml b/app/layout/header.phtml
new file mode 100644
index 000000000..d158e6353
--- /dev/null
+++ b/app/layout/header.phtml
@@ -0,0 +1,28 @@
+<div class="header">
+	<div class="item title">
+		<h1><a href="<?php echo _url ('index', 'index'); ?>">FreshRSS</a></h1>
+	</div>
+
+	<div class="item search">
+		<form action="<?php echo _url ('index', 'index'); ?>" method="get">
+			<input type="text" name="search" id="search" placeholder="Rechercher (non fonctionnel)" />
+			<button class="btn"><i class="icon search"></i></button>
+		</form>
+	</div>
+
+	<?php if (!login_is_conf ($this->conf) || is_logged ()) { ?>
+	<div class="item configure">
+		<a class="btn" href="<?php echo _url ('configure', 'display'); ?>"><i class="icon configure"></i></a>
+	</div>
+	<?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 } ?>-->
+</div>
diff --git a/app/layout/layout.phtml b/app/layout/layout.phtml
index 5b2adae1e..4adcbef45 100644
--- a/app/layout/layout.phtml
+++ b/app/layout/layout.phtml
@@ -8,8 +8,12 @@
 		<?php echo self::headScript (); ?>
 	</head>
 	<body>
+<?php $this->partial ('header'); ?>
+
 <div id="global">
+	<?php if (Request::controllerName () != 'configure') { ?>
 	<?php $this->partial ('aside'); ?>
+	<?php } ?>
 	
 	<div id="main">
 		<?php $this->render (); ?>
@@ -21,7 +25,7 @@
 <?php if (isset ($this->notification)) { ?>
 <div class="notification <?php echo $this->notification['type']; ?>">
 	<?php echo $this->notification['content']; ?>
-	<a class="close" href="">X</a>
+	<a class="close" href=""><i class="icon close"></i></a>
 </div>
 <?php } ?>
 	</body>
-- 
cgit v1.2.3