diff options
Diffstat (limited to 'classes/pref')
-rwxr-xr-x | classes/pref/feeds.php | 6 | ||||
-rwxr-xr-x | classes/pref/filters.php | 10 |
2 files changed, 6 insertions, 10 deletions
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>"; |