From 34c69d0b3f0559af49ed193dcd9ea6b0ac5e02c5 Mon Sep 17 00:00:00 2001
From: hylom <hylom@users.sourceforge.jp>
Date: Mon, 26 Nov 2018 19:28:13 +0900
Subject: [PATCH] fix reset password link and style

---
 src/newslash_web/css/newslash/base.less            | 17 +++++++++++++
 src/newslash_web/css/newslash/form.less            | 28 +++++++++++++---------
 src/newslash_web/css/newslash/ui.less              |  1 +
 .../lib/Newslash/Web/Controller/Login.pm           |  2 +-
 .../templates/common/login_dialog.html.tt2         |  6 ++++-
 .../templates/login/reset_password.html.tt2        | 14 +++++------
 6 files changed, 48 insertions(+), 20 deletions(-)

diff --git a/src/newslash_web/css/newslash/base.less b/src/newslash_web/css/newslash/base.less
index 78f5c4a8..110e2570 100644
--- a/src/newslash_web/css/newslash/base.less
+++ b/src/newslash_web/css/newslash/base.less
@@ -129,6 +129,7 @@
 }
 
 /**** button style ****/
+/*
 .buttonized-link {
     display: inline-block;
     font-size: 85%;
@@ -141,6 +142,22 @@
     -moz-border-radius: 10px;
     -webkit-border-radius: 10px;
 }
+*/
+
+.button {
+    &:extend(.button-base all);
+    box-sizing: border-box;
+    padding: 0 8px;
+}
+
+a.button {
+    color: @foreground-color;
+    &:hover {
+        color: @foreground-color;
+        text-decoration: none;
+    }
+}
+
 
 /**** Boxes ****/
 .bordered-box {
diff --git a/src/newslash_web/css/newslash/form.less b/src/newslash_web/css/newslash/form.less
index d9727790..55b5ab26 100644
--- a/src/newslash_web/css/newslash/form.less
+++ b/src/newslash_web/css/newslash/form.less
@@ -18,13 +18,18 @@
 }
 
 .button-base {
-    padding: 6px 8px;
     margin: 4px 0;
     border-radius: 4px;
     border: 1px solid @form-element-border-color;
     box-shadow: 0px 0px 2px 0px @form-element-shadow-color;
     background: inherit;
     cursor: pointer;
+    font-size: 80%;
+    display: inline-block;
+
+    &:disabled { cursor: inherit; }
+    &:hover:not(:disabled) { background: @form-element-hover-background; }
+    .active:not(:disabled) { background: @form-element-hover-background; }
 }
 
 .checkbox-base {
@@ -73,17 +78,18 @@ form:not(.compact), .form {
         &:extend(.text-form);
     }
 
-    button { &:extend(.button-base); }
-    button:disabled { cursor: inherit; }
-    button:hover:not(:disabled) { background: @form-element-hover-background; }
-    button.active:not(:disabled) { background: @form-element-hover-background; }
-
-    input[type="submit"] { &:extend(.button-base); }
-    input[type="submit"]:disabled { cursor: inherit; }
-    input[type="submit"]:hover:not(:disabled) { background: @form-element-hover-background; }
-
+    button {
+        &:extend(.button-base all);
+        padding: 6px 8px;
+    }
+    
+    input[type="submit"] {
+        &:extend(.button-base all);
+        padding: 6px 8px;
+    }
 
     select {
-        &:extend(.button-base);
+        &:extend(.button-base all);
+        padding: 6px 8px;
     }
 }
\ No newline at end of file
diff --git a/src/newslash_web/css/newslash/ui.less b/src/newslash_web/css/newslash/ui.less
index fc89e86d..dd718233 100644
--- a/src/newslash_web/css/newslash/ui.less
+++ b/src/newslash_web/css/newslash/ui.less
@@ -83,6 +83,7 @@ li.dropdown {
     li {
         &:extend(.flatten);
         &:extend(.button-base);
+        padding: 6px 8px;
     }
     li:hover, li.active {
         background: @form-element-hover-background;
diff --git a/src/newslash_web/lib/Newslash/Web/Controller/Login.pm b/src/newslash_web/lib/Newslash/Web/Controller/Login.pm
index bd5fbd94..df1c578e 100644
--- a/src/newslash_web/lib/Newslash/Web/Controller/Login.pm
+++ b/src/newslash_web/lib/Newslash/Web/Controller/Login.pm
@@ -117,7 +117,7 @@ sub reset_password {
         # check done
         my $rs = $c->users->reset_password($the_user);
         if (!$rs) {
-            $c->render(result => "ERROR");
+            $c->render(result => $c->users->last_error, email => $email);
             $c->res->code(400);
             return;
         }
diff --git a/src/newslash_web/templates/common/login_dialog.html.tt2 b/src/newslash_web/templates/common/login_dialog.html.tt2
index f7b1953f..41ff8719 100644
--- a/src/newslash_web/templates/common/login_dialog.html.tt2
+++ b/src/newslash_web/templates/common/login_dialog.html.tt2
@@ -32,10 +32,14 @@
       <div class="dialog-footer">
         <button type="button" class="btn btn-default" @click="doCancel">キャンセル</button>
         <button type="button" class="btn btn-primary" @click="doLogin">ログイン</button>
-        <a href="https://srad.jp/my/newuser" class="btn btn-default pull-right">新規アカウント作成</a>
       </div>
 
+      <div>
+        <a href="/my/resetpassword">パスワード再発行</a>
+        <a href="https://srad.jp/my/newuser" class="pull-right">新規アカウント作成</a>
+      </div>
     </form><!-- .dialog -->
+
   </div><!-- .dialog-wrapper -->
 </script>
 
diff --git a/src/newslash_web/templates/login/reset_password.html.tt2 b/src/newslash_web/templates/login/reset_password.html.tt2
index 97a455b9..a9adb21f 100644
--- a/src/newslash_web/templates/login/reset_password.html.tt2
+++ b/src/newslash_web/templates/login/reset_password.html.tt2
@@ -10,17 +10,17 @@
       
     <form id="password-reset-form" action="/my/resetpassword" method="POST">
       <label>登録メールアドレス：
-        [%- IF result %]
-        <div class="alert-error">
-          [%- IF result == "INVALID_EMAIL" -%]正しいメールアドレスを入力してください
-          [%- ELSIF result == "NOT_FOUND" -%]入力されたメールアドレスは登録されていません
-          [%- ELSE %]エラー[% END -%]
-        </div>
-        [%- END %]
         <input id="email"  type="text" name="email" value="[% email %]"/>
       </label>
 
       <input class="btn btn-primary" type="submit" value="確認メールを送信する" />
+      [%- IF result %]
+      <div class="alert-error">
+        [%- IF result == "INVALID_EMAIL" -%]正しいメールアドレスを入力してください
+        [%- ELSIF result == "NOT_FOUND" -%]入力されたメールアドレスは登録されていません
+        [%- ELSE %]エラー（[% result %]）[% END -%]
+      </div>
+      [%- END %]
     </form>
     [%- END %]
   </div><!-- .panel -->
-- 
2.11.0