# HG changeset patch # User Thomas De Schampheleire # Date 1602161520 -7200 # Node ID d379e2c39bba4666fd0e62a065e1cb5e60372b4b # Parent 495dea7c2a137942ced3be08406105256faae258 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. diff -r 495dea7c2a13 -r d379e2c39bba kallithea/model/notification.py --- 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 = {'_': _, diff -r 495dea7c2a13 -r d379e2c39bba kallithea/templates/email/button.html --- /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" />\ +## + + + %if padding_top: + + + + %endif + + + + %if padding_bottom: + + + + %endif +

+ +## diff -r 495dea7c2a13 -r d379e2c39bba kallithea/templates/email/button.txt --- /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} diff -r 495dea7c2a13 -r d379e2c39bba kallithea/templates/email/changeset_comment.html --- /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"/>\ +\ +\ + + + + + + + + + + + + + +

+<%include file="comment.html" args="text=body,author=cs_comment_user,status=status_change"/>\ +

+ ${_('Changeset on')} + ${cs_target_repo} + ${_('branch')} + ${branch}: +

+ "${h.shorter(message, 60, firstline=True)}" + ${_('by')} + ${cs_author.full_name_and_username}. +

+<% title = _('View Comment') %>\ +<%include file="button.html" args="url=cs_comment_url,title=title,padding_bottom=False"/>\ +

diff -r 495dea7c2a13 -r d379e2c39bba kallithea/templates/email/changeset_comment.txt --- /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"/>\ +\ + +<%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"/>\ diff -r 495dea7c2a13 -r d379e2c39bba kallithea/templates/email/comment.html --- /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" />\ +\ +## + + + + + + + + + + + + +


	+ %if link is not None: + ${title} + %else: + ${title} + %endif +

+## diff -r 495dea7c2a13 -r d379e2c39bba kallithea/templates/email/header.txt --- /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 diff -r 495dea7c2a13 -r d379e2c39bba kallithea/templates/email/main.html --- /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 @@ + + + + + + + + + + + + + + +

+ + + + + + + + + + + + + + + + +


+<%block name="header"/>\ +

	+ ## +${self.body()}\ + ## +

+ + diff -r 495dea7c2a13 -r d379e2c39bba kallithea/templates/email/password_reset.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"/>\ +\ +\ + + + + + + + + + + + + + + + + + + + + + + +

${_('Hello %s') % user},

+ ${_('We have received a request to reset the password for your account.')} +

+ %if reset_token is None: +

${_('This account is however managed outside this system and the password cannot be changed here.')}

+ %else: +

+ ${_('To set a new password, click the following link')}: +
+ ${reset_url} +
+ ${_("Should you not be able to use the link above, please type the following code into the password reset form")}: + ${reset_token} +

+ %endif +

+ ${_("If it weren't you who requested the password reset, just disregard this message.")} +

diff -r 495dea7c2a13 -r d379e2c39bba kallithea/templates/email/password_reset.txt --- /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"/>\ +\ +\ +${_('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} diff -r 495dea7c2a13 -r d379e2c39bba kallithea/templates/email/pull_request.html --- /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"/>\ +\ +\ + + + + + + + + + + + + + + + + + + + + + + + + +

+ ${_('Pull request')} + ${pr_nice_id} "${pr_title}" + ${_('by')} + ${pr_owner.full_name_and_username}. +

+ ${_('from')} + ${pr_source_repo} + ${_('branch')} + ${pr_source_branch} +
+ ${_('to')} + ${pr_target_repo} + ${_('branch')} + ${pr_target_branch} +

+ ${_('Description')}: +

+ + + + + + + + + + + + +


	+ ${body} +

${_('Changesets')}:

+ + ${h.shorter(desc, 80, firstline=True)} + +

+<% title = _('View Pull Request') %>\ +<%include file="button.html" args="url=pr_url,title=title,padding_bottom=False"/>\ +

diff -r 495dea7c2a13 -r d379e2c39bba kallithea/templates/email/pull_request.txt --- /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"/>\ +\ + +${_('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"/>\ diff -r 495dea7c2a13 -r d379e2c39bba kallithea/templates/email/pull_request_comment.html --- /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"/>\ +\ +\ + + + + + + + + + + + + + +

+<%include file="comment.html" args="text=body,author=pr_comment_user,status=status_change,close=closing_pr"/>\ +

+ ${_('Pull request')} + ${pr_nice_id} "${pr_title}" + ${_('by')} + ${pr_owner.full_name_and_username}. +

+ ${_('from')} + ${pr_source_repo} + ${_('branch')} + ${pr_source_branch} +
+ ${_('to')} + ${pr_target_repo} + ${_('branch')} + ${pr_target_branch}: +

+<% title = _('View Comment') %>\ +<%include file="button.html" args="url=pr_comment_url,title=title,padding_bottom=False"/>\ +

diff -r 495dea7c2a13 -r d379e2c39bba kallithea/templates/email/pull_request_comment.txt --- /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"/>\ +\ + +<%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"/>\ diff -r 495dea7c2a13 -r d379e2c39bba kallithea/templates/email/registration.html --- /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"/>\ +\ +\ + + + + + + + + + + + + + + + + + + + + + + +

+ ${_('Username')}: +	+ ${new_username} +

+ ${_('Full Name')}: +	+ ${new_full_name} +

+ ${_('Email')}: +	+ ${new_email} +
+<% title = _('View User Profile') %>\ +<%include file="button.html" args="url=registered_user_url,title=title,padding_bottom=False"/>\ +

