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

subtoolbar-related fixes

This commit is contained in:
Andrew Dolgov 2010-11-21 00:17:36 +03:00
parent d6034614e0
commit 33d8b5d091
1 changed files with 7 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
functions.php
View File

@ -4068,8 +4068,6 @@
$feed_id, $is_cat, $search, $match_on, $feed_id, $is_cat, $search, $match_on,
$search_mode, $view_mode) { $search_mode, $view_mode) {
# print "<div class=\"headlinesSubToolbar\">";
$page_prev_link = "viewFeedGoPage(-1)"; $page_prev_link = "viewFeedGoPage(-1)";
$page_next_link = "viewFeedGoPage(1)"; $page_next_link = "viewFeedGoPage(1)";
$page_first_link = "viewFeedGoPage(0)"; $page_first_link = "viewFeedGoPage(0)";
@ -4104,16 +4102,13 @@
onchange=\"headlineActionsChange(this)\">"; onchange=\"headlineActionsChange(this)\">";
print "<option value=\"false\">".__('Actions...')."</option>"; print "<option value=\"false\">".__('Actions...')."</option>";
# print "<optgroup label=\"".__("Selection toggle:")."\">"; print "<option value=\"0\" disabled=\"1\">".__('Selection toggle:')."</option>";
print "<option value=\"$tog_unread_link\">".__('Toggle unread')."</option> print "<option value=\"$tog_unread_link\">".__('Unread')."</option>
<option value=\"$tog_marked_link\">".__('Toggle starred')."</option> <option value=\"$tog_marked_link\">".__('Starred')."</option>
<option value=\"$tog_published_link\">".__('Toggle published')."</option>"; <option value=\"$tog_published_link\">".__('Published')."</option>";
# print "</optgroup> print "<option value=\"0\" disabled=\"1\">".__('Selection:')."</option>";
# <optgroup label=\"".__("Selection:")."\">";
print "<option>----------</option>";
print "<option value=\"$catchup_sel_link\">".__('Mark as read')."</option>"; print "<option value=\"$catchup_sel_link\">".__('Mark as read')."</option>";
@ -4128,13 +4123,8 @@
print "<option value=\"emailArticle(false)\">".__('Forward by email'). print "<option value=\"emailArticle(false)\">".__('Forward by email').
"</option>"; "</option>";
# print "<optgroup label=\"".__("Assign label:")."\">"; $rss_link = htmlspecialchars(get_self_url_prefix() .
//print "<option>----------</option>"; "/backend.php?op=rss&id=$feed_id&is_cat=$is_cat$view_mode$search_q");
//print_labels_headlines_dropdown($link, $feed_id);
print "<option>----------</option>";
# print "</optgroup>";
print "<option value=\"displayDlg('generatedFeed', '$feed_id:$is_cat:$rss_link')\">".__('View as RSS')."</option>"; print "<option value=\"displayDlg('generatedFeed', '$feed_id:$is_cat:$rss_link')\">".__('View as RSS')."</option>";
@ -4185,15 +4175,6 @@
else else
$view_mode = "&view-mode=$view_mode"; $view_mode = "&view-mode=$view_mode";
$rss_link = htmlspecialchars(get_self_url_prefix() .
"/backend.php?op=rss&id=$feed_id&is_cat=$is_cat$view_mode$search_q");
#print "
# <a target=\"_blank\"
# title=\"".__("View as RSS feed")."\"
# href=\"$rss_link\">
# <img class=\"noborder\" src=\"images/feed-icon-12x12.png\"></a>";
print " print "
<a href=\"#\" <a href=\"#\"
title=\"".__("View as RSS feed")."\" title=\"".__("View as RSS feed")."\"