Mercurial > kallithea
changeset 8652:d379e2c39bba
templates: rename email_templates to email
The '_templates' suffix is not really needed as we are already in a
'templates' dir.
This is more in line with the other templates, and the new 'ini' template
directory.
| author | Thomas De Schampheleire <thomas.de_schampheleire@nokia.com> |
|---|---|
| date | Thu, 08 Oct 2020 14:52:00 +0200 |
| parents | 495dea7c2a13 |
| children | ec73bce93d6a |
| files | kallithea/model/notification.py kallithea/templates/email/button.html kallithea/templates/email/button.txt kallithea/templates/email/changeset_comment.html kallithea/templates/email/changeset_comment.txt kallithea/templates/email/comment.html kallithea/templates/email/comment.txt kallithea/templates/email/default.html kallithea/templates/email/default.txt kallithea/templates/email/header.html kallithea/templates/email/header.txt kallithea/templates/email/main.html kallithea/templates/email/password_reset.html kallithea/templates/email/password_reset.txt kallithea/templates/email/pull_request.html kallithea/templates/email/pull_request.txt kallithea/templates/email/pull_request_comment.html kallithea/templates/email/pull_request_comment.txt kallithea/templates/email/registration.html kallithea/templates/email/registration.txt kallithea/templates/email_templates/button.html kallithea/templates/email_templates/button.txt kallithea/templates/email_templates/changeset_comment.html kallithea/templates/email_templates/changeset_comment.txt kallithea/templates/email_templates/comment.html kallithea/templates/email_templates/comment.txt kallithea/templates/email_templates/default.html kallithea/templates/email_templates/default.txt kallithea/templates/email_templates/header.html kallithea/templates/email_templates/header.txt kallithea/templates/email_templates/main.html kallithea/templates/email_templates/password_reset.html kallithea/templates/email_templates/password_reset.txt kallithea/templates/email_templates/pull_request.html kallithea/templates/email_templates/pull_request.txt kallithea/templates/email_templates/pull_request_comment.html kallithea/templates/email_templates/pull_request_comment.txt kallithea/templates/email_templates/registration.html kallithea/templates/email_templates/registration.txt scripts/whitespacecleanup.sh |
| diffstat | 40 files changed, 573 insertions(+), 573 deletions(-) [+] |
line wrap: on
line diff
--- a/kallithea/model/notification.py Tue Oct 06 20:18:40 2020 +0200 +++ b/kallithea/model/notification.py Thu Oct 08 14:52:00 2020 +0200 @@ -204,7 +204,7 @@ return generated template for email based on given type """ - base = 'email_templates/' + self.email_types.get(type_, self.email_types[self.TYPE_DEFAULT]) + '.' + content_type + base = 'email/' + self.email_types.get(type_, self.email_types[self.TYPE_DEFAULT]) + '.' + content_type email_template = self._tmpl_lookup.get_template(base) # translator and helpers inject _kwargs = {'_': _,
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/kallithea/templates/email/button.html Thu Oct 08 14:52:00 2020 +0200 @@ -0,0 +1,28 @@ +<%page args="url,title='',padding_top=True,padding_bottom=True" />\ +##<!-- button --> +<center> + <table cellspacing="0" cellpadding="0" style="margin-left:auto;margin-right:auto"> + %if padding_top: + <tr> + <td height="25px" style="height:25px"></td> + </tr> + %endif + <tr> + <td style="border-collapse:collapse;border-radius:2px;text-align:center;display:block;border:solid 1px ${color_button};padding:11px 20px 11px 20px"> + <a href="${url}" style="text-decoration:none;display:block" target="_blank"> + <center> + <font size="3"> + <span style="${sans_style};font-weight:700;font-size:15px;line-height:14px;color:${color_button};white-space:nowrap;vertical-align:middle">${_(title)}</span> + </font> + </center> + </a> + </td> + </tr> + %if padding_bottom: + <tr> + <td height="25px" style="height:25px"></td> + </tr> + %endif + </table> +</center> +##<!-- /button -->
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/kallithea/templates/email/button.txt Thu Oct 08 14:52:00 2020 +0200 @@ -0,0 +1,3 @@ +<%page args="url,title" />\ + +${title|n,unicode}: ${url}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/kallithea/templates/email/changeset_comment.html Thu Oct 08 14:52:00 2020 +0200 @@ -0,0 +1,40 @@ +<%inherit file="main.html"/>\ +\ +<%block name="header">\ +<% title = _('Mention in Comment on Changeset "%s"') % h.shorter(message, 200, firstline=True) if is_mention else _('Comment on Changeset "%s"') % h.shorter(message, 200, firstline=True) %>\ +<%include file="header.html" args="title=title,link=cs_comment_url"/>\ +</%block>\ +\ +<table cellpadding="0" cellspacing="0" border="0" width="100%"> + <tr> + <td> +<%include file="comment.html" args="text=body,author=cs_comment_user,status=status_change"/>\ + </td> + </tr> + <tr> + <td height="30px" style="height:30px"></td> + </tr> + <tr> + <td> + <div> + ${_('Changeset on')} + <a style="${link_text_style}" + href="${cs_target_repo}">${cs_target_repo}</a> + ${_('branch')} + <span style="${data_style}">${branch}</span>: + </div> + <div> + "<a style="${link_style}" + href="${cs_url}">${h.shorter(message, 60, firstline=True)}</a>" + ${_('by')} + <span style="${data_style}">${cs_author.full_name_and_username}</span>. + </div> + </td> + </tr> + <tr> + <td> +<% title = _('View Comment') %>\ +<%include file="button.html" args="url=cs_comment_url,title=title,padding_bottom=False"/>\ + </td> + </tr> +</table>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/kallithea/templates/email/changeset_comment.txt Thu Oct 08 14:52:00 2020 +0200 @@ -0,0 +1,17 @@ +<%block name="header">\ +<% title = _('Mention in Comment on Changeset "%s"') % h.shorter(message, 200, firstline=True) if is_mention else _('Comment on Changeset "%s"') % h.shorter(message, 200, firstline=True) %>\ +<%include file="header.txt" args="title=title,link=cs_comment_url"/>\ +</%block>\ + +<%include file="comment.txt" args="text=body,author=cs_comment_user,status=status_change"/>\ + +${_('Changeset on')|n,unicode} \ +${cs_target_repo|n,unicode} \ +${_('branch')|n,unicode} \ +${branch|n,unicode}: +"${h.shorter(message, 60, firstline=True)|n,unicode}" \ +${_('by')|n,unicode} \ +${cs_author.full_name_and_username|n,unicode}. + +<% title = _('View Comment') %>\ +<%include file="button.txt" args="url=cs_comment_url,title=title"/>\
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/kallithea/templates/email/comment.html Thu Oct 08 14:52:00 2020 +0200 @@ -0,0 +1,57 @@ +<%page args="author,text,status,close=False" />\ +\ +##<!-- comment -> +<table cellpadding="0" cellspacing="0" width="100%" border="0" bgcolor="${color_background_grey}" style="border:1px solid ${color_border};border-radius:4px"> + <tr> + <td height="10px" style="height:10px" colspan="3"></td> + </tr> + <tr> + <td width="20px" style="width:20px"></td> + <td> + <div style="${emph_style}">${author}</div> + </td> + <td width="20px" style="width:20px"></td> + </tr> + <tr> + <td height="10px" style="height:10px" colspan="3" style="border-bottom:1px solid ${color_border}"></td> + </tr> + %if status or close: + <tr> + <td height="10px" style="height:10px" colspan="3"></td> + </tr> + <tr> + <td width="20px" style="width:20px"></td> + <td> + %if status: + <div style="font-weight:600"> + ${_('Status change:')} + ${status} + </div> + %endif + %if close: + <div style="font-weight:600"> + ${_('The pull request has been closed.')} + </div> + %endif + </td> + <td width="20px" style="width:20px"></td> + </tr> + <tr> + <td height="10px" style="height:10px" colspan="3" style="border-bottom:1px solid ${color_border}"></td> + </tr> + %endif + <tr> + <td height="10px" style="height:10px" colspan="3"></td> + </tr> + <tr> + <td width="20px" style="width:20px"></td> + <td> + <div style="${comment_style}">${text}</div> + </td> + <td width="20px" style="width:20px"></td> + </tr> + <tr> + <td height="10px" style="height:10px" colspan="3"></td> + </tr> +</table> +##<!-- /comment ->
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/kallithea/templates/email/comment.txt Thu Oct 08 14:52:00 2020 +0200 @@ -0,0 +1,15 @@ +<%page args="author,text,status,close=False" />\ +${author|n,unicode}: + +%if status: +${_('Status change:')|n,unicode} \ +${status|n,unicode} + +%endif +%if close: +${_('The pull request has been closed.')|n,unicode} + +%endif +${text|n,unicode} + +## Trailing empty line
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/kallithea/templates/email/default.html Thu Oct 08 14:52:00 2020 +0200 @@ -0,0 +1,12 @@ +<%inherit file="main.html"/>\ +\ +<%block name="header">\ +<% title = _('Message') %>\ +<%include file="header.html" args="title=title,link=None"/>\ +</%block>\ +\ +<table cellpadding="0" cellspacing="0" border="0" width="100%"> + <tr> + <td style="${comment_style}">${body}</td> + </tr> +</table>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/kallithea/templates/email/default.txt Thu Oct 08 14:52:00 2020 +0200 @@ -0,0 +1,4 @@ +<%block name="header">\ +</%block>\ +\ +${body|n,unicode}\
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/kallithea/templates/email/header.html Thu Oct 08 14:52:00 2020 +0200 @@ -0,0 +1,25 @@ +<%page args="title,link" />\ +\ +##<!-- header --> +<table bgcolor="${color_background_grey}" width="100%" cellpadding="0" cellspacing="0" + style="border-bottom:1px solid ${color_border}"> + <tr> + <td height="20px" style="height:20px" colspan="3"></td> + </tr> + <tr> + <td width="30px" style="width:30px"></td> + <td style="${sans_style};font-size:19px;line-height:24px"> + %if link is not None: + <a style="text-decoration:none;${emph_style}" href="${link}" + target="_blank">${title}</a> + %else: + <span style="${emph_style}">${title}</span> + %endif + </td> + <td width="30px" style="width:30px"></td> + </tr> + <tr> + <td height="20px" style="height:20px" colspan="3"></td> + </tr> +</table> +##<!-- /header -->
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/kallithea/templates/email/header.txt Thu Oct 08 14:52:00 2020 +0200 @@ -0,0 +1,8 @@ +<%page args="title,link" />\ +%if link is not None: +${link} + +%endif +${title|n,unicode} + +## Trailing empty line
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/kallithea/templates/email/main.html Thu Oct 08 14:52:00 2020 +0200 @@ -0,0 +1,42 @@ +<!doctype html> +<html lang="en"> +<head> + <title></title> + <meta name="viewport" content="width=device-width"> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> +</head> +<body> +<table align="center" cellpadding="0" cellspacing="0" border="0" style="min-width:348px;max-width:800px;${default_style}"> + <tr> + <td width="30px" style="width:30px"></td> + <td> + <table width="100%" cellpadding="0" cellspacing="0" border="0" + style="table-layout:fixed;${sans_style};border:1px solid ${color_border}"> + <tr><td width="30px" style="width:30px"></td><td></td><td width="30px" style="width:30px"></td></tr> + <tr> + <td colspan="3"> +<%block name="header"/>\ + </td> + </tr> + <tr> + <td height="30px" style="height:30px" colspan="3"></td> + </tr> + <tr> + <td></td> + <td> + ##<!-- body --> +${self.body()}\ + ##<!-- /body --> + </td> + <td></td> + </tr> + <tr> + <td height="30px" style="height:30px" colspan="3"></td> + </tr> + </table> + </td> + <td width="30px" style="width:30px"></td> + </tr> +</table> +</body> +</html>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/kallithea/templates/email/password_reset.html Thu Oct 08 14:52:00 2020 +0200 @@ -0,0 +1,48 @@ +<%inherit file="main.html"/>\ +\ +<%block name="header">\ +<% title = _('Password Reset Request') %>\ +<%include file="header.html" args="title=title,link=None"/>\ +</%block>\ +\ +<table cellpadding="0" cellspacing="0" border="0" width="100%" style="table-layout:fixed;word-wrap:break-word;"> + <tr> + <td>${_('Hello %s') % user},</td> + </tr> + <tr> + <td height="10px" style="height:10px"></td> + </tr> + <tr> + <td> + ${_('We have received a request to reset the password for your account.')} + </td> + </tr> + <tr> + <td height="10px" style="height:10px"></td> + </tr> + <tr> + <td> + %if reset_token is None: + <div>${_('This account is however managed outside this system and the password cannot be changed here.')}</div> + %else: + <div> + ${_('To set a new password, click the following link')}: + <br/> + <a style="${link_style}" href="${reset_url}" + target="_blank">${reset_url}</a> + <br/> + ${_("Should you not be able to use the link above, please type the following code into the password reset form")}: + <code>${reset_token}</code> + </div> + %endif + </td> + </tr> + <tr> + <td height="10px" style="height:10px"></td> + </tr> + <tr> + <td> + ${_("If it weren't you who requested the password reset, just disregard this message.")} + </td> + </tr> +</table>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/kallithea/templates/email/password_reset.txt Thu Oct 08 14:52:00 2020 +0200 @@ -0,0 +1,21 @@ +<%block name="header">\ +<% title = _('Password Reset Request') %>\ +<%include file="header.txt" args="title=title,link=None"/>\ +</%block>\ +\ +${_('Hello %s') % user|n,unicode}, + +${_('We have received a request to reset the password for your account.')|n,unicode} + +%if reset_token is None: +${_('This account is however managed outside this system and the password cannot be changed here.')|n,unicode} +%else: +${_('To set a new password, click the following link')|n,unicode}: + +${reset_url|n,unicode} + +${_("Should you not be able to use the link above, please type the following code into the password reset form")|n,unicode}: +${reset_token|n,unicode} +%endif + +${_("If it weren't you who requested the password reset, just disregard this message.")|n,unicode}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/kallithea/templates/email/pull_request.html Thu Oct 08 14:52:00 2020 +0200 @@ -0,0 +1,89 @@ +<%inherit file="main.html"/>\ +\ +<%block name="header">\ +<% title = _('Mention on Pull Request %s "%s" by %s') % (pr_nice_id, pr_title, pr_user_created) if is_mention else _('Added as Reviewer of Pull Request %s "%s" by %s') % (pr_nice_id, pr_title, pr_user_created) %>\ +<%include file="header.html" args="title=title,link=pr_url"/>\ +</%block>\ +\ +<table cellpadding="0" cellspacing="0" border="0" width="100%"> + <tr> + <td> + <div> + ${_('Pull request')} + <a style="${link_style}" + href="${pr_url}">${pr_nice_id} "${pr_title}"</a> + ${_('by')} + <span style="${data_style}">${pr_owner.full_name_and_username}</span>. + </div> + <div> + ${_('from')} + <a style="${link_text_style}" + href="${pr_source_repo}">${pr_source_repo}</a> + ${_('branch')} + <span style="${data_style}">${pr_source_branch}</span> + <br/> + ${_('to')} + <a style="${link_text_style}" + href="${pr_target_repo}">${pr_target_repo}</a> + ${_('branch')} + <span style="${data_style}">${pr_target_branch}</span> + </div> + </td> + </tr> + <tr><td height="10px" style="height:10px"></td></tr> + <tr> + <td> + <div> + ${_('Description')}: + </div> + </td> + </tr> + <tr><td height="10px" style="height:10px"></td></tr> + <tr> + <td> + <table cellpadding="0" cellspacing="0" width="100%" border="0" bgcolor="${color_background_grey}" style="border:1px solid ${color_border};border-radius:4px"> + <tr> + <td height="10px" style="height:10px" colspan="3"></td> + </tr> + <tr> + <td width="20px" style="width:20px"></td> + <td> + <div style="${comment_style}">${body}</div> + </td> + <td width="20px" style="width:20px"></td> + </tr> + <tr> + <td height="10px" style="height:10px" colspan="3"></td> + </tr> + </table> + </td> + </tr> + <tr><td height="15px" style="height:15px"></td></tr> + <tr> + <td> + <div>${_('Changesets')}:</div> + </td> + </tr> + <tr><td height="10px" style="height:10px"></td></tr> + + <tr> + <td style="${sans_style}"> + <ul style="color:${color_link};padding-left:15px;margin:0"> + %for revision, desc in pr_revisions: + <li style="mso-special-format:bullet"> + <a style="${link_style}" + href="${h.canonical_url('changeset_home', repo_name=org_repo_name, revision=revision)}"> + ${h.shorter(desc, 80, firstline=True)} + </a> + </li> + %endfor + </ul> + </td> + </tr> + <tr> + <td> +<% title = _('View Pull Request') %>\ +<%include file="button.html" args="url=pr_url,title=title,padding_bottom=False"/>\ + </td> + </tr> +</table>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/kallithea/templates/email/pull_request.txt Thu Oct 08 14:52:00 2020 +0200 @@ -0,0 +1,33 @@ +<%block name="header">\ +<% title = _('Mention on Pull Request %s "%s" by %s') % (pr_nice_id, pr_title, pr_user_created) if is_mention else _('Added as Reviewer of Pull Request %s "%s" by %s') % (pr_nice_id, pr_title, pr_user_created) %>\ +<%include file="header.txt" args="title=title,link=pr_url"/>\ +</%block>\ + +${_('Pull request')|n,unicode} \ +${pr_nice_id|n,unicode} \ +"${pr_title|n,unicode}" \ +${_('by')|n,unicode} \ +${pr_owner.full_name_and_username|n,unicode} +${_('from')} \ +${pr_source_repo|n,unicode} \ +${_('branch')|n,unicode} \ +${pr_source_branch|n,unicode} +${_('to')|n,unicode} \ +${pr_target_repo|n,unicode} \ +${_('branch')|n,unicode} \ +${pr_target_branch|n,unicode} + + +${_('Description')|n,unicode}: + +${body|n,unicode} + + +${_('Changesets')|n,unicode}: + +%for revision, desc in pr_revisions: +${h.shorter(desc, 80, firstline=True)|n,unicode} +%endfor + +<% title = _('View Pull Request') %>\ +<%include file="button.txt" args="url=pr_url,title=title"/>\
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/kallithea/templates/email/pull_request_comment.html Thu Oct 08 14:52:00 2020 +0200 @@ -0,0 +1,47 @@ +<%inherit file="main.html"/>\ +\ +<%block name="header">\ +<% title = _('Mention in Comment on Pull Request %s "%s"') % (pr_nice_id, pr_title) if is_mention else _('Pull Request %s "%s" Closed') % (pr_nice_id, pr_title) if closing_pr else _('Comment on Pull Request %s "%s"') % (pr_nice_id, pr_title) %>\ +<%include file="header.html" args="title=title,link=pr_comment_url"/>\ +</%block>\ +\ +<table cellpadding="0" cellspacing="0" border="0" width="100%"> + <tr> + <td> +<%include file="comment.html" args="text=body,author=pr_comment_user,status=status_change,close=closing_pr"/>\ + </td> + </tr> + <tr> + <td height="30px" style="height:30px"></td> + </tr> + <tr> + <td> + <div> + ${_('Pull request')} + <a style="${link_style}" + href="${pr_url}">${pr_nice_id} "${pr_title}"</a> + ${_('by')} + <span style="${data_style}">${pr_owner.full_name_and_username}</span>. + </div> + <div> + ${_('from')} + <a style="${link_text_style}" + href="${pr_source_repo}">${pr_source_repo}</a> + ${_('branch')} + <span style="${data_style}">${pr_source_branch}</span> + <br/> + ${_('to')} + <a style="${link_text_style}" + href="${pr_target_repo}">${pr_target_repo}</a> + ${_('branch')} + <span style="${data_style}">${pr_target_branch}</span>: + </div> + </td> + </tr> + <tr> + <td> +<% title = _('View Comment') %>\ +<%include file="button.html" args="url=pr_comment_url,title=title,padding_bottom=False"/>\ + </td> + </tr> +</table>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/kallithea/templates/email/pull_request_comment.txt Thu Oct 08 14:52:00 2020 +0200 @@ -0,0 +1,23 @@ +<%block name="header">\ +<% title = _('Mention in Comment on Pull Request %s "%s"') % (pr_nice_id, pr_title) if is_mention else _('Pull Request %s "%s" Closed') % (pr_nice_id, pr_title) if closing_pr else _('Comment on Pull Request %s "%s"') % (pr_nice_id, pr_title) %>\ +<%include file="header.txt" args="title=title,link=pr_comment_url"/>\ +</%block>\ + +<%include file="comment.txt" args="text=body,author=pr_comment_user,status=status_change,close=closing_pr"/>\ + +${_('Pull request')|n,unicode} \ +${pr_nice_id|n,unicode} \ +"${pr_title|n,unicode}" \ +${_('by')|n,unicode} \ +${pr_owner.full_name_and_username|n,unicode} +${_('from')} \ +${pr_source_repo|n,unicode} \ +${_('branch')|n,unicode} \ +${pr_source_branch|n,unicode} +${_('to')|n,unicode} \ +${pr_target_repo|n,unicode} \ +${_('branch')|n,unicode} \ +${pr_target_branch|n,unicode} + +<% title = _('View Comment') %>\ +<%include file="button.txt" args="url=pr_comment_url,title=title"/>\
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/kallithea/templates/email/registration.html Thu Oct 08 14:52:00 2020 +0200 @@ -0,0 +1,46 @@ +## -*- coding: utf-8 -*- +<%inherit file="main.html"/>\ +\ +<%block name="header">\ +<% title = _('New User Registration') %>\ +<%include file="header.html" args="title=title,link=registered_user_url"/>\ +</%block>\ +\ +<table cellpadding="0" cellspacing="0" border="0" width="100%"> + <tr> + <td> + ${_('Username')}: + </td> + <td style="${data_style}"> + ${new_username} + </td> + </tr> + <tr> + <td height="10px" style="height:10px" colspan="2"></td> + </tr> + <tr> + <td> + ${_('Full Name')}: + </td> + <td style="${data_style}"> + ${new_full_name} + </td> + </tr> + <tr> + <td height="10px" style="height:10px" colspan="2"></td> + </tr> + <tr> + <td> + ${_('Email')}: + </td> + <td style="${data_style}"> + ${new_email} + </td> + </tr> + <tr> + <td colspan="2"> +<% title = _('View User Profile') %>\ +<%include file="button.html" args="url=registered_user_url,title=title,padding_bottom=False"/>\ + </td> + </tr> +</table>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/kallithea/templates/email/registration.txt Thu Oct 08 14:52:00 2020 +0200 @@ -0,0 +1,13 @@ +<%block name="header">\ +<% title = _('New User Registration') %>\ +<%include file="header.txt" args="title=title,link=registered_user_url"/>\ +</%block>\ + +${_('Username')|n,unicode}: ${new_username|n,unicode} + +${_('Full Name')|n,unicode}: ${new_full_name|n,unicode} + +${_('Email')|n,unicode}: ${new_email|n,unicode} + +<% title = _('View User Profile') %>\ +<%include file="button.txt" args="url=registered_user_url,title=title"/>\
--- a/kallithea/templates/email_templates/button.html Tue Oct 06 20:18:40 2020 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,28 +0,0 @@ -<%page args="url,title='',padding_top=True,padding_bottom=True" />\ -##<!-- button --> -<center> - <table cellspacing="0" cellpadding="0" style="margin-left:auto;margin-right:auto"> - %if padding_top: - <tr> - <td height="25px" style="height:25px"></td> - </tr> - %endif - <tr> - <td style="border-collapse:collapse;border-radius:2px;text-align:center;display:block;border:solid 1px ${color_button};padding:11px 20px 11px 20px"> - <a href="${url}" style="text-decoration:none;display:block" target="_blank"> - <center> - <font size="3"> - <span style="${sans_style};font-weight:700;font-size:15px;line-height:14px;color:${color_button};white-space:nowrap;vertical-align:middle">${_(title)}</span> - </font> - </center> - </a> - </td> - </tr> - %if padding_bottom: - <tr> - <td height="25px" style="height:25px"></td> - </tr> - %endif - </table> -</center> -##<!-- /button -->
--- a/kallithea/templates/email_templates/button.txt Tue Oct 06 20:18:40 2020 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -<%page args="url,title" />\ - -${title|n,unicode}: ${url}
--- a/kallithea/templates/email_templates/changeset_comment.html Tue Oct 06 20:18:40 2020 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,40 +0,0 @@ -<%inherit file="main.html"/>\ -\ -<%block name="header">\ -<% title = _('Mention in Comment on Changeset "%s"') % h.shorter(message, 200, firstline=True) if is_mention else _('Comment on Changeset "%s"') % h.shorter(message, 200, firstline=True) %>\ -<%include file="header.html" args="title=title,link=cs_comment_url"/>\ -</%block>\ -\ -<table cellpadding="0" cellspacing="0" border="0" width="100%"> - <tr> - <td> -<%include file="comment.html" args="text=body,author=cs_comment_user,status=status_change"/>\ - </td> - </tr> - <tr> - <td height="30px" style="height:30px"></td> - </tr> - <tr> - <td> - <div> - ${_('Changeset on')} - <a style="${link_text_style}" - href="${cs_target_repo}">${cs_target_repo}</a> - ${_('branch')} - <span style="${data_style}">${branch}</span>: - </div> - <div> - "<a style="${link_style}" - href="${cs_url}">${h.shorter(message, 60, firstline=True)}</a>" - ${_('by')} - <span style="${data_style}">${cs_author.full_name_and_username}</span>. - </div> - </td> - </tr> - <tr> - <td> -<% title = _('View Comment') %>\ -<%include file="button.html" args="url=cs_comment_url,title=title,padding_bottom=False"/>\ - </td> - </tr> -</table>
--- a/kallithea/templates/email_templates/changeset_comment.txt Tue Oct 06 20:18:40 2020 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,17 +0,0 @@ -<%block name="header">\ -<% title = _('Mention in Comment on Changeset "%s"') % h.shorter(message, 200, firstline=True) if is_mention else _('Comment on Changeset "%s"') % h.shorter(message, 200, firstline=True) %>\ -<%include file="header.txt" args="title=title,link=cs_comment_url"/>\ -</%block>\ - -<%include file="comment.txt" args="text=body,author=cs_comment_user,status=status_change"/>\ - -${_('Changeset on')|n,unicode} \ -${cs_target_repo|n,unicode} \ -${_('branch')|n,unicode} \ -${branch|n,unicode}: -"${h.shorter(message, 60, firstline=True)|n,unicode}" \ -${_('by')|n,unicode} \ -${cs_author.full_name_and_username|n,unicode}. - -<% title = _('View Comment') %>\ -<%include file="button.txt" args="url=cs_comment_url,title=title"/>\
--- a/kallithea/templates/email_templates/comment.html Tue Oct 06 20:18:40 2020 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,57 +0,0 @@ -<%page args="author,text,status,close=False" />\ -\ -##<!-- comment -> -<table cellpadding="0" cellspacing="0" width="100%" border="0" bgcolor="${color_background_grey}" style="border:1px solid ${color_border};border-radius:4px"> - <tr> - <td height="10px" style="height:10px" colspan="3"></td> - </tr> - <tr> - <td width="20px" style="width:20px"></td> - <td> - <div style="${emph_style}">${author}</div> - </td> - <td width="20px" style="width:20px"></td> - </tr> - <tr> - <td height="10px" style="height:10px" colspan="3" style="border-bottom:1px solid ${color_border}"></td> - </tr> - %if status or close: - <tr> - <td height="10px" style="height:10px" colspan="3"></td> - </tr> - <tr> - <td width="20px" style="width:20px"></td> - <td> - %if status: - <div style="font-weight:600"> - ${_('Status change:')} - ${status} - </div> - %endif - %if close: - <div style="font-weight:600"> - ${_('The pull request has been closed.')} - </div> - %endif - </td> - <td width="20px" style="width:20px"></td> - </tr> - <tr> - <td height="10px" style="height:10px" colspan="3" style="border-bottom:1px solid ${color_border}"></td> - </tr> - %endif - <tr> - <td height="10px" style="height:10px" colspan="3"></td> - </tr> - <tr> - <td width="20px" style="width:20px"></td> - <td> - <div style="${comment_style}">${text}</div> - </td> - <td width="20px" style="width:20px"></td> - </tr> - <tr> - <td height="10px" style="height:10px" colspan="3"></td> - </tr> -</table> -##<!-- /comment ->
--- a/kallithea/templates/email_templates/comment.txt Tue Oct 06 20:18:40 2020 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,15 +0,0 @@ -<%page args="author,text,status,close=False" />\ -${author|n,unicode}: - -%if status: -${_('Status change:')|n,unicode} \ -${status|n,unicode} - -%endif -%if close: -${_('The pull request has been closed.')|n,unicode} - -%endif -${text|n,unicode} - -## Trailing empty line
--- a/kallithea/templates/email_templates/default.html Tue Oct 06 20:18:40 2020 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,12 +0,0 @@ -<%inherit file="main.html"/>\ -\ -<%block name="header">\ -<% title = _('Message') %>\ -<%include file="header.html" args="title=title,link=None"/>\ -</%block>\ -\ -<table cellpadding="0" cellspacing="0" border="0" width="100%"> - <tr> - <td style="${comment_style}">${body}</td> - </tr> -</table>
--- a/kallithea/templates/email_templates/default.txt Tue Oct 06 20:18:40 2020 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,4 +0,0 @@ -<%block name="header">\ -</%block>\ -\ -${body|n,unicode}\
--- a/kallithea/templates/email_templates/header.html Tue Oct 06 20:18:40 2020 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,25 +0,0 @@ -<%page args="title,link" />\ -\ -##<!-- header --> -<table bgcolor="${color_background_grey}" width="100%" cellpadding="0" cellspacing="0" - style="border-bottom:1px solid ${color_border}"> - <tr> - <td height="20px" style="height:20px" colspan="3"></td> - </tr> - <tr> - <td width="30px" style="width:30px"></td> - <td style="${sans_style};font-size:19px;line-height:24px"> - %if link is not None: - <a style="text-decoration:none;${emph_style}" href="${link}" - target="_blank">${title}</a> - %else: - <span style="${emph_style}">${title}</span> - %endif - </td> - <td width="30px" style="width:30px"></td> - </tr> - <tr> - <td height="20px" style="height:20px" colspan="3"></td> - </tr> -</table> -##<!-- /header -->
--- a/kallithea/templates/email_templates/header.txt Tue Oct 06 20:18:40 2020 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,8 +0,0 @@ -<%page args="title,link" />\ -%if link is not None: -${link} - -%endif -${title|n,unicode} - -## Trailing empty line
--- a/kallithea/templates/email_templates/main.html Tue Oct 06 20:18:40 2020 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,42 +0,0 @@ -<!doctype html> -<html lang="en"> -<head> - <title></title> - <meta name="viewport" content="width=device-width"> - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> -</head> -<body> -<table align="center" cellpadding="0" cellspacing="0" border="0" style="min-width:348px;max-width:800px;${default_style}"> - <tr> - <td width="30px" style="width:30px"></td> - <td> - <table width="100%" cellpadding="0" cellspacing="0" border="0" - style="table-layout:fixed;${sans_style};border:1px solid ${color_border}"> - <tr><td width="30px" style="width:30px"></td><td></td><td width="30px" style="width:30px"></td></tr> - <tr> - <td colspan="3"> -<%block name="header"/>\ - </td> - </tr> - <tr> - <td height="30px" style="height:30px" colspan="3"></td> - </tr> - <tr> - <td></td> - <td> - ##<!-- body --> -${self.body()}\ - ##<!-- /body --> - </td> - <td></td> - </tr> - <tr> - <td height="30px" style="height:30px" colspan="3"></td> - </tr> - </table> - </td> - <td width="30px" style="width:30px"></td> - </tr> -</table> -</body> -</html>
--- a/kallithea/templates/email_templates/password_reset.html Tue Oct 06 20:18:40 2020 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,48 +0,0 @@ -<%inherit file="main.html"/>\ -\ -<%block name="header">\ -<% title = _('Password Reset Request') %>\ -<%include file="header.html" args="title=title,link=None"/>\ -</%block>\ -\ -<table cellpadding="0" cellspacing="0" border="0" width="100%" style="table-layout:fixed;word-wrap:break-word;"> - <tr> - <td>${_('Hello %s') % user},</td> - </tr> - <tr> - <td height="10px" style="height:10px"></td> - </tr> - <tr> - <td> - ${_('We have received a request to reset the password for your account.')} - </td> - </tr> - <tr> - <td height="10px" style="height:10px"></td> - </tr> - <tr> - <td> - %if reset_token is None: - <div>${_('This account is however managed outside this system and the password cannot be changed here.')}</div> - %else: - <div> - ${_('To set a new password, click the following link')}: - <br/> - <a style="${link_style}" href="${reset_url}" - target="_blank">${reset_url}</a> - <br/> - ${_("Should you not be able to use the link above, please type the following code into the password reset form")}: - <code>${reset_token}</code> - </div> - %endif - </td> - </tr> - <tr> - <td height="10px" style="height:10px"></td> - </tr> - <tr> - <td> - ${_("If it weren't you who requested the password reset, just disregard this message.")} - </td> - </tr> -</table>
--- a/kallithea/templates/email_templates/password_reset.txt Tue Oct 06 20:18:40 2020 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,21 +0,0 @@ -<%block name="header">\ -<% title = _('Password Reset Request') %>\ -<%include file="header.txt" args="title=title,link=None"/>\ -</%block>\ -\ -${_('Hello %s') % user|n,unicode}, - -${_('We have received a request to reset the password for your account.')|n,unicode} - -%if reset_token is None: -${_('This account is however managed outside this system and the password cannot be changed here.')|n,unicode} -%else: -${_('To set a new password, click the following link')|n,unicode}: - -${reset_url|n,unicode} - -${_("Should you not be able to use the link above, please type the following code into the password reset form")|n,unicode}: -${reset_token|n,unicode} -%endif - -${_("If it weren't you who requested the password reset, just disregard this message.")|n,unicode}
--- a/kallithea/templates/email_templates/pull_request.html Tue Oct 06 20:18:40 2020 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,89 +0,0 @@ -<%inherit file="main.html"/>\ -\ -<%block name="header">\ -<% title = _('Mention on Pull Request %s "%s" by %s') % (pr_nice_id, pr_title, pr_user_created) if is_mention else _('Added as Reviewer of Pull Request %s "%s" by %s') % (pr_nice_id, pr_title, pr_user_created) %>\ -<%include file="header.html" args="title=title,link=pr_url"/>\ -</%block>\ -\ -<table cellpadding="0" cellspacing="0" border="0" width="100%"> - <tr> - <td> - <div> - ${_('Pull request')} - <a style="${link_style}" - href="${pr_url}">${pr_nice_id} "${pr_title}"</a> - ${_('by')} - <span style="${data_style}">${pr_owner.full_name_and_username}</span>. - </div> - <div> - ${_('from')} - <a style="${link_text_style}" - href="${pr_source_repo}">${pr_source_repo}</a> - ${_('branch')} - <span style="${data_style}">${pr_source_branch}</span> - <br/> - ${_('to')} - <a style="${link_text_style}" - href="${pr_target_repo}">${pr_target_repo}</a> - ${_('branch')} - <span style="${data_style}">${pr_target_branch}</span> - </div> - </td> - </tr> - <tr><td height="10px" style="height:10px"></td></tr> - <tr> - <td> - <div> - ${_('Description')}: - </div> - </td> - </tr> - <tr><td height="10px" style="height:10px"></td></tr> - <tr> - <td> - <table cellpadding="0" cellspacing="0" width="100%" border="0" bgcolor="${color_background_grey}" style="border:1px solid ${color_border};border-radius:4px"> - <tr> - <td height="10px" style="height:10px" colspan="3"></td> - </tr> - <tr> - <td width="20px" style="width:20px"></td> - <td> - <div style="${comment_style}">${body}</div> - </td> - <td width="20px" style="width:20px"></td> - </tr> - <tr> - <td height="10px" style="height:10px" colspan="3"></td> - </tr> - </table> - </td> - </tr> - <tr><td height="15px" style="height:15px"></td></tr> - <tr> - <td> - <div>${_('Changesets')}:</div> - </td> - </tr> - <tr><td height="10px" style="height:10px"></td></tr> - - <tr> - <td style="${sans_style}"> - <ul style="color:${color_link};padding-left:15px;margin:0"> - %for revision, desc in pr_revisions: - <li style="mso-special-format:bullet"> - <a style="${link_style}" - href="${h.canonical_url('changeset_home', repo_name=org_repo_name, revision=revision)}"> - ${h.shorter(desc, 80, firstline=True)} - </a> - </li> - %endfor - </ul> - </td> - </tr> - <tr> - <td> -<% title = _('View Pull Request') %>\ -<%include file="button.html" args="url=pr_url,title=title,padding_bottom=False"/>\ - </td> - </tr> -</table>
--- a/kallithea/templates/email_templates/pull_request.txt Tue Oct 06 20:18:40 2020 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,33 +0,0 @@ -<%block name="header">\ -<% title = _('Mention on Pull Request %s "%s" by %s') % (pr_nice_id, pr_title, pr_user_created) if is_mention else _('Added as Reviewer of Pull Request %s "%s" by %s') % (pr_nice_id, pr_title, pr_user_created) %>\ -<%include file="header.txt" args="title=title,link=pr_url"/>\ -</%block>\ - -${_('Pull request')|n,unicode} \ -${pr_nice_id|n,unicode} \ -"${pr_title|n,unicode}" \ -${_('by')|n,unicode} \ -${pr_owner.full_name_and_username|n,unicode} -${_('from')} \ -${pr_source_repo|n,unicode} \ -${_('branch')|n,unicode} \ -${pr_source_branch|n,unicode} -${_('to')|n,unicode} \ -${pr_target_repo|n,unicode} \ -${_('branch')|n,unicode} \ -${pr_target_branch|n,unicode} - - -${_('Description')|n,unicode}: - -${body|n,unicode} - - -${_('Changesets')|n,unicode}: - -%for revision, desc in pr_revisions: -${h.shorter(desc, 80, firstline=True)|n,unicode} -%endfor - -<% title = _('View Pull Request') %>\ -<%include file="button.txt" args="url=pr_url,title=title"/>\
--- a/kallithea/templates/email_templates/pull_request_comment.html Tue Oct 06 20:18:40 2020 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,47 +0,0 @@ -<%inherit file="main.html"/>\ -\ -<%block name="header">\ -<% title = _('Mention in Comment on Pull Request %s "%s"') % (pr_nice_id, pr_title) if is_mention else _('Pull Request %s "%s" Closed') % (pr_nice_id, pr_title) if closing_pr else _('Comment on Pull Request %s "%s"') % (pr_nice_id, pr_title) %>\ -<%include file="header.html" args="title=title,link=pr_comment_url"/>\ -</%block>\ -\ -<table cellpadding="0" cellspacing="0" border="0" width="100%"> - <tr> - <td> -<%include file="comment.html" args="text=body,author=pr_comment_user,status=status_change,close=closing_pr"/>\ - </td> - </tr> - <tr> - <td height="30px" style="height:30px"></td> - </tr> - <tr> - <td> - <div> - ${_('Pull request')} - <a style="${link_style}" - href="${pr_url}">${pr_nice_id} "${pr_title}"</a> - ${_('by')} - <span style="${data_style}">${pr_owner.full_name_and_username}</span>. - </div> - <div> - ${_('from')} - <a style="${link_text_style}" - href="${pr_source_repo}">${pr_source_repo}</a> - ${_('branch')} - <span style="${data_style}">${pr_source_branch}</span> - <br/> - ${_('to')} - <a style="${link_text_style}" - href="${pr_target_repo}">${pr_target_repo}</a> - ${_('branch')} - <span style="${data_style}">${pr_target_branch}</span>: - </div> - </td> - </tr> - <tr> - <td> -<% title = _('View Comment') %>\ -<%include file="button.html" args="url=pr_comment_url,title=title,padding_bottom=False"/>\ - </td> - </tr> -</table>
--- a/kallithea/templates/email_templates/pull_request_comment.txt Tue Oct 06 20:18:40 2020 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,23 +0,0 @@ -<%block name="header">\ -<% title = _('Mention in Comment on Pull Request %s "%s"') % (pr_nice_id, pr_title) if is_mention else _('Pull Request %s "%s" Closed') % (pr_nice_id, pr_title) if closing_pr else _('Comment on Pull Request %s "%s"') % (pr_nice_id, pr_title) %>\ -<%include file="header.txt" args="title=title,link=pr_comment_url"/>\ -</%block>\ - -<%include file="comment.txt" args="text=body,author=pr_comment_user,status=status_change,close=closing_pr"/>\ - -${_('Pull request')|n,unicode} \ -${pr_nice_id|n,unicode} \ -"${pr_title|n,unicode}" \ -${_('by')|n,unicode} \ -${pr_owner.full_name_and_username|n,unicode} -${_('from')} \ -${pr_source_repo|n,unicode} \ -${_('branch')|n,unicode} \ -${pr_source_branch|n,unicode} -${_('to')|n,unicode} \ -${pr_target_repo|n,unicode} \ -${_('branch')|n,unicode} \ -${pr_target_branch|n,unicode} - -<% title = _('View Comment') %>\ -<%include file="button.txt" args="url=pr_comment_url,title=title"/>\
--- a/kallithea/templates/email_templates/registration.html Tue Oct 06 20:18:40 2020 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,46 +0,0 @@ -## -*- coding: utf-8 -*- -<%inherit file="main.html"/>\ -\ -<%block name="header">\ -<% title = _('New User Registration') %>\ -<%include file="header.html" args="title=title,link=registered_user_url"/>\ -</%block>\ -\ -<table cellpadding="0" cellspacing="0" border="0" width="100%"> - <tr> - <td> - ${_('Username')}: - </td> - <td style="${data_style}"> - ${new_username} - </td> - </tr> - <tr> - <td height="10px" style="height:10px" colspan="2"></td> - </tr> - <tr> - <td> - ${_('Full Name')}: - </td> - <td style="${data_style}"> - ${new_full_name} - </td> - </tr> - <tr> - <td height="10px" style="height:10px" colspan="2"></td> - </tr> - <tr> - <td> - ${_('Email')}: - </td> - <td style="${data_style}"> - ${new_email} - </td> - </tr> - <tr> - <td colspan="2"> -<% title = _('View User Profile') %>\ -<%include file="button.html" args="url=registered_user_url,title=title,padding_bottom=False"/>\ - </td> - </tr> -</table>
--- a/kallithea/templates/email_templates/registration.txt Tue Oct 06 20:18:40 2020 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,13 +0,0 @@ -<%block name="header">\ -<% title = _('New User Registration') %>\ -<%include file="header.txt" args="title=title,link=registered_user_url"/>\ -</%block>\ - -${_('Username')|n,unicode}: ${new_username|n,unicode} - -${_('Full Name')|n,unicode}: ${new_full_name|n,unicode} - -${_('Email')|n,unicode}: ${new_email|n,unicode} - -<% title = _('View User Profile') %>\ -<%include file="button.txt" args="url=registered_user_url,title=title"/>\
--- a/scripts/whitespacecleanup.sh Tue Oct 06 20:18:40 2020 +0200 +++ b/scripts/whitespacecleanup.sh Thu Oct 08 14:52:00 2020 +0200 @@ -2,7 +2,7 @@ # Enforce some consistency in whitespace - just to avoid spurious whitespaces changes -files=`hg mani | egrep -v '/fontello/|/email_templates/|(^LICENSE-MERGELY.html|^docs/Makefile|^scripts/whitespacecleanup.sh|/(graph|mergely|native.history)\.js|/test_dump_html_mails.ref.html|\.png|\.gif|\.ico|\.pot|\.po|\.mo|\.tar\.gz|\.diff)$'` +files=`hg mani | egrep -v '/fontello/|/templates/email/|(^LICENSE-MERGELY.html|^docs/Makefile|^scripts/whitespacecleanup.sh|/(graph|mergely|native.history)\.js|/test_dump_html_mails.ref.html|\.png|\.gif|\.ico|\.pot|\.po|\.mo|\.tar\.gz|\.diff)$'` sed -i "s/`printf '\r'`//g" $files sed -i -e "s,`printf '\t'`, ,g" $files