Merge pull request #200 from mattermost/mm-1356

MM-1356 Changing team URLs from team.domain.com to domain.com/team

14 files changed, 28 insertions, 28 deletions

diff --git a/api/templates/email_change_body.html b/api/templates/email_change_body.html
index dffe589cd..f8f3845e7 100644
--- a/api/templates/email_change_body.html
+++ b/api/templates/email_change_body.html
@@ -9,7 +9,7 @@
                         <table align="center" border="0" cellpadding="0" cellspacing="0" width="100%" style="border-collapse: collapse;">
                             <tr>
                                 <td style="padding: 20px 30px 10px; text-align:left;">
-                                    <img src="{{.TeamUrl}}/static/images/{{.SiteName}}-logodark.png" width="130px" style="opacity: 0.5" alt="">
+                                    <img src="{{.TeamURL}}/static/images/{{.SiteName}}-logodark.png" width="130px" style="opacity: 0.5" alt="">
                                 </td>
                             </tr>
                             <tr>
@@ -18,7 +18,7 @@
                                         <tr>
                                             <td style="border-bottom: 1px solid #ddd; padding: 0 0 20px;">
                                                 <h2 style="font-weight: normal; margin-top: 10px;">You updated your email</h2>
-                                                <p>You updated your email for {{.Props.TeamName}} on {{ .TeamUrl }}<br> If this change wasn't initiated by you, please reply to this email and let us know.</p>
+                                                <p>You updated your email for {{.Props.TeamDisplayName}} on {{ .TeamURL }}<br> If this change wasn't initiated by you, please reply to this email and let us know.</p>
                                             </td>
                                         </tr>
                                         <tr>
@@ -34,7 +34,7 @@
                             <tr>
                                 <td style="text-align: center;color: #AAA; font-size: 13px; padding-bottom: 10px;">
                                     <p style="margin: 25px 0;">
-                                        <img width="65" src="{{.TeamUrl}}/static/images/circles.png" alt="">
+                                        <img width="65" src="{{.TeamURL}}/static/images/circles.png" alt="">
                                     </p>
                                     <p style="padding: 0 50px;">
                                         (c) 2015 SpinPunch, Inc. 855 El Camino Real, 13A-168, Palo Alto, CA, 94301.<br>
diff --git a/api/templates/email_change_subject.html b/api/templates/email_change_subject.html
index 612dfcbe7..5690b148a 100644
--- a/api/templates/email_change_subject.html
+++ b/api/templates/email_change_subject.html
@@ -1 +1 @@
-{{define "email_change_subject"}}You updated your email for {{.Props.TeamName}} on {{ .Props.Domain }}{{end}}
+{{define "email_change_subject"}}You updated your email for {{.Props.TeamDisplayName}} on {{ .Props.Domain }}{{end}}
diff --git a/api/templates/find_teams_body.html b/api/templates/find_teams_body.html
index d8b582b8a..6eaaf56e0 100644
--- a/api/templates/find_teams_body.html
+++ b/api/templates/find_teams_body.html
@@ -9,7 +9,7 @@
                         <table align="center" border="0" cellpadding="0" cellspacing="0" width="100%" style="border-collapse: collapse;">
                             <tr>
                                 <td style="padding: 20px 30px 10px; text-align:left;">
-                                    <img src="{{.TeamUrl}}/static/images/{{.SiteName}}-logodark.png" width="130px" style="opacity: 0.5" alt="">
+                                    <img src="{{.TeamURL}}/static/images/{{.SiteName}}-logodark.png" width="130px" style="opacity: 0.5" alt="">
                                 </td>
                             </tr>
                             <tr>
@@ -42,7 +42,7 @@
                             <tr>
                                 <td style="text-align: center;color: #AAA; font-size: 13px; padding-bottom: 10px;">
                                     <p style="margin: 25px 0;">
-                                        <img width="65" src="{{.TeamUrl}}/static/images/circles.png" alt="">
+                                        <img width="65" src="{{.TeamURL}}/static/images/circles.png" alt="">
                                     </p>
                                     <p style="padding: 0 50px;">
                                         (c) 2015 SpinPunch, Inc. 855 El Camino Real, 13A-168, Palo Alto, CA, 94301.<br>
diff --git a/api/templates/invite_body.html b/api/templates/invite_body.html
index 8be2ac0df..46189fae5 100644
--- a/api/templates/invite_body.html
+++ b/api/templates/invite_body.html
@@ -9,7 +9,7 @@
                         <table align="center" border="0" cellpadding="0" cellspacing="0" width="100%" style="border-collapse: collapse;">
                             <tr>
                                 <td style="padding: 20px 30px 10px; text-align:left;">
