Show More
@@ -1,170 +1,170 b'' | |||||
1 | ## -*- coding: utf-8 -*- |
|
1 | ## -*- coding: utf-8 -*- | |
2 | <%inherit file="base.mako"/> |
|
2 | <%inherit file="base.mako"/> | |
3 | <%namespace name="base" file="base.mako"/> |
|
3 | <%namespace name="base" file="base.mako"/> | |
4 |
|
4 | |||
5 | ## EMAIL SUBJECT |
|
5 | ## EMAIL SUBJECT | |
6 | <%def name="subject()" filter="n,trim,whitespace_filter"> |
|
6 | <%def name="subject()" filter="n,trim,whitespace_filter"> | |
7 | <% |
|
7 | <% | |
8 | data = { |
|
8 | data = { | |
9 | 'user': '@'+h.person(user), |
|
9 | 'user': '@'+h.person(user), | |
10 | 'repo_name': repo_name, |
|
10 | 'repo_name': repo_name, | |
11 | 'status': status_change, |
|
11 | 'status': status_change, | |
12 | 'comment_file': comment_file, |
|
12 | 'comment_file': comment_file, | |
13 | 'comment_line': comment_line, |
|
13 | 'comment_line': comment_line, | |
14 | 'comment_type': comment_type, |
|
14 | 'comment_type': comment_type, | |
15 | 'comment_id': comment_id, |
|
15 | 'comment_id': comment_id, | |
16 |
|
16 | |||
17 | 'commit_id': h.show_id(commit), |
|
17 | 'commit_id': h.show_id(commit), | |
18 | } |
|
18 | } | |
19 | %> |
|
19 | %> | |
20 |
|
20 | |||
21 |
|
21 | |||
22 | % if comment_file: |
|
22 | % if comment_file: | |
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} |
|
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 | % else: |
|
24 | % else: | |
25 | % if status_change: |
|
25 | % if status_change: | |
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} |
|
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 | % else: |
|
27 | % else: | |
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} |
|
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 | % endif |
|
29 | % endif | |
30 | % endif |
|
30 | % endif | |
31 |
|
31 | |||
32 | </%def> |
|
32 | </%def> | |
33 |
|
33 | |||
34 | ## PLAINTEXT VERSION OF BODY |
|
34 | ## PLAINTEXT VERSION OF BODY | |
35 | <%def name="body_plaintext()" filter="n,trim"> |
|
35 | <%def name="body_plaintext()" filter="n,trim"> | |
36 | <% |
|
36 | <% | |
37 | data = { |
|
37 | data = { | |
38 | 'user': h.person(user), |
|
38 | 'user': h.person(user), | |
39 | 'repo_name': repo_name, |
|
39 | 'repo_name': repo_name, | |
40 | 'status': status_change, |
|
40 | 'status': status_change, | |
41 | 'comment_file': comment_file, |
|
41 | 'comment_file': comment_file, | |
42 | 'comment_line': comment_line, |
|
42 | 'comment_line': comment_line, | |
43 | 'comment_type': comment_type, |
|
43 | 'comment_type': comment_type, | |
44 | 'comment_id': comment_id, |
|
44 | 'comment_id': comment_id, | |
45 |
|
45 | |||
46 | 'commit_id': h.show_id(commit), |
|
46 | 'commit_id': h.show_id(commit), | |
47 | } |
|
47 | } | |
48 | %> |
|
48 | %> | |
49 |
|
49 | |||
50 | * ${_('Comment link')}: ${commit_comment_url} |
|
50 | * ${_('Comment link')}: ${commit_comment_url} | |
51 |
|
51 | |||
52 | %if status_change: |
|
52 | %if status_change: | |
53 | * ${_('Commit status')}: ${_('Status was changed to')}: *${status_change}* |
|
53 | * ${_('Commit status')}: ${_('Status was changed to')}: *${status_change}* | |
54 |
|
54 | |||
55 | %endif |
|
55 | %endif | |
56 | * ${_('Commit')}: ${h.show_id(commit)} |
|
56 | * ${_('Commit')}: ${h.show_id(commit)} | |
57 |
|
57 | |||
58 | * ${_('Commit message')}: ${commit.message} |
|
58 | * ${_('Commit message')}: ${commit.message} | |
59 |
|
59 | |||
60 | %if comment_file: |
|
60 | %if comment_file: | |
61 | * ${_('File: {comment_file} on line {comment_line}').format(**data)} |
|
61 | * ${_('File: {comment_file} on line {comment_line}').format(**data)} | |
62 |
|
62 | |||
63 | %endif |
|
63 | %endif | |
64 | % if comment_type == 'todo': |
|
64 | % if comment_type == 'todo': | |
65 | ${('Inline' if comment_file else 'General')} ${_('`TODO` number')} ${comment_id}: |
|
65 | ${('Inline' if comment_file else 'General')} ${_('`TODO` number')} ${comment_id}: | |
66 | % else: |
|
66 | % else: | |
67 | ${('Inline' if comment_file else 'General')} ${_('`Note` number')} ${comment_id}: |
|
67 | ${('Inline' if comment_file else 'General')} ${_('`Note` number')} ${comment_id}: | |
68 | % endif |
|
68 | % endif | |
69 |
|
69 | |||
70 | ${comment_body |n, trim} |
|
70 | ${comment_body |n, trim} | |
71 |
|
71 | |||
72 | --- |
|
72 | --- | |
73 | ${self.plaintext_footer()} |
|
73 | ${self.plaintext_footer()} | |
74 | </%def> |
|
74 | </%def> | |
75 |
|
75 | |||
76 |
|
76 | |||
77 | <% |
|
77 | <% | |
78 | data = { |
|
78 | data = { | |
79 | 'user': h.person(user), |
|
79 | 'user': h.person(user), | |
80 | 'comment_file': comment_file, |
|
80 | 'comment_file': comment_file, | |
81 | 'comment_line': comment_line, |
|
81 | 'comment_line': comment_line, | |
82 | 'comment_type': comment_type, |
|
82 | 'comment_type': comment_type, | |
83 | 'comment_id': comment_id, |
|
83 | 'comment_id': comment_id, | |
84 | 'renderer_type': renderer_type or 'plain', |
|
84 | 'renderer_type': renderer_type or 'plain', | |
85 |
|
85 | |||
86 | 'repo': commit_target_repo_url, |
|
86 | 'repo': commit_target_repo_url, | |
87 | 'repo_name': repo_name, |
|
87 | 'repo_name': repo_name, | |
88 | 'commit_id': h.show_id(commit), |
|
88 | 'commit_id': h.show_id(commit), | |
89 | } |
|
89 | } | |
90 | %> |
|
90 | %> | |
91 |
|
91 | |||
92 | <table style="text-align:left;vertical-align:middle;width: 100%"> |
|
92 | <table style="text-align:left;vertical-align:middle;width: 100%"> | |
93 | <tr> |
|
93 | <tr> | |
94 | <td style="width:100%;border-bottom:1px solid #dbd9da;"> |
|
94 | <td style="width:100%;border-bottom:1px solid #dbd9da;"> | |
95 |
|
95 | |||
96 | <h4 style="margin: 0"> |
|
96 | <h4 style="margin: 0"> | |
97 |
<div style="margin-bottom: 4px |
|
97 | <div style="margin-bottom: 4px"> | |
98 | @${h.person(user.username)} |
|
98 | <span style="color:#7E7F7F">@${h.person(user.username)}</span> | |
|
99 | ${_('left a')} | |||
|
100 | <a href="${commit_comment_url}" style="${base.link_css()}"> | |||
|
101 | % if comment_file: | |||
|
102 | ${_('{comment_type} on file `{comment_file}` in commit.').format(**data)} | |||
|
103 | % else: | |||
|
104 | ${_('{comment_type} on commit.').format(**data) |n} | |||
|
105 | % endif | |||
|
106 | </a> | |||
99 | </div> |
|
107 | </div> | |
100 | ${_('left a')} |
|
|||
101 | <a href="${commit_comment_url}" style="${base.link_css()}"> |
|
|||
102 | % if comment_file: |
|
|||
103 | ${_('{comment_type} on file `{comment_file}` in commit.').format(**data)} |
|
|||
104 | % else: |
|
|||
105 | ${_('{comment_type} on commit.').format(**data) |n} |
|
|||
106 | % endif |
|
|||
107 | </a> |
|
|||
108 | <div style="margin-top: 10px"></div> |
|
108 | <div style="margin-top: 10px"></div> | |
109 | ${_('Commit')} <code>${data['commit_id']}</code> ${_('of repository')}: ${data['repo_name']} |
|
109 | ${_('Commit')} <code>${data['commit_id']}</code> ${_('of repository')}: ${data['repo_name']} | |
110 | </h4> |
|
110 | </h4> | |
111 |
|
111 | |||
112 | </td> |
|
112 | </td> | |
113 | </tr> |
|
113 | </tr> | |
114 |
|
114 | |||
115 | </table> |
|
115 | </table> | |
116 |
|
116 | |||
117 | <table style="text-align:left;vertical-align:middle;width: 100%"> |
|
117 | <table style="text-align:left;vertical-align:middle;width: 100%"> | |
118 |
|
118 | |||
119 | ## spacing def |
|
119 | ## spacing def | |
120 | <tr> |
|
120 | <tr> | |
121 | <td style="width: 130px"></td> |
|
121 | <td style="width: 130px"></td> | |
122 | <td></td> |
|
122 | <td></td> | |
123 | </tr> |
|
123 | </tr> | |
124 |
|
124 | |||
125 | % if status_change: |
|
125 | % if status_change: | |
126 | <tr> |
|
126 | <tr> | |
127 | <td style="padding-right:20px;">${_('Commit Status')}:</td> |
|
127 | <td style="padding-right:20px;">${_('Commit Status')}:</td> | |
128 | <td> |
|
128 | <td> | |
129 | ${_('Status was changed to')}: ${base.status_text(status_change, tag_type=status_change_type)} |
|
129 | ${_('Status was changed to')}: ${base.status_text(status_change, tag_type=status_change_type)} | |
130 | </td> |
|
130 | </td> | |
131 | </tr> |
|
131 | </tr> | |
132 | % endif |
|
132 | % endif | |
133 |
|
133 | |||
134 | <tr> |
|
134 | <tr> | |
135 | <td style="padding-right:20px;">${_('Commit')}:</td> |
|
135 | <td style="padding-right:20px;">${_('Commit')}:</td> | |
136 | <td> |
|
136 | <td> | |
137 | <a href="${commit_comment_url}" style="${base.link_css()}">${h.show_id(commit)}</a> |
|
137 | <a href="${commit_comment_url}" style="${base.link_css()}">${h.show_id(commit)}</a> | |
138 | </td> |
|
138 | </td> | |
139 | </tr> |
|
139 | </tr> | |
140 | <tr> |
|
140 | <tr> | |
141 | <td style="padding-right:20px;">${_('Commit message')}:</td> |
|
141 | <td style="padding-right:20px;">${_('Commit message')}:</td> | |
142 | <td style="white-space:pre-wrap">${h.urlify_commit_message(commit.message, repo_name)}</td> |
|
142 | <td style="white-space:pre-wrap">${h.urlify_commit_message(commit.message, repo_name)}</td> | |
143 | </tr> |
|
143 | </tr> | |
144 |
|
144 | |||
145 | % if comment_file: |
|
145 | % if comment_file: | |
146 | <tr> |
|
146 | <tr> | |
147 | <td style="padding-right:20px;">${_('File')}:</td> |
|
147 | <td style="padding-right:20px;">${_('File')}:</td> | |
148 | <td><a href="${commit_comment_url}" style="${base.link_css()}">${_('`{comment_file}` on line {comment_line}').format(**data)}</a></td> |
|
148 | <td><a href="${commit_comment_url}" style="${base.link_css()}">${_('`{comment_file}` on line {comment_line}').format(**data)}</a></td> | |
149 | </tr> |
|
149 | </tr> | |
150 | % endif |
|
150 | % endif | |
151 |
|
151 | |||
152 | <tr style="border-bottom:1px solid #dbd9da;"> |
|
152 | <tr style="border-bottom:1px solid #dbd9da;"> | |
153 | <td colspan="2" style="padding-right:20px;"> |
|
153 | <td colspan="2" style="padding-right:20px;"> | |
154 | % if comment_type == 'todo': |
|
154 | % if comment_type == 'todo': | |
155 | ${('Inline' if comment_file else 'General')} ${_('`TODO` number')} ${comment_id}: |
|
155 | ${('Inline' if comment_file else 'General')} ${_('`TODO` number')} ${comment_id}: | |
156 | % else: |
|
156 | % else: | |
157 | ${('Inline' if comment_file else 'General')} ${_('`Note` number')} ${comment_id}: |
|
157 | ${('Inline' if comment_file else 'General')} ${_('`Note` number')} ${comment_id}: | |
158 | % endif |
|
158 | % endif | |
159 | </td> |
|
159 | </td> | |
160 | </tr> |
|
160 | </tr> | |
161 |
|
161 | |||
162 | <tr> |
|
162 | <tr> | |
163 | <td colspan="2" style="background: #F7F7F7">${h.render(comment_body, renderer=data['renderer_type'], mentions=True)}</td> |
|
163 | <td colspan="2" style="background: #F7F7F7">${h.render(comment_body, renderer=data['renderer_type'], mentions=True)}</td> | |
164 | </tr> |
|
164 | </tr> | |
165 |
|
165 | |||
166 | <tr> |
|
166 | <tr> | |
167 | <td><a href="${commit_comment_reply_url}">${_('Reply')}</a></td> |
|
167 | <td><a href="${commit_comment_reply_url}">${_('Reply')}</a></td> | |
168 | <td></td> |
|
168 | <td></td> | |
169 | </tr> |
|
169 | </tr> | |
170 | </table> |
|
170 | </table> |
General Comments 0
You need to be logged in to leave comments.
Login now