Mercurial > kallithea
changeset 3780:1de8abd9a4e1 beta
emails: try to improve wording and layout - 1st iteration
author | Mads Kiilerich <madski@unity3d.com> |
---|---|
date | Thu, 04 Apr 2013 12:12:38 +0200 |
parents | e61a656b44bd |
children | 40d50bb7cf2f |
files | rhodecode/model/comment.py rhodecode/templates/email_templates/changeset_comment.html rhodecode/templates/email_templates/password_reset.html rhodecode/templates/email_templates/pull_request.html rhodecode/templates/email_templates/pull_request_comment.html rhodecode/templates/email_templates/registration.html |
diffstat | 6 files changed, 38 insertions(+), 40 deletions(-) [+] |
line wrap: on
line diff
--- a/rhodecode/model/comment.py Wed Apr 03 15:56:12 2013 +0200 +++ b/rhodecode/model/comment.py Thu Apr 04 12:12:38 2013 +0200 @@ -91,7 +91,7 @@ {'desc': desc, 'line': line}, _url) ) - email_subject = 'User %s commented on changeset %s' % \ + email_subject = '%s commented on changeset %s' % \ (user.username, h.short_id(revision)) # get the current participants of this changeset recipients = ChangesetComment.get_users(revision=revision) @@ -127,7 +127,7 @@ 'line': line}, _url) ) - email_subject = 'User %s commented on pull request #%s' % \ + email_subject = '%s commented on pull request #%s' % \ (user.username, comment.pull_request.pull_request_id) # get the current participants of this pull request recipients = ChangesetComment.get_users(pull_request_id= @@ -140,6 +140,7 @@ #set some variables for email notification email_kwargs = { + 'pr_title': pull_request.title, 'pr_id': pull_request.pull_request_id, 'status_change': status_change, 'closing_pr': closing_pr,
--- a/rhodecode/templates/email_templates/changeset_comment.html Wed Apr 03 15:56:12 2013 +0200 +++ b/rhodecode/templates/email_templates/changeset_comment.html Thu Apr 04 12:12:38 2013 +0200 @@ -1,17 +1,18 @@ ## -*- coding: utf-8 -*- <%inherit file="main.html"/> -##message from user goes here -<p> -${cs_comment_user}: <br/> + +<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>${_('Changeset')}: ${h.short_id(raw_id)}</p> +<p>${_('Description')}:<br/> +${h.shorter(message, 256)} +</p> + +%if status_change: + <p>${_('The changeset status was changed to')}: <b>${status_change}</b></p> +%endif +<p>${_('Comment')}:<br/> ${body} </p> -%if status_change: - <span>${_('New status')} -> ${status_change}</span> -%endif -<div>${_('View this comment here')}: ${cs_comment_url}</div> - -<pre> -${_('Repo')}: ${cs_target_repo} -${_('Changeset')}: ${h.short_id(raw_id)} -${_('desc')}: ${h.shorter(message, 256)} -</pre>
--- a/rhodecode/templates/email_templates/password_reset.html Wed Apr 03 15:56:12 2013 +0200 +++ b/rhodecode/templates/email_templates/password_reset.html Thu Apr 04 12:12:38 2013 +0200 @@ -2,10 +2,9 @@ <%inherit file="main.html"/> <h4>${_('Hello %s') % user}</h4> -<div>${_('We received a request to create a new password for your account.')}</div> -<div>${_('You can generate it by clicking following URL')}:</div> +<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> -<br/> -${_("If you did not request new password please ignore this email.")} +<p>${_("Please ignore this email if you did not request a new password .")}</p>
--- a/rhodecode/templates/email_templates/pull_request.html Wed Apr 03 15:56:12 2013 +0200 +++ b/rhodecode/templates/email_templates/pull_request.html Thu Apr 04 12:12:38 2013 +0200 @@ -1,18 +1,19 @@ ## -*- coding: utf-8 -*- <%inherit file="main.html"/> -${_('User %s opened pull request for repository %s and wants you to review changes.') % (('<b>%s</b>' % pr_user_created),pr_repo_url) |n} -<div>${_('View this pull request here')}: ${pr_url}</div> -<div>${_('title')}: ${pr_title}</div> -<div>${_('description')}:</div> -<p> -${body} -</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> -<div>${_('revisions for reviewing')}</div> +<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>: ${h.shorter(r_msg, 256)} + %endfor </p>
--- a/rhodecode/templates/email_templates/pull_request_comment.html Wed Apr 03 15:56:12 2013 +0200 +++ b/rhodecode/templates/email_templates/pull_request_comment.html Thu Apr 04 12:12:38 2013 +0200 @@ -1,18 +1,17 @@ ## -*- coding: utf-8 -*- <%inherit file="main.html"/> -${_('Pull request #%s for repository %s') % (pr_id, pr_target_repo) |n} -##message from user goes here -<p> -${pr_comment_user}: <br/> -${body} -</p> -<div>${_('View this comment here')}: ${pr_comment_url}</div> + +<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> %if status_change: %if closing_pr: - <span>${_('Closing pull request with status')} -> ${status_change}</span> + <p>${_('Pull request was closed with status')}: <b>${status_change}</b></p> %else: - <span>${_('New status')} -> ${status_change}</span> + <p>${_('Pull request changed status')}: <b>${status_change}</b></p> %endif %endif -</p> + +<p>${_('Comment')}:</p> +<p>${body}</p>
--- a/rhodecode/templates/email_templates/registration.html Wed Apr 03 15:56:12 2013 +0200 +++ b/rhodecode/templates/email_templates/registration.html Thu Apr 04 12:12:38 2013 +0200 @@ -1,9 +1,6 @@ ## -*- coding: utf-8 -*- <%inherit file="main.html"/> -${_('A new user have registered in RhodeCode')} - ${body} - ${_('View this user here')}: ${registered_user_url}