diff options
author | Andrew Dolgov <[email protected]> | 2005-11-25 09:20:32 +0100 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2005-11-25 09:20:32 +0100 |
commit | 21703604b2754f19c17fb9a0229c03de5b6649ad (patch) | |
tree | 7638f36e8810ecef77f8f5e99aa3611952df2984 | |
parent | 747976de1dbdd25c9f494b26a02ca1b1c40aa71e (diff) |
show tags in article view mode
-rw-r--r-- | backend.php | 45 | ||||
-rw-r--r-- | tt-rss.js | 26 |
2 files changed, 58 insertions, 13 deletions
diff --git a/backend.php b/backend.php index 1ff981ace..01ea67eed 100644 --- a/backend.php +++ b/backend.php @@ -525,8 +525,8 @@ $addheader = $_GET["addheader"]; - $result = db_query($link, "SELECT title,link,content,feed_id,comments, - (SELECT icon_url FROM ttrss_feeds WHERE id = feed_id) as icon_url + $result = db_query($link, "SELECT title,link,content,feed_id,comments,int_id, + (SELECT icon_url FROM ttrss_feeds WHERE id = feed_id) as icon_url FROM ttrss_entries,ttrss_user_entries WHERE id = '$id' AND ref_id = id"); @@ -557,16 +557,35 @@ print "<div class=\"postReply\">"; - print "<div class=\"postHeader\"><table>"; + print "<div class=\"postHeader\"><table width=\"100%\">"; + + print "<tr><td width='5%'><b>Title:</b></td> + <td colspan='2'>" . $line["title"] . "</td></tr>"; + + $tmp_result = db_query($link, "SELECT DISTINCT tag_name FROM + ttrss_tags WHERE post_int_id = " . $line["int_id"] . " + ORDER BY tag_name"); + + $tags_str = ""; + + while ($tmp_line = db_fetch_assoc($tmp_result)) { + $tag = $tmp_line["tag_name"]; + $tags_str .= "<a href=\"javascript:parent.viewfeed('$tag')\">$tag</a> / "; + } + + $tags_str = preg_replace("/ \/ $/", "", $tags_str); - print "<tr><td><b>Title:</b></td> - <td width='100%'>" . $line["title"] . "</td></tr>"; - print "<tr><td><b>Link:</b></td> - <td width='100%'> + <td width='50%'> <a href=\"" . $line["link"] . "\">".$line["link"]."</a> - $entry_comments</td></tr>"; - + $entry_comments</td> + <td align=\"right\">$tags_str</td></tr>"; + +/* if ($tags_str) { + print "<tr><td><b>Tags:</b></td> + <td width='100%'>$tags_str</td></tr>"; + } */ + print "</table></div>"; print "<div class=\"postIcon\">" . $feed_icon . "</div>"; @@ -800,6 +819,12 @@ if (sprintf("%d", $feed) != 0) { + if ($feed > 0) { + $feed_kind = "Feeds"; + } else { + $feed_kind = "Labels"; + } + $result = db_query($link, "SELECT id,title,updated,unread,feed_id,marked,link,last_read, SUBSTRING(last_read,1,19) as last_read_noms, @@ -818,6 +843,8 @@ } else { // browsing by tag + $feed_kind = "Tags"; + $result = db_query($link, "SELECT ttrss_entries.id as id,title,updated,unread,feed_id, marked,link,last_read, @@ -12,6 +12,10 @@ var display_tags = false; var global_unread = 0; +var active_title_text = ""; + +var current_subtitle = ""; + /*@cc_on @*/ /*@if (@_jscript_version >= 5) // JScript gives us Conditional compilation, we can cope with old IE versions. @@ -171,7 +175,7 @@ function scheduleFeedUpdate(force) { // document.title = "Tiny Tiny RSS - Updating..."; - updateTitle("Updating..."); + updateTitle("Updating"); var query_str = "backend.php?op=rpc&subop="; @@ -234,7 +238,7 @@ function catchupAllFeeds() { feeds_frame.src = query_str; global_unread = 0; - updateTitle(); + updateTitle(""); } @@ -314,14 +318,23 @@ function localHotkeyHandler(keycode) { function updateTitle(s) { var tmp = "Tiny Tiny RSS"; - + + if (s && s.length > 0) { + current_subtitle = s; + } + if (global_unread > 0) { tmp = tmp + " (" + global_unread + ")"; } if (s) { - tmp = tmp + " - " + s; + tmp = tmp + " - " + current_subtitle; } + + if (active_title_text.length > 0) { + tmp = tmp + " > " + active_title_text; + } + document.title = tmp; } @@ -529,6 +542,11 @@ function allFeedsMenuGo() { } +function updateFeedTitle(t) { + active_title_text = t; + updateTitle(); +} + function toggleDispRead() { var hide_read_feeds = (getCookie("ttrss_vf_hreadf") == 1); |