mark feed with error in headlines toolbar, use error icon in feed editor

3 files changed, 8 insertions, 9 deletions

diff --git a/classes/feeds.php b/classes/feeds.php
index e71be4e55..5649da7ce 100644
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -48,9 +48,11 @@ class Feeds extends Handler_Protected {
 
 		// right part
 
+		$error_class = $error ? "error" : "";
+
 		$reply .= "<span class='r'>";
 		$reply .= "<span id='selected_prompt'></span>";
-		$reply .= "<span id='feed_title'>";
+		$reply .= "<span id='feed_title' class='$error_class'>";
 
 		if ($feed_site_url) {
 			$last_updated = T_sprintf("Last updated: %s",
diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php
index 1f8c5e4a0..122d4b116 100644
--- a/classes/pref/feeds.php
+++ b/classes/pref/feeds.php
@@ -572,8 +572,9 @@ class Pref_Feeds extends Handler_Protected {
 		$last_error = $this->dbh->fetch_result($result, 0, "last_error");
 
 		if ($last_error) {
-			print "&nbsp;<span title=\"".htmlspecialchars($last_error)."\"
-				class=\"feed_error\">(error)</span>";
+			print "&nbsp;<img src=\"images/error.png\" alt=\"(error)\"
+				style=\"vertical-align : middle\"
+				title=\"".htmlspecialchars($last_error)."\">";
 
 		}
 
diff --git a/css/tt-rss.css b/css/tt-rss.css
index 6b3b310c8..de2a92d59 100644
--- a/css/tt-rss.css
+++ b/css/tt-rss.css
@@ -320,10 +320,6 @@ div.prefHelp {
 	padding : 5px;
 }
 
-span.feed_error {
-	color : red;
-}
-
 .insensitive {
 	color : #555;
 }
@@ -356,9 +352,9 @@ div#headlines-toolbar span.r {
 	text-align : right;
 }	
 
-div#headlines-toolbar span.r span.error {
+#headlines-toolbar span.r .error a {
 	color : red;
-} 
+}
 
 div#headlines-toolbar span.r a {
 	color : #555;