From c805b031481d5b53b0f5f9d6d39bc83911709834 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Fri, 15 Nov 2013 17:26:22 +0100
Subject: Corrige style bigMarkAsRead
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Corrige problème héritage de style pour bigMarkAsRead.
Plus détails
---
 app/views/helpers/pagination.phtml     |  4 ++--
 public/scripts/main.js                 | 12 ++++++++----
 public/themes/default/freshrss.css     | 18 +++++++++---------
 public/themes/flat-design/freshrss.css | 18 +++++++++---------
 4 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/app/views/helpers/pagination.phtml b/app/views/helpers/pagination.phtml
index 9cd877f82..0b0d2f5ba 100755
--- a/app/views/helpers/pagination.phtml
+++ b/app/views/helpers/pagination.phtml
@@ -12,13 +12,13 @@
 	<?php $params[$getteur] = $this->next; ?>
 	<a id="load_more" href="<?php echo Url::display (array ('c' => $c, 'a' => $a, 'params' => $params)); ?>"><?php echo Translate::t ('load_more'); ?></a>
 	<?php } elseif ($markReadUrl) { ?>
-	<a class="bigMarkAsRead" href="<?php echo $markReadUrl; ?>">
+	<a id="bigMarkAsRead" href="<?php echo $markReadUrl; ?>">
 		<?php echo Translate::t ('nothing_to_load'); ?><br />
 		<span class="bigTick">✔</span><br />
 		<?php echo Translate::t ('mark_all_read'); ?>
 	</a>
 	<?php } else { ?>
-	<a class="bigMarkAsRead" href=".">
+	<a id="bigMarkAsRead" href=".">
 		<?php echo Translate::t ('nothing_to_load'); ?><br />
 	</a>
 	<?php } ?>
diff --git a/public/scripts/main.js b/public/scripts/main.js
index 04c1977d5..159bf48b3 100644
--- a/public/scripts/main.js
+++ b/public/scripts/main.js
@@ -58,12 +58,16 @@ function mark_read(active, only_not_read) {
 			elem = $('#' + feed_id + ' .feed').get(0),
 			feed_unread = elem ? (parseInt(elem.getAttribute('data-unread'), 10) || 0) : 0,
 			feed_priority = elem ? (parseInt(elem.getAttribute('data-priority'), 10) || 0) : 0;
-		elem.setAttribute('data-unread', Math.max(0, feed_unread + inc));
+		if (elem) {
+			elem.setAttribute('data-unread', Math.max(0, feed_unread + inc));
+		}
 
 		//Update unread: category
 		elem = $('#' + feed_id).parent().prevAll('.category').children(':first').get(0);
 		feed_unread = elem ? (parseInt(elem.getAttribute('data-unread'), 10) || 0) : 0;
-		elem.setAttribute('data-unread', Math.max(0, feed_unread + inc));
+		if (elem) {
+			elem.setAttribute('data-unread', Math.max(0, feed_unread + inc));
+		}
 
 		//Update unread: all
 		if (feed_priority > 0) {
@@ -589,8 +593,8 @@ function init_persona() {
 
 function init_confirm_action() {
 	$('.confirm').click(function () {
-        return confirm(str_confirmation);
-    });
+		return confirm(str_confirmation);
+	});
 }
 
 function init_all() {
diff --git a/public/themes/default/freshrss.css b/public/themes/default/freshrss.css
index a05a3cf04..81ff6d196 100644
--- a/public/themes/default/freshrss.css
+++ b/public/themes/default/freshrss.css
@@ -575,7 +575,7 @@
 	font-size: 0;
 }
 
-a.bigMarkAsRead {
+#bigMarkAsRead {
 	display: block;
 	font-style: normal;
 	padding: 32px 0 64px 0;
@@ -583,14 +583,14 @@ a.bigMarkAsRead {
 	text-decoration: none;
 	text-shadow: 0 -1px 0 #aaa;
 }
-a.bigMarkAsRead:hover {
-	background: #333;
-	color: #fff;
-}
-.bigTick {
-	font-size: 72pt;
-	line-height: 1.6em;
-}
+	#bigMarkAsRead:hover {
+		background: #333;
+		color: #fff;
+	}
+	.bigTick {
+		font-size: 72pt;
+		line-height: 1.6em;
+	}
 
 /*** NOTIFICATION ***/
 .notification {
diff --git a/public/themes/flat-design/freshrss.css b/public/themes/flat-design/freshrss.css
index fa9295da5..498a02c1e 100644
--- a/public/themes/flat-design/freshrss.css
+++ b/public/themes/flat-design/freshrss.css
@@ -562,7 +562,7 @@ body {
 	font-size: 0;
 }
 
-a.bigMarkAsRead {
+#bigMarkAsRead {
 	background: #ecf0f1;
 	display: block;
 	font-style: normal;
@@ -571,14 +571,14 @@ a.bigMarkAsRead {
 	text-decoration: none;
 	text-shadow: 0 -1px 0 #aaa;
 }
-a.bigMarkAsRead:hover {
-	background: #34495e;
-	color: #fff;
-}
-.bigTick {
-	font-size: 72pt;
-	line-height: 1.6em;
-}
+	#bigMarkAsRead:hover {
+		background: #34495e;
+		color: #fff;
+	}
+	.bigTick {
+		font-size: 72pt;
+		line-height: 1.6em;
+	}
 
 /*** NOTIFICATION ***/
 .notification {
-- 
cgit v1.2.3