# HG changeset patch
# User Marcin Kuzminski <marcin@python-works.com>
# Date 2013-01-29 22:41:05
# Node ID 6f71e6f81c9f38d3034e2863fcf158825a8a3fc2
# Parent  32a283e5fd0dea7446c2abd3c9bc3f29d391f118

Fix bold beeing not escaped in emails and make the email form more consistent

diff --git a/rhodecode/templates/email_templates/pull_request.html b/rhodecode/templates/email_templates/pull_request.html
--- a/rhodecode/templates/email_templates/pull_request.html
+++ b/rhodecode/templates/email_templates/pull_request.html
@@ -2,9 +2,9 @@
 <%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>
-<div>${_('View this pull request here')}: ${pr_url}</div>
 <p>
 ${body}
 </p>
diff --git a/rhodecode/templates/email_templates/pull_request_comment.html b/rhodecode/templates/email_templates/pull_request_comment.html
--- a/rhodecode/templates/email_templates/pull_request_comment.html
+++ b/rhodecode/templates/email_templates/pull_request_comment.html
@@ -1,7 +1,8 @@
 ## -*- coding: utf-8 -*-
 <%inherit file="main.html"/>
 
-${_('User %s commented on pull request #%s for repository %s') % ('<b>%s</b>' % pr_comment_user ,pr_id,pr_target_repo)}
+${_('User %s commented on pull request #%s for repository %s') % ('<b>%s</b>' % pr_comment_user, pr_id, pr_target_repo) |n}
+<div>${_('View this comment here')}: ${pr_comment_url}</div>
 
 <p>
 ${body}
@@ -11,4 +12,4 @@ ${body}
 %endif
 </p>
 
-${_('View this comment here')}: ${pr_comment_url}
+