valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rework label counter behaviour

This commit is contained in:
Andrew Dolgov 2005-09-09 02:21:30 +01:00
parent 90cd2ea5a1
commit 392d45635b
3 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
backend.php
View File

@ -37,7 +37,7 @@
error_reporting (0); error_reporting (0);
$tmp_result = db_query($link, "SELECT count(id) as count FROM ttrss_entries $tmp_result = db_query($link, "SELECT count(id) as count FROM ttrss_entries
WHERE " . $line["sql_exp"]); WHERE (" . $line["sql_exp"] . ") AND unread = true");
$count = db_fetch_result($tmp_result, 0, "count"); $count = db_fetch_result($tmp_result, 0, "count");
@ -98,14 +98,20 @@
error_reporting (0); error_reporting (0);
$tmp_result = db_query($link, "SELECT count(id) as count FROM ttrss_entries $tmp_result = db_query($link, "SELECT count(id) as count FROM ttrss_entries
WHERE " . $line["sql_exp"]); WHERE (" . $line["sql_exp"] . ") AND unread = true");
$count = db_fetch_result($tmp_result, 0, "count"); $count = db_fetch_result($tmp_result, 0, "count");
$class = "odd";
if ($count > 0) {
$class .= "Unread";
}
error_reporting (E_ERROR | E_WARNING | E_PARSE); error_reporting (E_ERROR | E_WARNING | E_PARSE);
printFeedEntry(-$line["id"]-11, printFeedEntry(-$line["id"]-11,
"odd", $line["description"], $count, "images/label.png"); $class, $line["description"], $count, "images/label.png");
} }
} }

7
functions.js
View File

@ -312,14 +312,19 @@ function label_counters_callback() {
var feedctr = f_document.getElementById("FEEDCTR-" + id); var feedctr = f_document.getElementById("FEEDCTR-" + id);
var feedu = f_document.getElementById("FEEDU-" + id); var feedu = f_document.getElementById("FEEDU-" + id);
var feedr = f_document.getElementById("FEEDR-" + id);
feedu.innerHTML = ctr; feedu.innerHTML = ctr;
if (ctr > 0) { if (ctr > 0) {
feedctr.className = "odd"; feedctr.className = "odd";
if (!feedr.className.match("Unread") && id != -1) {
feedr.className = feedr.className + "Unread";
}
} else { } else {
feedctr.className = "invisible"; feedctr.className = "invisible";
} feedr.className = feedr.className.replace("Unread", "");
}
} }
} }
} }

2
tt-rss.js
View File

@ -70,7 +70,7 @@ function refetch_callback() {
if (ctr > 0) { if (ctr > 0) {
feedctr.className = "odd"; feedctr.className = "odd";
if (id > 0 && !feedr.className.match("Unread")) { if (id != -1 && !feedr.className.match("Unread")) {
feedr.className = feedr.className + "Unread"; feedr.className = feedr.className + "Unread";
} }
} else { } else {