##// END OF EJS Templates
notifications: adding pre-wrap to descriptions in emails
lisaq -
r549:a7fac4dd default
parent child Browse files
Show More
@@ -1,88 +1,88 b''
1 1 ## -*- coding: utf-8 -*-
2 2 <%inherit file="base.mako"/>
3 3 <%namespace name="base" file="base.mako"/>
4 4
5 5 <%def name="subject()" filter="n,trim">
6 6 <%
7 7 data = {
8 8 'user': h.person(user),
9 9 'repo_name': repo_name,
10 10 'commit_id': h.show_id(commit),
11 11 'status': status_change,
12 12 'comment_file': comment_file,
13 13 'comment_line': comment_line,
14 14 }
15 15 %>
16 16 ${_('[mention]') if mention else ''} \
17 17
18 18 % if comment_file:
19 19 ${_('%(user)s commented on commit `%(commit_id)s` (file: `%(comment_file)s`)') % data} ${_('in the %(repo_name)s repository') % data |n}
20 20 % else:
21 21 % if status_change:
22 22 ${_('%(user)s commented on commit `%(commit_id)s` (status: %(status)s)') % data |n} ${_('in the %(repo_name)s repository') % data |n}
23 23 % else:
24 24 ${_('%(user)s commented on commit `%(commit_id)s`') % data |n} ${_('in the %(repo_name)s repository') % data |n}
25 25 % endif
26 26 % endif
27 27
28 28 </%def>
29 29
30 30 <%def name="body_plaintext()" filter="n,trim">
31 31 <%
32 32 data = {
33 33 'user': h.person(user),
34 34 'repo_name': repo_name,
35 35 'commit_id': h.show_id(commit),
36 36 'status': status_change,
37 37 'comment_file': comment_file,
38 38 'comment_line': comment_line,
39 39 }
40 40 %>
41 41 ${self.subject()}
42 42
43 43 * ${_('Comment link')}: ${commit_comment_url}
44 44
45 45 * ${_('Commit')}: ${h.show_id(commit)}
46 46
47 47 %if comment_file:
48 48 * ${_('File: %(comment_file)s on line %(comment_line)s') % {'comment_file': comment_file, 'comment_line': comment_line}}
49 49 %endif
50 50
51 51 ---
52 52
53 53 %if status_change:
54 54 ${_('Commit status was changed to')}: *${status_change}*
55 55 %endif
56 56
57 57 ${comment_body|n}
58 58
59 59 ${self.plaintext_footer()}
60 60 </%def>
61 61
62 62
63 63 <%
64 64 data = {
65 65 'user': h.person(user),
66 66 'comment_file': comment_file,
67 67 'comment_line': comment_line,
68 68 'repo': commit_target_repo,
69 69 'repo_name': repo_name,
70 70 'commit_id': h.show_id(commit),
71 71 }
72 72 %>
73 73 <table style="text-align:left;vertical-align:middle;">
74 74 <tr><td colspan="2" style="width:100%;padding-bottom:15px;border-bottom:1px solid #dbd9da;">
75 75 % if comment_file:
76 76 <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>
77 77 % else:
78 78 <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>
79 79 % endif
80 80 </td></tr>
81 81 <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>
82 <tr><td style="padding-right:20px;">${_('Description')}</td><td>${h.urlify_commit_message(commit.message, repo_name)}</td></tr>
82 <tr><td style="padding-right:20px;">${_('Description')}</td><td style="white-space:pre-wrap">${h.urlify_commit_message(commit.message, repo_name)}</td></tr>
83 83
84 84 % if status_change:
85 85 <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>
86 86 % endif
87 <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>
87 <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>
88 88 </table>
@@ -1,98 +1,98 b''
1 1 ## -*- coding: utf-8 -*-
2 2 <%inherit file="base.mako"/>
3 3 <%namespace name="base" file="base.mako"/>
4 4
5 5
6 6 <%def name="subject()" filter="n,trim">
7 7 <%
8 8 data = {
9 9 'user': h.person(user),
10 10 'pr_title': pull_request.title,
11 11 'pr_id': pull_request.pull_request_id,
12 12 'status': status_change,
13 13 'comment_file': comment_file,
14 14 'comment_line': comment_line,
15 15 }
16 16 %>
17 17
18 18 ${_('[mention]') if mention else ''} \
19 19
20 20 % if comment_file:
21 21 ${_('%(user)s commented on pull request #%(pr_id)s "%(pr_title)s" (file: `%(comment_file)s`)') % data |n}
22 22 % else:
23 23 % if status_change:
24 24 ${_('%(user)s commented on pull request #%(pr_id)s "%(pr_title)s" (status: %(status)s)') % data |n}
25 25 % else:
26 26 ${_('%(user)s commented on pull request #%(pr_id)s "%(pr_title)s"') % data |n}
27 27 % endif
28 28 % endif
29 29 </%def>
30 30
31 31 <%def name="body_plaintext()" filter="n,trim">
32 32 <%
33 33 data = {
34 34 'user': h.person(user),
35 35 'pr_title': pull_request.title,
36 36 'pr_id': pull_request.pull_request_id,
37 37 'status': status_change,
38 38 'comment_file': comment_file,
39 39 'comment_line': comment_line,
40 40 }
41 41 %>
42 42 ${self.subject()}
43 43
44 44 * ${_('Comment link')}: ${pr_comment_url}
45 45
46 46 * ${_('Source repository')}: ${pr_source_repo_url}
47 47
48 48 %if comment_file:
49 49 * ${_('File: %(comment_file)s on line %(comment_line)s') % {'comment_file': comment_file, 'comment_line': comment_line}}
50 50 %endif
51 51
52 52 ---
53 53
54 54 %if status_change and not closing_pr:
55 55 ${_('%(user)s submitted pull request #%(pr_id)s status: *%(status)s*') % data}
56 56 %elif status_change and closing_pr:
57 57 ${_('%(user)s submitted pull request #%(pr_id)s status: *%(status)s and closed*') % data}
58 58 %endif
59 59
60 60 ${comment_body|n}
61 61
62 62 ${self.plaintext_footer()}
63 63 </%def>
64 64
65 65
66 66 <%
67 67 data = {
68 68 'user': h.person(user),
69 69 'pr_title': pull_request.title,
70 70 'pr_id': pull_request.pull_request_id,
71 71 'status': status_change,
72 72 'comment_file': comment_file,
73 73 'comment_line': comment_line,
74 74 }
75 75 %>
76 76 <table style="text-align:left;vertical-align:middle;">
77 77 <tr><td colspan="2" style="width:100%;padding-bottom:15px;border-bottom:1px solid #dbd9da;">
78 78 <h4><a href="${pr_comment_url}" style="color:#427cc9;text-decoration:none;cursor:pointer">
79 79
80 80 % if comment_file:
81 81 ${_('%(user)s commented on pull request #%(pr_id)s "%(pr_title)s" (file:`%(comment_file)s`)') % data |n}
82 82 % else:
83 83 ${_('%(user)s commented on pull request #%(pr_id)s "%(pr_title)s"') % data |n}
84 84 % endif
85 85 </a>
86 86 %if status_change and not closing_pr:
87 87 , ${_('submitted pull request status: %(status)s') % data}
88 88 %elif status_change and closing_pr:
89 89 , ${_('submitted pull request status: %(status)s and closed') % data}
90 90 %endif
91 91 </h4>
92 92 </td></tr>
93 93 <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>
94 94 % if status_change:
95 95 <tr><td style="padding-right:20px;">${_('Submitted status')}</td><td>${base.status_text(status_change, tag_type=status_change_type)}</td></tr>
96 96 % endif
97 <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>
97 <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>
98 98 </table>
General Comments 0
You need to be logged in to leave comments. Login now