##// END OF EJS Templates
rhodecode-enterprise-ce
RSS
emails: expose inline/general next to comment type.
dan -
r4052:23a700f2 default
parent child Browse files
Show More
Show file before | Show file after | Hide comments
@@ -1,170 +1,170 b''
1 1 ## -*- coding: utf-8 -*-
2 2 <%inherit file="base.mako"/>
3 3 <%namespace name="base" file="base.mako"/>
4 4
5 5 ## EMAIL SUBJECT
6 6 <%def name="subject()" filter="n,trim,whitespace_filter">
7 7 <%
8 8 data = {
9 9 'user': '@'+h.person(user),
10 10 'repo_name': repo_name,
11 11 'status': status_change,
12 12 'comment_file': comment_file,
13 13 'comment_line': comment_line,
14 14 'comment_type': comment_type,
15 15 'comment_id': comment_id,
16 16
17 17 'commit_id': h.show_id(commit),
18 18 }
19 19 %>
20 20
21 21
22 22 % if comment_file:
23 23 ${(_('[mention]') if mention else '')} ${_('{user} left a {comment_type} on file `{comment_file}` in commit `{commit_id}`').format(**data)} ${_('in the `{repo_name}` repository').format(**data) |n}
24 24 % else:
25 25 % if status_change:
26 26 ${(_('[mention]') if mention else '')} ${_('[status: {status}] {user} left a {comment_type} on commit `{commit_id}`').format(**data) |n} ${_('in the `{repo_name}` repository').format(**data) |n}
27 27 % else:
28 28 ${(_('[mention]') if mention else '')} ${_('{user} left a {comment_type} on commit `{commit_id}`').format(**data) |n} ${_('in the `{repo_name}` repository').format(**data) |n}
29 29 % endif
30 30 % endif
31 31
32 32 </%def>
33 33
34 34 ## PLAINTEXT VERSION OF BODY
35 35 <%def name="body_plaintext()" filter="n,trim">
36 36 <%
37 37 data = {
38 38 'user': h.person(user),
39 39 'repo_name': repo_name,
40 40 'status': status_change,
41 41 'comment_file': comment_file,
42 42 'comment_line': comment_line,
43 43 'comment_type': comment_type,
44 44 'comment_id': comment_id,
45 45
46 46 'commit_id': h.show_id(commit),
47 47 }
48 48 %>
49 49
50 * ${_('Comment link')}: ${commit_comment_url}
50 * ${('Inline' if comment_file else 'General')} ${_('Comment link')}: ${commit_comment_url}
51 51
52 52 %if status_change:
53 53 * ${_('Commit status')}: ${_('Status was changed to')}: *${status_change}*
54 54
55 55 %endif
56 56 * ${_('Commit')}: ${h.show_id(commit)}
57 57
58 58 * ${_('Commit message')}: ${commit.message}
59 59
60 60 %if comment_file:
61 61 * ${_('File: {comment_file} on line {comment_line}').format(**data)}
62 62
63 63 %endif
64 64 % if comment_type == 'todo':
65 65 ${_('`TODO` comment')}:
66 66 % else:
67 67 ${_('`Note` comment')}:
68 68 % endif
69 69
70 70 ${comment_body |n, trim}
71 71
72 72 ---
73 73 ${self.plaintext_footer()}
74 74 </%def>
75 75
76 76
77 77 <%
78 78 data = {
79 79 'user': h.person(user),
80 80 'comment_file': comment_file,
81 81 'comment_line': comment_line,
82 82 'comment_type': comment_type,
83 83 'comment_id': comment_id,
84 84 'renderer_type': renderer_type or 'plain',
85 85
86 86 'repo': commit_target_repo_url,
87 87 'repo_name': repo_name,
88 88 'commit_id': h.show_id(commit),
89 89 }
90 90 %>
91 91
92 92 <table style="text-align:left;vertical-align:middle;width: 100%">
93 93 <tr>
94 94 <td style="width:100%;border-bottom:1px solid #dbd9da;">
95 95
96 96 <h4 style="margin: 0">
97 97 <div style="margin-bottom: 4px; color:#7E7F7F">
98 98 @${h.person(user.username)}
99 99 </div>
100 100 ${_('left a')}
101 101 <a href="${commit_comment_url}" style="${base.link_css()}">
102 102 % if comment_file:
103 103 ${_('{comment_type} on file `{comment_file}` in commit.').format(**data)}
104 104 % else:
105 105 ${_('{comment_type} on commit.').format(**data) |n}
106 106 % endif
107 107 </a>
108 108 <div style="margin-top: 10px"></div>
109 109 ${_('Commit')} <code>${data['commit_id']}</code> ${_('of repository')}: ${data['repo_name']}
110 110 </h4>
111 111
112 112 </td>
113 113 </tr>
114 114
115 115 </table>
116 116
117 117 <table style="text-align:left;vertical-align:middle;width: 100%">
118 118
119 119 ## spacing def
120 120 <tr>
121 121 <td style="width: 130px"></td>
122 122 <td></td>
123 123 </tr>
124 124
125 125 % if status_change:
126 126 <tr>
127 127 <td style="padding-right:20px;">${_('Commit Status')}:</td>
128 128 <td>
129 129 ${_('Status was changed to')}: ${base.status_text(status_change, tag_type=status_change_type)}
130 130 </td>
131 131 </tr>
132 132 % endif
133 133
134 134 <tr>
135 135 <td style="padding-right:20px;">${_('Commit')}:</td>
136 136 <td>
137 137 <a href="${commit_comment_url}" style="${base.link_css()}">${h.show_id(commit)}</a>
138 138 </td>
139 139 </tr>
140 140 <tr>
141 141 <td style="padding-right:20px;">${_('Commit message')}:</td>
142 142 <td style="white-space:pre-wrap">${h.urlify_commit_message(commit.message, repo_name)}</td>
143 143 </tr>
144 144
145 145 % if comment_file:
146 146 <tr>
147 147 <td style="padding-right:20px;">${_('File')}:</td>
148 148 <td><a href="${commit_comment_url}" style="${base.link_css()}">${_('`{comment_file}` on line {comment_line}').format(**data)}</a></td>
149 149 </tr>
150 150 % endif
151 151
152 152 <tr style="border-bottom:1px solid #dbd9da;">
153 153 <td colspan="2" style="padding-right:20px;">
154 154 % if comment_type == 'todo':
155 ${_('`TODO` number')} ${comment_id}:
155 ${('Inline' if comment_file else 'General')} ${_('`TODO` number')} ${comment_id}:
156 156 % else:
157 ${_('`Note` number')} ${comment_id}:
157 ${('Inline' if comment_file else 'General')} ${_('`Note` number')} ${comment_id}:
158 158 % endif
159 159 </td>
160 160 </tr>
161 161
162 162 <tr>
163 163 <td colspan="2" style="background: #F7F7F7">${h.render(comment_body, renderer=data['renderer_type'], mentions=True)}</td>
164 164 </tr>
165 165
166 166 <tr>
167 167 <td><a href="${commit_comment_reply_url}">${_('Reply')}</a></td>
168 168 <td></td>
169 169 </tr>
170 170 </table>
Show file before | Show file after | Hide comments
@@ -1,200 +1,200 b''
1 1 ## -*- coding: utf-8 -*-
2 2 <%inherit file="base.mako"/>
3 3 <%namespace name="base" file="base.mako"/>
4 4
5 5 ## EMAIL SUBJECT
6 6 <%def name="subject()" filter="n,trim,whitespace_filter">
7 7 <%
8 8 data = {
9 9 'user': '@'+h.person(user),
10 10 'repo_name': repo_name,
11 11 'status': status_change,
12 12 'comment_file': comment_file,
13 13 'comment_line': comment_line,
14 14 'comment_type': comment_type,
15 15 'comment_id': comment_id,
16 16
17 17 'pr_title': pull_request.title,
18 18 'pr_id': pull_request.pull_request_id,
19 19 }
20 20 %>
21 21
22 22
23 23 % if comment_file:
24 24 ${(_('[mention]') if mention else '')} ${_('{user} left a {comment_type} on file `{comment_file}` in pull request !{pr_id}: "{pr_title}"').format(**data) |n}
25 25 % else:
26 26 % if status_change:
27 27 ${(_('[mention]') if mention else '')} ${_('[status: {status}] {user} left a {comment_type} on pull request !{pr_id}: "{pr_title}"').format(**data) |n}
28 28 % else:
29 29 ${(_('[mention]') if mention else '')} ${_('{user} left a {comment_type} on pull request !{pr_id}: "{pr_title}"').format(**data) |n}
30 30 % endif
31 31 % endif
32 32
33 33 </%def>
34 34
35 35 ## PLAINTEXT VERSION OF BODY
36 36 <%def name="body_plaintext()" filter="n,trim">
37 37 <%
38 38 data = {
39 39 'user': h.person(user),
40 40 'repo_name': repo_name,
41 41 'status': status_change,
42 42 'comment_file': comment_file,
43 43 'comment_line': comment_line,
44 44 'comment_type': comment_type,
45 45 'comment_id': comment_id,
46 46
47 47 'pr_title': pull_request.title,
48 48 'pr_id': pull_request.pull_request_id,
49 49 'source_ref_type': pull_request.source_ref_parts.type,
50 50 'source_ref_name': pull_request.source_ref_parts.name,
51 51 'target_ref_type': pull_request.target_ref_parts.type,
52 52 'target_ref_name': pull_request.target_ref_parts.name,
53 53 'source_repo': pull_request_source_repo.repo_name,
54 54 'target_repo': pull_request_target_repo.repo_name,
55 55 'source_repo_url': pull_request_source_repo_url,
56 56 'target_repo_url': pull_request_target_repo_url,
57 57 }
58 58 %>
59 59
60 60 ${h.literal(_('Pull request !{pr_id}: `{pr_title}`').format(**data))}
61 61
62 62 * ${h.literal(_('Commit flow: {source_ref_type}:{source_ref_name} of {source_repo_url} into {target_ref_type}:{target_ref_name} of {target_repo_url}').format(**data))}
63 63
64 * ${_('Comment link')}: ${pr_comment_url}
64 * ${('Inline' if comment_file else 'General')} ${_('Comment link')}: ${pr_comment_url}
65 65
66 66 %if status_change and not closing_pr:
67 67 * ${_('{user} submitted pull request !{pr_id} status: *{status}*').format(**data)}
68 68
69 69 %elif status_change and closing_pr:
70 70 * ${_('{user} submitted pull request !{pr_id} status: *{status} and closed*').format(**data)}
71 71
72 72 %endif
73 73 %if comment_file:
74 74 * ${_('File: {comment_file} on line {comment_line}').format(**data)}
75 75
76 76 %endif
77 77 % if comment_type == 'todo':
78 78 ${_('`TODO` comment')}:
79 79 % else:
80 80 ${_('`Note` comment')}:
81 81 % endif
82 82
83 83 ${comment_body |n, trim}
84 84
85 85 ---
86 86 ${self.plaintext_footer()}
87 87 </%def>
88 88
89 89
90 90 <%
91 91 data = {
92 92 'user': h.person(user),
93 93 'comment_file': comment_file,
94 94 'comment_line': comment_line,
95 95 'comment_type': comment_type,
96 96 'comment_id': comment_id,
97 97 'renderer_type': renderer_type or 'plain',
98 98
99 99 'pr_title': pull_request.title,
100 100 'pr_id': pull_request.pull_request_id,
101 101 'status': status_change,
102 102 'source_ref_type': pull_request.source_ref_parts.type,
103 103 'source_ref_name': pull_request.source_ref_parts.name,
104 104 'target_ref_type': pull_request.target_ref_parts.type,
105 105 'target_ref_name': pull_request.target_ref_parts.name,
106 106 'source_repo': pull_request_source_repo.repo_name,
107 107 'target_repo': pull_request_target_repo.repo_name,
108 108 'source_repo_url': h.link_to(pull_request_source_repo.repo_name, pull_request_source_repo_url),
109 109 'target_repo_url': h.link_to(pull_request_target_repo.repo_name, pull_request_target_repo_url),
110 110 }
111 111 %>
112 112
113 113 <table style="text-align:left;vertical-align:middle;width: 100%">
114 114 <tr>
115 115 <td style="width:100%;border-bottom:1px solid #dbd9da;">
116 116
117 117 <h4 style="margin: 0">
118 118 <div style="margin-bottom: 4px; color:#7E7F7F">
119 119 @${h.person(user.username)}
120 120 </div>
121 121 ${_('left a')}
122 122 <a href="${pr_comment_url}" style="${base.link_css()}">
123 123 % if comment_file:
124 124 ${_('{comment_type} on file `{comment_file}` in pull request.').format(**data)}
125 125 % else:
126 126 ${_('{comment_type} on pull request.').format(**data) |n}
127 127 % endif
128 128 </a>
129 129 <div style="margin-top: 10px"></div>
130 130 ${_('Pull request')} <code>!${data['pr_id']}: ${data['pr_title']}</code>
131 131 </h4>
132 132
133 133 </td>
134 134 </tr>
135 135
136 136 </table>
137 137
138 138 <table style="text-align:left;vertical-align:middle;width: 100%">
139 139
140 140 ## spacing def
141 141 <tr>
142 142 <td style="width: 130px"></td>
143 143 <td></td>
144 144 </tr>
145 145
146 146 % if status_change:
147 147 <tr>
148 148 <td style="padding-right:20px;">${_('Review Status')}:</td>
149 149 <td>
150 150 % if closing_pr:
151 151 ${_('Closed pull request with status')}: ${base.status_text(status_change, tag_type=status_change_type)}
152 152 % else:
153 153 ${_('Submitted review status')}: ${base.status_text(status_change, tag_type=status_change_type)}
154 154 % endif
155 155 </td>
156 156 </tr>
157 157 % endif
158 158
159 159 <tr>
160 160 <td style="padding-right:20px;line-height:20px;">${_('Commit Flow')}:</td>
161 161 <td style="line-height:20px;">
162 162 ${base.tag_button('{}:{}'.format(data['source_ref_type'], pull_request.source_ref_parts.name))} ${_('of')} ${data['source_repo_url']}
163 163 &rarr;
164 164 ${base.tag_button('{}:{}'.format(data['target_ref_type'], pull_request.target_ref_parts.name))} ${_('of')} ${data['target_repo_url']}
165 165 </td>
166 166 </tr>
167 167 <tr>
168 168 <td style="padding-right:20px;">${_('Pull request')}:</td>
169 169 <td>
170 170 <a href="${pull_request_url}" style="${base.link_css()}">
171 171 !${pull_request.pull_request_id}
172 172 </a>
173 173 </td>
174 174 </tr>
175 175 % if comment_file:
176 176 <tr>
177 177 <td style="padding-right:20px;">${_('File')}:</td>
178 178 <td><a href="${pr_comment_url}" style="${base.link_css()}">${_('`{comment_file}` on line {comment_line}').format(**data)}</a></td>
179 179 </tr>
180 180 % endif
181 181
182 182 <tr style="border-bottom:1px solid #dbd9da;">
183 183 <td colspan="2" style="padding-right:20px;">
184 184 % if comment_type == 'todo':
185 ${_('`TODO` number')} ${comment_id}:
185 ${('Inline' if comment_file else 'General')} ${_('`TODO` number')} ${comment_id}:
186 186 % else:
187 ${_('`Note` number')} ${comment_id}:
187 ${('Inline' if comment_file else 'General')} ${_('`Note` number')} ${comment_id}:
188 188 % endif
189 189 </td>
190 190 </tr>
191 191
192 192 <tr>
193 193 <td colspan="2" style="background: #F7F7F7">${h.render(comment_body, renderer=data['renderer_type'], mentions=True)}</td>
194 194 </tr>
195 195
196 196 <tr>
197 197 <td><a href="${pr_comment_reply_url}">${_('Reply')}</a></td>
198 198 <td></td>
199 199 </tr>
200 200 </table>
General Comments 0
You need to be logged in to leave comments. Login now