# HG changeset patch # User Thomas De Schampheleire # Date 2018-02-03 17:17:57 # Node ID 10ee27bae2ff3534b981ecee05b1b39407cc5c84 # Parent ffe7f24c7c7ab042b713dbca4aeba1169154505b HTML email templates: Outlook: fix width and height attributes to preserve whitespace The rendering of HTML emails in Outlook is very restricted and based on old Internet Explorer versions (more or less the same rendering as in Microsoft Word). To make the Kallithea emails look the same as in the browser, some adaptations are needed. HTML width and height attributes do not have any effect, the size is interpreted as 0px. A CSS-based width and height do work in Outlook and result in the expected spacing between and within elements of the email. For Outlook rendering, the CSS variant is probably sufficient, but as it is unclear how other mail agents will interpret this, leave the HTML width and height attributes as well. diff --git a/kallithea/templates/email_templates/button.html b/kallithea/templates/email_templates/button.html --- a/kallithea/templates/email_templates/button.html +++ b/kallithea/templates/email_templates/button.html @@ -4,7 +4,7 @@ %if padding_top: - + %endif @@ -20,7 +20,7 @@ %if padding_bottom: - + %endif
diff --git a/kallithea/templates/email_templates/changeset_comment.html b/kallithea/templates/email_templates/changeset_comment.html --- a/kallithea/templates/email_templates/changeset_comment.html +++ b/kallithea/templates/email_templates/changeset_comment.html @@ -12,7 +12,7 @@ - + diff --git a/kallithea/templates/email_templates/comment.html b/kallithea/templates/email_templates/comment.html --- a/kallithea/templates/email_templates/comment.html +++ b/kallithea/templates/email_templates/comment.html @@ -3,24 +3,24 @@ ## diff --git a/kallithea/templates/email_templates/main.html b/kallithea/templates/email_templates/main.html --- a/kallithea/templates/email_templates/main.html +++ b/kallithea/templates/email_templates/main.html @@ -8,18 +8,18 @@ - + - +
- + - + @@ -31,11 +31,11 @@ ${self.body()}\ - +
<%block name="header"/>\
diff --git a/kallithea/templates/email_templates/password_reset.html b/kallithea/templates/email_templates/password_reset.html --- a/kallithea/templates/email_templates/password_reset.html +++ b/kallithea/templates/email_templates/password_reset.html @@ -9,7 +9,7 @@ ${_('Hello %s') % user}, - + @@ -17,7 +17,7 @@ - + @@ -37,7 +37,7 @@ - + diff --git a/kallithea/templates/email_templates/pull_request.html b/kallithea/templates/email_templates/pull_request.html --- a/kallithea/templates/email_templates/pull_request.html +++ b/kallithea/templates/email_templates/pull_request.html @@ -29,7 +29,7 @@ - +
@@ -37,19 +37,19 @@
- +
${body}
- +
${_('Changesets')}:
- + diff --git a/kallithea/templates/email_templates/pull_request_comment.html b/kallithea/templates/email_templates/pull_request_comment.html --- a/kallithea/templates/email_templates/pull_request_comment.html +++ b/kallithea/templates/email_templates/pull_request_comment.html @@ -12,7 +12,7 @@ - + diff --git a/kallithea/templates/email_templates/registration.html b/kallithea/templates/email_templates/registration.html --- a/kallithea/templates/email_templates/registration.html +++ b/kallithea/templates/email_templates/registration.html @@ -15,7 +15,7 @@ - + @@ -26,7 +26,7 @@ - + diff --git a/kallithea/tests/models/test_dump_html_mails.ref.html b/kallithea/tests/models/test_dump_html_mails.ref.html --- a/kallithea/tests/models/test_dump_html_mails.ref.html +++ b/kallithea/tests/models/test_dump_html_mails.ref.html @@ -39,34 +39,34 @@ View Comment: http://comment.org - +
- + - + @@ -76,36 +76,36 @@ View Comment: http://comment.org - + - +
- + - + - + - +
Comment on Changeset "This changeset did something clever which is hard to explain"
- + - + - + - + - + - + - + - +
Opinionated User (jsmith)
This is the new comment.

- and here it ends indented.
@@ -129,7 +129,7 @@ View Comment: http://comment.org
- + - +
@@ -151,11 +151,11 @@ View Comment: http://comment.org
@@ -198,34 +198,34 @@ View Comment: http://comment.org - +
- + - + @@ -235,36 +235,36 @@ View Comment: http://comment.org - + - +
- + - + - + - +
Mention in Comment on Changeset "This changeset did something clever which is hard to explain"
- + - + - + - + - + - + - + - +
Opinionated User (jsmith)
This is the new comment.

