summaryrefslogtreecommitdiffstats
path: root/templates/mail/notify
diff options
context:
space:
mode:
authormrsdizzie <info@mrsdizzie.com>2020-01-03 12:13:22 -0500
committerLauris BH <lauris@nix.lv>2020-01-03 19:13:22 +0200
commitb39fab41c8b315ba7ddf9f9a4cc522385cf9f720 (patch)
tree19dc394a4b47c9a2306d4ee45d2524164c6e778e /templates/mail/notify
parent134e3fdf3d271f1015d062c74d55e3f28f7825d6 (diff)
downloadgitea-b39fab41c8b315ba7ddf9f9a4cc522385cf9f720.tar.gz
gitea-b39fab41c8b315ba7ddf9f9a4cc522385cf9f720.zip
Some more e-mail notification fixes (#9596)
* Some more e-mail notification fixes A few more small e-mail notification fixes/changes * Style footer of notification email to be smaller * Include text for when pull request is merged * Don't include original body of issue or PR when merging/closing by setting issue.Content to "" in these cases * Set Re: prefix and meessage-ID headers based on actName instead of checking for a comment. This fixes a bug where certain actions that didn't have a comment were setting Message-ID instead of In-Reply-To which caused some mail programs not to show those messages as they would have had the same Message-ID as a previous message. Also fixes the case where a final comment and closing message would have been displayed out of order if you didn't have a copy of the original issue/pr cretion message. * Update other template footers for consistency
Diffstat (limited to 'templates/mail/notify')
-rw-r--r--templates/mail/notify/collaborator.tmpl15
1 files changed, 10 insertions, 5 deletions
diff --git a/templates/mail/notify/collaborator.tmpl b/templates/mail/notify/collaborator.tmpl
index 4bbf40bbc4..947b404399 100644
--- a/templates/mail/notify/collaborator.tmpl
+++ b/templates/mail/notify/collaborator.tmpl
@@ -1,16 +1,21 @@
<!DOCTYPE html>
<html>
<head>
+ <style>
+ .footer { font-size:small; color:#666;}
+ </style>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>{{.Subject}}</title>
</head>
<body>
<p>You have been added as a collaborator of repository: <code>{{.RepoName}}</code></p>
- <p>
- ---
- <br>
- <a href="{{.Link}}">View it on Gitea</a>.
- </p>
+ <div class="footer">
+ <p>
+ ---
+ <br>
+ <a href="{{.Link}}">View it on {{AppName}}</a>.
+ </p>
+ </div>
</body>
</html>