show feed update error (if any) in subtoolbar

This commit is contained in:
Andrew Dolgov 2010-11-24 19:30:41 +03:00
parent 88e4e5979c
commit 26a1e185e2
2 changed files with 12 additions and 2 deletions

View File

@ -4027,7 +4027,7 @@
function print_headline_subtoolbar($link, $feed_site_url, $feed_title, function print_headline_subtoolbar($link, $feed_site_url, $feed_title,
$feed_id, $is_cat, $search, $match_on, $feed_id, $is_cat, $search, $match_on,
$search_mode, $view_mode) { $search_mode, $view_mode, $error) {
$page_prev_link = "viewFeedGoPage(-1)"; $page_prev_link = "viewFeedGoPage(-1)";
$page_next_link = "viewFeedGoPage(1)"; $page_next_link = "viewFeedGoPage(1)";
@ -4099,6 +4099,11 @@
$target = "target=\"_blank\""; $target = "target=\"_blank\"";
print "<a title=\"".__("Visit the website")."\" $target href=\"$feed_site_url\">". print "<a title=\"".__("Visit the website")."\" $target href=\"$feed_site_url\">".
truncate_string($feed_title,30)."</a>"; truncate_string($feed_title,30)."</a>";
if ($error) {
print " (<span class=\"error\" title=\"$error\">Error</span>)";
}
} else { } else {
if ($feed_id < -10) { if ($feed_id < -10) {
$label_id = -11-$feed_id; $label_id = -11-$feed_id;
@ -4847,7 +4852,8 @@
if (db_num_rows($result) > 0) { if (db_num_rows($result) > 0) {
print_headline_subtoolbar($link, $feed_site_url, $feed_title, 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()\">"; // print "<div id=\"headlinesInnerContainer\" onscroll=\"headlines_scroll_handler()\">";

View File

@ -616,6 +616,10 @@ div#headlines-toolbar div#subtoolbar_ftitle {
padding-right : 5px; padding-right : 5px;
} }
div#subtoolbar_ftitle span.error {
color : red;
}
span.contentPreview { span.contentPreview {
color : gray; color : gray;
font-weight : normal; font-weight : normal;