summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCorey Hulen <corey@hulen.com>2016-01-03 22:01:08 -0600
committerCorey Hulen <corey@hulen.com>2016-01-03 22:01:08 -0600
commit15bcd163f1bc199046121dfba4021fcef1856d00 (patch)
tree82dedfb9a45e4793c596fa2fc1a895893c1e755f
parent99d12bcdcc010d444309810a34304a1bf27b1ffb (diff)
parent76b1d260b87c85045e43d99033fd5e43d2674369 (diff)
downloadchat-15bcd163f1bc199046121dfba4021fcef1856d00.tar.gz
chat-15bcd163f1bc199046121dfba4021fcef1856d00.tar.bz2
chat-15bcd163f1bc199046121dfba4021fcef1856d00.zip
Merge pull request #1786 from hjf288/PLT-853
PLT-853: Correct mail templates to show "You've joined the [teamname] team"...
-rw-r--r--api/templates/verify_body.html2
-rw-r--r--api/templates/welcome_body.html2
2 files changed, 2 insertions, 2 deletions
diff --git a/api/templates/verify_body.html b/api/templates/verify_body.html
index 97571d9e3..c42b2a372 100644
--- a/api/templates/verify_body.html
+++ b/api/templates/verify_body.html
@@ -17,7 +17,7 @@
<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;">You've been invited</h2>
+ <h2 style="font-weight: normal; margin-top: 10px;">You've joined the {{ .Props.TeamDisplayName }} team</h2>
<p>Please verify your email address by clicking below.</p>
<p style="margin: 20px 0 15px">
<a href="{{.Props.VerifyUrl}}" 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;">Verify Email</a>
diff --git a/api/templates/welcome_body.html b/api/templates/welcome_body.html
index dbb94cf06..14f8e13c4 100644
--- a/api/templates/welcome_body.html
+++ b/api/templates/welcome_body.html
@@ -18,7 +18,7 @@
{{if .Props.VerifyUrl }}
<tr>
<td style="border-bottom: 1px solid #ddd; padding: 0 0 20px;">
- <h2 style="font-weight: normal; margin-top: 10px;">You've been invited</h2>
+ <h2 style="font-weight: normal; margin-top: 10px;">You've joined the {{ .Props.TeamDisplayName }} team</h2>
<p>Please verify your email address by clicking below.</p>
<p style="margin: 20px 0 15px">
<a href="{{.Props.VerifyUrl}}" 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;">Verify Email</a>