From 178ccd16cba26144eac404f413440867b360033c Mon Sep 17 00:00:00 2001 From: Jonathan Date: Sat, 5 Aug 2017 19:52:35 -0400 Subject: System Console: Email notification content setting (#7122) * PLT-7195: Added new config option, new license feature, and config UI to system console. Still need to implement behaviour change in email batching code * PLT-7195: Modified batch emails to respect email notification content type setting * PLT-7195: Tweaking the colours a bit * PLT-7195: Added support for email notification content type setting in immediate (non-batched) notification messages. Attempted to clean up the code somewhat. Unit tests coming in a future commit * PLT-7195: Added unit tests for non-batched emails * Checked license when applying email content settings * Changed return type of getFormattedPostTime --- templates/post_batched_post.html | 38 --------------------------- templates/post_batched_post_full.html | 38 +++++++++++++++++++++++++++ templates/post_batched_post_generic.html | 37 ++++++++++++++++++++++++++ templates/post_body.html | 45 -------------------------------- templates/post_body_full.html | 45 ++++++++++++++++++++++++++++++++ templates/post_body_generic.html | 45 ++++++++++++++++++++++++++++++++ 6 files changed, 165 insertions(+), 83 deletions(-) delete mode 100644 templates/post_batched_post.html create mode 100644 templates/post_batched_post_full.html create mode 100644 templates/post_batched_post_generic.html delete mode 100644 templates/post_body.html create mode 100644 templates/post_body_full.html create mode 100644 templates/post_body_generic.html (limited to 'templates') diff --git a/templates/post_batched_post.html b/templates/post_batched_post.html deleted file mode 100644 index f3dbf9d6d..000000000 --- a/templates/post_batched_post.html +++ /dev/null @@ -1,38 +0,0 @@ -{{define "post_batched_post"}} - - - - - - - - - - -
- - {{.Props.ChannelName}} - -
-
- - @{{.Props.SenderName}} - - - {{.Props.Date}} - -
-
- 
{{.Props.PostMessage}}
- - {{.Props.Button}} - -
- -{{end}} diff --git a/templates/post_batched_post_full.html b/templates/post_batched_post_full.html new file mode 100644 index 000000000..7e12da46e --- /dev/null +++ b/templates/post_batched_post_full.html @@ -0,0 +1,38 @@ +{{define "post_batched_post_full"}} + + + + + + + + + + +
+ + {{.Props.ChannelName}} + +
+
+ + @{{.Props.SenderName}} + + + {{.Props.Date}} + +
+
+ 
{{.Props.PostMessage}}
+ + {{.Props.Button}} + +
+ +{{end}} diff --git a/templates/post_batched_post_generic.html b/templates/post_batched_post_generic.html new file mode 100644 index 000000000..5d34af645 --- /dev/null +++ b/templates/post_batched_post_generic.html @@ -0,0 +1,37 @@ +{{define "post_batched_post_generic"}} + + + + + + + + + + +
+ + {{.Props.ChannelName}} + + + @{{.Props.SenderName}} + +
+
+ + {{.Props.Date}} + +
+
+ + {{.Props.Button}} + +
+ +{{end}} diff --git a/templates/post_body.html b/templates/post_body.html deleted file mode 100644 index 54f34d1dd..000000000 --- a/templates/post_body.html +++ /dev/null @@ -1,45 +0,0 @@ -{{define "post_body"}} - - - - - -
- - - - -
- - - - - - - - - {{template "email_footer" . }} - -
- -
- - - - - - {{template "email_info" . }} - -
-

{{.Props.BodyText}}

-

{{.Html.Info}}

{{.Props.PostMessage}}

-

- {{.Props.Button}} -

-
-
-
-
- -{{end}} - diff --git a/templates/post_body_full.html b/templates/post_body_full.html new file mode 100644 index 000000000..fa27aba55 --- /dev/null +++ b/templates/post_body_full.html @@ -0,0 +1,45 @@ +{{define "post_body_full"}} + + + + + +
+ + + + +
+ + + + + + + + + {{template "email_footer" . }} + +
+ +
+ + + + + + {{template "email_info" . }} + +
+

{{.Props.BodyText}}

+

{{.Html.Info}}

{{.Props.PostMessage}}

+

+ {{.Props.Button}} +

+
+
+
+
+ +{{end}} + diff --git a/templates/post_body_generic.html b/templates/post_body_generic.html new file mode 100644 index 000000000..bdd358e99 --- /dev/null +++ b/templates/post_body_generic.html @@ -0,0 +1,45 @@ +{{define "post_body_generic"}} + + + + + +
+ + + + +
+ + + + + + + + + {{template "email_footer" . }} + +
+ +
+ + + + + + {{template "email_info" . }} + +
+

{{.Props.BodyText}}

+

{{.Html.Info}}

+

+ {{.Props.Button}} +

+
+
+
+
+ +{{end}} + -- cgit v1.2.3-1-g7c22