diff options
| author | mrsdizzie <info@mrsdizzie.com> | 2020-01-03 12:13:22 -0500 |
|---|---|---|
| committer | Lauris BH <lauris@nix.lv> | 2020-01-03 19:13:22 +0200 |
| commit | b39fab41c8b315ba7ddf9f9a4cc522385cf9f720 (patch) | |
| tree | 19dc394a4b47c9a2306d4ee45d2524164c6e778e /templates | |
| parent | 134e3fdf3d271f1015d062c74d55e3f28f7825d6 (diff) | |
| download | gitea-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')
| -rw-r--r-- | templates/mail/issue/assigned.tmpl | 16 | ||||
| -rw-r--r-- | templates/mail/issue/default.tmpl | 15 | ||||
| -rw-r--r-- | templates/mail/notify/collaborator.tmpl | 15 |
3 files changed, 31 insertions, 15 deletions
diff --git a/templates/mail/issue/assigned.tmpl b/templates/mail/issue/assigned.tmpl index 997e2447fc..d302a16f26 100644 --- a/templates/mail/issue/assigned.tmpl +++ b/templates/mail/issue/assigned.tmpl @@ -1,17 +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>@{{.Doer.Name}} assigned you to the {{if .IsPull}}pull request{{else}}issue{{end}} <a href="{{.Link}}">#{{.Issue.Index}}</a> in repository {{.Repo}}.</p> - <p> - --- - <br> - <a href="{{.Link}}">View it on {{AppName}}</a>. - </p> - + <div class="footer"> + <p> + --- + <br> + <a href="{{.Link}}">View it on {{AppName}}</a>. + </p> + </div> </body> </html> diff --git a/templates/mail/issue/default.tmpl b/templates/mail/issue/default.tmpl index 71291c61bb..aebad09cd3 100644 --- a/templates/mail/issue/default.tmpl +++ b/templates/mail/issue/default.tmpl @@ -3,12 +3,15 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <title>{{.Subject}}</title> - {{if .ReviewComments}} + <style> - .review { padding-left: 1em; margin: 1em 0; } - .review > pre { padding: 1em; border-left: 1px solid grey; } + .footer { font-size:small; color:#666;} + {{if .ReviewComments}} + .review { padding-left: 1em; margin: 1em 0; } + .review > pre { padding: 1em; border-left: 1px solid grey; } + {{end}} </style> - {{end}} + </head> <body> @@ -18,6 +21,8 @@ Closed #{{.Issue.Index}}. {{else if eq .ActionName "reopen"}} Reopened #{{.Issue.Index}}. + {{else if eq .ActionName "merge"}} + Merged #{{.Issue.Index}} into {{.Issue.PullRequest.BaseBranch}}. {{else if eq .ActionName "approve"}} <b>@{{.Doer.Name}}</b> approved this pull request. {{else if eq .ActionName "reject"}} @@ -42,10 +47,12 @@ </div> {{end -}} </p> + <div class="footer"> <p> --- <br> <a href="{{.Link}}">View it on {{AppName}}</a>. </p> + </div> </body> </html> 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> |