finish new auth e-mails

5 files changed, 81 insertions, 68 deletions

diff --git a/templates/user/auth/activate.tmpl b/templates/user/auth/activate.tmpl
index cc318fe3b9..caadc4f82b 100644
--- a/templates/user/auth/activate.tmpl
+++ b/templates/user/auth/activate.tmpl
@@ -8,33 +8,34 @@
           {{.i18n.Tr "auth.active_your_account"}}
         </h2>
         <div class="ui attached segment">
+          {{template "base/alert" .}}
           {{if .IsActivatePage}}
             {{if .ServiceNotEnabled}}
-            <p>{{.i18n.Tr "auth.disable_register_mail"}}</p>
+              <p class="center">{{.i18n.Tr "auth.disable_register_mail"}}</p>
             {{else if .ResendLimited}}
-            <p>{{.i18n.Tr "auth.resent_limit_prompt"}}</p>
+              <p class="center">{{.i18n.Tr "auth.resent_limit_prompt"}}</p>
             {{else}}
-            <p>{{.i18n.Tr "auth.confirmation_mail_sent_prompt" .SignedUser.Email .Hours | Str2html}}</p>
-            <div class="ui divider"></div>
-            <div class="text right">
-              <a class="ui green button" href="http://{{Mail2Domain .SignedUser.Email}}">{{.i18n.Tr "auth.sign_in_to_account"}}</a>
-            </div>
+              <p>{{.i18n.Tr "auth.confirmation_mail_sent_prompt" .SignedUser.Email .Hours | Str2html}}</p>
+              <div class="ui divider"></div>
+              <div class="text right">
+                <a class="ui green button" href="http://{{Mail2Domain .SignedUser.Email}}">{{.i18n.Tr "auth.sign_in_to_account"}}</a>
+              </div>
             {{end}}
           {{else}}
             {{if .IsSendRegisterMail}}
-            <p>{{.i18n.Tr "auth.confirmation_mail_sent_prompt" .Email .Hours | Str2html}}</p>
-            <div class="ui divider"></div>
-            <div class="text right">
-              <a class="ui green button" href="http://{{Mail2Domain .Email}}">{{.i18n.Tr "auth.sign_in_to_account"}}</a>
-            </div>
+              <p>{{.i18n.Tr "auth.confirmation_mail_sent_prompt" .Email .Hours | Str2html}}</p>
+              <div class="ui divider"></div>
+              <div class="text right">
+                <a class="ui green button" href="http://{{Mail2Domain .Email}}">{{.i18n.Tr "auth.sign_in_to_account"}}</a>
+              </div>
             {{else if .IsActivateFailed}}
-            <p>{{.i18n.Tr "auth.invalid_code"}}</p>
+              <p>{{.i18n.Tr "auth.invalid_code"}}</p>
             {{else}}
-            <p>{{.i18n.Tr "auth.has_unconfirmed_mail" .SignedUser.Name .SignedUser.Email | Str2html}}</p>
-            <div class="ui divider"></div>
-            <div class="text right">
-              <button class="ui blue button" href="http://{{Mail2Domain .SignedUser.Email}}">{{.i18n.Tr "auth.resend_mail"}}</button>
-            </div>
+              <p>{{.i18n.Tr "auth.has_unconfirmed_mail" .SignedUser.Name .SignedUser.Email | Str2html}}</p>
+              <div class="ui divider"></div>
+              <div class="text right">
+                <button class="ui blue button">{{.i18n.Tr "auth.resend_mail"}}</button>
+              </div>
             {{end}}
           {{end}}
         </div>
diff --git a/templates/user/auth/forgot_passwd.tmpl b/templates/user/auth/forgot_passwd.tmpl
index 6122dfceba..f8f23318c4 100644
--- a/templates/user/auth/forgot_passwd.tmpl
+++ b/templates/user/auth/forgot_passwd.tmpl
@@ -1,32 +1,38 @@
-{{template "ng/base/head" .}}
-{{template "ng/base/header" .}}
-<div id="sign-wrapper">
-    <form class="form-align form panel sign-panel sign-form container panel-radius" id="sign-up-form" action="{{AppSubUrl}}/user/forget_password" method="post">
+{{template "base/head" .}}
+<div class="user forgot password">
+  <div class="ui middle very relaxed page grid">
+    <div class="column">
+      <form class="ui form" action="{{.Link}}" method="post">
         {{.CsrfTokenHtml}}
-        <div class="panel-header">
-            <h2>{{.i18n.Tr "auth.forgot_password"}}</h2>
-        </div>
-        <div class="panel-content">
-            {{template "ng/base/alert" .}}
-            {{if .IsResetSent}}
+        <h2 class="ui top attached header">
+          {{.i18n.Tr "auth.forgot_password"}}
+        </h2>
+        <div class="ui attached segment">
+          {{template "base/alert" .}}
+          {{if .IsResetSent}}
             <p>{{.i18n.Tr "auth.confirmation_mail_sent_prompt" .Email .Hours | Str2html}}</p>
