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

4 files changed, 84 insertions, 2 deletions

diff --git a/templates/post_batched_post.html b/templates/post_batched_post_full.html
index f3dbf9d6d..7e12da46e 100644
--- a/templates/post_batched_post.html
+++ b/templates/post_batched_post_full.html
@@ -1,4 +1,4 @@
-{{define "post_batched_post"}}
+{{define "post_batched_post_full"}}
 
 <style type="text/css">
     @media screen and (max-width: 480px){
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"}}
+
+<style type="text/css">
+    @media screen and (max-width: 480px){
+        a[class="post_btn"] {
+            float: none !important;
+        }
+    }
+</style>
+
+<table style="border-top: 1px solid #ddd; padding: 20px 0; width: 100%">
+    <tr>
+        <td style="text-align: left">
+            <span style="font-size: 16px; font-weight: bold; color: #555; margin: 0 0 5px; display: inline-block;" >
+                {{.Props.ChannelName}}
+            </span>
+            <span style="font-weight: bold; white-space: nowrap; color: #555;">
+                @{{.Props.SenderName}}
+            </span>
+            <br/>
+            <div style="margin: 5px 0 0;">
+                <span style="color: #AAA; font-size: 12px; margin-left: 2px;">
+                    {{.Props.Date}}
+                </span>
+            </div>
+        </td>
+    </tr>
+    <tr>
+        <td colspan=2>
+            <a class="post_btn" href="{{.Props.PostLink}}" style="font-size: 13px; background: #2389D7; display: inline-block; border-radius: 2px; color: #fff; padding: 6px 0; width: 120px; text-decoration: none; float:left; text-align: center; margin: 15px 0 5px;">
+                {{.Props.Button}}
+            </a>
+        </td>
+    </tr>
+</table>
+
+{{end}}
diff --git a/templates/post_body.html b/templates/post_body_full.html
index 54f34d1dd..fa27aba55 100644
--- a/templates/post_body.html
+++ b/templates/post_body_full.html
@@ -1,4 +1,4 @@
-{{define "post_body"}}
+{{define "post_body_full"}}
 
 <table align="center" border="0" cellpadding="0" cellspacing="0" width="100%" style="margin-top: 20px; line-height: 1.7; color: #555;">
     <tr>
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"}}
+
+<table align="center" border="0" cellpadding="0" cellspacing="0" width="100%" style="margin-top: 20px; line-height: 1.7; color: #555;">
+    <tr>
+        <td>
+            <table align="center" border="0" cellpadding="0" cellspacing="0" width="100%" style="max-width: 660px; font-family: Helvetica, Arial, sans-serif; font-size: 14px; background: #FFF;">
+                <tr>
+                    <td style="border: 1px solid #ddd;">
+                        <table align="center" border="0" cellpadding="0" cellspacing="0" width="100%" style="border-collapse: collapse;">
+                            <tr>
+                                <td style="padding: 20px 20px 10px; text-align:left;">
+                                    <img src="{{.Props.SiteURL}}/static/images/logo-email.png" width="130px" style="opacity: 0.5" alt="">
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <table border="0" cellpadding="0" cellspacing="0" style="padding: 20px 50px 0; text-align: center; margin: 0 auto">
+                                        <tr>
+                                            <td style="border-bottom: 1px solid #ddd; padding: 0 0 20px;">
+                                                <h2 style="font-weight: normal; margin-top: 10px;">{{.Props.BodyText}}</h2>
+                                                <p>{{.Html.Info}}</p>
+                                                <p style="margin: 20px 0 15px">
+                                                    <a href="{{.Props.TeamLink}}" style="background: #2389D7; display: inline-block; border-radius: 3px; color: #fff; border: none; outline: none; min-width: 170px; padding: 15px 25px; font-size: 14px; font-family: inherit; cursor: pointer; -webkit-appearance: none;text-decoration: none;">{{.Props.Button}}</a>
+                                                </p>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            {{template "email_info" . }}
+                                        </tr>
+                                    </table>
+                                </td>
+                            </tr>
+                            <tr>
+                                {{template "email_footer" . }}
+                            </tr>
+                        </table>
+                    </td>
+                </tr>
+            </table>
+        </td>
+    </tr>
+</table>
+
+{{end}}
+