- and here it ends indented.
@@ -288,7 +288,7 @@ View Comment: http://comment.org
- + - +
@@ -310,11 +310,11 @@ View Comment: http://comment.org
@@ -359,34 +359,34 @@ View Comment: http://comment.org - +
- + - + @@ -396,52 +396,52 @@ View Comment: http://comment.org - + - +
- + - + - + - +
Comment on Changeset "This changeset did something clever which is hard to explain"
- + - + - + - + - + - + - + - + - + - + - + - +
Opinionated User (jsmith)
Status change: Approved
This is the new comment.

- and here it ends indented.
@@ -465,7 +465,7 @@ View Comment: http://comment.org
- + - +
@@ -487,11 +487,11 @@ View Comment: http://comment.org
@@ -536,34 +536,34 @@ View Comment: http://comment.org - +
- + - + @@ -573,52 +573,52 @@ View Comment: http://comment.org - + - +
- + - + - + - +
Mention in Comment on Changeset "This changeset did something clever which is hard to explain"
- + - + - + - + - + - + - + - + - + - + - + - +
Opinionated User (jsmith)
Status change: Approved
This is the new comment.

- and here it ends indented.
@@ -642,7 +642,7 @@ View Comment: http://comment.org
- + - +
@@ -664,11 +664,11 @@ View Comment: http://comment.org
@@ -695,33 +695,33 @@ Subject: Test Message - + - +
- + - + @@ -735,11 +735,11 @@ Subject: Test Message - +
- + - + - + - +
Message
@@ -778,34 +778,34 @@ View User Profile: http://newbie.org - +
- + - + @@ -820,7 +820,7 @@ View User Profile: http://newbie.org - + - + - +
- + - + - + - +
New User Registration
@@ -831,7 +831,7 @@ View User Profile: http://newbie.org
@@ -846,7 +846,7 @@ View User Profile: http://newbie.org
- + - +
@@ -868,11 +868,11 @@ View User Profile: http://newbie.org
@@ -920,34 +920,34 @@ View Pull Request: http://pr.org/7 - +
- + - + @@ -976,7 +976,7 @@ View Pull Request: http://pr.org/7 - + - + - + - + - +
- + - + - + - +
Added as Reviewer of Pull Request #7 "The Title" by Requesting User (root)
@@ -984,19 +984,19 @@ View Pull Request: http://pr.org/7
This PR is awesome because it does stuff
- please approve indented!
Changesets:
@@ -1021,7 +1021,7 @@ View Pull Request: http://pr.org/7
- + - +
@@ -1043,11 +1043,11 @@ View Pull Request: http://pr.org/7
@@ -1095,34 +1095,34 @@ View Pull Request: http://pr.org/7 - +
- + - + @@ -1151,7 +1151,7 @@ View Pull Request: http://pr.org/7 - + - + - + - + - +
- + - + - + - +
Mention on Pull Request #7 "The Title" by Requesting User (root)
@@ -1159,19 +1159,19 @@ View Pull Request: http://pr.org/7
This PR is awesome because it does stuff
- please approve indented!
Changesets:
@@ -1196,7 +1196,7 @@ View Pull Request: http://pr.org/7
- + - +
@@ -1218,11 +1218,11 @@ View Pull Request: http://pr.org/7
@@ -1265,34 +1265,34 @@ View Comment: http://pr.org/comment - +
- + - + @@ -1302,36 +1302,36 @@ View Comment: http://pr.org/comment - + - +
- + - + - + - +
Comment on Pull Request #7 "The Title"
- + - + - + - + - + - + - + - +
Opinionated User (jsmith)
Me too!

- and indented on second line
@@ -1361,7 +1361,7 @@ View Comment: http://pr.org/comment
- + - +
@@ -1383,11 +1383,11 @@ View Comment: http://pr.org/comment
@@ -1430,34 +1430,34 @@ View Comment: http://pr.org/comment - +
- + - + @@ -1467,36 +1467,36 @@ View Comment: http://pr.org/comment - + - +
- + - + - + - +
Mention in Comment on Pull Request #7 "The Title"
- + - + - + - + - + - + - + - +
Opinionated User (jsmith)
Me too!

