banananetwork
/
tt-rss
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

code cleanup

Browse Source
master
Andrew Dolgov 16 years ago
parent f8bfb81fd1
commit beb760d516
3 changed files with 0 additions and 192 deletions
Show Stats Download Patch File Download Diff File

30
functions.php
Unescape Escape View File

@ -5792,36 +5792,6 @@
print "</table>"; print "</table>";
} }
function print_label_dlg_common_examples() {
print __("Match ") . " ";
/* print "<select name=\"label_andor\">";
print "<option value=\"and\">AND</option>";
print "<option value=\"or\">OR</option>";
print "</select>"; */
print "<select name=\"label_fields\" onchange=\"labelFieldsCheck(this)\">";
print "<option value=\"unread\">".__("Unread articles")."</option>";
print "<option value=\"updated\">".__("Updated articles")."</option>";
print "<option value=\"kw_title\">".__("Title contains")."</option>";
print "<option value=\"kw_content\">".__("Content contains")."</option>";
print "<option value=\"scoreE\">".__("Score equals")."</option>";
print "<option value=\"scoreG\">".__("Score is greater than")."</option>";
print "<option value=\"scoreL\">".__("Score is less than")."</option>";
print "<option value=\"newerH\">".__("Articles newer than X hours")."</option>";
print "<option value=\"newerD\">".__("Articles newer than X days")."</option>";
print "</select>";
print "<input style=\"display : none\" name=\"label_fields_param\"
size=\"10\">";
print " <input type=\"submit\"
onclick=\"return addLabelExample()\"
value=\"".__("Add")."\">";
}
function feed_has_icon($id) { function feed_has_icon($id) {
return is_file(ICONS_DIR . "/$id.ico") && filesize(ICONS_DIR . "/$id.ico") > 0; return is_file(ICONS_DIR . "/$id.ico") && filesize(ICONS_DIR . "/$id.ico") > 0;
} }

112
modules/popup-dialog.php
Unescape Escape View File