-                                    <img src="{{.TeamUrl}}/static/images/{{.SiteName}}-logodark.png" width="130px" style="opacity: 0.5" alt="">
+                                    <img src="{{.TeamURL}}/static/images/{{.SiteName}}-logodark.png" width="130px" style="opacity: 0.5" alt="">
                                 </td>
                             </tr>
                             <tr>
@@ -18,7 +18,7 @@
                                         <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>
-                                                <p>{{.Props.TeamName}} started using {{.SiteName}}.<br> The team {{.Props.SenderStatus}} <strong>{{.Props.SenderName}}</strong>, has invited you to join <strong>{{.Props.TeamName}}</strong>.</p>
+                                                <p>{{.Props.TeamDisplayName}} started using {{.SiteName}}.<br> The team {{.Props.SenderStatus}} <strong>{{.Props.SenderName}}</strong>, has invited you to join <strong>{{.Props.TeamDisplayName}}</strong>.</p>
                                                 <p style="margin: 20px 0 15px">
                                                     <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;">Join Team</a>
                                                 </p>
@@ -37,7 +37,7 @@
                             <tr>
                                 <td style="text-align: center;color: #AAA; font-size: 13px; padding-bottom: 10px;">
                                     <p style="margin: 25px 0;">
-                                        <img width="65" src="{{.TeamUrl}}/static/images/circles.png" alt="">
+                                        <img width="65" src="{{.TeamURL}}/static/images/circles.png" alt="">
                                     </p>
                                     <p style="padding: 0 50px;">
                                         (c) 2015 SpinPunch, Inc. 855 El Camino Real, 13A-168, Palo Alto, CA, 94301.<br>
diff --git a/api/templates/invite_subject.html b/api/templates/invite_subject.html
index 4be15e343..6a1e57dcc 100644
--- a/api/templates/invite_subject.html
+++ b/api/templates/invite_subject.html
@@ -1 +1 @@
-{{define "invite_subject"}}{{ .Props.SenderName }} invited you to join {{ .Props.TeamName }} Team on {{.SiteName}}{{end}}
+{{define "invite_subject"}}{{ .Props.SenderName }} invited you to join {{ .Props.TeamDisplayName }} Team on {{.SiteName}}{{end}}
diff --git a/api/templates/password_change_body.html b/api/templates/password_change_body.html
index f6499d46d..515c0a7d9 100644
--- a/api/templates/password_change_body.html
+++ b/api/templates/password_change_body.html
@@ -9,7 +9,7 @@
                         <table align="center" border="0" cellpadding="0" cellspacing="0" width="100%" style="border-collapse: collapse;">
                             <tr>
                                 <td style="padding: 20px 30px 10px; text-align:left;">
-                                    <img src="{{.TeamUrl}}/static/images/{{.SiteName}}-logodark.png" width="130px" style="opacity: 0.5" alt="">
+                                    <img src="{{.TeamURL}}/static/images/{{.SiteName}}-logodark.png" width="130px" style="opacity: 0.5" alt="">
                                 </td>
                             </tr>
                             <tr>
@@ -18,7 +18,7 @@
                                         <tr>
                                             <td style="border-bottom: 1px solid #ddd; padding: 0 0 20px;">
                                                 <h2 style="font-weight: normal; margin-top: 10px;">You updated your password</h2>
-                                                <p>You updated your password for {{.Props.TeamName}} on {{ .TeamUrl }} by {{.Props.Method}}.<br> If this change wasn't initiated by you, please reply to this email and let us know.</p>
+                                                <p>You updated your password for {{.Props.TeamDisplayName}} on {{ .TeamURL }} by {{.Props.Method}}.<br> If this change wasn't initiated by you, please reply to this email and let us know.</p>
                                             </td>
                                         </tr>
                                         <tr>
@@ -34,7 +34,7 @@
                             <tr>
                                 <td style="text-align: center;color: #AAA; font-size: 13px; padding-bottom: 10px;">
                                     <p style="margin: 25px 0;">
-                                        <img width="65" src="{{.TeamUrl}}/static/images/circles.png" alt="">
+                                        <img width="65" src="{{.TeamURL}}/static/images/circles.png" alt="">
                                     </p>
                                     <p style="padding: 0 50px;">
                                         (c) 2015 SpinPunch, Inc. 855 El Camino Real, 13A-168, Palo Alto, CA, 94301.<br>