diff -r 495dea7c2a13 -r d379e2c39bba kallithea/templates/email/registration.txt --- /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"/>\ +\ + +${_('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"/>\ diff -r 495dea7c2a13 -r d379e2c39bba kallithea/templates/email_templates/button.html --- 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" />\ -## - - - %if padding_top: - - - - %endif - - - - %if padding_bottom: - - - - %endif -

- - - - ${_(title)} - - - -

- -## diff -r 495dea7c2a13 -r d379e2c39bba kallithea/templates/email_templates/button.txt --- 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} diff -r 495dea7c2a13 -r d379e2c39bba kallithea/templates/email_templates/changeset_comment.html --- 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"/>\ -\ -\ - - - - - - - - - - - - - -

-<%include file="comment.html" args="text=body,author=cs_comment_user,status=status_change"/>\ -

- ${_('Changeset on')} - ${cs_target_repo} - ${_('branch')} - ${branch}: -

- "${h.shorter(message, 60, firstline=True)}" - ${_('by')} - ${cs_author.full_name_and_username}. -

-<% title = _('View Comment') %>\ -<%include file="button.html" args="url=cs_comment_url,title=title,padding_bottom=False"/>\ -

diff -r 495dea7c2a13 -r d379e2c39bba kallithea/templates/email_templates/changeset_comment.txt --- 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"/>\ -\ - -<%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"/>\ diff -r 495dea7c2a13 -r d379e2c39bba kallithea/templates/email_templates/comment.html --- 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" />\ -\ -## - - - - - - - - - - - - -


	- %if link is not None: - ${title} - %else: - ${title} - %endif -

-## diff -r 495dea7c2a13 -r d379e2c39bba kallithea/templates/email_templates/header.txt --- 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 diff -r 495dea7c2a13 -r d379e2c39bba kallithea/templates/email_templates/main.html --- 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 @@ - - - - - - - - - - - - - - -

- - - - - - - - - - - - - - - - -


-<%block name="header"/>\ -

	- ## -${self.body()}\ - ## -

- - diff -r 495dea7c2a13 -r d379e2c39bba kallithea/templates/email_templates/password_reset.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"/>\ -\ -\ - - - - - - - - - - - - - - - - - - - - - - -

${_('Hello %s') % user},

- ${_('We have received a request to reset the password for your account.')} -

- %if reset_token is None: -

${_('This account is however managed outside this system and the password cannot be changed here.')}

- %else: -

- ${_('To set a new password, click the following link')}: -
- ${reset_url} -
- ${_("Should you not be able to use the link above, please type the following code into the password reset form")}: - ${reset_token} -

- %endif -

- ${_("If it weren't you who requested the password reset, just disregard this message.")} -

diff -r 495dea7c2a13 -r d379e2c39bba kallithea/templates/email_templates/password_reset.txt --- 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"/>\ -\ -\ -${_('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} diff -r 495dea7c2a13 -r d379e2c39bba kallithea/templates/email_templates/pull_request.html --- 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"/>\ -\ -\ - - - - - - - - - - - - - - - - - - - - - - - - -

- ${_('Pull request')} - ${pr_nice_id} "${pr_title}" - ${_('by')} - ${pr_owner.full_name_and_username}. -

- ${_('from')} - ${pr_source_repo} - ${_('branch')} - ${pr_source_branch} -
- ${_('to')} - ${pr_target_repo} - ${_('branch')} - ${pr_target_branch} -

- ${_('Description')}: -

- - - - - - - - - - - - -


	- ${body} -

${_('Changesets')}:

- - ${h.shorter(desc, 80, firstline=True)} - -

-<% title = _('View Pull Request') %>\ -<%include file="button.html" args="url=pr_url,title=title,padding_bottom=False"/>\ -

diff -r 495dea7c2a13 -r d379e2c39bba kallithea/templates/email_templates/pull_request.txt --- 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"/>\ -\ - -${_('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"/>\ diff -r 495dea7c2a13 -r d379e2c39bba kallithea/templates/email_templates/pull_request_comment.html --- 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"/>\ -\ -\ - - - - - - - - - - - - - -

-<%include file="comment.html" args="text=body,author=pr_comment_user,status=status_change,close=closing_pr"/>\ -

- ${_('Pull request')} - ${pr_nice_id} "${pr_title}" - ${_('by')} - ${pr_owner.full_name_and_username}. -

- ${_('from')} - ${pr_source_repo} - ${_('branch')} - ${pr_source_branch} -
- ${_('to')} - ${pr_target_repo} - ${_('branch')} - ${pr_target_branch}: -

-<% title = _('View Comment') %>\ -<%include file="button.html" args="url=pr_comment_url,title=title,padding_bottom=False"/>\ -

diff -r 495dea7c2a13 -r d379e2c39bba kallithea/templates/email_templates/pull_request_comment.txt --- 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"/>\ -\ - -<%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"/>\ diff -r 495dea7c2a13 -r d379e2c39bba kallithea/templates/email_templates/registration.html --- 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"/>\ -\ -\ - - - - - - - - - - - - - - - - - - - - - - -

- ${_('Username')}: -	- ${new_username} -

- ${_('Full Name')}: -	- ${new_full_name} -

- ${_('Email')}: -	- ${new_email} -
-<% title = _('View User Profile') %>\ -<%include file="button.html" args="url=registered_user_url,title=title,padding_bottom=False"/>\ -

diff -r 495dea7c2a13 -r d379e2c39bba kallithea/templates/email_templates/registration.txt --- 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"/>\ -\ - -${_('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"/>\ diff -r 495dea7c2a13 -r d379e2c39bba scripts/whitespacecleanup.sh --- 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