From 6fc16ed8a307cb95ef9e60f2e3e781b4734cabfd Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Thu, 14 Mar 2013 18:04:45 +0100
Subject: Meilleur affichage page d'erreur + on n'affiche plus une catégorie si
 aucun flux n'en fait partie
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/configureController.php | 2 --
 app/layout/aside_feed.phtml             | 2 +-
 app/layout/aside_flux.phtml             | 5 +++--
 app/views/error/index.phtml             | 6 +++---
 public/theme/base.css                   | 4 +++-
 5 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/app/controllers/configureController.php b/app/controllers/configureController.php
index ebf59e2cd..9a42599a8 100755
--- a/app/controllers/configureController.php
+++ b/app/controllers/configureController.php
@@ -10,8 +10,6 @@ class configureController extends ActionController {
 		}
 	}
 
-	public function indexAction () { }
-
 	public function categorizeAction () {
 		$catDAO = new CategoryDAO ();
 
diff --git a/app/layout/aside_feed.phtml b/app/layout/aside_feed.phtml
index aca000cd6..7e37b2ac4 100644
--- a/app/layout/aside_feed.phtml
+++ b/app/layout/aside_feed.phtml
@@ -4,7 +4,7 @@
 	<?php if (!empty ($this->feeds)) { ?>
 	<?php foreach ($this->feeds as $feed) { ?>
 	<li class="item<?php echo ($this->flux && $this->flux->id () == $feed->id ()) ? ' active' : ''; ?>">
-		<a href="<?php echo Url::display (array ('c' => 'configure', 'a' => 'feed', 'params' => array ('id' => $feed->id ()))); ?>"><?php echo $feed->name (); ?></a>
+		<a href="<?php echo _url ('configure', 'feed', 'id', $feed->id ()); ?>"><?php echo $feed->name (); ?></a>
 	</li>
 	<?php } ?>
 	<?php } else { ?>
diff --git a/app/layout/aside_flux.phtml b/app/layout/aside_flux.phtml
index 9403a0445..f6d8b3887 100644
--- a/app/layout/aside_flux.phtml
+++ b/app/layout/aside_flux.phtml
@@ -21,6 +21,7 @@
 
 		<?php foreach ($this->cat_aside as $cat) { ?>
 		<?php $feeds = $cat->feeds (); $catNotRead = $cat->nbNotRead (); ?>
+		<?php if (!empty ($feeds)) { ?>
 		<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 (); ?>
@@ -31,7 +32,7 @@
 			<ul class="feeds">
 				<?php foreach ($feeds as $feed) { ?>
 				<li>
-					<a class="website" href="<?php echo $feed->website(); ?>"><i class="icon link"></i></a>
+					<a class="website" href="<?php echo _url ('configure', 'feed', 'id', $feed->id ()); ?>"><i class="icon configure"></i></a>
 					<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(); ?>
@@ -41,6 +42,6 @@
 			</ul>
 			<?php } ?>
 		</li>
-		<?php } ?>
+		<?php } } ?>
 	</ul>
 </div>
diff --git a/app/views/error/index.phtml b/app/views/error/index.phtml
index 626102109..21d298eb4 100644
--- a/app/views/error/index.phtml
+++ b/app/views/error/index.phtml
@@ -1,6 +1,6 @@
-<div class="table">
-	<div class="nothing">
-		<h2><?php echo $this->code; ?></h2>
+<div class="post">
+	<div class="alert">
+		<h1 class="alert-head"><?php echo $this->code; ?></h1>
 
 		<p><a href="<?php echo Url::display (); ?>">Revenir à l'accueil</a></p>
 	</div>
diff --git a/public/theme/base.css b/public/theme/base.css
index 1a709af83..856878b18 100644
--- a/public/theme/base.css
+++ b/public/theme/base.css
@@ -240,8 +240,9 @@ input {
 	box-shadow: 1px 1px 3px #aaa inset;
 }
 	.alert .alert-head {
+		margin: 0;
 		font-weight: bold;
-		font-size: 105%;
+		font-size: 110%;
 	}
 
 /* ICONES */
@@ -301,6 +302,7 @@ input {
 		}
 			.header .item.title h1 {
 				margin: 0;
+				text-shadow: 1px -1px 0 #ccc;
 			}
 			.header .item.title a:hover {
 				text-decoration: none;
-- 
cgit v1.2.3