diff --git a/api/templates/password_change_subject.html b/api/templates/password_change_subject.html
index 57422c692..55daefdb1 100644
--- a/api/templates/password_change_subject.html
+++ b/api/templates/password_change_subject.html
@@ -1 +1 @@
-{{define "password_change_subject"}}You updated your password for {{.Props.TeamName}} on {{ .SiteName }}{{end}}
+{{define "password_change_subject"}}You updated your password for {{.Props.TeamDisplayName}} on {{ .SiteName }}{{end}}
diff --git a/api/templates/post_body.html b/api/templates/post_body.html
index 069cdf1fb..41a29d020 100644
--- a/api/templates/post_body.html
+++ b/api/templates/post_body.html
@@ -9,7 +9,7 @@
                         <table align="center" border="0" cellpadding="0" cellspacing="0" width="100%" style="border-collapse: collapse;">
                             <tr>
                                 <td style="padding: 20px 30px 10px; text-align:left;">
-                                    <img src="{{.TeamUrl}}/static/images/{{.SiteName}}-logodark.png" width="130px" style="opacity: 0.5" alt="">
+                                    <img src="{{.TeamURL}}/static/images/{{.SiteName}}-logodark.png" width="130px" style="opacity: 0.5" alt="">
                                 </td>
                             </tr>
                             <tr>
@@ -37,7 +37,7 @@
                             <tr>
                                 <td style="text-align: center;color: #AAA; font-size: 13px; padding-bottom: 10px;">
                                     <p style="margin: 25px 0;">
-                                        <img width="65" src="{{.TeamUrl}}/static/images/circles.png" alt="">
+                                        <img width="65" src="{{.TeamURL}}/static/images/circles.png" alt="">
                                     </p>
                                     <p style="padding: 0 50px;">
                                         (c) 2015 SpinPunch, Inc. 855 El Camino Real, 13A-168, Palo Alto, CA, 94301.<br>
diff --git a/api/templates/post_subject.html b/api/templates/post_subject.html
index 32df31018..8ebc9550b 100644
--- a/api/templates/post_subject.html
+++ b/api/templates/post_subject.html
@@ -1 +1 @@
-{{define "post_subject"}}[{{.Props.TeamName}} {{.SiteName}}] {{.Props.SubjectText}} for {{.Props.Month}} {{.Props.Day}}, {{.Props.Year}}{{end}}
\ No newline at end of file
+{{define "post_subject"}}[{{.Props.TeamDisplayName}} {{.SiteName}}] {{.Props.SubjectText}} for {{.Props.Month}} {{.Props.Day}}, {{.Props.Year}}{{end}}
diff --git a/api/templates/reset_body.html b/api/templates/reset_body.html
index 4b5976663..af9f6b4e8 100644
--- a/api/templates/reset_body.html
+++ b/api/templates/reset_body.html
@@ -9,7 +9,7 @@
                         <table align="center" border="0" cellpadding="0" cellspacing="0" width="100%" style="border-collapse: collapse;">
                             <tr>
                                 <td style="padding: 20px 30px 10px; text-align:left;">
-                                    <img src="{{.TeamUrl}}/static/images/{{.SiteName}}-logodark.png" width="130px" style="opacity: 0.5" alt="">
+                                    <img src="{{.TeamURL}}/static/images/{{.SiteName}}-logodark.png" width="130px" style="opacity: 0.5" alt="">
                                 </td>
                             </tr>
                             <tr>
@@ -37,7 +37,7 @@
                             <tr>
                                 <td style="text-align: center;color: #AAA; font-size: 13px; padding-bottom: 10px;">
                                     <p style="margin: 25px 0;">
-                                        <img width="65" src="{{.TeamUrl}}/static/images/circles.png" alt="">
+                                        <img width="65" src="{{.TeamURL}}/static/images/circles.png" alt="">
                                     </p>
                                     <p style="padding: 0 50px;">
                                         (c) 2015 SpinPunch, Inc. 855 El Camino Real, 13A-168, Palo Alto, CA, 94301.<br>
diff --git a/api/templates/signup_team_body.html b/api/templates/signup_team_body.html
index 6f8bbd92d..5a5ae4d47 100644
--- a/api/templates/signup_team_body.html
+++ b/api/templates/signup_team_body.html
@@ -9,7 +9,7 @@
                         <table align="center" border="0" cellpadding="0" cellspacing="0" width="100%" style="border-collapse: collapse;">
                             <tr>
                                 <td style="padding: 20px 30px 10px; text-align:left;">
-                                    <img src="{{.TeamUrl}}/static/images/{{.SiteName}}-logodark.png" width="130px" style="opacity: 0.5" alt="">
+                                    <img src="{{.TeamURL}}/static/images/{{.SiteName}}-logodark.png" width="130px" style="opacity: 0.5" alt="">
                                 </td>
                             </tr>
                             <tr>
