notifications: adding pre-wrap to descriptions in emails

rhodecode/templates/email_templates/commit_comment.mako

@@ -1,88 +1,88 b''
 ## -*- coding: utf-8 -*-
 <%inherit file="base.mako"/>
 <%namespace name="base" file="base.mako"/>
 
 <%def name="subject()" filter="n,trim">
 <%
 data = {
     'user': h.person(user),
     'repo_name': repo_name,
     'commit_id': h.show_id(commit),
     'status': status_change,
     'comment_file': comment_file,
     'comment_line': comment_line,
 }
 %>
 ${_('[mention]') if mention else ''} \
 
 % if comment_file:
     ${_('%(user)s commented on commit `%(commit_id)s` (file: `%(comment_file)s`)') % data} ${_('in the %(repo_name)s repository') % data |n}
 % else:
     % if status_change:
     ${_('%(user)s commented on commit `%(commit_id)s` (status: %(status)s)') % data |n} ${_('in the %(repo_name)s repository') % data |n}
     % else:
     ${_('%(user)s commented on commit `%(commit_id)s`') % data |n} ${_('in the %(repo_name)s repository') % data |n}
     % endif
 % endif
 
 </%def>
 
 <%def name="body_plaintext()" filter="n,trim">
 <%
 data = {
     'user': h.person(user),
     'repo_name': repo_name,
     'commit_id': h.show_id(commit),
     'status': status_change,
     'comment_file': comment_file,
     'comment_line': comment_line,
 }
 %>
 ${self.subject()}
 
 * ${_('Comment link')}: ${commit_comment_url}
 
 * ${_('Commit')}: ${h.show_id(commit)}
 
 %if comment_file:
 * ${_('File: %(comment_file)s on line %(comment_line)s') % {'comment_file': comment_file, 'comment_line': comment_line}}
 %endif
 
 ---
 
 %if status_change:
     ${_('Commit status was changed to')}: *${status_change}*
 %endif
 
 ${comment_body|n}
 
 ${self.plaintext_footer()}
 </%def>
 
 
 <%
 data = {
     'user': h.person(user),
     'comment_file': comment_file,
     'comment_line': comment_line,
     'repo': commit_target_repo,
     'repo_name': repo_name,
     'commit_id': h.show_id(commit),
 }
 %>
 <table style="text-align:left;vertical-align:middle;">
     <tr><td colspan="2" style="width:100%;padding-bottom:15px;border-bottom:1px solid #dbd9da;">
     % if comment_file:
         <h4><a href="${commit_comment_url}" style="color:#427cc9;text-decoration:none;cursor:pointer">${_('%(user)s commented on commit `%(commit_id)s` (file:`%(comment_file)s`)') % data}</a> ${_('in the %(repo)s repository') % data |n}</h4>
     % else:
         <h4><a href="${commit_comment_url}" style="color:#427cc9;text-decoration:none;cursor:pointer">${_('%(user)s commented on commit `%(commit_id)s`') % data |n}</a> ${_('in the %(repo)s repository') % data |n}</h4>
     % endif
     </td></tr>
     <tr><td style="padding-right:20px;padding-top:15px;">${_('Commit')}</td><td style="padding-top:15px;"><a href="${commit_comment_url}" style="color:#427cc9;text-decoration:none;cursor:pointer">${h.show_id(commit)}</a></td></tr>
-    <tr><td style="padding-right:20px;">${_('Description')}</td><td>${h.urlify_commit_message(commit.message, repo_name)}</td></tr>
+    <tr><td style="padding-right:20px;">${_('Description')}</td><td style="white-space:pre-wrap">${h.urlify_commit_message(commit.message, repo_name)}</td></tr>
 
     % if status_change:
         <tr><td style="padding-right:20px;">${_('Status')}</td><td>${_('The commit status was changed to')}: ${base.status_text(status_change, tag_type=status_change_type)}</td></tr>
     % endif
-    <tr><td style="padding-right:20px;">${(_('Comment on line: %(comment_line)s') if comment_file else _('Comment')) % data}</td><td style="line-height:1.2em;">${h.render(comment_body, renderer=renderer_type, mentions=True)}</td></tr>
+    <tr><td style="padding-right:20px;">${(_('Comment on line: %(comment_line)s') if comment_file else _('Comment')) % data}</td><td style="line-height:1.2em;white-space:pre-wrap">${h.render(comment_body, renderer=renderer_type, mentions=True)}</td></tr>
 </table>

