summaryrefslogtreecommitdiffstats
path: root/templates
diff options
context:
space:
mode:
authorUnknwon <u@gogs.io>2016-07-16 00:36:39 +0800
committerUnknwon <u@gogs.io>2016-07-16 00:36:39 +0800
commitf1b8d52eb3ac230ed5a275f4a844ddb0cf48041e (patch)
tree51dda05a9fb7a985a4e91f3e1708ffddf3fee19c /templates
parent7ca5f8f119593023809e6130db75154597c52426 (diff)
downloadgitea-f1b8d52eb3ac230ed5a275f4a844ddb0cf48041e.tar.gz
gitea-f1b8d52eb3ac230ed5a275f4a844ddb0cf48041e.zip
#2854 fix no mail notification when issue is closed/reopened
Diffstat (limited to 'templates')
-rw-r--r--templates/mail/auth/activate.tmpl8
-rw-r--r--templates/mail/auth/activate_email.tmpl10
-rw-r--r--templates/mail/auth/register_notify.tmpl10
-rw-r--r--templates/mail/auth/reset_passwd.tmpl10
-rw-r--r--templates/mail/issue/comment.tmpl (renamed from templates/mail/notify/mention.tmpl)5
-rw-r--r--templates/mail/issue/mention.tmpl17
-rw-r--r--templates/mail/notify/collaborator.tmpl4
7 files changed, 40 insertions, 24 deletions
diff --git a/templates/mail/auth/activate.tmpl b/templates/mail/auth/activate.tmpl
index dfbc3ba86b..f03c165694 100644
--- a/templates/mail/auth/activate.tmpl
+++ b/templates/mail/auth/activate.tmpl
@@ -2,14 +2,14 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <title>{{.User.Name}}, please activate your account</title>
+ <title>{{.Username}}, please activate your account</title>
</head>
<body>
- <p>Hi <b>{{.User.Name}}</b>, thanks for registering at {{.AppName}}!</p>
+ <p>Hi <b>{{.Username}}</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><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>
+ <p>© 2016 <a target="_blank" href="{{AppUrl}}">{{AppName}}</a></p>
</body>
</html>
diff --git a/templates/mail/auth/activate_email.tmpl b/templates/mail/auth/activate_email.tmpl
index 73d7f616ef..65cb5045b3 100644
--- a/templates/mail/auth/activate_email.tmpl
+++ b/templates/mail/auth/activate_email.tmpl
@@ -2,14 +2,14 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <title>{{.User.Name}}, please verify your e-mail address</title>
+ <title>{{.Username}}, please verify your e-mail address</title>
</head>
<body>
- <p>Hi <b>{{.User.Name}}</b>,</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_email?code={{.Code}}&email={{.Email}}">{{.AppUrl}}user/activate_email?code={{.Code}}&email={{.Email}}</a></p>
+ <p>Hi <b>{{.Username}}</b>,</p>
+ <p>Please click the following link to verify your email address within <b>{{.ActiveCodeLives}} hours</b>:</p>
+ <p><a href="{{AppUrl}}user/activate_email?code={{.Code}}&email={{.Email}}">{{AppUrl}}user/activate_email?code={{.Code}}&email={{.Email}}</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>
+ <p>© 2016 <a target="_blank" href="{{AppUrl}}">{{AppName}}</a></p>
</body>
</html>
diff --git a/templates/mail/auth/register_notify.tmpl b/templates/mail/auth/register_notify.tmpl
index 864ed55acd..75a4356459 100644
--- a/templates/mail/auth/register_notify.tmpl
+++ b/templates/mail/auth/register_notify.tmpl
@@ -2,13 +2,13 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <title>{{.User.Name}}, welcome to {{.AppName}}</title>
+ <title>{{.Username}}, welcome to {{AppName}}</title>
</head>
<body>
- <p>Hi <b>{{.User.Name}}</b>, this is your registration confirmation email for {{.AppName}}!</p>
- <p>You can now login via username: {{.User.Name}}.</p>
- <p><a href="{{.AppUrl}}user/login">{{.AppUrl}}user/login</a></p>
- <p>© 2015 <a target="_blank" href="http://gogs.io">Gogs: Go Git Service</a></p>
+ <p>Hi <b>{{.Username}}</b>, this is your registration confirmation email for {{AppName}}!</p>
+ <p>You can now login via username: {{.Username}}.</p>
+ <p><a href="{{AppUrl}}user/login">{{AppUrl}}user/login</a></p>
+ <p>© 2016 <a target="_blank" href="{{AppUrl}}">{{AppName}}</a></p>
</body>
</html>
diff --git a/templates/mail/auth/reset_passwd.tmpl b/templates/mail/auth/reset_passwd.tmpl
index eb29477828..aae0558052 100644
--- a/templates/mail/auth/reset_passwd.tmpl
+++ b/templates/mail/auth/reset_passwd.tmpl
@@ -2,14 +2,14 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <title>{{.User.Name}}, you have requested to reset your password</title>
+ <title>{{.Username}}, you have requested to reset your password</title>
</head>
<body>
- <p>Hi <b>{{.User.Name}}</b>,</p>
- <p>Please click the following link to verify your e-mail address within <b>{{.ActiveCodeLives}} hours</b>:</p>
- <p><a href="{{.AppUrl}}user/reset_password?code={{.Code}}">{{.AppUrl}}user/reset_password?code={{.Code}}</a></p>
+ <p>Hi <b>{{.Username}}</b>,</p>
+ <p>Please click the following link to verify your email address within <b>{{.ResetPwdCodeLives}} hours</b>:</p>
+ <p><a href="{{AppUrl}}user/reset_password?code={{.Code}}">{{AppUrl}}user/reset_password?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>
+ <p>© 2016 <a target="_blank" href="{{AppUrl}}">{{AppName}}</a></p>
</body>
</html>
diff --git a/templates/mail/notify/mention.tmpl b/templates/mail/issue/comment.tmpl
index 048a0c9c1c..5dabb51950 100644
--- a/templates/mail/notify/mention.tmpl
+++ b/templates/mail/issue/comment.tmpl
@@ -6,12 +6,11 @@
</head>
<body>
- <p>@{{.ActUserName}} mentioned you:</p>
- <p>{{.Content | Str2html}}</p>
+ <p>{{.Body | Str2html}}</p>
<p>
---
<br>
- <a href="{{.AppUrl}}{{.IssueLink}}">View it on Gogs</a>.
+ <a href="{{.Link}}">View it on Gogs</a>.
</p>
</body>
</html>
diff --git a/templates/mail/issue/mention.tmpl b/templates/mail/issue/mention.tmpl
new file mode 100644
index 0000000000..53ff367e24
--- /dev/null
+++ b/templates/mail/issue/mention.tmpl
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <title>{{.Subject}}</title>
+</head>
+
+<body>
+ <p>@{{.Doer.Name}} mentioned you:</p>
+ <p>{{.Body | Str2html}}</p>
+ <p>
+ ---
+ <br>
+ <a href="{{.Link}}">View it on Gogs</a>.
+ </p>
+</body>
+</html> \ No newline at end of file
diff --git a/templates/mail/notify/collaborator.tmpl b/templates/mail/notify/collaborator.tmpl
index a4748093ad..63d5637183 100644
--- a/templates/mail/notify/collaborator.tmpl
+++ b/templates/mail/notify/collaborator.tmpl
@@ -6,11 +6,11 @@
</head>
<body>
- <p>You are now a collaborator of this repository.</p>
+ <p>You have been added as a collaborator of repository: <code>{{.RepoName}}</code></p>
<p>
---
<br>
- View it on Gogs: <a href="{{.AppUrl}}{{.RepoLink}}">{{.RepoLink}}</a>
+ <a href="{{.Link}}">View it on Gogs</a>.
</p>
</body>
</html>
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-25 05:18:14 +0000