- and indented on second line
@@ -1526,7 +1526,7 @@ View Comment: http://pr.org/comment
- + - +
@@ -1548,11 +1548,11 @@ View Comment: http://pr.org/comment
@@ -1597,34 +1597,34 @@ View Comment: http://pr.org/comment - +
- + - + @@ -1634,52 +1634,52 @@ View Comment: http://pr.org/comment - + - +
- + - + - + - +
Comment on Pull Request #7 "The Title"
- + - + - + - + - + - + - + - + - + - + - + - +
Opinionated User (jsmith)
Status change: Under Review
Me too!

- and indented on second line
@@ -1709,7 +1709,7 @@ View Comment: http://pr.org/comment
- + - +
@@ -1731,11 +1731,11 @@ View Comment: http://pr.org/comment
@@ -1780,34 +1780,34 @@ View Comment: http://pr.org/comment - +
- + - + @@ -1817,52 +1817,52 @@ View Comment: http://pr.org/comment - + - +
- + - + - + - +
Mention in Comment on Pull Request #7 "The Title"
- + - + - + - + - + - + - + - + - + - + - + - +
Opinionated User (jsmith)
Status change: Under Review
Me too!

- and indented on second line
@@ -1892,7 +1892,7 @@ View Comment: http://pr.org/comment
- + - +
@@ -1914,11 +1914,11 @@ View Comment: http://pr.org/comment
@@ -1963,34 +1963,34 @@ View Comment: http://pr.org/comment - +
- + - + @@ -2000,51 +2000,51 @@ View Comment: http://pr.org/comment - + - +
- + - + - + - +
Pull Request #7 "The Title" Closed
- + - + - + - + - + - + - + - + - + - + - + - +
Opinionated User (jsmith)
The pull request has been closed.
Me too!

- and indented on second line
@@ -2074,7 +2074,7 @@ View Comment: http://pr.org/comment
- + - +
@@ -2096,11 +2096,11 @@ View Comment: http://pr.org/comment
@@ -2145,34 +2145,34 @@ View Comment: http://pr.org/comment - +
- + - + @@ -2182,51 +2182,51 @@ View Comment: http://pr.org/comment - + - +
- + - + - + - +
Mention in Comment on Pull Request #7 "The Title"
- + - + - + - + - + - + - + - + - + - + - + - +
Opinionated User (jsmith)
The pull request has been closed.
Me too!

- and indented on second line
@@ -2256,7 +2256,7 @@ View Comment: http://pr.org/comment
- + - +
@@ -2278,11 +2278,11 @@ View Comment: http://pr.org/comment
@@ -2329,34 +2329,34 @@ View Comment: http://pr.org/comment - +
- + - + @@ -2366,23 +2366,23 @@ View Comment: http://pr.org/comment - + - +
- + - + - + - +
Pull Request #7 "The Title" Closed
- + - + - + - + - + - + - + - + - + - + - + - +
Opinionated User (jsmith)
Status change: @@ -2392,29 +2392,29 @@ View Comment: http://pr.org/comment The pull request has been closed.
Me too!

- and indented on second line
@@ -2444,7 +2444,7 @@ View Comment: http://pr.org/comment
- + - +
@@ -2466,11 +2466,11 @@ View Comment: http://pr.org/comment
@@ -2517,34 +2517,34 @@ View Comment: http://pr.org/comment - +
- + - + @@ -2554,23 +2554,23 @@ View Comment: http://pr.org/comment - + - +
- + - + - + - +
Mention in Comment on Pull Request #7 "The Title"
- + - + - + - + - + - + - + - + - + - + - + - +
Opinionated User (jsmith)
Status change: @@ -2580,29 +2580,29 @@ View Comment: http://pr.org/comment The pull request has been closed.
Me too!

- and indented on second line
@@ -2632,7 +2632,7 @@ View Comment: http://pr.org/comment
- + - +
@@ -2654,11 +2654,11 @@ View Comment: http://pr.org/comment
@@ -2698,33 +2698,33 @@ If it weren't you who requested the pass - + - +
- + - + @@ -2734,7 +2734,7 @@ If it weren't you who requested the pass - + - + - + - +
- + - + - + - +
Password Reset Request
Hello John Doe,
@@ -2742,7 +2742,7 @@ If it weren't you who requested the pass
@@ -2758,7 +2758,7 @@ If it weren't you who requested the pass
@@ -2770,11 +2770,11 @@ If it weren't you who requested the pass