blallo/tt-rss
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

vfeed grouping: allow per-feed catchup

Browse source
This commit is contained in:
Andrew Dolgov 2008-05-17 05:26:56 +01:00
parent f52fb64d8c
commit a9bcfb8ff8
2 changed files with 23 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
functions.php
View file

@ -4694,6 +4694,8 @@
if ($subop == "undefined") $subop = ""; if ($subop == "undefined") $subop = "";
$subop_split = split(":", $subop);
if ($subop == "CatchupSelected") { if ($subop == "CatchupSelected") {
$ids = split(",", db_escape_string($_GET["ids"])); $ids = split(",", db_escape_string($_GET["ids"]));
$cmode = sprintf("%d", $_GET["cmode"]); $cmode = sprintf("%d", $_GET["cmode"]);
@ -4715,6 +4717,11 @@
} }
} }
if ($subop_split[0] == "MarkAllReadGR") {
catchup_feed($link, $subop_split[1], false);
}
if ($feed_id > 0) { if ($feed_id > 0) {
$result = db_query($link, $result = db_query($link,
"SELECT id FROM ttrss_feeds WHERE id = '$feed' LIMIT 1"); "SELECT id FROM ttrss_feeds WHERE id = '$feed' LIMIT 1");
@ -4921,16 +4928,20 @@
if (defined('_VFEED_GROUP_BY_FEED')) { if (defined('_VFEED_GROUP_BY_FEED')) {
if ($line["feed_title"] != $cur_feed_title) { if ($line["feed_title"] != $cur_feed_title) {
$cur_feed_title = $line["feed_title"];
/* print "<tr class='feedTitle'><td colspan='7'>". /* print "<tr class='feedTitle'><td colspan='7'>".
$line["feed_title"]. $line["feed_title"].
" (<a href=\"javascript:viewfeed($feed_id, '', false)\">". " (<a href=\"javascript:viewfeed($feed_id, '', false)\">".
"more</a>)</td></tr>"; */ "more</a>)</td></tr>"; */
$vf_catchup_link = "(<a href='javascript:'>select</a>,
<a href='javascript:catchupFeedInGroup($feed_id, \"$cur_feed_title\")'>mark as read</a>)";
print "<tr class='feedTitle'><td colspan='7'>". print "<tr class='feedTitle'><td colspan='7'>".
"<a href=\"javascript:viewfeed($feed_id, '', false)\">". "<a href=\"javascript:viewfeed($feed_id, '', false)\">".
$line["feed_title"]."</a>:</td></tr>"; $line["feed_title"]."</a> $vf_catchup_link:</td></tr>";
$cur_feed_title = $line["feed_title"];
} }
} }

9
tt-rss.js
View file

@ -648,6 +648,15 @@ function catchupCurrentFeed() {
} }
} }
function catchupFeedInGroup(id, title) {
var str = __("Mark all articles in %s as read?").replace("%s", title);
if (getInitParam("confirm_feed_catchup") != 1 || confirm(str)) {
return viewCurrentFeed('MarkAllReadGR:' + id)
}
}
function editFeedDlg(feed) { function editFeedDlg(feed) {
try { try {