public/tt-rss
1
0
Fork 0
mirror of https://git.tt-rss.org/git/tt-rss.git synced 2025-12-13 19:05:55 +00:00
Code Issues Releases Wiki Activity

simplify dlgSec-related markup

Browse Source
This commit is contained in:
Andrew Dolgov
2019-02-20 14:37:59 +03:00
parent 6701497879
commit 4d9141d762
15 changed files with 402 additions and 254 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
classes/pref/filters.php
View File

@@ -339,20 +339,22 @@ class Pref_Filters extends Handler_Protected {
$inverse = $row["inverse"];
$title = htmlspecialchars($row["title"]);
print "<form id=\"filter_edit_form\" onsubmit='return false'>";
print "<form id='filter_edit_form' onsubmit='return false'>";
print_hidden("op", "pref-filters");
print_hidden("id", "$filter_id");
print_hidden("method", "editSave");
print_hidden("csrf_token", $_SESSION['csrf_token']);
print "<div class=\"dlgSecHoriz\">".__("Caption")."</div>";
print "<div class='dlgSecHoriz'>".__("Caption")."</div>";
print "<div class='dlgSecCont'>";
print "<input required=\"true\" dojoType=\"dijit.form.ValidationTextBox\" style=\"width : 20em;\" name=\"title\" value=\"$title\">";
print "</div>";
print "<div class=\"dlgSecHoriz\">".__("Match")."</div>";
print "<div class='dlgSecHoriz'>".__("Match")."</div>";
print "<div class='dlgSecCont'>";
print "<div dojoType=\"dijit.Toolbar\">";
@@ -410,7 +412,9 @@ class Pref_Filters extends Handler_Protected {
print "</div>";
print "<div class=\"dlgSecHoriz\">".__("Apply actions")."</div>";
print "<div class='dlgSecHoriz'>".__("Apply actions")."</div>";
print "<div class='dlgSecCont'>";
print "<div dojoType=\"dijit.Toolbar\">";
@@ -454,14 +458,18 @@ class Pref_Filters extends Handler_Protected {
print "</div>";
print "<div class='dlgSec'>".__("Options")."</div>";
print "<div class='dlgSecCont'>";
if ($enabled) {
$checked = "checked=\"1\"";
} else {
$checked = "";
}
print "<input dojoType=\"dijit.form.CheckBox\" type=\"checkbox\" name=\"enabled\" id=\"enabled\" $checked>
<label for=\"enabled\">".__('Enabled')."</label>";
print "<fieldset class='narrow'>";
print "<label class='checkbox'><input dojoType=\"dijit.form.CheckBox\" type=\"checkbox\" name=\"enabled\" id=\"enabled\" $checked>
".__('Enabled')."</label>";
if ($match_any_rule) {
$checked = "checked=\"1\"";
@@ -469,8 +477,12 @@ class Pref_Filters extends Handler_Protected {
$checked = "";
}
print "<br/><input dojoType=\"dijit.form.CheckBox\" type=\"checkbox\" name=\"match_any_rule\" id=\"match_any_rule\" $checked>
<label for=\"match_any_rule\">".__('Match any rule')."</label>";
print "</fieldset><fieldset class='narrow'>";
print "<label class='checkbox'><input dojoType=\"dijit.form.CheckBox\" type=\"checkbox\" name=\"match_any_rule\" id=\"match_any_rule\" $checked>
".__('Match any rule')."</label>";
print "</fieldset><fieldset class='narrow'>";
if ($inverse) {
$checked = "checked=\"1\"";
@@ -478,10 +490,12 @@ class Pref_Filters extends Handler_Protected {
$checked = "";
}
print "<br/><input dojoType=\"dijit.form.CheckBox\" type=\"checkbox\" name=\"inverse\" id=\"inverse\" $checked>
<label for=\"inverse\">".__('Inverse matching')."</label>";
print "<label class='checkbox'><input dojoType=\"dijit.form.CheckBox\" type=\"checkbox\" name=\"inverse\" id=\"inverse\" $checked>
".__('Inverse matching')."</label>";
print "<p/>";
print "</fieldset>";
print "</div>";
print "<div class=\"dlgButtons\">";
@@ -835,11 +849,15 @@ class Pref_Filters extends Handler_Protected {
print_hidden("method", "add");
print_hidden("csrf_token", $_SESSION['csrf_token']);
print "<div class=\"dlgSecHoriz\">".__("Caption")."</div>";
print "<div class='dlgSecHoriz'>".__("Caption")."</div>";
print "<div class='dlgSecCont'>";
print "<input required=\"true\" dojoType=\"dijit.form.ValidationTextBox\" style=\"width : 20em;\" name=\"title\" value=\"\">";
print "</div>";
print "<div class=\"dlgSecHoriz\">".__("Match")."</div>";
print "<div class='dlgSecHoriz'>".__("Match")."</div>";
print "<div class='dlgSecCont'>";
print "<div dojoType=\"dijit.Toolbar\">";
@@ -864,9 +882,12 @@ class Pref_Filters extends Handler_Protected {
# print "<li>No rules</li>";
print "</ul>";
print "</div>";
print "</div>";
print "<div class=\"dlgSecHoriz\">".__("Apply actions")."</div>";
print "<div class='dlgSecHoriz'>".__("Apply actions")."</div>";
print "<div class='dlgSecCont'>";
print "<div dojoType=\"dijit.Toolbar\">";
@@ -887,21 +908,33 @@ class Pref_Filters extends Handler_Protected {
print "</div>";
print "<ul id='filterDlg_Actions'>";
# print "<li>No actions</li>";
print "</ul>";
print "</div>";
/* print "<div class=\"dlgSec\">".__("Options")."</div>";
print "<div class=\"dlgSecCont\">"; */
print "<div class='dlgSec'>".__("Options")."</div>";
print "<input dojoType=\"dijit.form.CheckBox\" type=\"checkbox\" name=\"enabled\" id=\"enabled\" checked=\"1\">
<label for=\"enabled\">".__('Enabled')."</label>";
print "<div class='dlgSecCont'>";
print "<fieldset class='narrow'>";
print "<br/><input dojoType=\"dijit.form.CheckBox\" type=\"checkbox\" name=\"match_any_rule\" id=\"match_any_rule\">
<label for=\"match_any_rule\">".__('Match any rule')."</label>";
print "<label class='checkbox'><input dojoType=\"dijit.form.CheckBox\" type=\"checkbox\" name=\"enabled\" id=\"enabled\" checked=\"1\">
".__('Enabled')."</label>";
print "<br/><input dojoType=\"dijit.form.CheckBox\" type=\"checkbox\" name=\"inverse\" id=\"inverse\">
<label for=\"inverse\">".__('Inverse matching')."</label>";
print "</fieldset><fieldset class='narrow'>";
print "<label class='checkbox'><input dojoType=\"dijit.form.CheckBox\" type=\"checkbox\" name=\"match_any_rule\" id=\"match_any_rule\">
".__('Match any rule')."</label>";
print "</fieldset><fieldset class='narrow'>";
print "<label class='checkbox'><input dojoType=\"dijit.form.CheckBox\" type=\"checkbox\" name=\"inverse\" id=\"inverse\">
".__('Inverse matching')."</label>";
print "</fieldset>";
print "</div>";
// print "</div>";