diff options
author | Andrew Dolgov <[email protected]> | 2008-04-30 04:37:56 +0100 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2008-04-30 04:37:56 +0100 |
commit | 43fc671f796b1f9720544c1577a05f6fe9e4d1d2 (patch) | |
tree | 3d205f4a15cc86dccf01be2d29002f519a0e0356 | |
parent | 6cfea5c790194e19c723d67a413df51635300342 (diff) |
group-by-feed tweaks
-rw-r--r-- | functions.php | 17 | ||||
-rw-r--r-- | tt-rss.css | 4 |
2 files changed, 18 insertions, 3 deletions
diff --git a/functions.php b/functions.php index 426566ecc..a93b36a67 100644 --- a/functions.php +++ b/functions.php @@ -3268,7 +3268,15 @@ if ($vfeed_query_part && defined('_VFEED_GROUP_BY_FEED')) { 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 ttrss_entries,ttrss_user_entries,ttrss_feeds WHERE + $group_limit_part ttrss_feeds.hidden = false AND ttrss_user_entries.feed_id = ttrss_feeds.id AND ttrss_user_entries.ref_id = ttrss_entries.id AND @@ -4915,9 +4924,15 @@ if (defined('_VFEED_GROUP_BY_FEED')) { 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'>". "<a href=\"javascript:viewfeed($feed_id, '', false)\">". $line["feed_title"]."</a>:</td></tr>"; + $cur_feed_title = $line["feed_title"]; } } diff --git a/tt-rss.css b/tt-rss.css index d01ac5d65..1cb36247f 100644 --- a/tt-rss.css +++ b/tt-rss.css @@ -1744,7 +1744,6 @@ a.visibleLink { } table.headlinesList tr.feedTitle td a, div.cdmFeedTitle a { - padding-left : 5px; color : #4684ff; } @@ -1752,10 +1751,11 @@ div.cdmFeedTitle { border-color : #a0a0a0; border-width : 0px 0px 1px 0px; border-style : solid; - padding : 5px 5px 5px 0px; + padding : 5px; } table.headlinesList tr.feedTitle td { /* text-align : right; margin-top : 10px; */ + padding-left : 5px; } |