@ -219,68 +219,6 @@
} }
/* if ($id == "quickAddLabel") {
print "<div id=\"infoBoxTitle\">".__('Create Label')."</div>";
print "<div class=\"infoBoxContents\">";
print "<form id=\"label_edit_form\" onsubmit='return false'>";
print "<input type=\"hidden\" name=\"op\" value=\"pref-labels\">";
print "<input type=\"hidden\" name=\"subop\" value=\"add\">";
print "<div class=\"dlgSec\">".__("Caption")."</div>";
print "<div class=\"dlgSecCont\">";
print "<input onkeypress=\"return filterCR(event, addLabel)\"
onkeyup=\"toggleSubmitNotEmpty(this, 'infobox_submit')\"
onchange=\"toggleSubmitNotEmpty(this, 'infobox_submit')\"
name=\"description\" size=\"30\" value=\"$description\">";
print "</div>";
print "<div class=\"dlgSec\">".__("Match SQL")."</div>";
print "<div class=\"dlgSecCont\">";
print "<textarea onkeyup=\"toggleSubmitNotEmpty(this, 'infobox_submit')\"
rows=\"6\" name=\"sql_exp\" class=\"labelSQL\"
cols=\"50\">$sql_exp</textarea>";
print "<br/>";
print_label_dlg_common_examples();
print "</div>";
print "</form>";
print "<div style=\"display : none\" id=\"label_test_result\"></div>";
print "<div class=\"dlgButtons\">";
print "<div style='float : left'>";
print "<input type=\"submit\"
class=\"button\" onclick=\"return displayHelpInfobox(1)\"
value=\"".__('Help')."\"> ";
print "</div>";
print "<input type=\"submit\" onclick=\"labelTest()\" value=\"".__('Test')."\">
";
print "<input type=\"submit\"
id=\"infobox_submit\"
disabled=\"true\"
class=\"button\" onclick=\"return addLabel()\"
value=\"".__('Create')."\"> ";
print "<input class=\"button\"
type=\"submit\" onclick=\"return labelEditCancel()\"
value=\"".__('Cancel')."\">";
return;
} */
if ($id == "quickAddFilter") { if ($id == "quickAddFilter") {
$active_feed_id = db_escape_string($_GET["param"]); $active_feed_id = db_escape_string($_GET["param"]);
@ -293,8 +231,6 @@
print "<input type=\"hidden\" name=\"op\" value=\"pref-filters\">"; print "<input type=\"hidden\" name=\"op\" value=\"pref-filters\">";
print "<input type=\"hidden\" name=\"quiet\" value=\"1\">"; print "<input type=\"hidden\" name=\"quiet\" value=\"1\">";
print "<input type=\"hidden\" name=\"subop\" value=\"add\">"; print "<input type=\"hidden\" name=\"subop\" value=\"add\">";
// print "<div class=\"notice\"><b>Note:</b> filter will only apply to new articles.</div>";
$result = db_query($link, "SELECT id,description $result = db_query($link, "SELECT id,description
FROM ttrss_filter_types ORDER BY description"); FROM ttrss_filter_types ORDER BY description");
@ -306,54 +242,6 @@
$filter_types[$line["id"]] = __($line["description"]); $filter_types[$line["id"]] = __($line["description"]);
} }
/* print "<table width='100%'>";
print "<tr><td>".__('Match:')."</td>
<td><input onkeypress=\"return filterCR(event, createFilter)\"
onkeyup=\"toggleSubmitNotEmpty(this, 'infobox_submit')\"
onchange=\"toggleSubmitNotEmpty(this, 'infobox_submit')\"
name=\"reg_exp\" class=\"iedit\">";
print "</td></tr><tr><td>".__('On field:')."</td><td>";
print_select_hash("filter_type", 1, $filter_types, "class=\"_iedit\"");
print "</td></tr>";
print "<tr><td>".__('Feed:')."</td><td colspan='2'>";
print_feed_select($link, "feed_id", $active_feed_id);
print "</td></tr>";
print "<tr><td>".__('Action:')."</td>";
print "<td colspan='2'><select name=\"action_id\"
onchange=\"filterDlgCheckAction(this)\">";
$result = db_query($link, "SELECT id,description FROM ttrss_filter_actions
ORDER BY name");
while ($line = db_fetch_assoc($result)) {
printf("<option value='%d'>%s</option>", $line["id"], __($line["description"]));
}
print "</select>";
print "</td></tr>";
print "<tr><td>".__('Params:')."</td>";
print "<td><input disabled class='iedit' name='action_param'></td></tr>";
print "<tr><td valign='top'>".__('Options:')."</td><td>";
print "<input type=\"checkbox\" name=\"inverse\" id=\"inverse\">
<label for=\"inverse\">".__('Inverse match')."</label></td></tr>";
print "</table>";
print "</form>"; */
print "<div class=\"dlgSec\">".__("Match")."</div>"; print "<div class=\"dlgSec\">".__("Match")."</div>";
print "<div class=\"dlgSecCont\">"; print "<div class=\"dlgSecCont\">";

50
tt-rss.js
Unescape Escape View File

@ -856,34 +856,6 @@ function feedEditSave() {
} }
} }
function labelEditCancel() {
closeInfoBox();
return false;
}
function labelEditSave() {
try {
closeInfoBox();
notify_progress("Saving label...");
query = Form.serialize("label_edit_form");
new Ajax.Request("backend.php?" + query, {
onComplete: function(transport) {
dlg_frefresh_callback(transport);
} });
return false;
} catch (e) {
exception_error("feedEditSave (main)", e);
}
}
function clearFeedArticles(feed_id) { function clearFeedArticles(feed_id) {
notify_progress("Clearing feed..."); notify_progress("Clearing feed...");
@ -898,28 +870,6 @@ function clearFeedArticles(feed_id) {
return false; return false;
} }
/*
function toggle_feedlist() {
try {
debug("toggle_feedlist");
var fl = document.getElementById("feeds-holder");
if (!Element.visible(fl)) {
Element.show(fl);
fl.style.zIndex = 30;
fl.scrollTop = _hfd_scrolltop;
} else {
_hfd_scrolltop = fl.scrollTop;
Element.hide(fl);
// Effect.Fade(fl, {duration : 0.2,
// queue: { position: 'end', scope: 'FLFADEQ', limit: 1 }});
}
} catch (e) {
exception_error("toggle_feedlist", e);
}
} */
function collapse_feedlist() { function collapse_feedlist() {
try { try {
debug("toggle_feedlist"); debug("toggle_feedlist");

Write Preview
Loading…
Cancel
Save