rhodecode/templates/email_templates/pull_request_comment.mako

@@ -1,98 +1,98 b''
 ## -*- coding: utf-8 -*-
 <%inherit file="base.mako"/>
 <%namespace name="base" file="base.mako"/>
 
 
 <%def name="subject()" filter="n,trim">
 <%
 data = {
     'user': h.person(user),
     'pr_title': pull_request.title,
     'pr_id': pull_request.pull_request_id,
     'status': status_change,
     'comment_file': comment_file,
     'comment_line': comment_line,
 }
 %>
 
 ${_('[mention]') if mention else ''} \
 
 % if comment_file:
     ${_('%(user)s commented on pull request #%(pr_id)s "%(pr_title)s" (file: `%(comment_file)s`)') % data |n}
 % else:
     % if status_change:
     ${_('%(user)s commented on pull request #%(pr_id)s "%(pr_title)s" (status: %(status)s)') % data |n}
     % else:
     ${_('%(user)s commented on pull request #%(pr_id)s "%(pr_title)s"') % data |n}
     % endif
 % endif
 </%def>
 
 <%def name="body_plaintext()" filter="n,trim">
 <%
 data = {
     'user': h.person(user),
     'pr_title': pull_request.title,
     'pr_id': pull_request.pull_request_id,
     'status': status_change,
     'comment_file': comment_file,
     'comment_line': comment_line,
 }
 %>
 ${self.subject()}
 
 * ${_('Comment link')}: ${pr_comment_url}
 
 * ${_('Source repository')}: ${pr_source_repo_url}
 
 %if comment_file:
 * ${_('File: %(comment_file)s on line %(comment_line)s') % {'comment_file': comment_file, 'comment_line': comment_line}}
 %endif
 
 ---
 
 %if status_change and not closing_pr:
    ${_('%(user)s submitted pull request #%(pr_id)s status: *%(status)s*') % data}
 %elif status_change and closing_pr:
    ${_('%(user)s submitted pull request #%(pr_id)s status: *%(status)s and closed*') % data}
 %endif
 
 ${comment_body|n}
 
 ${self.plaintext_footer()}
 </%def>
 
 
 <%
 data = {
     'user': h.person(user),
     'pr_title': pull_request.title,
     'pr_id': pull_request.pull_request_id,
     'status': status_change,
     'comment_file': comment_file,
     'comment_line': comment_line,
 }
 %>
 <table style="text-align:left;vertical-align:middle;">
     <tr><td colspan="2" style="width:100%;padding-bottom:15px;border-bottom:1px solid #dbd9da;">
     <h4><a href="${pr_comment_url}" style="color:#427cc9;text-decoration:none;cursor:pointer">
 
     % if comment_file:
         ${_('%(user)s commented on pull request #%(pr_id)s "%(pr_title)s" (file:`%(comment_file)s`)') % data |n}
     % else:
         ${_('%(user)s commented on pull request #%(pr_id)s "%(pr_title)s"') % data |n}
     % endif
     </a>
     %if status_change and not closing_pr:
        , ${_('submitted pull request status: %(status)s') % data}
     %elif status_change and closing_pr:
        , ${_('submitted pull request status: %(status)s and closed') % data}
     %endif
     </h4>
     </td></tr>
     <tr><td style="padding-right:20px;padding-top:15px;">${_('Source')}</td><td style="padding-top:15px;"><a style="color:#427cc9;text-decoration:none;cursor:pointer" href="${pr_source_repo_url}">${pr_source_repo.repo_name}</a></td></tr>
     % if status_change:
         <tr><td style="padding-right:20px;">${_('Submitted status')}</td><td>${base.status_text(status_change, tag_type=status_change_type)}</td></tr>
     % endif
-    <tr><td style="padding-right:20px;">${(_('Comment on line: %(comment_line)s') if comment_file else _('Comment')) % data}</td><td style="line-height:1.2em;">${h.render(comment_body, renderer=renderer_type, mentions=True)}</td></tr>
+    <tr><td style="padding-right:20px;">${(_('Comment on line: %(comment_line)s') if comment_file else _('Comment')) % data}</td><td style="line-height:1.2em;white-space:pre-wrap">${h.render(comment_body, renderer=renderer_type, mentions=True)}</td></tr>
 </table>