##// END OF EJS Templates
metrics: fixed celery task names, fixed hiistogram type metrics, client small fixes
metrics: fixed celery task names, fixed hiistogram type metrics, client small fixes

File last commit:

r4681:7eba96a2 stable
r4807:1bd9683a default
Show More
pull_request_update.mako
172 lines | 5.5 KiB | application/x-mako | MakoHtmlLexer
pull-requests: added update pull-requests email+notifications...
r4120 ## -*- coding: utf-8 -*-
<%inherit file="base.mako"/>
<%namespace name="base" file="base.mako"/>
## EMAIL SUBJECT
<%def name="subject()" filter="n,trim,whitespace_filter">
<%
data = {
'updating_user': '@'+h.person(updating_user),
'pr_id': pull_request.pull_request_id,
pull-requests: fixed a case when template marker was used in description field....
r4631 'pr_title': pull_request.title_safe,
pull-requests: added update pull-requests email+notifications...
r4120 }
emails: added logic to allow overwriting the default email titles via rcextensions.
r4448
subject_template = email_pr_update_subject_template or _('{updating_user} updated pull request. !{pr_id}: "{pr_title}"')
pull-requests: added update pull-requests email+notifications...
r4120 %>
emails: added logic to allow overwriting the default email titles via rcextensions.
r4448 ${subject_template.format(**data) |n}
pull-requests: added update pull-requests email+notifications...
r4120 </%def>
## PLAINTEXT VERSION OF BODY
<%def name="body_plaintext()" filter="n,trim">
<%
data = {
'updating_user': h.person(updating_user),
'pr_id': pull_request.pull_request_id,
pull-requests: fixed a case when template marker was used in description field....
r4631 'pr_title': pull_request.title_safe,
pull-requests: added update pull-requests email+notifications...
r4120 'source_ref_type': pull_request.source_ref_parts.type,
'source_ref_name': pull_request.source_ref_parts.name,
'target_ref_type': pull_request.target_ref_parts.type,
'target_ref_name': pull_request.target_ref_parts.name,
'repo_url': pull_request_source_repo_url,
'source_repo': pull_request_source_repo.repo_name,
'target_repo': pull_request_target_repo.repo_name,
'source_repo_url': pull_request_source_repo_url,
'target_repo_url': pull_request_target_repo_url,
}
%>
* ${_('Pull Request link')}: ${pull_request_url}
* ${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))}
* ${_('Title')}: ${pull_request.title}
* ${_('Description')}:
${pull_request.description | trim}
* Changed commits:
- Added: ${len(added_commits)}
- Removed: ${len(removed_commits)}
* Changed files:
%if not changed_files:
No file changes found
%else:
%for file_name in added_files:
- A `${file_name}`
%endfor
%for file_name in modified_files:
- M `${file_name}`
%endfor
%for file_name in removed_files:
- R `${file_name}`
%endfor
%endif
---
${self.plaintext_footer()}
</%def>
<%
data = {
'updating_user': h.person(updating_user),
'pr_id': pull_request.pull_request_id,
pull-requests: fixed a case when template marker was used in description field....
r4631 'pr_title': pull_request.title_safe,
pull-requests: added update pull-requests email+notifications...
r4120 'source_ref_type': pull_request.source_ref_parts.type,
'source_ref_name': pull_request.source_ref_parts.name,
'target_ref_type': pull_request.target_ref_parts.type,
'target_ref_name': pull_request.target_ref_parts.name,
'repo_url': pull_request_source_repo_url,
'source_repo': pull_request_source_repo.repo_name,
'target_repo': pull_request_target_repo.repo_name,
'source_repo_url': h.link_to(pull_request_source_repo.repo_name, pull_request_source_repo_url),
'target_repo_url': h.link_to(pull_request_target_repo.repo_name, pull_request_target_repo_url),
}
%>
emails: improved styling, and fixed problems with some email clients...
r4377 ## header
pull-requests: added update pull-requests email+notifications...
r4120 <table style="text-align:left;vertical-align:middle;width: 100%">
<tr>
<td style="width:100%;border-bottom:1px solid #dbd9da;">
emails: improved styling, and fixed problems with some email clients...
r4377 <div style="margin: 0; font-weight: bold">
<div class="clear-both" style="margin-bottom: 4px">
pull-requests: added update pull-requests email+notifications...
r4120 <span style="color:#7E7F7F">@${h.person(updating_user.username)}</span>
${_('updated')}
<a href="${pull_request_url}" style="${base.link_css()}">
${_('pull request.').format(**data) }
</a>
</div>
<div style="margin-top: 10px"></div>
${_('Pull request')} <code>!${data['pr_id']}: ${data['pr_title']}</code>
emails: improved styling, and fixed problems with some email clients...
r4377 </div>
pull-requests: added update pull-requests email+notifications...
r4120
</td>
</tr>
</table>
emails: improved styling, and fixed problems with some email clients...
r4377 <div class="clear-both"></div>
## main body
pull-requests: added update pull-requests email+notifications...
r4120 <table style="text-align:left;vertical-align:middle;width: 100%">
## spacing def
<tr>
<td style="width: 130px"></td>
<td></td>
</tr>
<tr>
<td style="padding-right:20px;">${_('Pull request')}:</td>
<td>
<a href="${pull_request_url}" style="${base.link_css()}">
!${pull_request.pull_request_id}
</a>
</td>
</tr>
<tr>
<td style="padding-right:20px;line-height:20px;">${_('Commit Flow')}:</td>
<td style="line-height:20px;">
pull-requests: fixed problems with unicode characters in branches.
r4681 <code>${data['source_ref_type']}:${pull_request.source_ref_parts.name}</code> ${_('of')} ${data['source_repo_url']}
pull-requests: added update pull-requests email+notifications...
r4120 &rarr;
pull-requests: fixed problems with unicode characters in branches.
r4681 <code>${data['target_ref_type']}:${pull_request.target_ref_parts.name}</code> ${_('of')} ${data['target_repo_url']}
pull-requests: added update pull-requests email+notifications...
r4120 </td>
</tr>
<tr>
<td style="padding-right:20px;">${_('Description')}:</td>
<td style="white-space:pre-wrap"><code>${pull_request.description | trim}</code></td>
</tr>
<tr>
<td style="padding-right:20px;">${_('Changes')}:</td>
emails: improved styling, and fixed problems with some email clients...
r4377 <td>
pull-requests: added update pull-requests email+notifications...
r4120 <strong>Changed commits:</strong>
emails: improved styling, and fixed problems with some email clients...
r4377 <ul class="changes-ul">
<li>- Added: ${len(added_commits)}</li>
<li>- Removed: ${len(removed_commits)}</li>
</ul>
pull-requests: added update pull-requests email+notifications...
r4120
<strong>Changed files:</strong>
emails: improved styling, and fixed problems with some email clients...
r4377 <ul class="changes-ul">
pull-requests: added update pull-requests email+notifications...
r4120
%if not changed_files:
emails: improved styling, and fixed problems with some email clients...
r4377 <li>No file changes found</li>
pull-requests: added update pull-requests email+notifications...
r4120 %else:
emails: improved styling, and fixed problems with some email clients...
r4377 %for file_name in added_files:
<li>- A <a href="${pull_request_url + '#a_' + h.FID(ancestor_commit_id, file_name)}">${file_name}</a></li>
%endfor
%for file_name in modified_files:
<li>- M <a href="${pull_request_url + '#a_' + h.FID(ancestor_commit_id, file_name)}">${file_name}</a></li>
%endfor
%for file_name in removed_files:
<li>- R <a href="${pull_request_url + '#a_' + h.FID(ancestor_commit_id, file_name)}">${file_name}</a></li>
%endfor
pull-requests: added update pull-requests email+notifications...
r4120 %endif
emails: improved styling, and fixed problems with some email clients...
r4377
</ul>
pull-requests: added update pull-requests email+notifications...
r4120 </td>
</tr>
</table>