diff options
| author | =Corey Hulen <corey@hulen.com> | 2015-09-25 08:11:01 -0700 |
|---|---|---|
| committer | =Corey Hulen <corey@hulen.com> | 2015-09-25 08:11:01 -0700 |
| commit | d989be85cb52b66d092db9b5647f8fcc2df17a8f (patch) | |
| tree | d9effd2354a61a787987d784944e4d6bb7d5582d /api/templates | |
| parent | 8a9fc46f8b62a61d07e943f708749f046a596571 (diff) | |
| parent | 2322a7c74ed8e5d411e08e59b45c54f4663a1683 (diff) | |
| download | chat-d989be85cb52b66d092db9b5647f8fcc2df17a8f.tar.gz chat-d989be85cb52b66d092db9b5647f8fcc2df17a8f.tar.bz2 chat-d989be85cb52b66d092db9b5647f8fcc2df17a8f.zip | |
Merge branch 'master' into PLT-157
Diffstat (limited to 'api/templates')
| -rw-r--r-- | api/templates/signup_team_body.html | 3 | ||||
| -rw-r--r-- | api/templates/welcome_body.html | 12 | ||||
| -rw-r--r-- | api/templates/welcome_subject.html | 2 |
3 files changed, 4 insertions, 13 deletions
diff --git a/api/templates/signup_team_body.html b/api/templates/signup_team_body.html index f5c0e62b0..e6ffb3a5b 100644 --- a/api/templates/signup_team_body.html +++ b/api/templates/signup_team_body.html @@ -22,9 +22,6 @@ <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;">Set up your team</a> </p> {{ .ClientProps.SiteName }} is one place for all your team communication, searchable and available anywhere.<br>You'll get more out of {{ .ClientProps.SiteName }} when your team is in constant communication--let's get them on board.<br></p> - <p> - Learn more by <a href="{{.Props.TourUrl}}" style="text-decoration: none; color:#2389D7;">taking a tour</a> - </p> </td> </tr> <tr> diff --git a/api/templates/welcome_body.html b/api/templates/welcome_body.html index c75e14c6a..5fe3450b7 100644 --- a/api/templates/welcome_body.html +++ b/api/templates/welcome_body.html @@ -17,15 +17,9 @@ <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.TeamDisplayName}} team at {{.ClientProps.SiteName}}!</h2> - <p>Please let me know if you have any questions.<br>Enjoy your stay at <a href="{{.Props.TeamURL}}">{{.ClientProps.SiteName}}</a>.</p> - </td> - </tr> - <tr> - <td style="color: #999; padding-top: 20px; line-height: 25px; font-size: 13px;"> - Any questions at all, mail us any time: <a href="mailto:{{.ClientProps.FeedbackEmail}}" style="text-decoration: none; color:#2389D7;">{{.ClientProps.FeedbackEmail}}</a>.<br> - Best wishes,<br> - The {{.ClientProps.SiteName}} Team<br> + <h2 style="font-weight: normal; margin-top: 10px;">You can sign-in to your new team from the web address:</h2> + <a href="{{.Props.TeamURL}}">{{.Props.TeamURL}}</a> + <p>Mattermost lets you share messages and files from your PC or phone, with instant search and archiving.</p> </td> </tr> </table> diff --git a/api/templates/welcome_subject.html b/api/templates/welcome_subject.html index 2214f7a38..c3b70ef20 100644 --- a/api/templates/welcome_subject.html +++ b/api/templates/welcome_subject.html @@ -1 +1 @@ -{{define "welcome_subject"}}Welcome to {{ .ClientProps.SiteName }}{{end}}
\ No newline at end of file +{{define "welcome_subject"}}You joined {{ .Props.TeamDisplayName }}{{end}} |