valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of git.tt-rss.org:fox/tt-rss

This commit is contained in:
Andrew Dolgov 2019-02-21 06:52:23 +03:00
parent fd8f8c7b3e d5bc53fda1
commit e66d6b7646
9 changed files with 209 additions and 195 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

162
classes/pref/prefs.php
View File

@ -178,13 +178,16 @@ class Pref_Prefs extends Handler_Protected {
$_SESSION["prefs_op_result"] = ""; $_SESSION["prefs_op_result"] = "";
print "<div dojoType=\"dijit.layout.AccordionContainer\" region=\"center\">"; print "<div dojoType='dijit.layout.AccordionContainer' region='center'>";
print "<div dojoType=\"dijit.layout.AccordionPane\" print "<div dojoType='dijit.layout.AccordionPane'
title=\"<i class='material-icons'>person</i> ".__('Personal data / Authentication')."\">"; title=\"<i class='material-icons'>person</i> ".__('Personal data / Authentication')."\">";
print "<form dojoType=\"dijit.form.Form\" id=\"changeUserdataForm\">"; print "<div dojoType='dijit.layout.TabContainer'>";
print "<div dojoType='dijit.layout.ContentPane' title=\"".__('Personal data')."\">";
print "<script type=\"dojo/method\" event=\"onSubmit\" args=\"evt\"> print "<form dojoType='dijit.form.Form' id='changeUserdataForm'>";
print "<script type='dojo/method' event='onSubmit' args='evt'>
evt.preventDefault(); evt.preventDefault();
if (this.validate()) { if (this.validate()) {
Notify.progress('Saving data...', true); Notify.progress('Saving data...', true);
@ -198,10 +201,6 @@ class Pref_Prefs extends Handler_Protected {
} }
</script>"; </script>";
print "<table width=\"100%\" class=\"prefPrefsList\">";
print "<h2>" . __("Personal data") . "</h2>";
$sth = $this->pdo->prepare("SELECT email,full_name,otp_enabled, $sth = $this->pdo->prepare("SELECT email,full_name,otp_enabled,
access_level FROM ttrss_users access_level FROM ttrss_users
WHERE id = ?"); WHERE id = ?");
@ -212,30 +211,38 @@ class Pref_Prefs extends Handler_Protected {
$full_name = htmlspecialchars($row["full_name"]); $full_name = htmlspecialchars($row["full_name"]);
$otp_enabled = sql_bool_to_bool($row["otp_enabled"]); $otp_enabled = sql_bool_to_bool($row["otp_enabled"]);
print "<tr><td width=\"40%\">".__('Full name')."</td>"; print "<fieldset>";
print "<td class=\"prefValue\"><input dojoType=\"dijit.form.ValidationTextBox\" name=\"full_name\" required=\"1\" print "<label>".__('Full name:')."</label>";
value=\"$full_name\"></td></tr>"; print "<input dojoType='dijit.form.ValidationTextBox' name='full_name' required='1' value='$full_name'>";
print "</fieldset>";
print "<tr><td width=\"40%\">".__('E-mail')."</td>"; print "<fieldset>";
print "<td class=\"prefValue\"><input dojoType=\"dijit.form.ValidationTextBox\" name=\"email\" required=\"1\" value=\"$email\"></td></tr>"; print "<label>".__('E-mail:')."</label>";
print "<input dojoType='dijit.form.ValidationTextBox' name='email' required='1' value='$email'>";
print "</fieldset>";
if (!SINGLE_USER_MODE && !$_SESSION["hide_hello"]) { if (!SINGLE_USER_MODE && !$_SESSION["hide_hello"]) {
$access_level = $row["access_level"]; $access_level = $row["access_level"];
print "<tr><td width=\"40%\">".__('Access level')."</td>"; print "<fieldset>";
print "<td>" . $access_level_names[$access_level] . "</td></tr>"; print "<label>".__('Access level:')."</label>";
print $access_level_names[$access_level];
print "</fieldset>";
} }
print "</table>";
print_hidden("op", "pref-prefs"); print_hidden("op", "pref-prefs");
print_hidden("method", "changeemail"); print_hidden("method", "changeemail");
print "<p><button dojoType=\"dijit.form.Button\" type=\"submit\" class=\"alt-primary\">". print "<hr/>";
print "<button dojoType='dijit.form.Button' type='submit' class='alt-primary'>".
__("Save data")."</button>"; __("Save data")."</button>";
print "</form>"; print "</form>";
print "</div>"; # content pane
print "<div dojoType='dijit.layout.ContentPane' title=\"".__('Password')."\">";
if ($_SESSION["auth_module"]) { if ($_SESSION["auth_module"]) {
$authenticator = PluginHost::getInstance()->get_plugin($_SESSION["auth_module"]); $authenticator = PluginHost::getInstance()->get_plugin($_SESSION["auth_module"]);
} else { } else {
@ -244,13 +251,11 @@ class Pref_Prefs extends Handler_Protected {
if ($authenticator && method_exists($authenticator, "change_password")) { if ($authenticator && method_exists($authenticator, "change_password")) {
print "<h2>" . __("Password") . "</h2>";
print "<div style='display : none' id='pwd_change_infobox'></div>"; print "<div style='display : none' id='pwd_change_infobox'></div>";
print "<form dojoType=\"dijit.form.Form\">"; print "<form dojoType='dijit.form.Form'>";
print "<script type=\"dojo/method\" event=\"onSubmit\" args=\"evt\"> print "<script type='dojo/method' event='onSubmit' args='evt'>
evt.preventDefault(); evt.preventDefault();
if (this.validate()) { if (this.validate()) {
Notify.progress('Changing password...', true); Notify.progress('Changing password...', true);
@ -283,41 +288,43 @@ class Pref_Prefs extends Handler_Protected {
print_notice(__("Changing your current password will disable OTP.")); print_notice(__("Changing your current password will disable OTP."));
} }
print "<table width=\"100%\" class=\"prefPrefsList\">"; print "<fieldset>";
print "<label>".__("Old password:")."</label>";
print "<input dojoType='dijit.form.ValidationTextBox' type='password' required='1' name='old_password'>";
print "</fieldset>";
print "<tr><td width=\"40%\">".__("Old password")."</td>"; print "<fieldset>";
print "<td class=\"prefValue\"><input dojoType=\"dijit.form.ValidationTextBox\" type=\"password\" required=\"1\" name=\"old_password\"></td></tr>"; print "<label>".__("New password:")."</label>";
print "<input dojoType='dijit.form.ValidationTextBox' type='password' required='1' name='new_password'>";
print "</fieldset>";
print "<tr><td width=\"40%\">".__("New password")."</td>"; print "<fieldset>";
print "<label>".__("Confirm password:")."</label>";
print "<td class=\"prefValue\"><input dojoType=\"dijit.form.ValidationTextBox\" type=\"password\" required=\"1\" print "<input dojoType='dijit.form.ValidationTextBox' type='password' required='1' name='confirm_password'>";
name=\"new_password\"></td></tr>"; print "</fieldset>";
print "<tr><td width=\"40%\">".__("Confirm password")."</td>";
print "<td class=\"prefValue\"><input dojoType=\"dijit.form.ValidationTextBox\" type=\"password\" required=\"1\" name=\"confirm_password\"></td></tr>";
print "</table>";
print_hidden("op", "pref-prefs"); print_hidden("op", "pref-prefs");
print_hidden("method", "changepassword"); print_hidden("method", "changepassword");
print "<p><button dojoType=\"dijit.form.Button\" type=\"submit\" class=\"alt-primary\">". print "<hr/>";
print "<button dojoType='dijit.form.Button' type='submit' class='alt-primary'>".
__("Change password")."</button>"; __("Change password")."</button>";
print "</form>"; print "</form>";
if ($_SESSION["auth_module"] == "auth_internal") { print "</div>"; # content pane
print "<div dojoType='dijit.layout.ContentPane' title=\"".__('One time passwords / Authenticator')."\">";
print "<h2>" . __("One time passwords / Authenticator") . "</h2>"; if ($_SESSION["auth_module"] == "auth_internal") {
if ($otp_enabled) { if ($otp_enabled) {
print_notice(__("One time passwords are currently enabled. Enter your current password below to disable.")); print_warning("One time passwords are currently enabled. Enter your current password below to disable.");
print "<form dojoType=\"dijit.form.Form\">"; print "<form dojoType='dijit.form.Form'>";
print "<script type=\"dojo/method\" event=\"onSubmit\" args=\"evt\"> print "<script type='dojo/method' event='onSubmit' args='evt'>
evt.preventDefault(); evt.preventDefault();
if (this.validate()) { if (this.validate()) {
Notify.progress('Disabling OTP', true); Notify.progress('Disabling OTP', true);
@ -336,39 +343,36 @@ class Pref_Prefs extends Handler_Protected {
} }
</script>"; </script>";
print "<table width=\"100%\" class=\"prefPrefsList\">"; print "<fieldset>";
print "<label>".__("Your password:")."</label>";
print "<tr><td width=\"40%\">".__("Enter your password")."</td>"; print "<input dojoType='dijit.form.ValidationTextBox' type='password' required='1' name='password'>";
print "</fieldset>";
print "<td class=\"prefValue\"><input dojoType=\"dijit.form.ValidationTextBox\" type=\"password\" required=\"1\"
name=\"password\"></td></tr>";
print "</table>";
print_hidden("op", "pref-prefs"); print_hidden("op", "pref-prefs");
print_hidden("method", "otpdisable"); print_hidden("method", "otpdisable");
print "<p><button dojoType=\"dijit.form.Button\" type=\"submit\">". print "<hr/>";
print "<button dojoType='dijit.form.Button' type='submit'>".
__("Disable OTP")."</button>"; __("Disable OTP")."</button>";
print "</form>"; print "</form>";
} else if (function_exists("imagecreatefromstring")) { } else if (function_exists("imagecreatefromstring")) {
print "<p>" . __("You will need a compatible Authenticator to use this. Changing your password would automatically disable OTP.") . "</p>"; print_warning("You will need a compatible Authenticator to use this. Changing your password would automatically disable OTP.");
print_notice("Scan the following code by the Authenticator application:");
print "<p>".__("Scan the following code by the Authenticator application:")."</p>";
$csrf_token = $_SESSION["csrf_token"]; $csrf_token = $_SESSION["csrf_token"];
print "<img src=\"backend.php?op=pref-prefs&method=otpqrcode&csrf_token=$csrf_token\">"; print "<img alt='otp qr-code' src='backend.php?op=pref-prefs&method=otpqrcode&csrf_token=$csrf_token'>";
print "<form dojoType=\"dijit.form.Form\" id=\"changeOtpForm\">"; print "<form dojoType='dijit.form.Form' id='changeOtpForm'>";
print_hidden("op", "pref-prefs"); print_hidden("op", "pref-prefs");
print_hidden("method", "otpenable"); print_hidden("method", "otpenable");
print "<script type=\"dojo/method\" event=\"onSubmit\" args=\"evt\"> print "<script type='dojo/method' event='onSubmit' args='evt'>
evt.preventDefault(); evt.preventDefault();
if (this.validate()) { if (this.validate()) {
Notify.progress('Saving data...', true); Notify.progress('Saving data...', true);
@ -387,38 +391,32 @@ class Pref_Prefs extends Handler_Protected {
} }
</script>"; </script>";
print "<table width=\"100%\" class=\"prefPrefsList\">"; print "<fieldset>";
print "<label>".__("Your password:")."</label>";
print "<input dojoType='dijit.form.ValidationTextBox' type='password' required='1'
name='password'>";
print "</fieldset>";
print "<tr><td width=\"40%\">".__("Enter your password")."</td>"; print "<fieldset>";
print "<label>".__("One time password:")."</label>";
print "<input dojoType='dijit.form.ValidationTextBox' autocomplete='off'
required='1' name='otp'>";
print "</fieldset>";
print "<td class=\"prefValue\"><input dojoType=\"dijit.form.ValidationTextBox\" type=\"password\" required=\"1\" print "<hr/>";
name=\"password\"></td></tr>"; print "<button dojoType='dijit.form.Button' type='submit' class='alt-primary'>".
print "<tr><td width=\"40%\">".__("Enter the generated one time password")."</td>";
print "<td class=\"prefValue\"><input dojoType=\"dijit.form.ValidationTextBox\" autocomplete=\"off\"
required=\"1\"
name=\"otp\"></td></tr>";
print "<tr><td colspan=\"2\">";
print "</td></tr><tr><td colspan=\"2\">";
print "</td></tr>";
print "</table>";
print "<p><button dojoType=\"dijit.form.Button\" type=\"submit\" class=\"alt-primary\">".
__("Enable OTP")."</button>"; __("Enable OTP")."</button>";
print "</form>"; print "</form>";
} else { } else {
print_notice("PHP GD functions are required for OTP support.");
print_notice(__("PHP GD functions are required for OTP support.")); }
} }
} print "</div>"; # content pane
print "</div>"; # tab container
} }
PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TAB_SECTION, PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TAB_SECTION,
@ -426,12 +424,12 @@ class Pref_Prefs extends Handler_Protected {
print "</div>"; #pane print "</div>"; #pane
print "<div dojoType=\"dijit.layout.AccordionPane\" selected=\"true\" print "<div dojoType='dijit.layout.AccordionPane' selected='true'
title=\"<i class='material-icons'>settings</i> ".__('Preferences')."\">"; title=\"<i class='material-icons'>settings</i> ".__('Preferences')."\">";
print "<form dojoType=\"dijit.form.Form\" id=\"changeSettingsForm\">"; print "<form dojoType='dijit.form.Form' id='changeSettingsForm'>";
print "<script type=\"dojo/method\" event=\"onSubmit\" args=\"evt, quit\"> print "<script type='dojo/method' event='onSubmit' args='evt, quit'>
if (evt) evt.preventDefault(); if (evt) evt.preventDefault();
if (this.validate()) { if (this.validate()) {
console.log(dojo.objectToQuery(this.getValues())); console.log(dojo.objectToQuery(this.getValues()));

47
css/default.css
View File

@ -1474,6 +1474,32 @@ body.ttrss_prefs .phpinfo td.e {
body.ttrss_prefs .phpinfo td.v { body.ttrss_prefs .phpinfo td.v {
font-family: monospace; font-family: monospace;
} }
body.ttrss_prefs fieldset,
body.ttrss_utility fieldset {
border-width: 0px;
padding: 5px 0px;
}
body.ttrss_prefs fieldset.narrow,
body.ttrss_utility fieldset.narrow {
padding: 2px 0px;
}
body.ttrss_prefs fieldset.align-right,
body.ttrss_utility fieldset.align-right {
text-align: right;
}
body.ttrss_prefs fieldset > label:first-of-type,
body.ttrss_utility fieldset > label:first-of-type {
min-width: 140px;
margin-right: 20px;
display: inline-block;
text-align: right;
font-weight: bold;
}
body.ttrss_prefs fieldset > label.checkbox,
body.ttrss_utility fieldset > label.checkbox {
display: inline;
font-weight: normal;
}
body.ttrss_utility.sanity_failed { body.ttrss_utility.sanity_failed {
background: #900; background: #900;
} }
@ -1505,27 +1531,6 @@ body.ttrss_utility .content h2 {
body.ttrss_utility .content h3 { body.ttrss_utility .content h3 {
font-size: 16px; font-size: 16px;
} }
body.ttrss_utility .content fieldset {
border-width: 0px;
padding: 5px 0px;
}
body.ttrss_utility .content fieldset.narrow {
padding: 2px 0px;
}
body.ttrss_utility .content fieldset.align-right {
text-align: right;
}
body.ttrss_utility .content fieldset > label:first-of-type {
min-width: 140px;
margin-right: 20px;
display: inline-block;
text-align: right;
font-weight: bold;
}
body.ttrss_utility .content fieldset > label.checkbox {
display: inline;
font-weight: normal;
}
body.ttrss_utility a { body.ttrss_utility a {
color: #257aa7; color: #257aa7;
text-decoration: none; text-decoration: none;

2
css/default.css.map
View File

File diff suppressed because one or more lines are too long

28
css/prefs.less
View File

@ -132,3 +132,31 @@ body.ttrss_prefs {
} }
} }
body.ttrss_prefs,
body.ttrss_utility {
fieldset {
border-width : 0px;
padding : 5px 0px;
}
fieldset.narrow {
padding : 2px 0px;
}
fieldset.align-right {
text-align : right;
}
fieldset > label:first-of-type {
min-width : 140px;
margin-right : 20px;
display : inline-block;
text-align : right;
font-weight : bold;
}
fieldset > label.checkbox {
display : inline;
font-weight : normal;
}
}

27
css/utility.less
View File

@ -31,33 +31,6 @@ body.ttrss_utility {
h3 { h3 {
font-size : 16px; font-size : 16px;
} }
fieldset {
border-width : 0px;
padding : 5px 0px;
}
fieldset.narrow {
padding : 2px 0px;
}
fieldset.align-right {
text-align : right;
}
fieldset > label:first-of-type {
min-width : 140px;
margin-right : 20px;
display : inline-block;
text-align : right;
font-weight : bold;
}
fieldset > label.checkbox {
display : inline;
font-weight : normal;
}
} }
a { a {

47
themes/night.css
View File

@ -1475,6 +1475,32 @@ body.ttrss_prefs .phpinfo td.e {
body.ttrss_prefs .phpinfo td.v { body.ttrss_prefs .phpinfo td.v {
font-family: monospace; font-family: monospace;
} }
body.ttrss_prefs fieldset,
body.ttrss_utility fieldset {
border-width: 0px;
padding: 5px 0px;
}
body.ttrss_prefs fieldset.narrow,
body.ttrss_utility fieldset.narrow {
padding: 2px 0px;
}
body.ttrss_prefs fieldset.align-right,
body.ttrss_utility fieldset.align-right {
text-align: right;
}
body.ttrss_prefs fieldset > label:first-of-type,
body.ttrss_utility fieldset > label:first-of-type {
min-width: 140px;
margin-right: 20px;
display: inline-block;
text-align: right;
font-weight: bold;
}
body.ttrss_prefs fieldset > label.checkbox,
body.ttrss_utility fieldset > label.checkbox {
display: inline;
font-weight: normal;
}
body.ttrss_utility.sanity_failed { body.ttrss_utility.sanity_failed {
background: #900; background: #900;
} }
@ -1506,27 +1532,6 @@ body.ttrss_utility .content h2 {
body.ttrss_utility .content h3 { body.ttrss_utility .content h3 {
font-size: 16px; font-size: 16px;
} }
body.ttrss_utility .content fieldset {
border-width: 0px;
padding: 5px 0px;
}
body.ttrss_utility .content fieldset.narrow {
padding: 2px 0px;
}
body.ttrss_utility .content fieldset.align-right {
text-align: right;
}
body.ttrss_utility .content fieldset > label:first-of-type {
min-width: 140px;
margin-right: 20px;
display: inline-block;
text-align: right;
font-weight: bold;
}
body.ttrss_utility .content fieldset > label.checkbox {
display: inline;
font-weight: normal;
}
body.ttrss_utility a { body.ttrss_utility a {
color: #b87d2c; color: #b87d2c;
text-decoration: none; text-decoration: none;

2
themes/night.css.map
View File

File diff suppressed because one or more lines are too long

47
themes/night_blue.css
View File

@ -1475,6 +1475,32 @@ body.ttrss_prefs .phpinfo td.e {
body.ttrss_prefs .phpinfo td.v { body.ttrss_prefs .phpinfo td.v {
font-family: monospace; font-family: monospace;
} }
body.ttrss_prefs fieldset,
body.ttrss_utility fieldset {
border-width: 0px;
padding: 5px 0px;
}
body.ttrss_prefs fieldset.narrow,
body.ttrss_utility fieldset.narrow {
padding: 2px 0px;
}
body.ttrss_prefs fieldset.align-right,
body.ttrss_utility fieldset.align-right {
text-align: right;
}
body.ttrss_prefs fieldset > label:first-of-type,
body.ttrss_utility fieldset > label:first-of-type {
min-width: 140px;
margin-right: 20px;
display: inline-block;
text-align: right;
font-weight: bold;
}
body.ttrss_prefs fieldset > label.checkbox,
body.ttrss_utility fieldset > label.checkbox {
display: inline;
font-weight: normal;
}
body.ttrss_utility.sanity_failed { body.ttrss_utility.sanity_failed {
background: #900; background: #900;
} }
@ -1506,27 +1532,6 @@ body.ttrss_utility .content h2 {
body.ttrss_utility .content h3 { body.ttrss_utility .content h3 {
font-size: 16px; font-size: 16px;
} }
body.ttrss_utility .content fieldset {
border-width: 0px;
padding: 5px 0px;
}
body.ttrss_utility .content fieldset.narrow {
padding: 2px 0px;
}
body.ttrss_utility .content fieldset.align-right {
text-align: right;
}
body.ttrss_utility .content fieldset > label:first-of-type {
min-width: 140px;
margin-right: 20px;
display: inline-block;
text-align: right;
font-weight: bold;
}
body.ttrss_utility .content fieldset > label.checkbox {
display: inline;
font-weight: normal;
}
body.ttrss_utility a { body.ttrss_utility a {
color: #257aa7; color: #257aa7;
text-decoration: none; text-decoration: none;

2
themes/night_blue.css.map
View File

File diff suppressed because one or more lines are too long