summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2010-11-24 19:30:41 +0300
committerAndrew Dolgov <[email protected]>2010-11-24 19:30:41 +0300
commit26a1e185e2c762cf7e9cadd95c081737a3de2078 (patch)
tree8012bbd799bdd6f412c51b06e6fb0161c4a7f3fe
parent88e4e5979c505cdbb494c2624b7a4e09c8145217 (diff)
show feed update error (if any) in subtoolbar
-rw-r--r--functions.php10
-rw-r--r--tt-rss.css4
2 files changed, 12 insertions, 2 deletions
diff --git a/functions.php b/functions.php
index 28f2cc892..6b76cea30 100644
--- a/functions.php
+++ b/functions.php
@@ -4027,7 +4027,7 @@
function print_headline_subtoolbar($link, $feed_site_url, $feed_title,
$feed_id, $is_cat, $search, $match_on,
- $search_mode, $view_mode) {
+ $search_mode, $view_mode, $error) {
$page_prev_link = "viewFeedGoPage(-1)";
$page_next_link = "viewFeedGoPage(1)";
@@ -4099,6 +4099,11 @@
$target = "target=\"_blank\"";
print "<a title=\"".__("Visit the website")."\" $target href=\"$feed_site_url\">".
truncate_string($feed_title,30)."</a>";
+
+ if ($error) {
+ print " (<span class=\"error\" title=\"$error\">Error</span>)";
+ }
+
} else {
if ($feed_id < -10) {
$label_id = -11-$feed_id;
@@ -4847,7 +4852,8 @@
if (db_num_rows($result) > 0) {
print_headline_subtoolbar($link, $feed_site_url, $feed_title,
- $feed, $cat_view, $search, $match_on, $search_mode, $view_mode);
+ $feed, $cat_view, $search, $match_on, $search_mode, $view_mode,
+ $last_error);
// print "<div id=\"headlinesInnerContainer\" onscroll=\"headlines_scroll_handler()\">";
diff --git a/tt-rss.css b/tt-rss.css
index 4e767efb8..2164324ba 100644
--- a/tt-rss.css
+++ b/tt-rss.css
@@ -616,6 +616,10 @@ div#headlines-toolbar div#subtoolbar_ftitle {
padding-right : 5px;
}
+div#subtoolbar_ftitle span.error {
+ color : red;
+}
+
span.contentPreview {
color : gray;
font-weight : normal;