From 8203fd16ce3356d69b0cc51287d0a1fc25318b2d Mon Sep 17 00:00:00 2001 From: Harrison Healey Date: Tue, 16 Aug 2016 14:41:47 -0400 Subject: PLT-3647 Email Batching (#3718) * PLT-3647 Added config settings for email batching * PLT-3647 Refactored generation of email notification * PLT-3647 Added serverside code for email batching * PLT-3647 Updated settings UI to enable email batching * PLT-3647 Removed debug code * PLT-3647 Fixed 0-padding of minutes in batched notification * PLT-3647 Updated clientside UI for when email batching is disabled * Go fmt * PLT-3647 Changed email batching to be disabled by default * Updated batched email message * Added email batching toggle to system console * Changed Email Notifications > Immediate setting to a 30 second batch interval * Go fmt * Fixed link to Mattermost icon in batched email notification * Updated users to use 30 second email batching by default * Fully disabled email batching when clustering is enabled * Fixed email batching setting in the system console * Fixed casing of 'Send Email notifications' -> 'Send email notifications' * Updating UI Improvements for email batching (#3736) * Updated text for notification settings and SiteURL. * Prevented enabling email batching when SiteURL isn't set in the system console * Re-added a couple debug messages * Added warning text when clustering is enabled --- templates/post_batched_body.html | 43 ++++++++++++++++++++++++++++++++++++++++ templates/post_batched_post.html | 30 ++++++++++++++++++++++++++++ 2 files changed, 73 insertions(+) create mode 100644 templates/post_batched_body.html create mode 100644 templates/post_batched_post.html (limited to 'templates') diff --git a/templates/post_batched_body.html b/templates/post_batched_body.html new file mode 100644 index 000000000..6efca4516 --- /dev/null +++ b/templates/post_batched_body.html @@ -0,0 +1,43 @@ +{{define "post_batched_body"}} + + + + + +
+ + + + +
+ + + + + + + + + {{template "email_footer" . }} + +
+ +
+ + + + + + {{template "email_info" . }} + +
+

+ {{.Props.BodyText}} +

+ {{.Props.Posts}} +
+
+
+
+ +{{end}} diff --git a/templates/post_batched_post.html b/templates/post_batched_post.html new file mode 100644 index 000000000..76b35b0cd --- /dev/null +++ b/templates/post_batched_post.html @@ -0,0 +1,30 @@ +{{define "post_batched_post"}} + + + + + + + + + +
+ + {{.Props.ChannelName}} + +
+ + @{{.Props.SenderName}} + + + {{.Props.Date}} + + 		+ + {{.Props.Button}} + +
+ 
{{.Props.PostMessage}}
+
+ +{{end}} -- cgit v1.2.3-1-g7c22