From 373731f5e85566eb385e92f604e81232e3d6ba1a Mon Sep 17 00:00:00 2001 From: Unknwon Date: Thu, 17 Sep 2015 01:54:12 -0400 Subject: user gomail and new activate account email tpl - #1496: fallback plain text - #1002: add date header - #913: fix encoding of header --- templates/user/auth/activate.tmpl | 50 ++++++++++++++++++++++----------------- 1 file changed, 28 insertions(+), 22 deletions(-) (limited to 'templates/user/auth') diff --git a/templates/user/auth/activate.tmpl b/templates/user/auth/activate.tmpl index 724f6b5078..cc318fe3b9 100644 --- a/templates/user/auth/activate.tmpl +++ b/templates/user/auth/activate.tmpl @@ -1,39 +1,45 @@ -{{template "ng/base/head" .}} -{{template "ng/base/header" .}} -
-
+{{template "base/head" .}} +
+
+
+ {{.CsrfTokenHtml}} -
-

{{.i18n.Tr "auth.active_your_account"}}

-
-
- {{if .IsActivatePage}} +

+ {{.i18n.Tr "auth.active_your_account"}} +

+
+ {{if .IsActivatePage}} {{if .ServiceNotEnabled}}

{{.i18n.Tr "auth.disable_register_mail"}}

{{else if .ResendLimited}}

{{.i18n.Tr "auth.resent_limit_prompt"}}

{{else}}

{{.i18n.Tr "auth.confirmation_mail_sent_prompt" .SignedUser.Email .Hours | Str2html}}

-
- - {{.i18n.Tr "auth.sign_in_email"}} +
+ {{end}} - {{else}} + {{else}} {{if .IsSendRegisterMail}}

{{.i18n.Tr "auth.confirmation_mail_sent_prompt" .Email .Hours | Str2html}}

-
- - {{.i18n.Tr "auth.sign_in_to_account"}} +
+ {{else if .IsActivateFailed}}

{{.i18n.Tr "auth.invalid_code"}}

{{else}}

{{.i18n.Tr "auth.has_unconfirmed_mail" .SignedUser.Name .SignedUser.Email | Str2html}}

-
- - +
+
+ +
{{end}} - {{end}} + {{end}}
- + +
+
-{{template "ng/base/footer" .}} +{{template "base/footer" .}} -- cgit v1.2.3