@@ -40,7 +40,7 @@
                             <tr>
                                 <td style="text-align: center;color: #AAA; font-size: 13px; padding-bottom: 10px;">
                                     <p style="margin: 25px 0;">
-                                        <img width="65" src="{{.TeamUrl}}/static/images/circles.png" alt="">
+                                        <img width="65" src="{{.TeamURL}}/static/images/circles.png" alt="">
                                     </p>
                                     <p style="padding: 0 50px;">
                                         (c) 2015 SpinPunch, Inc. 855 El Camino Real, 13A-168, Palo Alto, CA, 94301.<br>
diff --git a/api/templates/verify_body.html b/api/templates/verify_body.html
index 56d85572b..67ded9c20 100644
--- a/api/templates/verify_body.html
+++ b/api/templates/verify_body.html
@@ -9,7 +9,7 @@
                         <table align="center" border="0" cellpadding="0" cellspacing="0" width="100%" style="border-collapse: collapse;">
                             <tr>
                                 <td style="padding: 20px 30px 10px; text-align:left;">
-                                    <img src="{{.TeamUrl}}/static/images/{{.SiteName}}-logodark.png" width="130px" style="opacity: 0.5" alt="">
+                                    <img src="{{.TeamURL}}/static/images/{{.SiteName}}-logodark.png" width="130px" style="opacity: 0.5" alt="">
                                 </td>
                             </tr>
                             <tr>
@@ -37,7 +37,7 @@
                             <tr>
                                 <td style="text-align: center;color: #AAA; font-size: 13px; padding-bottom: 10px;">
                                     <p style="margin: 25px 0;">
-                                        <img width="65" src="{{.TeamUrl}}/static/images/circles.png" alt="">
+                                        <img width="65" src="{{.TeamURL}}/static/images/circles.png" alt="">
                                     </p>
                                     <p style="padding: 0 50px;">
                                         (c) 2015 SpinPunch, Inc. 855 El Camino Real, 13A-168, Palo Alto, CA, 94301.<br>
diff --git a/api/templates/verify_subject.html b/api/templates/verify_subject.html
index de0ef1d7a..a66150735 100644
--- a/api/templates/verify_subject.html
+++ b/api/templates/verify_subject.html
@@ -1 +1 @@
-{{define "verify_subject"}}[{{ .Props.TeamName }} {{ .SiteName }}] Email Verification{{end}}
\ No newline at end of file
+{{define "verify_subject"}}[{{ .Props.TeamDisplayName }} {{ .SiteName }}] Email Verification{{end}}
diff --git a/api/templates/welcome_body.html b/api/templates/welcome_body.html
index fbc2e5551..7107bc2e0 100644
--- a/api/templates/welcome_body.html
+++ b/api/templates/welcome_body.html
@@ -9,7 +9,7 @@
                         <table align="center" border="0" cellpadding="0" cellspacing="0" width="100%" style="border-collapse: collapse;">
                             <tr>
                                 <td style="padding: 20px 30px 10px; text-align:left;">
-                                    <img src="{{.TeamUrl}}/static/images/{{.SiteName}}-logodark.png" width="130px" style="opacity: 0.5" alt="">
+                                    <img src="{{.TeamURL}}/static/images/{{.SiteName}}-logodark.png" width="130px" style="opacity: 0.5" alt="">
                                 </td>
                             </tr>
                             <tr>
@@ -17,8 +17,8 @@
                                     <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 joined the {{.Props.TeamName}} team at {{.SiteName}}!</h2>
-                                                <p>Please let me know if you have any questions.<br>Enjoy your stay at <a href="{{.TeamUrl}}">{{.SiteName}}</a>.</p>
+                                                <h2 style="font-weight: normal; margin-top: 10px;">You joined the {{.Props.TeamDisplayName}} team at {{.SiteName}}!</h2>
+                                                <p>Please let me know if you have any questions.<br>Enjoy your stay at <a href="{{.TeamURL}}">{{.SiteName}}</a>.</p>
                                             </td>
                                         </tr>
                                         <tr>
@@ -34,7 +34,7 @@
                             <tr>
                                 <td style="text-align: center;color: #AAA; font-size: 13px; padding-bottom: 10px;">
                                     <p style="margin: 25px 0;">
-                                        <img width="65" src="{{.TeamUrl}}/static/images/circles.png" alt="">
+                                        <img width="65" src="{{.TeamURL}}/static/images/circles.png" alt="">
                                     </p>
                                     <p style="padding: 0 50px;">
                                         (c) 2015 SpinPunch, Inc. 855 El Camino Real, 13A-168, Palo Alto, CA, 94301.<br>