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

update utility.css related stuff some more

This commit is contained in:
Andrew Dolgov 2013-03-28 13:19:28 +04:00
parent 2137d67496
commit 483f15d538
3 changed files with 31 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
classes/handler/public.php
View File

@ -740,17 +740,17 @@ class Handler_Public extends Handler {
<body id='forgotpass'>"; <body id='forgotpass'>";
print '<div class="floatingLogo"><img src="images/logo_small.png"></div>'; print '<div class="floatingLogo"><img src="images/logo_small.png"></div>';
print "<h1>".__("Reset password")."</h1>"; print "<h1>".__("Password recovery")."</h1>";
print "<div class='content'>"; print "<div class='content'>";
print "<p>".__("You will need to provide valid account name and email. New password will be sent on your email address.")."</p>";
@$method = $_POST['method']; @$method = $_POST['method'];
if (!$method) { if (!$method) {
$secretkey = uniqid(); $secretkey = uniqid();
$_SESSION["secretkey"] = $secretkey; $_SESSION["secretkey"] = $secretkey;
print_notice(__("You will need to provide valid account name and email. New password will be sent on your email address."));
print "<form method='POST' action='public.php'>"; print "<form method='POST' action='public.php'>";
print "<input type='hidden' name='secretkey' value='$secretkey'>"; print "<input type='hidden' name='secretkey' value='$secretkey'>";
print "<input type='hidden' name='method' value='do'>"; print "<input type='hidden' name='method' value='do'>";
@ -785,7 +785,10 @@ class Handler_Public extends Handler {
if (($test != 4 && $test != 'four') || !$email || !$login) { if (($test != 4 && $test != 'four') || !$email || !$login) {
print_error(__('Some of the required form parameters are missing or incorrect.')); print_error(__('Some of the required form parameters are missing or incorrect.'));
print "<p><a href=\"public.php?op=forgotpass\">".__("Go back")."</a></p>"; print "<form method=\"GET\" action=\"public.php\">
<input type=\"hidden\" name=\"op\" value=\"forgotpass\">
<input type=\"submit\" value=\"".__("Go back")."\">
</form>";
} else if ($_SESSION["secretkey"] == $secretkey) { } else if ($_SESSION["secretkey"] == $secretkey) {
@ -797,16 +800,30 @@ class Handler_Public extends Handler {
Pref_Users::resetUserPassword($this->link, $id, false); Pref_Users::resetUserPassword($this->link, $id, false);
print "<p>".__("Completed.")."</p>"; print "<p>";
print_notice("Completed.");
print "<form method=\"GET\" action=\"index.php\">
<input type=\"submit\" value=\"".__("Return to Tiny Tiny RSS")."\">
</form>";
} else { } else {
print_error(__("Sorry, login and email combination not found.")); print_error(__("Sorry, login and email combination not found."));
print "<p><a href=\"public.php?op=forgotpass\">".__("Go back")."</a></p>";
print "<form method=\"GET\" action=\"public.php\">
<input type=\"hidden\" name=\"op\" value=\"forgotpass\">
<input type=\"submit\" value=\"".__("Go back")."\">
</form>";
} }
} else { } else {
print_error(__("Form secret key incorrect. Please enable cookies and try again.")); print_error(__("Form secret key incorrect. Please enable cookies and try again."));
print "<p><a href=\"public.php?op=forgotpass\">".__("Go back")."</a></p>"; print "<form method=\"GET\" action=\"public.php\">
<input type=\"hidden\" name=\"op\" value=\"forgotpass\">
<input type=\"submit\" value=\"".__("Go back")."\">
</form>";
} }

2
classes/pref/users.php
View File

@ -290,7 +290,7 @@ class Pref_Users extends Handler_Protected {
if ($show_password) { if ($show_password) {
print T_sprintf("Changed password of user <b>%s</b> to <b>%s</b>", $login, $tmp_user_pwd); print T_sprintf("Changed password of user <b>%s</b> to <b>%s</b>", $login, $tmp_user_pwd);
} else { } else {
print T_sprintf("Sending new password of user <b>%s</b> to <b>%s</b>", $login, $email); print_notice(T_sprintf("Sending new password of user <b>%s</b> to <b>%s</b>", $login, $email));
} }
require_once 'classes/ttrssmailer.php'; require_once 'classes/ttrssmailer.php';

9
utility.css
View File

@ -8,7 +8,7 @@ body {
} }
form { form {
margin : 0px; margin : 10px 0px 0px 0px;
padding : 0px; padding : 0px;
} }
@ -38,6 +38,8 @@ div.insensitive-small {
.floatingLogo { .floatingLogo {
float : right; float : right;
position : relative;
top : -10px;
} }
a { a {
@ -75,10 +77,11 @@ div.warning img, div.notice img, div.error img {
} }
h1 { h1 {
color : black; color : #88b0f0;
font-size : 32px; font-size : 32px;
font-family : serif; font-family : serif;
/* text-shadow : 2px 2px 2px #f0f0f0; */ margin : 20px 0px 5px 0px;
text-shadow : 2px 2px 2px #fff;
} }
h2 { h2 {