summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--functions.js19
-rw-r--r--functions.php61
-rw-r--r--tt-rss.css4
3 files changed, 69 insertions, 15 deletions
diff --git a/functions.js b/functions.js
index c66993c2a..99d267f91 100644
--- a/functions.js
+++ b/functions.js
@@ -475,7 +475,8 @@ function parse_counters(reply, scheduled_call) {
var has_img = elems[l].getAttribute("hi");
var updated = elems[l].getAttribute("updated");
var title = elems[l].getAttribute("title");
-
+ var xmsg = elems[l].getAttribute("xmsg");
+
if (id == "global-unread") {
global_unread = ctr;
updateTitle();
@@ -515,11 +516,21 @@ function parse_counters(reply, scheduled_call) {
}
}
- if (updated && feedupd) {
+ if (feedupd) {
+ if (!updated) updated = "";
+
if (error) {
- feedupd.innerHTML = updated + " (Error)";
+ if (xmsg) {
+ feedupd.innerHTML = updated + " " + xmsg + " (Error)";
+ } else {
+ feedupd.innerHTML = updated + " (Error)";
+ }
} else {
- feedupd.innerHTML = updated;
+ if (xmsg) {
+ feedupd.innerHTML = updated + " " + xmsg;
+ } else {
+ feedupd.innerHTML = updated;
+ }
}
}
diff --git a/functions.php b/functions.php
index 48caab061..5d4966865 100644
--- a/functions.php
+++ b/functions.php
@@ -1550,8 +1550,9 @@
(<span id=\"FEEDU-$feed_id\">$unread</span>)</span>";
if (get_pref($link, "EXTENDED_FEEDLIST")) {
+ $total = getFeedArticles($link, $feed_id);
print "<div class=\"feedExtInfo\">
- <span id=\"FLUPD-$feed_id\">$last_updated $error_notify_msg</span></div>";
+ <span id=\"FLUPD-$feed_id\">$last_updated ($total total) $error_notify_msg</span></div>";
}
print "</li>";
@@ -2316,8 +2317,18 @@
}
function getFeedUnread($link, $feed, $is_cat = false) {
+ return getFeedArticles($link, $feed, $is_cat, true);
+ }
+
+ function getFeedArticles($link, $feed, $is_cat = false, $unread_only = false) {
$n_feed = sprintf("%d", $feed);
+ if ($unread_only) {
+ $unread_qpart = "unread = true";
+ } else {
+ $unread_qpart = "true";
+ }
+
$age_qpart = getMaxAgeSubquery();
if ($is_cat) {
@@ -2357,7 +2368,7 @@
$result = db_query($link, "SELECT COUNT(int_id) AS unread
FROM ttrss_user_entries,ttrss_entries
- WHERE unread = true AND
+ WHERE $unread_qpart AND
ttrss_user_entries.ref_id = ttrss_entries.id AND
$age_qpart AND
($match_part) AND
@@ -2393,14 +2404,14 @@
ttrss_user_entries.ref_id = ttrss_entries.id AND
ttrss_feeds.hidden = false AND
$age_qpart AND
- unread = true AND ($match_part) AND ttrss_user_entries.owner_uid = " . $_SESSION["uid"]);
+ $unread_qpart AND ($match_part) AND ttrss_user_entries.owner_uid = " . $_SESSION["uid"]);
} else {
$result = db_query($link, "SELECT COUNT(post_int_id) AS unread
FROM ttrss_tags,ttrss_user_entries,ttrss_entries
WHERE tag_name = '$feed' AND post_int_id = int_id AND ref_id = ttrss_entries.id
- AND unread = true AND $age_qpart AND
+ AND $unread_qpart AND $age_qpart AND
ttrss_tags.owner_uid = " . $_SESSION["uid"]);
}
@@ -2520,7 +2531,14 @@
$count = getFeedUnread($link, -1);
if (!$ret_mode) {
- print "<counter type=\"label\" id=\"-1\" counter=\"$count\"/>";
+
+ if (get_pref($link, 'EXTENDED_FEEDLIST')) {
+ $xmsg_part = "xmsg=\"(" . getFeedArticles($link, $id) . " total)\"";
+ } else {
+ $xmsg_part = "";
+ }
+
+ print "<counter type=\"label\" id=\"-1\" counter=\"$count\" $xmsg_part/>";
} else {
$ret_arr["-1"]["counter"] = $count;
$ret_arr["-1"]["description"] = __("Starred articles");
@@ -2529,7 +2547,14 @@
$count = getFeedUnread($link, -2);
if (!$ret_mode) {
- print "<counter type=\"label\" id=\"-2\" counter=\"$count\"/>";
+
+ if (get_pref($link, 'EXTENDED_FEEDLIST')) {
+ $xmsg_part = "xmsg=\"(" . getFeedArticles($link, $id) . " total)\"";
+ } else {
+ $xmsg_part = "";
+ }
+
+ print "<counter type=\"label\" id=\"-2\" counter=\"$count\" $xmsg_part/>";
} else {
$ret_arr["-2"]["counter"] = $count;
$ret_arr["-2"]["description"] = __("Published articles");
@@ -2538,7 +2563,14 @@
$count = getFeedUnread($link, -3);
if (!$ret_mode) {
- print "<counter type=\"label\" id=\"-3\" counter=\"$count\"/>";
+
+ if (get_pref($link, 'EXTENDED_FEEDLIST')) {
+ $xmsg_part = "xmsg=\"(" . getFeedArticles($link, $id) . " total)\"";
+ } else {
+ $xmsg_part = "";
+ }
+
+ print "<counter type=\"label\" id=\"-3\" counter=\"$count\" $xmsg_part/>";
} else {
$ret_arr["-3"]["counter"] = $count;
$ret_arr["-3"]["description"] = __("Fresh articles");
@@ -2570,7 +2602,14 @@
$old_counters[$id] = $count;
$lctrs_modified = true;
if (!$ret_mode) {
- print "<counter type=\"label\" id=\"$id\" counter=\"$count\"/>";
+
+ if (get_pref($link, 'EXTENDED_FEEDLIST')) {
+ $xmsg_part = "xmsg=\"(" . getFeedArticles($link, $id) . " total)\"";
+ } else {
+ $xmsg_part = "";
+ }
+
+ print "<counter type=\"label\" id=\"$id\" counter=\"$count\" $xmsg_part/>";
} else {
$ret_arr[$id]["counter"] = $count;
$ret_arr[$id]["description"] = $label_name;
@@ -2695,7 +2734,11 @@
$has_title_part = "";
}
- print "<counter type=\"feed\" id=\"$id\" counter=\"$count\" $has_img_part $error_part updated=\"$last_updated\" $has_title_part/>";
+ if (get_pref($link, 'EXTENDED_FEEDLIST')) {
+ $xmsg_part = "xmsg=\"(" . getFeedArticles($link, $id) . " total)\"";
+ }
+
+ print "<counter type=\"feed\" id=\"$id\" counter=\"$count\" $has_img_part $error_part updated=\"$last_updated\" $xmsg_part $has_title_part/>";
}
}
diff --git a/tt-rss.css b/tt-rss.css
index 2582811c8..a37e6870a 100644
--- a/tt-rss.css
+++ b/tt-rss.css
@@ -83,7 +83,7 @@ ul.feedList li.feedCat {
margin : 0px;
padding : 3px 0px 3px 0px;
color : #707070;
- font-size : 11px;
+ font-size : 12px;
}
ul.feedList li.feedCat a {
@@ -278,7 +278,7 @@ input.editbox {
}
#dispSwitch {
- font-size : 11px;
+ font-size : 12px;
font-family : "Lucida Grande", Tahoma, Arial, sans-serif;
text-align : right;
float : right;
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-06 20:50:18 +0000