kallithea Changeset - d379e2c39bba

Parent rev.

Child rev.

[Not reviewed]

default

19 2 19

Thomas De Schampheleire - 5 years ago 2020-10-08 14:52:00
thomas.de_schampheleire@nokia.com

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.

21 files changed with 2 insertions and 2 deletions:

kallithea/model/notification.py

kallithea/templates/email/button.html

rename

kallithea/templates/email/button.txt

rename

kallithea/templates/email/changeset_comment.html

rename

kallithea/templates/email/changeset_comment.txt

rename

kallithea/templates/email/comment.html

rename

kallithea/templates/email/comment.txt

rename

kallithea/templates/email/default.html

rename

kallithea/templates/email/default.txt

rename

kallithea/templates/email/header.html

rename

kallithea/templates/email/header.txt

rename

kallithea/templates/email/main.html

rename

kallithea/templates/email/password_reset.html

rename

kallithea/templates/email/password_reset.txt

rename

kallithea/templates/email/pull_request.html

rename

kallithea/templates/email/pull_request.txt

rename

kallithea/templates/email/pull_request_comment.html

rename

kallithea/templates/email/pull_request_comment.txt

rename

kallithea/templates/email/registration.html

rename

kallithea/templates/email/registration.txt

rename

scripts/whitespacecleanup.sh

0 comments (0 inline, 0 general)

kallithea/model/notification.py

➞

Show inline comments

@@ @@ -195,25 +195,25 @@ class EmailNotificationModel(object): @@
         if bracket_tags:
             if subj.startswith('['):
                 subj = '[' + ', '.join(bracket_tags) + ': ' + subj[1:]
             else:
                 subj = '[' + ', '.join(bracket_tags) + '] ' + subj
         return subj
     def get_email_tmpl(self, type_, content_type, **kwargs):
         """
         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 = {'_': _,
                    'h': h,
                    'c': c}
         _kwargs.update(kwargs)
         if content_type == 'html':
             _kwargs.update({
                 "color_text": "#202020",
                 "color_emph": "#395fa0",
                 "color_link": "#395fa0",
                 "color_border": "#ddd",

kallithea/templates/email/button.html

➞

Show inline comments

file renamed from kallithea/templates/email_templates/button.html to kallithea/templates/email/button.html

kallithea/templates/email/button.txt

➞

Show inline comments

file renamed from kallithea/templates/email_templates/button.txt to kallithea/templates/email/button.txt

kallithea/templates/email/changeset_comment.html

➞

Show inline comments

file renamed from kallithea/templates/email_templates/changeset_comment.html to kallithea/templates/email/changeset_comment.html

kallithea/templates/email/changeset_comment.txt

➞

Show inline comments

file renamed from kallithea/templates/email_templates/changeset_comment.txt to kallithea/templates/email/changeset_comment.txt

kallithea/templates/email/comment.html

➞

Show inline comments

file renamed from kallithea/templates/email_templates/comment.html to kallithea/templates/email/comment.html

kallithea/templates/email/comment.txt

➞

Show inline comments

file renamed from kallithea/templates/email_templates/comment.txt to kallithea/templates/email/comment.txt

kallithea/templates/email/default.html

➞

Show inline comments

file renamed from kallithea/templates/email_templates/default.html to kallithea/templates/email/default.html

kallithea/templates/email/default.txt

➞

Show inline comments

file renamed from kallithea/templates/email_templates/default.txt to kallithea/templates/email/default.txt

kallithea/templates/email/header.html

➞

Show inline comments

file renamed from kallithea/templates/email_templates/header.html to kallithea/templates/email/header.html

kallithea/templates/email/header.txt

➞

Show inline comments

file renamed from kallithea/templates/email_templates/header.txt to kallithea/templates/email/header.txt

kallithea/templates/email/main.html

➞

Show inline comments

file renamed from kallithea/templates/email_templates/main.html to kallithea/templates/email/main.html

kallithea/templates/email/password_reset.html

➞

Show inline comments

file renamed from kallithea/templates/email_templates/password_reset.html to kallithea/templates/email/password_reset.html

kallithea/templates/email/password_reset.txt

➞

Show inline comments

file renamed from kallithea/templates/email_templates/password_reset.txt to kallithea/templates/email/password_reset.txt

kallithea/templates/email/pull_request.html

➞

Show inline comments

file renamed from kallithea/templates/email_templates/pull_request.html to kallithea/templates/email/pull_request.html

kallithea/templates/email/pull_request.txt

➞

Show inline comments

file renamed from kallithea/templates/email_templates/pull_request.txt to kallithea/templates/email/pull_request.txt

kallithea/templates/email/pull_request_comment.html

➞

Show inline comments

file renamed from kallithea/templates/email_templates/pull_request_comment.html to kallithea/templates/email/pull_request_comment.html

kallithea/templates/email/pull_request_comment.txt

➞

Show inline comments

file renamed from kallithea/templates/email_templates/pull_request_comment.txt to kallithea/templates/email/pull_request_comment.txt

kallithea/templates/email/registration.html

➞

Show inline comments

file renamed from kallithea/templates/email_templates/registration.html to kallithea/templates/email/registration.html

kallithea/templates/email/registration.txt

➞

Show inline comments

file renamed from kallithea/templates/email_templates/registration.txt to kallithea/templates/email/registration.txt

scripts/whitespacecleanup.sh

➞

Show inline comments

 #!/bin/bash -xe
 # 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
 sed -i -e "s,  *$,,g" $files
 sed -i -e 's,\([^ ]\)\\$,\1 \\,g' -e 's,\(["'"'"']["'"'"']["'"'"']\) \\$,\1\\,g' $files
 # ensure one trailing newline - remove empty last line and make last line include trailing newline:
 sed -i -e '$,${/^$/d}' -e '$a\' $files
 sed -i -e 's,\([^ /]\){,\1 {,g' `hg loc '*.css'`
 sed -i -e 's|^\([^ /].*,\)\([^ ]\)|\1 \2|g' `hg loc '*.css'`
 hg mani | xargs chmod -x

0 comments (0 inline, 0 general)