From 70f35565e1245b5ab91837930dc118e6a7c05a59 Mon Sep 17 00:00:00 2001 From: nupplaPhil Date: Sun, 8 Mar 2020 08:26:21 +0100 Subject: [PATCH 1/2] Fix & align mail text ... again --- view/templates/email/html.tpl | 8 ++-- view/templates/email/notify/html.tpl | 56 +++++++++++++++++++++------- view/templates/email/system/html.tpl | 29 ++++++++++++-- 3 files changed, 73 insertions(+), 20 deletions(-) diff --git a/view/templates/email/html.tpl b/view/templates/email/html.tpl index 103572eae..08de50a54 100644 --- a/view/templates/email/html.tpl +++ b/view/templates/email/html.tpl @@ -14,10 +14,12 @@
+ + + {{$htmlversion nofilter}} + + -

- {{$htmlversion nofilter}} -

diff --git a/view/templates/email/notify/html.tpl b/view/templates/email/notify/html.tpl index f7c3f7d8f..1be8c9eaf 100644 --- a/view/templates/email/notify/html.tpl +++ b/view/templates/email/notify/html.tpl @@ -1,20 +1,48 @@ - - - + + + + + {{if $content_allowed}} + {{if $source_photo}} - - - - + + + + {{/if}} - - + + + + + + {{/if}} - - - - - + + + + + + + + + + + + + + +
{{$preamble nofilter}}
+ {{$preamble nofilter}} +
{{$source_name}}
{{$source_name}}
{{$title}}
{{$htmlversion nofilter}}
{{$title}}
{{$htmlversion nofilter}} +
{{$hsitelink nofilter}}
{{$hitemlink nofilter}}
{{$thanks}}
{{$site_admin}}
+ {{$hsitelink nofilter}} +
+ {{$hitemlink nofilter}} +
+ {{$thanks}} +
+ {{$site_admin}} +
diff --git a/view/templates/email/system/html.tpl b/view/templates/email/system/html.tpl index f32825d3e..8f4e1573f 100644 --- a/view/templates/email/system/html.tpl +++ b/view/templates/email/system/html.tpl @@ -1,5 +1,28 @@ - - - + + + + + + + + + + + + + + + + + +
{{$htmlversion nofilter}}
{{$thanks}}
{{$site_admin}}
+ {{$preamble nofilter}} +
+ {{$htmlversion nofilter}} +
+ {{$thanks}} +
+ {{$site_admin}} +
From 06b0df8e462508b73c48542416402ddcd4e1ccd5 Mon Sep 17 00:00:00 2001 From: nupplaPhil Date: Sun, 8 Mar 2020 20:24:17 +0100 Subject: [PATCH 2/2] Fix mail text ... again --- view/templates/email/notify/html.tpl | 2 ++ view/templates/email/system/html.tpl | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/view/templates/email/notify/html.tpl b/view/templates/email/notify/html.tpl index 1be8c9eaf..7237fad83 100644 --- a/view/templates/email/notify/html.tpl +++ b/view/templates/email/notify/html.tpl @@ -35,11 +35,13 @@ + {{$thanks}} + {{$site_admin}} diff --git a/view/templates/email/system/html.tpl b/view/templates/email/system/html.tpl index 8f4e1573f..313a06627 100644 --- a/view/templates/email/system/html.tpl +++ b/view/templates/email/system/html.tpl @@ -18,7 +18,7 @@ {{$thanks}} - + {{$site_admin}}