Break HTML blocks to individual strings (#8903)

* Modifying message and templates about mfa_change

* Modifying message and templates about password_change

* Modify message and template about password_reset

* Modify message and template about singin_change

* Modify message and template about email_info

* Modify message and template about change_username

* Modify message about change_email

* Add missing props

* Add argument

* Modify message and template about token_added

* Modify messages and template about notification_email

* Modify message and template about deactivate_email

* Fix style

* Remove unused message

* Remove br tags

* Modify message and code about invite_mail

* Add missing message

9 files changed, 9 insertions, 9 deletions

diff --git a/templates/deactivate_body.html b/templates/deactivate_body.html
index 45a2f42af..018fe2561 100644
--- a/templates/deactivate_body.html
+++ b/templates/deactivate_body.html
@@ -18,7 +18,7 @@
                                         <tr>
                                             <td style="border-bottom: 1px solid #ddd; padding: 0 0 20px;">
                                                 <h2 style="font-weight: normal; margin-top: 10px;">{{.Props.Title}}</h2>
-                                                <p>{{.Html.Info}}</p>
+                                                <p>{{.Props.Info}}<br>{{.Props.Warning}}</p>
                                             </td>
                                         </tr>
                                         <tr>
diff --git a/templates/email_change_body.html b/templates/email_change_body.html
index 41b1bcd7d..e9becde3e 100644
--- a/templates/email_change_body.html
+++ b/templates/email_change_body.html
@@ -18,7 +18,7 @@
                                         <tr>
                                             <td style="border-bottom: 1px solid #ddd; padding: 0 0 20px;">
                                                 <h2 style="font-weight: normal; margin-top: 10px;">{{.Props.Title}}</h2>
-                                                <p>{{.Html.Info}}</p>
+                                                <p>{{.Props.Info}}<br>{{.Props.Warning}}</p>
                                             </td>
                                         </tr>
                                         <tr>
diff --git a/templates/email_info.html b/templates/email_info.html
index 0a34f18a0..6b83db76e 100644
--- a/templates/email_info.html
+++ b/templates/email_info.html
@@ -1,7 +1,7 @@
 {{define "email_info"}}
 
 <td style="color: #999; padding-top: 20px; line-height: 25px; font-size: 13px;">
-    {{.Html.EmailInfo}}
+    {{.Props.EmailInfo1}}<a href='mailto:{{.Props.SupportEmail}}' style='text-decoration: none; color:#2389D7;'>{{.Props.SupportEmail}}</a><br>{{.Props.EmailInfo2}}<br>{{.Props.EmailInfo3}}<br>
 </td>
 
 {{end}}
diff --git a/templates/invite_body.html b/templates/invite_body.html
index 2b6bde6d3..2352d3245 100644
--- a/templates/invite_body.html
+++ b/templates/invite_body.html
@@ -23,7 +23,7 @@
                                                     <a href="{{.Props.Link}}" style="background: #2389D7; border-radius: 3px; color: #fff; border: none; outline: none; min-width: 200px; padding: 15px 25px; font-size: 14px; font-family: inherit; cursor: pointer; -webkit-appearance: none;text-decoration: none;">{{.Props.Button}}</a>
                                                 </p>
                                                 <br/>
-                                                <p>{{.Html.ExtraInfo}}</p>
+                                                <p>{{.Html.ExtraInfo}}<br/><br/><a href='{{.Props.TeamURL}}'>{{.Props.TeamURL}}</a></p>
                                             </td>
                                         </tr>
                                         <tr>
diff --git a/templates/mfa_change_body.html b/templates/mfa_change_body.html
index b7cc0630c..c2c6383d4 100644
--- a/templates/mfa_change_body.html
+++ b/templates/mfa_change_body.html
@@ -18,7 +18,7 @@
                                         <tr>
                                             <td style="border-bottom: 1px solid #ddd; padding: 0 0 20px;">
                                                 <h2 style="font-weight: normal; margin-top: 10px;">{{.Props.Title}}</h2>
-                                                <p>{{.Html.Info}}</p>
+                                                <p>{{.Props.Info}}<br>{{.Props.Warning}}</p>
                                             </td>
                                         </tr>
                                         <tr>
diff --git a/templates/password_change_body.html b/templates/password_change_body.html
index 2c4ba10ca..36a302bf1 100644
--- a/templates/password_change_body.html
+++ b/templates/password_change_body.html
@@ -18,7 +18,7 @@
                                         <tr>
                                             <td style="border-bottom: 1px solid #ddd; padding: 0 0 20px;">
                                                 <h2 style="font-weight: normal; margin-top: 10px;">{{.Props.Title}}</h2>
-                                                <p>{{.Html.Info}}</p>
+                                                <p>{{.Props.Info}}<br>{{.Props.Warning}}</p>
                                             </td>
                                         </tr>
                                         <tr>
diff --git a/templates/post_body_full.html b/templates/post_body_full.html
index fa27aba55..db51074f5 100644
--- a/templates/post_body_full.html
+++ b/templates/post_body_full.html
@@ -18,7 +18,7 @@
                                         <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}}<br><pre style="text-align:left;font-family: 'Lato', sans-serif; white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">{{.Props.PostMessage}}</pre></p>
+                                                <p>{{.Props.Info1}}<br>{{.Props.Info2}}<br><pre style="text-align:left;font-family: 'Lato', sans-serif; white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">{{.Props.PostMessage}}</pre></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>
diff --git a/templates/reset_body.html b/templates/reset_body.html
index 69cd44957..bbfbb35e0 100644
--- a/templates/reset_body.html
+++ b/templates/reset_body.html
@@ -18,7 +18,7 @@
                                         <tr>
                                             <td style="border-bottom: 1px solid #ddd; padding: 0 0 20px;">
                                                 <h2 style="font-weight: normal; margin-top: 10px;">{{.Props.Title}}</h2>
-                                                <p>{{.Html.Info}}</p>
+                                                <p>{{.Props.Info1}}<br>{{.Props.Info2}}</p>
                                                 <p style="margin: 20px 0 15px">
                                                     <a href="{{.Props.ResetUrl}}" style="background: #2389D7; border-radius: 3px; color: #fff; border: none; outline: none; min-width: 200px; padding: 15px 25px; font-size: 14px; font-family: inherit; cursor: pointer; -webkit-appearance: none;text-decoration: none;">{{.Props.Button}}</a>
                                                 </p>
diff --git a/templates/signin_change_body.html b/templates/signin_change_body.html
index af8577f0f..047761469 100644
--- a/templates/signin_change_body.html
+++ b/templates/signin_change_body.html
@@ -18,7 +18,7 @@
                                         <tr>
                                             <td style="border-bottom: 1px solid #ddd; padding: 0 0 20px;">
                                                 <h2 style="font-weight: normal; margin-top: 10px;">{{.Props.Title}}</h2>
-                                                <p>{{.Html.Info}}</p>
+                                                <p>{{.Props.Info}}<br>{{.Props.Warning}}</p>
                                             </td>
                                         </tr>
                                         <tr>