-            <hr/>
-            <label></label>
-            <a class="btn btn-green btn-large btn-link btn-radius" href="http://{{Mail2Domain .Email}}">{{.i18n.Tr "auth.sign_in_email"}}</a>
-            {{else if .IsResetRequest}}
-            <div class="field">
-                <label class="req" for="email">{{.i18n.Tr "email"}}</label>
-                <input class="ipt ipt-large ipt-radius {{if .Err_Email}}ipt-error{{end}}" id="email" name="email" type="email"  value="{{.email}}"required/>
+            <div class="ui divider"></div>
+            <div class="text right">
+              <a class="ui green button" href="http://{{Mail2Domain .Email}}">{{.i18n.Tr "auth.sign_in_to_account"}}</a>
+            </div>
+          {{else if .IsResetRequest}}
+            <div class="required inline field {{if .Err_Email}}error{{end}}">
+                <label for="email">{{.i18n.Tr "email"}}</label>
+                <input id="email" name="email" type="email"  value="{{.Email}}" autofocus required>
+            </div>
+            <div class="ui divider"></div>
+            <div class="inline field">
+              <label></label>
+              <button class="ui blue button">{{.i18n.Tr "auth.send_reset_mail"}}</button>
             </div>
-            <hr/>
-            <label></label>
-            <button class="btn btn-blue btn-large btn-radius">{{.i18n.Tr "auth.send_reset_mail"}}</button>
-            {{else if .IsResetDisable}}
-            <p>{{.i18n.Tr "auth.disable_register_mail"}}</p>
-            {{else if .ResendLimited}}
-            <p>{{.i18n.Tr "auth.resent_limit_prompt"}}</p>
-            {{end}}
+          {{else if .IsResetDisable}}
+            <p class="center">{{.i18n.Tr "auth.disable_register_mail"}}</p>
+          {{else if .ResendLimited}}
+            <p class="center">{{.i18n.Tr "auth.resent_limit_prompt"}}</p>
+          {{end}}
         </div>
-    </form>
+      </form>
+    </div>
+  </div>
 </div>
-{{template "ng/base/footer" .}}
+{{template "base/footer" .}}
diff --git a/templates/user/auth/reset_passwd.tmpl b/templates/user/auth/reset_passwd.tmpl
index d63d7a0f3c..5f06bd6494 100644
--- a/templates/user/auth/reset_passwd.tmpl
+++ b/templates/user/auth/reset_passwd.tmpl
@@ -1,25 +1,31 @@
-{{template "ng/base/head" .}}
-{{template "ng/base/header" .}}
-<div id="sign-wrapper">
-    <form class="form-align form panel sign-panel sign-form container panel-radius" id="sign-up-form" action="{{AppSubUrl}}/user/reset_password?code={{.Code}}" method="post">
+{{template "base/head" .}}
+<div class="user reset password">
+  <div class="ui middle very relaxed page grid">
+    <div class="column">
+      <form class="ui form" action="{{.Link}}" method="post">
         {{.CsrfTokenHtml}}
-        <div class="panel-header">
-            <h2>{{.i18n.Tr "auth.reset_password"}}</h2>
-        </div>
-        <div class="panel-content">
-            {{template "ng/base/alert" .}}
-            {{if .IsResetForm}}
-            <div class="field">
-                <label class="req" for="password">{{.i18n.Tr "password"}}</label>
-                <input class="ipt ipt-large ipt-radius {{if .Err_Password}}ipt-error{{end}}" id="password" name="password" type="password" value="{{.password}}" required/>
+        <input name="code" type="hidden" value="{{.Code}}">
+        <h2 class="ui top attached header">
+          {{.i18n.Tr "auth.reset_password"}}
+        </h2>
+        <div class="ui attached segment">
+          {{template "base/alert" .}}
+          {{if .IsResetForm}}
+            <div class="required inline field {{if .Err_Password}}error{{end}}">
+              <label for="password">{{.i18n.Tr "password"}}</label>
+              <input id="password" name="password" type="password"  value="{{.password}}" autofocus required>
+            </div>
+            <div class="ui divider"></div>
+            <div class="inline field">
+              <label></label>
+              <button class="ui blue button">{{.i18n.Tr "auth.reset_password_helper"}}</button>
             </div>
-            <hr/>
-            <label></label>
-            <button class="btn btn-blue btn-large btn-radius">{{.i18n.Tr "auth.reset_password_helper"}}</button>
-            {{else}}
-            <p>{{.i18n.Tr "auth.invalid_code"}}</p>
-            {{end}}
+          {{else}}
+            <p class="center">{{.i18n.Tr "auth.invalid_code"}}</p>
+          {{end}}
         </div>
-    </form>
+      </form>
+    </div>
+  </div>
 </div>
-{{template "ng/base/footer" .}}
+{{template "base/footer" .}}
diff --git a/templates/user/auth/signin.tmpl b/templates/user/auth/signin.tmpl
index b93700361d..259c5f7d8f 100644
--- a/templates/user/auth/signin.tmpl
+++ b/templates/user/auth/signin.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="signin">
+<div class="user signin">
   <div class="ui middle very relaxed page grid">
     <div class="column">
       <form class="ui form" action="{{.Link}}" method="post">
diff --git a/templates/user/auth/signup.tmpl b/templates/user/auth/signup.tmpl
index 8baec58773..c237a20d85 100644
--- a/templates/user/auth/signup.tmpl
+++ b/templates/user/auth/signup.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="signup">
+<div class="user signup">
   <div class="ui middle very relaxed page grid">
     <div class="column">
       <form class="ui form" action="{{.Link}}" method="post">