diff options
| author | Andrew Dolgov <[email protected]> | 2021-02-16 15:19:42 +0300 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2021-02-16 15:19:42 +0300 |
| commit | 1f5d81b77cd9a5d5f965af0435688c1f1f229e96 (patch) | |
| tree | eee52e0332ffa1ecac52c72f991dd8f5319d5fe7 /classes | |
| parent | af4b3e7df06e50e956e9fda281935a7483f5673a (diff) | |
use a few more control helpers for checkboxes
Diffstat (limited to 'classes')
| -rwxr-xr-x | classes/feeds.php | 8 | ||||
| -rwxr-xr-x | classes/pref/feeds.php | 6 | ||||
| -rwxr-xr-x | classes/pref/filters.php | 10 |
3 files changed, 8 insertions, 16 deletions
diff --git a/classes/feeds.php b/classes/feeds.php index 400c302d6..4e6fdbaf8 100755 --- a/classes/feeds.php +++ b/classes/feeds.php @@ -649,10 +649,6 @@ class Feeds extends Handler_Protected { print "Access denied."; return; } - - $refetch_checked = isset($_REQUEST["force_refetch"]) ? "checked" : ""; - $rehash_checked = isset($_REQUEST["force_rehash"]) ? "checked" : ""; - ?> <!DOCTYPE html> <html> @@ -712,11 +708,11 @@ class Feeds extends Handler_Protected { </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 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> <?= \Controls\submit_tag("Continue") ?> diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php index d087d026d..636f2d69b 100755 --- a/classes/pref/feeds.php +++ b/classes/pref/feeds.php @@ -663,7 +663,7 @@ class Pref_Feeds extends Handler_Protected { print "<fieldset>"; - print "<input dojoType='dijit.form.TextBox' id='feedEditDlg_login' + print "<input dojoType='dijit.form.TextBox' placeHolder='".__("Login")."' autocomplete='new-password' name='auth_login' value=\"$auth_login\">"; @@ -675,10 +675,6 @@ class Pref_Feeds extends Handler_Protected { placeHolder='".__("Password")."' 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 "</section></div>"; diff --git a/classes/pref/filters.php b/classes/pref/filters.php index 9b740753a..36357234b 100755 --- a/classes/pref/filters.php +++ b/classes/pref/filters.php @@ -775,12 +775,12 @@ class Pref_Filters extends Handler_Protected { $reg_exp = htmlspecialchars($rule["reg_exp"]); $filter_type = $rule["filter_type"]; $feed_id = $rule["feed_id"]; - $inverse_checked = isset($rule["inverse"]) ? "checked" : ""; + $inverse_checked = !empty($rule["inverse"]); } else { $reg_exp = ""; $filter_type = 1; $feed_id = ["0"]; - $inverse_checked = ""; + $inverse_checked = false; } print "<form name='filter_new_rule_form' id='filter_new_rule_form' onsubmit='return false;'>"; @@ -808,9 +808,9 @@ class Pref_Filters extends Handler_Protected { print "<div dojoType='dijit.Tooltip' id='filterDlg_regExp_tip' connectId='filterDlg_regExp' position='below'></div>"; print "<fieldset>"; - print "<label class='checkbox'><input id='filterDlg_inverse' dojoType='dijit.form.CheckBox' - name='inverse' $inverse_checked/> ". - __("Inverse regular expression matching")."</label>"; + print "<label class='checkbox'>". + \Controls\checkbox_tag("inverse", $inverse_checked) . + __("Inverse regular expression matching")."</label>"; print "</fieldset>"; print "<fieldset>"; |