]> git.wh0rd.org Git - tt-rss.git/commitdiff
projects / tt-rss.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2137d67)
update utility.css related stuff some more
authorAndrew Dolgov <fox@madoka.volgo-balt.ru>
Thu, 28 Mar 2013 09:19:28 +0000 (13:19 +0400)
committerAndrew Dolgov <fox@madoka.volgo-balt.ru>
Thu, 28 Mar 2013 09:19:28 +0000 (13:19 +0400)
classes/handler/public.php patch | blob | history
classes/pref/users.php patch | blob | history
utility.css patch | blob | history

diff --git a/classes/handler/public.php b/classes/handler/public.php
index 84d6aa18ee368534828880212c8a8894c5790919..5adb3ab6ea410022d05a898e8947b2a4b1f7a457 100644 (file)
--- a/classes/handler/public.php
+++ b/classes/handler/public.php
@@ -740,17 +740,17 @@ class Handler_Public extends Handler {
                                <body id='forgotpass'>";
 
                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 "<p>".__("You will need to provide valid account name and email. New password will be sent on your email address.")."</p>";
-
                @$method = $_POST['method'];
 
                if (!$method) {
                        $secretkey = uniqid();
                        $_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 "<input type='hidden' name='secretkey' value='$secretkey'>";
                        print "<input type='hidden' name='method' value='do'>";
@@ -785,7 +785,10 @@ class Handler_Public extends Handler {
                        if (($test != 4 && $test != 'four') || !$email || !$login) {
                                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) {
 
@@ -797,16 +800,30 @@ class Handler_Public extends Handler {
 
                                        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 {
                                        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 {
                                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>";
 
                        }
 
diff --git a/classes/pref/users.php b/classes/pref/users.php
index 45260fd9332f260eee50c73969f04d5c207e2779..5b5120e1b834387549fc97035ede79ef1e74b35f 100644 (file)
--- a/classes/pref/users.php
+++ b/classes/pref/users.php
@@ -290,7 +290,7 @@ class Pref_Users extends Handler_Protected {
                        if ($show_password) {
                                print T_sprintf("Changed password of user <b>%s</b> to <b>%s</b>", $login, $tmp_user_pwd);
                        } 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';
diff --git a/utility.css b/utility.css
index bdf4fde58854b7dcd79a6b0a72c3c1d91059260b..d79a9daa6247b2c88426db968eccec1bdae76e06 100644 (file)
--- a/utility.css
+++ b/utility.css
@@ -8,7 +8,7 @@ body {
 }
 
 form {
-       margin : 0px;
+       margin : 10px 0px 0px 0px;
        padding : 0px;
 }
 
@@ -38,6 +38,8 @@ div.insensitive-small {
 
 .floatingLogo {
        float : right;
+       position : relative;
+       top : -10px;
 }
 
 a {
@@ -75,10 +77,11 @@ div.warning img, div.notice img, div.error img {
 }
 
 h1 {
-       color : black;
+       color : #88b0f0;
        font-size : 32px;
        font-family : serif;
-       /* text-shadow : 2px 2px 2px #f0f0f0; */
+       margin : 20px 0px 5px 0px;
+       text-shadow : 2px 2px 2px #fff;
 }
 
 h2 {
web-based news feed (RSS/Atom) reader and aggregator; see https://tt-rss.org/