From 212366fb4ce01cba97af0e0ffed71578d75f10dc Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 25 Jan 2014 15:36:31 +0100
Subject: Message article disponibles un cran au dessus
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

@marienfressinaud Que diras-tu de mettre le message un cran plus haut,
juste au dessus de "aujourd'hui' ?
En effet, la liste peut bien commencer à "Hier" par exemple, et du coup
le message semblerait un peu anachronique.
De plus, ça permet de sortir un test d'une boucle.

Il reste peut-être à optimiser l'adresse. La version précédente avec
_url() générait une exception chez moi.

https://github.com/marienfressinaud/FreshRSS/issues/379
---
 app/views/helpers/view/normal_view.phtml | 11 +++--------
 p/themes/Dark/freshrss.css               |  4 ++--
 p/themes/Flat/freshrss.css               |  4 ++--
 p/themes/Origine/freshrss.css            |  4 ++--
 4 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/app/views/helpers/view/normal_view.phtml b/app/views/helpers/view/normal_view.phtml
index af5ff03fe..652def98a 100644
--- a/app/views/helpers/view/normal_view.phtml
+++ b/app/views/helpers/view/normal_view.phtml
@@ -38,6 +38,9 @@ if (!empty($this->entries)) {
 ?>
 
 <div id="stream" class="normal<?php echo $hidePosts ? ' hide_posts' : ''; ?>"><?php
+	?><div id="new-article">
+		<a href="./"><?php echo Minz_Translate::t ('new_article'); ?></a>
+	</div><?php
 	foreach ($this->entries as $item) {
 		if ($display_today && $item->isDay (FreshRSS_Days::TODAY, $this->today)) {
 			?><div class="day" id="day_today"><?php
@@ -62,14 +65,6 @@ if (!empty($this->entries)) {
 			?></div><?php
 			$display_others = false;
 		}
-
-		if ($this->entries[0]->id () === $item->id ()) {
-			?><div id="new-article">
-				<a href="<?php echo _url(); ?>"><?php
-				echo Minz_Translate::t ('new_article');
-				?></a></div><?php
-		}
-
 	?><div class="flux<?php echo !$item->isRead () ? ' not_read' : ''; ?><?php echo $item->isFavorite () ? ' favorite' : ''; ?>" id="flux_<?php echo $item->id (); ?>">
 		<ul class="horizontal-list flux_header"><?php
 			if ($this->loginOk) {
diff --git a/p/themes/Dark/freshrss.css b/p/themes/Dark/freshrss.css
index 8e2efd383..19809c215 100644
--- a/p/themes/Dark/freshrss.css
+++ b/p/themes/Dark/freshrss.css
@@ -233,13 +233,13 @@
 	#new-article:hover {
 		background: #4A5D7A;
 	}
-	#new-article a {
+	#new-article > a {
 		display: block;
 		line-height: 40px;
 		color: #fff;
 		font-weight: bold;
 	}
-		#new-article a:hover {
+		#new-article > a:hover {
 			text-decoration: none;
 		}
 
diff --git a/p/themes/Flat/freshrss.css b/p/themes/Flat/freshrss.css
index 80e0da330..894497656 100644
--- a/p/themes/Flat/freshrss.css
+++ b/p/themes/Flat/freshrss.css
@@ -226,13 +226,13 @@ body {
 	#new-article:hover {
 		background: #2980b9;
 	}
-	#new-article a {
+	#new-article > a {
 		display: block;
 		line-height: 40px;
 		color: #fff;
 		font-weight: bold;
 	}
-		#new-article a:hover {
+		#new-article > a:hover {
 			text-decoration: none;
 		}
 
diff --git a/p/themes/Origine/freshrss.css b/p/themes/Origine/freshrss.css
index bedeff695..be549bf41 100644
--- a/p/themes/Origine/freshrss.css
+++ b/p/themes/Origine/freshrss.css
@@ -239,13 +239,13 @@
 	#new-article:hover {
 		background: #0066CC;
 	}
-	#new-article a {
+	#new-article > a {
 		display: block;
 		line-height: 40px;
 		color: #fff;
 		font-weight: bold;
 	}
-		#new-article a:hover {
+		#new-article > a:hover {
 			text-decoration: none;
 		}
 
-- 
cgit v1.2.3