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

diff --git a/classes/feeds.php b/classes/feeds.php
index e71be4e559c98e14997dfd4c26129f3c04f2dc69..5649da7ced1d3f6114bce0701bb16ed780c2c41f 100644 (file)
--- 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 1f8c5e4a0101be73e49ac19d7f20730fd7b9804e..122d4b116ef26245fc37cbe36bdab8d0ecabfc84 100644 (file)
--- 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 6b3b310c8f2d5c66108c82fa39d529a03ac0057a..de2a92d593b99fb39104c57df8c8031c0588662d 100644 (file)
--- 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;