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

group-by-feed tweaks

This commit is contained in:
Andrew Dolgov 2008-04-30 04:37:56 +01:00
parent 6cfea5c790
commit 43fc671f79
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
functions.php
View File

@ -3268,7 +3268,15 @@
if ($vfeed_query_part && defined('_VFEED_GROUP_BY_FEED')) { if ($vfeed_query_part && defined('_VFEED_GROUP_BY_FEED')) {
if (!$override_order) { if (!$override_order) {
$order_by = "ttrss_feeds.id, $order_by"; $order_by = "ttrss_feeds.title, $order_by";
}
if ($feed == -3) {
$group_limit_part = "(select count(*) from
ttrss_user_entries AS t1, ttrss_entries AS t2 where
t1.ref_id = t2.id and t1.owner_uid = 2 and
t1.feed_id = ttrss_user_entries.feed_id and
t2.updated > ttrss_entries.updated) <= 5 AND";
} }
} }
@ -3285,6 +3293,7 @@
FROM FROM
ttrss_entries,ttrss_user_entries,ttrss_feeds ttrss_entries,ttrss_user_entries,ttrss_feeds
WHERE WHERE
$group_limit_part
ttrss_feeds.hidden = false AND ttrss_feeds.hidden = false AND
ttrss_user_entries.feed_id = ttrss_feeds.id AND ttrss_user_entries.feed_id = ttrss_feeds.id AND
ttrss_user_entries.ref_id = ttrss_entries.id AND ttrss_user_entries.ref_id = ttrss_entries.id AND
@ -4915,9 +4924,15 @@
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) {
/* print "<tr class='feedTitle'><td colspan='7'>".
$line["feed_title"].
" (<a href=\"javascript:viewfeed($feed_id, '', false)\">".
"more</a>)</td></tr>"; */
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>:</td></tr>";
$cur_feed_title = $line["feed_title"]; $cur_feed_title = $line["feed_title"];
} }
} }

4
tt-rss.css
View File

@ -1744,7 +1744,6 @@ a.visibleLink {
} }
table.headlinesList tr.feedTitle td a, div.cdmFeedTitle a { table.headlinesList tr.feedTitle td a, div.cdmFeedTitle a {
padding-left : 5px;
color : #4684ff; color : #4684ff;
} }
@ -1752,10 +1751,11 @@ div.cdmFeedTitle {
border-color : #a0a0a0; border-color : #a0a0a0;
border-width : 0px 0px 1px 0px; border-width : 0px 0px 1px 0px;
border-style : solid; border-style : solid;
padding : 5px 5px 5px 0px; padding : 5px;
} }
table.headlinesList tr.feedTitle td { table.headlinesList tr.feedTitle td {
/* text-align : right; /* text-align : right;
margin-top : 10px; */ margin-top : 10px; */
padding-left : 5px;
} }