public/tt-rss
1
0
Fork 0
mirror of https://git.tt-rss.org/git/tt-rss.git synced 2026-01-03 10:49:14 +00:00
Code Issues Releases Wiki Activity

rework search dialog

Browse Source
This commit is contained in:
Andrew Dolgov
2010-11-21 13:35:16 +03:00
parent 83331f6e1d
commit 973fe3c6fa
3 changed files with 35 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
modules/popup-dialog.php
View File

@@ -376,13 +376,6 @@
if ($id == "search") {
print "<title>".__('Search')."</title>";
print "<content><![CDATA[";
print "<form id='search_form' onsubmit='return false'>";
#$active_feed_id = db_escape_string($_REQUEST["param"]);
$params = explode(":", db_escape_string($_REQUEST["param"]), 2);
$active_feed_id = sprintf("%d", $params[0]);
@@ -406,14 +399,15 @@
print_select_hash("match_on", 3, $search_fields);
} else {
print "<input onkeypress=\"return filterCR(event, search)\"
name=\"query\" size=\"50\" type=\"search\" value=''>";
print "<input dojoType=\"dijit.form.ValidationTextBox\"
style=\"font-size : 16px; width : 20em;\"
required=\"1\" name=\"query\" type=\"search\" value=''>";
}
print "<br/>".__('Limit search to:')." ";
print "<select name=\"search_mode\">
print "<select name=\"search_mode\" dojoType=\"dijit.form.Select\">
<option value=\"all_feeds\">".__('All feeds')."</option>";
$feed_title = getFeedTitle($link, $active_feed_id);
@@ -425,13 +419,13 @@
}
if ($active_feed_id && !$is_cat) {
print "<option selected value=\"this_feed\">$feed_title</option>";
print "<option selected=\"1\" value=\"this_feed\">$feed_title</option>";
} else {
print "<option disabled>".__('This feed')."</option>";
print "<option disabled=\"1\" value=\"false\">".__('This feed')."</option>";
}
if ($is_cat) {
$cat_preselected = "selected";
$cat_preselected = "selected=\"1\"";
}
if (get_pref($link, 'ENABLE_FEED_CATS') && ($active_feed_id > 0 || $is_cat)) {
@@ -444,17 +438,10 @@
print "</div>";
print "</form>";
print "<div class=\"dlgButtons\">
<button onclick=\"javascript:search()\">".__('Search')."</button>
<button onclick=\"javascript:closeInfoBox(true)\">".__('Cancel')."</button>
<button dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('searchDlg').execute()\">".__('Search')."</button>
<button dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('searchDlg').hide()\">".__('Cancel')."</button>
</div>";
print "]]></content>";
//return;
}
if ($id == "quickAddFilter") {