diff options
author | Andrew Dolgov <[email protected]> | 2008-05-05 08:18:14 +0100 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2008-05-05 08:18:14 +0100 |
commit | 6cfa22dcd20c89e64815b392538c1547fa014de7 (patch) | |
tree | 3e9e6bd243c1c9fb58f8d7ce18310e0aa470dfbc /functions.php | |
parent | e7002fc3fa723ac757d14371a6df2dac024e6bfb (diff) |
subtoolbar tweaks, properly display search results title for vfeeds
Diffstat (limited to 'functions.php')
-rw-r--r-- | functions.php | 57 |
1 files changed, 53 insertions, 4 deletions
diff --git a/functions.php b/functions.php index 30a639344..4ed1f4b66 100644 --- a/functions.php +++ b/functions.php @@ -3231,10 +3231,13 @@ } else if ($feed == -1) { $feed_title = __("Starred articles"); + if ($search) { $feed_title = __("Searched for") . " $search ($feed_title)"; } } else if ($feed == -2) { $feed_title = __("Published articles"); + if ($search) { $feed_title = __("Searched for") . " $search ($feed_title)"; } } else if ($feed == -3) { $feed_title = __("Fresh articles"); + if ($search) { $feed_title = __("Searched for") . " $search ($feed_title)"; } } else if ($feed < -10) { $label_id = -$feed - 11; $result = db_query($link, "SELECT description FROM ttrss_labels @@ -3851,7 +3854,7 @@ if (!$dashboard_menu) { if (strpos($_SESSION["client.userAgent"], "MSIE") === false) { - + print "<td class=\"headlineActions$rtl_cpart\"> <ul class=\"headlineDropdownMenu\"> <li class=\"top2\"> @@ -3860,6 +3863,52 @@ <a href=\"$sel_unread_link\">".__('Unread')."</a>, <a href=\"$sel_none_link\">".__('None')."</a></li> <li class=\"vsep\"> </li> + <li class=\"top\">".__('Actions...')."<ul> + <li><span class=\"insensitive\">".__('Selection toggle:')."</span></li> + <li onclick=\"$tog_unread_link\"> ".__('Unread')."</li> + <li onclick=\"$tog_marked_link\"> ".__('Starred')."</li> + <li onclick=\"$tog_published_link\"> ".__('Published')."</li> + <li><span class=\"insensitive\">".__('Mark as read:')."</span></li> + <li onclick=\"$catchup_sel_link\"> ".__('Selection')."</li>"; + + +/* if (!get_pref($link, 'COMBINED_DISPLAY_MODE')) { + + print " + <li onclick=\"catchupRelativeToArticle(0)\"> ".__("Above active article")."</li> + <li onclick=\"catchupRelativeToArticle(1)\"> ".__("Below active article")."</li>"; + } else { + print " + <li><span class=\"insensitive\"> ".__("Above active article")."</span></li> + <li><span class=\"insensitive\"> ".__("Below active article")."</span></li>"; + + } */ + + print "<li onclick=\"$catchup_feed_link\"> ".__('Entire feed')."</li>"; + + print "<li><span class=\"insensitive\">".__('Other actions:')."</span></li>"; + + + if ($search && $feed_id >= 0 && get_pref($link, 'ENABLE_LABELS') && GLOBAL_ENABLE_LABELS) { + print " + <li onclick=\"javascript:labelFromSearch('$search', '$search_mode', + '$match_on', '$feed_id', '$is_cat');\"> + ".__('Search to label')."</li>"; + } else { + print "<li><span class=\"insensitive\"> ".__('Search to label')."</li>"; + + } + + print "</ul></li></ul>"; + +/* print "<td class=\"headlineActions$rtl_cpart\"> + <ul class=\"headlineDropdownMenu\"> + <li class=\"top2\"> + ".__('Select:')." + <a href=\"$sel_all_link\">".__('All')."</a>, + <a href=\"$sel_unread_link\">".__('Unread')."</a>, + <a href=\"$sel_none_link\">".__('None')."</a></li> + <li class=\"vsep\"> </li> <li class=\"top\">".__('Toggle')."<ul> <li onclick=\"$tog_unread_link\">".__('Unread')."</li> <li onclick=\"$tog_marked_link\">".__('Starred')."</li> @@ -3901,9 +3950,9 @@ <a href=\"javascript:labelFromSearch('$search', '$search_mode', '$match_on', '$feed_id', '$is_cat');\"> ".__('Convert to label')."</a></td>"; - } - print " - </td>"; + } */ + + print "</td>"; } else { // old style subtoolbar: |