diff --git a/backend.php b/backend.php index 50d316b66..bf8394b0b 100644 --- a/backend.php +++ b/backend.php @@ -106,10 +106,14 @@ } print "$feed"; - if ($unread > 0) { - print " -  ($unread)"; + if ($unread != 0) { + $fctr_class = ""; + } else { + $fctr_class = "class=\"invisible\""; } + + print " + ($unread)"; print ""; @@ -456,19 +460,24 @@ var p_document = parent.frames['feeds-frame'].document; var feedr = p_document.getElementById(\"FEEDR-\" + $feed); - var feedt = p_document.getElementById(\"FEEDT-\" + $feed); var feedu = p_document.getElementById(\"FEEDU-\" + $feed); - feedt.innerHTML = \"$total\"; - feedu.innerHTML = \"$unread\"; + if (feedu) { + feedu.innerHTML = \"$unread\"; + } + + var feedctr = p_document.getElementById(\"FEEDCTR-\" + $feed); if ($unread > 0 && !feedr.className.match(\"Unread\")) { feedr.className = feedr.className + \"Unread\"; + feedctr.className = ''; } else if ($unread <= 0) { feedr.className = feedr.className.replace(\"Unread\", \"\"); + feedctr.className = 'invisible'; } - //p_notify(''); + p_notify(\"\"); + "; if ($addheader) { diff --git a/tt-rss.css b/tt-rss.css index 40d959d7d..f3113b1bf 100644 --- a/tt-rss.css +++ b/tt-rss.css @@ -128,7 +128,8 @@ ul.feedList li { } ul.feedList li.oddSelected, ul.feedList li.evenSelected, - li.oddUnreadSelected, li.evenUnreadSelected { + li.oddUnreadSelected, li.evenUnreadSelected, li.evenSelectedUnread, + li.oddSelectedUnread { background-color : white; } diff --git a/viewfeed.js b/viewfeed.js index 85963dfeb..1fade8598 100644 --- a/viewfeed.js +++ b/viewfeed.js @@ -25,7 +25,7 @@ if (!xmlhttp_rpc && typeof XMLHttpRequest!='undefined') { function view(id, feed_id) { -// p_notify("Loading article..."); + p_notify("Loading article..."); enableHotkeys(); @@ -46,7 +46,7 @@ function view(id, feed_id) { var feedctr = f_doc.getElementById("FEEDCTR-" + feed_id); if (feedctr) { - feedctr.innerHTML = ""; + feedctr.className = "invisible"; } }