aboutsummaryrefslogtreecommitdiffstats
path: root/templates
diff options
context:
space:
mode:
authorUnknwon <u@gogs.io>2015-09-17 01:54:12 -0400
committerUnknwon <u@gogs.io>2015-09-17 01:54:12 -0400
commit373731f5e85566eb385e92f604e81232e3d6ba1a (patch)
tree83311e464adf24f3006030e27473086e43a11240 /templates
parente75fd2f783a413ae612e3e6110c912b3ecf9555d (diff)
downloadgitea-373731f5e85566eb385e92f604e81232e3d6ba1a.tar.gz
gitea-373731f5e85566eb385e92f604e81232e3d6ba1a.zip
user gomail and new activate account email tpl
- #1496: fallback plain text - #1002: add date header - #913: fix encoding of header
Diffstat (limited to 'templates')
-rw-r--r--templates/mail/auth/activate.tmpl15
-rw-r--r--templates/mail/auth/active.tmpl33
-rw-r--r--templates/mail/auth/register_success.tmpl43
-rw-r--r--templates/user/auth/activate.tmpl50
4 files changed, 59 insertions, 82 deletions
diff --git a/templates/mail/auth/activate.tmpl b/templates/mail/auth/activate.tmpl
new file mode 100644
index 0000000000..5822770e1c
--- /dev/null
+++ b/templates/mail/auth/activate.tmpl
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <title>{{.User.Name}}, please activate your account</title>
+</head>
+
+<body>
+ <p>Hi <b>{{.User.Name}}</b>, thanks for registering at {{.AppName}}!</p>
+ <p>Please click the following link to verify your e-mail address within <b>{{.ActiveCodeLives}} hours</b>:</p>
+ <p><a href="{{.AppUrl}}user/activate?code={{.Code}}">{{.AppUrl}}user/activate?code={{.Code}}</a></p>
+ <p>Not working? Try copying and pasting it to your browser.</p>
+ <p>© 2015 <a target="_blank" href="http://gogs.io">Gogs: Go Git Service</a></p>
+</body>
+</html>
diff --git a/templates/mail/auth/active.tmpl b/templates/mail/auth/active.tmpl
deleted file mode 100644
index b9dacc7575..0000000000
--- a/templates/mail/auth/active.tmpl
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>{{.User.Name}}, please activate your account</title>
-</head>
-<body style="background:#eee;">
-<div style="color:#333; font:12px/1.5 Tahoma,Arial,sans-serif;; text-shadow:1px 1px #fff; padding:0; margin:0;">
- <div style="width:600px;margin:0 auto; padding:40px 0 20px;">
- <div style="border:1px solid #d9d9d9;border-radius:3px; background:#fff; box-shadow: 0px 2px 5px rgba(0, 0, 0,.05); -webkit-box-shadow: 0px 2px 5px rgba(0, 0, 0,.05);">
- <div style="padding: 20px 15px;">
- <h1 style="font-size:20px; padding:10px 0 20px; margin:0; border-bottom:1px solid #ddd;"><img src="{{.AppUrl}}/img/favicon.png" style="height: 32px; margin-bottom: -10px;"> <a style="color:#333;text-decoration:none;" target="_blank" href="{{.AppUrl}}">{{.AppName}}</a></h1>
- <div style="padding:40px 15px;">
- <div style="font-size:16px; padding-bottom:30px; font-weight:bold;">
- Hi <span style="color: #00BFFF;">{{.User.Name}}</span>,
- </div>
- <div style="font-size:14px; padding:0 15px;">
- <p style="margin:0;padding:0 0 9px 0;">Please click the following link to verify your e-mail address within <b>{{.ActiveCodeLives}} hours</b>.</p>
- <p style="margin:0;padding:0 0 9px 0;">
- <a href="{{.AppUrl}}user/activate?code={{.Code}}">{{.AppUrl}}user/activate?code={{.Code}}</a>
- </p>
- <p style="margin:0;padding:0 0 9px 0;">Not working? Try copying and pasting it to your browser.</p>
- </div>
- </div>
- </div>
- </div>
- <div style="color:#aaa;padding:10px;text-align:center;">
- © 2014 <a style="color:#888;text-decoration:none;" target="_blank" href="http://gogits.org">Gogs: Go Git Service</a>
- </div>
- </div>
-</div>
-</body>
-</html>
diff --git a/templates/mail/auth/register_success.tmpl b/templates/mail/auth/register_success.tmpl
index 5e4cb84ba6..7b642ea052 100644
--- a/templates/mail/auth/register_success.tmpl
+++ b/templates/mail/auth/register_success.tmpl
@@ -1,33 +1,22 @@
<!DOCTYPE html>
-<html>
+<html>
<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>{{.User.Name}}, welcome to {{.AppName}}</title>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <title>{{.User.Name}}, welcome to {{.AppName}}</title>
</head>
-<body style="background:#eee;">
-<div style="color:#333; font:12px/1.5 Tahoma,Arial,sans-serif;; text-shadow:1px 1px #fff; padding:0; margin:0;">
- <div style="width:600px;margin:0 auto; padding:40px 0 20px;">
- <div style="border:1px solid #d9d9d9;border-radius:3px; background:#fff; box-shadow: 0px 2px 5px rgba(0, 0, 0,.05); -webkit-box-shadow: 0px 2px 5px rgba(0, 0, 0,.05);">
- <div style="padding: 20px 15px;">
- <h1 style="font-size:20px; padding:10px 0 20px; margin:0; border-bottom:1px solid #ddd;"><img src="{{.AppUrl}}/img/favicon.png" style="height: 32px; margin-bottom: -10px;"> <a style="color:#333;text-decoration:none;" target="_blank" href="{{.AppUrl}}">{{.AppName}}</a></h1>
- <div style="padding:40px 15px;">
- <div style="font-size:16px; padding-bottom:30px; font-weight:bold;">
- Hi <span style="color: #00BFFF;">{{.User.Name}}</span>, this is your registration email for {{.AppName}}!
- </div>
- <div style="font-size:14px; padding:0 15px;">
- <p style="margin:0;padding:0 0 9px 0;">Please click the following link to verify your e-mail address within <b>{{.ActiveCodeLives}} hours</b>.</p>
- <p style="margin:0;padding:0 0 9px 0;">
- <a href="{{.AppUrl}}user/activate?code={{.Code}}">{{.AppUrl}}user/activate?code={{.Code}}</a>
- </p>
- <p style="margin:0;padding:0 0 9px 0;">Not working? Try copying and pasting it to your browser.</p>
- </div>
- </div>
- </div>
- </div>
- <div style="color:#aaa;padding:10px;text-align:center;">
- © 2014 <a style="color:#888;text-decoration:none;" target="_blank" href="http://gogits.org">Gogs: Go Git Service</a>
- </div>
+
+<body class="mail register success">
+ <div class="ui segment">
+ <div class="ui header">
+ <img class="ui image" src="{{.AppUrl}}/img/favicon.png">
+ {{.AppName}}
</div>
-</div>
+ <div class="ui divider"></div>
+ <p>Hi <b>{{.User.Name}}</b>, this is your registration email for {{.AppName}}!</p>
+ <p>Please click the following link to verify your e-mail address within <b>{{.ActiveCodeLives}} hours</b>:</p>
+ <p><a href="{{.AppUrl}}user/activate?code={{.Code}}">{{.AppUrl}}user/activate?code={{.Code}}</a></p>
+ <p>Not working? Try copying and pasting it to your browser.</p>
+ </div>
+ <p class="copyright text grey">© 2015 <a target="_blank" href="http://gogs.io">Gogs: Go Git Service</a></p>
</body>
</html>
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" .}}
-<div id="sign-wrapper">
- <form class="form-align form panel sign-panel sign-form container panel-radius" id="sign-up-form" action="{{AppSubUrl}}/user/activate" method="post">
+{{template "base/head" .}}
+<div class="user activate">
+ <div class="ui middle very relaxed page grid">
+ <div class="column">
+ <form class="ui form" action="{{AppSubUrl}}/user/activate" method="post">
{{.CsrfTokenHtml}}
- <div class="panel-header">
- <h2>{{.i18n.Tr "auth.active_your_account"}}</h2>
- </div>
- <div class="panel-content">
- {{if .IsActivatePage}}
+ <h2 class="ui top attached header">
+ {{.i18n.Tr "auth.active_your_account"}}
+ </h2>
+ <div class="ui attached segment">
+ {{if .IsActivatePage}}
{{if .ServiceNotEnabled}}
<p>{{.i18n.Tr "auth.disable_register_mail"}}</p>
{{else if .ResendLimited}}
<p>{{.i18n.Tr "auth.resent_limit_prompt"}}</p>
{{else}}
<p>{{.i18n.Tr "auth.confirmation_mail_sent_prompt" .SignedUser.Email .Hours | Str2html}}</p>
- <hr/>
- <label></label>
- <a class="btn btn-green btn-large btn-link btn-radius" href="http://{{Mail2Domain .SignedUser.Email}}">{{.i18n.Tr "auth.sign_in_email"}}</a>
+ <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}}
+ {{else}}
{{if .IsSendRegisterMail}}
<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_to_account"}}</a>
+ <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>
{{else}}
<p>{{.i18n.Tr "auth.has_unconfirmed_mail" .SignedUser.Name .SignedUser.Email | Str2html}}</p>
- <hr/>
- <label></label>
- <button class="btn btn-blue btn-large btn-radius">{{.i18n.Tr "auth.resend_mail"}}</button>
+ <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>
{{end}}
- {{end}}
+ {{end}}
</div>
- </form>
+ </form>
+ </div>
+ </div>
</div>
-{{template "ng/base/footer" .}}
+{{template "base/footer" .}}
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-27 03:08:07 +0000