Mercurial > kallithea
changeset 4383:2bb17f6f3044
notifications: improve Email bodies - especially markup of URLs
author | Mads Kiilerich <madski@unity3d.com> |
---|---|
date | Fri, 18 Jul 2014 19:22:01 +0200 |
parents | 8eeb3fa7bc05 |
children | 0529498575ce |
files | kallithea/templates/email_templates/changeset_comment.html kallithea/templates/email_templates/main.html kallithea/templates/email_templates/password_reset.html kallithea/templates/email_templates/pull_request.html kallithea/templates/email_templates/pull_request_comment.html kallithea/templates/email_templates/registration.html |
diffstat | 6 files changed, 16 insertions(+), 26 deletions(-) [+] |
line wrap: on
line diff
--- a/kallithea/templates/email_templates/changeset_comment.html Fri Jul 18 19:22:01 2014 +0200 +++ b/kallithea/templates/email_templates/changeset_comment.html Fri Jul 18 19:22:01 2014 +0200 @@ -1,16 +1,14 @@ ## -*- coding: utf-8 -*- <%inherit file="main.html"/> -<p>${_('URL')}: <a href="${cs_comment_url}">${cs_comment_url}</a></p> - -<h4>${_('%s commented on a %s changeset.') % (cs_comment_user,cs_target_repo) |n}</h4> +<p>${_('Comment from %s on %s changeset %s') % (cs_comment_user, cs_target_repo, h.short_id(raw_id))}:</p> +<p>${body}</p> %if status_change: <p>${_('The changeset status was changed to')}: <b>${status_change}</b></p> %endif -<p>${_('Comment')}:<br/> -${body} -</p> + +<p>${_('URL')}: <a href="${cs_comment_url}">${cs_comment_url}</a></p> <p>${_('Changeset')}: ${h.short_id(raw_id)}</p> <p>${_('Description')}:<br/>
--- a/kallithea/templates/email_templates/main.html Fri Jul 18 19:22:01 2014 +0200 +++ b/kallithea/templates/email_templates/main.html Fri Jul 18 19:22:01 2014 +0200 @@ -1,9 +1,6 @@ ${self.body()} - -<div> --- <br/> <br/> -<b>${_('This is a notification from Kallithea.')}</b> -</div> +--<br/> +${_("This is an automatic notification - don't reply to this mail.")}
--- a/kallithea/templates/email_templates/password_reset.html Fri Jul 18 19:22:01 2014 +0200 +++ b/kallithea/templates/email_templates/password_reset.html Fri Jul 18 19:22:01 2014 +0200 @@ -4,7 +4,5 @@ <h4>${_('Hello %s') % user}</h4> <p>${_('We received a request to create a new password for your account.')}</p> <p>${_('You can generate it by clicking following URL')}:</p> -<pre> -${reset_url} -</pre> +<p><a href="${reset_url}">${reset_url}</a></p> <p>${_("Please ignore this email if you did not request a new password .")}</p>
--- a/kallithea/templates/email_templates/pull_request.html Fri Jul 18 19:22:01 2014 +0200 +++ b/kallithea/templates/email_templates/pull_request.html Fri Jul 18 19:22:01 2014 +0200 @@ -1,18 +1,17 @@ ## -*- coding: utf-8 -*- <%inherit file="main.html"/> +<p>${_('%s requested your review of %s pull request "%s"') % (pr_user_created, repo_name, pr_title)}</p> + <p>${_('URL')}: <a href="${pr_url}">${pr_url}</a></p> -<h4>${_('%s opened a pull request for repository %s and wants you to review changes.') % (pr_user_created,pr_repo_url) |n}</h4> - -<p>${_('Title')}: <b>${pr_title}</b></p> <p>${_('Description')}:</p> <p style="white-space: pre-wrap;">${body}</p> <p>${_('Changesets')}:</p> <p style="white-space: pre-wrap;"> %for r,r_msg in pr_revisions: -<b>${h.short_id(r)}</b>: +<i>${h.short_id(r)}</i>: ${h.shorter(r_msg, 256)} %endfor
--- a/kallithea/templates/email_templates/pull_request_comment.html Fri Jul 18 19:22:01 2014 +0200 +++ b/kallithea/templates/email_templates/pull_request_comment.html Fri Jul 18 19:22:01 2014 +0200 @@ -1,17 +1,15 @@ ## -*- coding: utf-8 -*- <%inherit file="main.html"/> -<p>${_('URL')}: <a href="${pr_comment_url}">${pr_comment_url}</a></p> - -<h4>${_('%s commented on pull request "%s"') % (pr_comment_user,pr_title) |n}</h4> +<p>${_('Comment from %s on %s pull request "%s"') % (pr_comment_user, repo_name, pr_title)}:</p> +<p>${body}</p> %if status_change: %if closing_pr: - <p>${_('Pull request was closed with status')}: <b>${status_change}</b></p> + <p>${_('The comment closed the pull request with status')}: <b>${status_change}</b></p> %else: - <p>${_('Pull request changed status')}: <b>${status_change}</b></p> + <p>${_('The comment was made with status')}: <b>${status_change}</b></p> %endif %endif -<p>${_('Comment')}:</p> -<p>${body}</p> +<p>${_('URL')}: <a href="${pr_comment_url}">${pr_comment_url}</a></p>
--- a/kallithea/templates/email_templates/registration.html Fri Jul 18 19:22:01 2014 +0200 +++ b/kallithea/templates/email_templates/registration.html Fri Jul 18 19:22:01 2014 +0200 @@ -3,4 +3,4 @@ ${body} -${_('View this user here')}: ${registered_user_url} +${_('View this user here')}: <a href="${registered_user_url}">${registered_user_url}</a>