From 9d36fc698627f290f01cd3cc5a7f4eaec7a669fd Mon Sep 17 00:00:00 2001
From: Unknwon <u@gogs.io>
Date: Thu, 17 Sep 2015 14:57:24 -0400
Subject: finish new auth e-mails

---
 templates/user/auth/activate.tmpl | 37 +++++++++++++++++++------------------
 1 file changed, 19 insertions(+), 18 deletions(-)

(limited to 'templates/user/auth/activate.tmpl')

diff --git a/templates/user/auth/activate.tmpl b/templates/user/auth/activate.tmpl
index cc318fe3..caadc4f8 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>
-- 
cgit v1.2.3