blallo/tt-rss
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

enable search toolbar

Browse source
This commit is contained in:
Andrew Dolgov 2006-05-21 13:09:55 +01:00
parent 86b682ce2f
commit 164f4738eb
4 changed files with 17 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
backend.php
View file

@ -757,8 +757,6 @@
window.onload = init; window.onload = init;
</script>"; </script>";
// print_r($_GET);
$search = db_escape_string($_GET["query"]); $search = db_escape_string($_GET["query"]);
$search_mode = db_escape_string($_GET["search_mode"]); $search_mode = db_escape_string($_GET["search_mode"]);
$match_on = db_escape_string($_GET["match_on"]); $match_on = db_escape_string($_GET["match_on"]);

4
feedlist.js
View file

@ -79,6 +79,10 @@ function viewfeed(feed, skip, subop, doc, is_cat, subop_param) {
var toolbar_query = parent.Form.serialize("main_toolbar_form"); var toolbar_query = parent.Form.serialize("main_toolbar_form");
if (parent.document.forms["main_toolbar_form"].query) {
parent.document.forms["main_toolbar_form"].query.value = "";
}
var query = "backend.php?op=viewfeed&feed=" + feed + "&" + var query = "backend.php?op=viewfeed&feed=" + feed + "&" +
toolbar_query + "&subop=" + param_escape(subop); toolbar_query + "&subop=" + param_escape(subop);

1
tt-rss.js
View file

@ -248,6 +248,7 @@ function viewCurrentFeed(skip, subop) {
disableContainerChildren("headlinesToolbar", false, document); disableContainerChildren("headlinesToolbar", false, document);
viewfeed(-1, skip, subop); // FIXME viewfeed(-1, skip, subop); // FIXME
} }
return false; // block unneeded form submits
} }
function viewfeed(feed, skip, subop) { function viewfeed(feed, skip, subop) {

30
tt-rss.php
View file

@ -150,26 +150,17 @@ window.onload = init;
<tr><td class="headlinesToolbar" id="headlinesToolbar"> <tr><td class="headlinesToolbar" id="headlinesToolbar">
<!-- <? if (get_pref($link, 'ENABLE_SEARCH_TOOLBAR')) { ?>
<input id="searchbox"
onblur="javascript:enableHotkeys();" onfocus="javascript:disableHotkeys();">
<select id="searchmodebox">
<option value="all_feeds">All feeds</option>
<option value="this_feed" selected>This feed</option>
<? if (get_pref($link, 'ENABLE_FEED_CATS')) { ?>
<option value="this_cat">This category</option>
<? } ?>
</select>
<input type="submit"
class="button" onclick="javascript:search()" value="Search">
&nbsp;
<? } ?> -->
<form id="main_toolbar_form"> <form id="main_toolbar_form">
<? if (get_pref($link, 'ENABLE_SEARCH_TOOLBAR')) { ?>
<input name="query"
onKeyPress="return filterCR(event)"
onblur="javascript:enableHotkeys();" onfocus="javascript:disableHotkeys();">
<input class="button" type="submit"
onclick="return viewCurrentFeed(0)" value="Search">
&nbsp;
<? } ?>
View: View:
<select name="view_mode" onchange="viewCurrentFeed(0, '')"> <select name="view_mode" onchange="viewCurrentFeed(0, '')">
<option selected value="adaptive">Adaptive</option> <option selected value="adaptive">Adaptive</option>
@ -177,6 +168,7 @@ window.onload = init;
<option value="marked">Starred</option> <option value="marked">Starred</option>
<option value="unread">Unread</option> <option value="unread">Unread</option>
</select> </select>
&nbsp;Limit: &nbsp;Limit:
<? <?
$limits = array(15 => 15, 30 => 30, 60 => 60, 0 => "All"); $limits = array(15 => 15, 30 => 30, 60 => 60, 0 => "All");