use a few more control helpers for checkboxes
This commit is contained in:
parent
af4b3e7df0
commit
1f5d81b77c
|
@ -649,10 +649,6 @@ class Feeds extends Handler_Protected {
|
||||||
print "Access denied.";
|
print "Access denied.";
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
$refetch_checked = isset($_REQUEST["force_refetch"]) ? "checked" : "";
|
|
||||||
$rehash_checked = isset($_REQUEST["force_rehash"]) ? "checked" : "";
|
|
||||||
|
|
||||||
?>
|
?>
|
||||||
<!DOCTYPE html>
|
<!DOCTYPE html>
|
||||||
<html>
|
<html>
|
||||||
|
@ -712,11 +708,11 @@ class Feeds extends Handler_Protected {
|
||||||
</fieldset>
|
</fieldset>
|
||||||
|
|
||||||
<fieldset>
|
<fieldset>
|
||||||
<label class="checkbox"><input dojoType="dijit.form.CheckBox" type="checkbox" name="force_refetch" value="1" <?= $refetch_checked ?>> Force refetch</label>
|
<label class="checkbox"><?= \Controls\checkbox_tag("force_refetch", isset($_REQUEST["force_refetch"])) ?> Force refetch</label>
|
||||||
</fieldset>
|
</fieldset>
|
||||||
|
|
||||||
<fieldset class="narrow">
|
<fieldset class="narrow">
|
||||||
<label class="checkbox"><input dojoType="dijit.form.CheckBox" type="checkbox" name="force_rehash" value="1" <?= $rehash_checked ?>> Force rehash</label>
|
<label class="checkbox"><?= \Controls\checkbox_tag("force_rehash", isset($_REQUEST["force_rehash"])) ?> Force rehash</label>
|
||||||
</fieldset>
|
</fieldset>
|
||||||
|
|
||||||
<?= \Controls\submit_tag("Continue") ?>
|
<?= \Controls\submit_tag("Continue") ?>
|
||||||
|
|
|
@ -663,7 +663,7 @@ class Pref_Feeds extends Handler_Protected {
|
||||||
|
|
||||||
print "<fieldset>";
|
print "<fieldset>";
|
||||||
|
|
||||||
print "<input dojoType='dijit.form.TextBox' id='feedEditDlg_login'
|
print "<input dojoType='dijit.form.TextBox'
|
||||||
placeHolder='".__("Login")."'
|
placeHolder='".__("Login")."'
|
||||||
autocomplete='new-password'
|
autocomplete='new-password'
|
||||||
name='auth_login' value=\"$auth_login\">";
|
name='auth_login' value=\"$auth_login\">";
|
||||||
|
@ -675,10 +675,6 @@ class Pref_Feeds extends Handler_Protected {
|
||||||
placeHolder='".__("Password")."'
|
placeHolder='".__("Password")."'
|
||||||
value=\"$auth_pass\">";
|
value=\"$auth_pass\">";
|
||||||
|
|
||||||
print "<div dojoType='dijit.Tooltip' connectId='feedEditDlg_login' position='below'>
|
|
||||||
".__('<b>Hint:</b> you need to fill in your login information if your feed requires authentication, except for Twitter feeds.')."
|
|
||||||
</div>";
|
|
||||||
|
|
||||||
print "</fieldset>";
|
print "</fieldset>";
|
||||||
|
|
||||||
print "</section></div>";
|
print "</section></div>";
|
||||||
|
|
|
@ -775,12 +775,12 @@ class Pref_Filters extends Handler_Protected {
|
||||||
$reg_exp = htmlspecialchars($rule["reg_exp"]);
|
$reg_exp = htmlspecialchars($rule["reg_exp"]);
|
||||||
$filter_type = $rule["filter_type"];
|
$filter_type = $rule["filter_type"];
|
||||||
$feed_id = $rule["feed_id"];
|
$feed_id = $rule["feed_id"];
|
||||||
$inverse_checked = isset($rule["inverse"]) ? "checked" : "";
|
$inverse_checked = !empty($rule["inverse"]);
|
||||||
} else {
|
} else {
|
||||||
$reg_exp = "";
|
$reg_exp = "";
|
||||||
$filter_type = 1;
|
$filter_type = 1;
|
||||||
$feed_id = ["0"];
|
$feed_id = ["0"];
|
||||||
$inverse_checked = "";
|
$inverse_checked = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
print "<form name='filter_new_rule_form' id='filter_new_rule_form' onsubmit='return false;'>";
|
print "<form name='filter_new_rule_form' id='filter_new_rule_form' onsubmit='return false;'>";
|
||||||
|
@ -808,8 +808,8 @@ class Pref_Filters extends Handler_Protected {
|
||||||
print "<div dojoType='dijit.Tooltip' id='filterDlg_regExp_tip' connectId='filterDlg_regExp' position='below'></div>";
|
print "<div dojoType='dijit.Tooltip' id='filterDlg_regExp_tip' connectId='filterDlg_regExp' position='below'></div>";
|
||||||
|
|
||||||
print "<fieldset>";
|
print "<fieldset>";
|
||||||
print "<label class='checkbox'><input id='filterDlg_inverse' dojoType='dijit.form.CheckBox'
|
print "<label class='checkbox'>".
|
||||||
name='inverse' $inverse_checked/> ".
|
\Controls\checkbox_tag("inverse", $inverse_checked) .
|
||||||
__("Inverse regular expression matching")."</label>";
|
__("Inverse regular expression matching")."</label>";
|
||||||
print "</fieldset>";
|
print "</fieldset>";
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue