diff options
| -rw-r--r-- | backend.php | 39 | ||||
| -rw-r--r-- | prefs.js | 2 | ||||
| -rw-r--r-- | tt-rss.css | 6 |
3 files changed, 40 insertions, 7 deletions
diff --git a/backend.php b/backend.php index 8f1fe08e4..ad6e932ed 100644 --- a/backend.php +++ b/backend.php @@ -3950,17 +3950,42 @@ if ($subop == "details") { $id = db_escape_string($_GET["id"]); - $result = db_query($link, "SELECT title,content, + print "<div class=\"browserFeedInfo\">"; + print "<b>Feed information:</b>"; + print "<div class=\"detailsPart\">"; + + $result = db_query($link, "SELECT + feed_url,site_url, + SUBSTRING(last_updated,1,19) AS last_updated + FROM ttrss_feeds WHERE id = '$id'"); + + $feed_url = db_fetch_result($result, 0, "feed_url"); + $site_url = db_fetch_result($result, 0, "site_url"); + $last_updated = db_fetch_result($result, 0, "last_updated"); + + if (get_pref($link, 'HEADLINES_SMART_DATE')) { + $last_updated = smart_date_time(strtotime($last_updated)); + } else { + $short_date = get_pref($link, 'SHORT_DATE_FORMAT'); + $last_updated = date($short_date, strtotime($last_updated)); + } + + print "Site: <a href='$site_url'>$site_url</a> ". + "(<a href='$feed_url'>feed</a>), ". + "Last updated: $last_updated"; + + print "</div>"; + + $result = db_query($link, "SELECT + ttrss_entries.title, + content, substring(date_entered,1,19) as date_entered, substring(updated,1,19) as updated - FROM ttrss_entries,ttrss_user_entries - WHERE id = ref_id AND feed_id = '$id' + FROM ttrss_entries,ttrss_user_entries + WHERE ttrss_entries.id = ref_id AND feed_id = '$id' ORDER BY updated DESC LIMIT 5"); if (db_num_rows($result) > 0) { - - print "<b>Feed information:</b>"; - print "<div class=\"detailsPart\">FIXME</div>"; print "<b>Last headlines:</b><br>"; @@ -3980,6 +4005,8 @@ } print "</ul></div>"; } + + print "</div>"; return; } @@ -1335,6 +1335,8 @@ function feedBrowserSubscribe() { try { var list = document.getElementById("browseFeedList"); + if (!list) list = document.getElementById("browseBigFeedList"); + var selected = new Array(); for (i = 0; i < list.childNodes.length; i++) { diff --git a/tt-rss.css b/tt-rss.css index d3e0fee79..092bbc7f2 100644 --- a/tt-rss.css +++ b/tt-rss.css @@ -973,6 +973,10 @@ ul.compact li { padding : 0px; } -div.detailsPart { +div.browserFeedInfo { + font-size : x-small; +} + +div.browserFeedInfo div.detailsPart { margin : 5px 0px 5px 5px; } |