From 75ce7548603072fe19f5230bd59596cc4e5959e5 Mon Sep 17 00:00:00 2001 From: Reed Garmsen Date: Fri, 11 Dec 2015 11:22:12 -0800 Subject: Fixed broken unsubscribe instructions --- api/templates/email_change_body.html | 16 ++-------------- api/templates/email_change_verify_body.html | 16 ++-------------- api/templates/email_footer.html | 13 +++++++++++++ api/templates/email_info.html | 9 +++++++++ api/templates/find_teams_body.html | 16 ++-------------- api/templates/invite_body.html | 16 ++-------------- api/templates/password_change_body.html | 16 ++-------------- api/templates/post_body.html | 16 ++-------------- api/templates/reset_body.html | 16 ++-------------- api/templates/signup_team_body.html | 16 ++-------------- api/templates/verify_body.html | 16 ++-------------- api/templates/welcome_body.html | 10 +--------- 12 files changed, 41 insertions(+), 135 deletions(-) create mode 100644 api/templates/email_footer.html create mode 100644 api/templates/email_info.html (limited to 'api') diff --git a/api/templates/email_change_body.html b/api/templates/email_change_body.html index df2db8730..7349aee6f 100644 --- a/api/templates/email_change_body.html +++ b/api/templates/email_change_body.html @@ -22,25 +22,13 @@ - - Any questions at all, mail us any time: {{.ClientCfg.FeedbackEmail}}.
- Best wishes,
- The {{.ClientCfg.SiteName}} Team
- + {{template "email_info" . }} - -

- -

-

- (c) 2015 Mattermost, Inc. 855 El Camino Real, 13A-168, Palo Alto, CA, 94301.
- If you no longer wish to receive these emails, click on the following link: Unsubscribe -

- + {{template "email_footer" . }} diff --git a/api/templates/email_change_verify_body.html b/api/templates/email_change_verify_body.html index f6bc3bc39..9d2c559b3 100644 --- a/api/templates/email_change_verify_body.html +++ b/api/templates/email_change_verify_body.html @@ -25,25 +25,13 @@ - - Any questions at all, mail us any time: {{.ClientCfg.FeedbackEmail}}.
- Best wishes,
- The {{.ClientCfg.SiteName}} Team
- + {{template "email_info" . }} - -

- -

-

- (c) 2015 Mattermost, Inc. 855 El Camino Real, 13A-168, Palo Alto, CA, 94301.
- If you no longer wish to receive these emails, click on the following link: Unsubscribe -

- + {{template "email_footer" . }} diff --git a/api/templates/email_footer.html b/api/templates/email_footer.html new file mode 100644 index 000000000..e3ff9c584 --- /dev/null +++ b/api/templates/email_footer.html @@ -0,0 +1,13 @@ +{{define "email_footer"}} + + +

+ +

+

+ (c) 2015 Mattermost, Inc. 855 El Camino Real, 13A-168, Palo Alto, CA, 94301.
+ To change your notification preferences, log in to your team site and go to Account Settings > Notifications. +

+ + +{{end}} diff --git a/api/templates/email_info.html b/api/templates/email_info.html new file mode 100644 index 000000000..48725d144 --- /dev/null +++ b/api/templates/email_info.html @@ -0,0 +1,9 @@ +{{define "email_info"}} + + + Any questions at all, mail us any time: {{.ClientCfg.FeedbackEmail}}.
+ Best wishes,
+ The {{.ClientCfg.SiteName}} Team
+ + +{{end}} diff --git a/api/templates/find_teams_body.html b/api/templates/find_teams_body.html index 4669d51c1..0b52af033 100644 --- a/api/templates/find_teams_body.html +++ b/api/templates/find_teams_body.html @@ -30,25 +30,13 @@ - - Any questions at all, mail us any time: {{.ClientCfg.FeedbackEmail}}.
- Best wishes,
- The {{.ClientCfg.SiteName}} Team
- + {{template "email_info" . }} - -

- -

-

- (c) 2015 Mattermost, Inc. 855 El Camino Real, 13A-168, Palo Alto, CA, 94301.
- If you no longer wish to receive these emails, click on the following link: Unsubscribe -

- + {{template "email_footer" . }} diff --git a/api/templates/invite_body.html b/api/templates/invite_body.html index d98f91357..a81d0c3d5 100644 --- a/api/templates/invite_body.html +++ b/api/templates/invite_body.html @@ -27,25 +27,13 @@ - - Any questions at all, mail us any time: {{.ClientCfg.FeedbackEmail}}.
- Best wishes,
- The {{.ClientCfg.SiteName}} Team
- + {{template "email_info" . }} - -

- -

-

- (c) 2015 Mattermost, Inc. 855 El Camino Real, 13A-168, Palo Alto, CA, 94301.
- If you no longer wish to receive these emails, click on the following link: Unsubscribe -

- + {{template "email_footer" . }} diff --git a/api/templates/password_change_body.html b/api/templates/password_change_body.html index 2e1df3ff2..82f4d5429 100644 --- a/api/templates/password_change_body.html +++ b/api/templates/password_change_body.html @@ -22,25 +22,13 @@ - - Any questions at all, mail us any time: {{.ClientCfg.FeedbackEmail}}.
- Best wishes,
- The {{.ClientCfg.SiteName}} Team
- + {{template "email_info" . }} - -

- -

-

- (c) 2015 Mattermost, Inc. 855 El Camino Real, 13A-168, Palo Alto, CA, 94301.
- If you no longer wish to receive these emails, click on the following link: Unsubscribe -

- + {{template "email_footer" . }} diff --git a/api/templates/post_body.html b/api/templates/post_body.html index 00d4a563d..468d5e205 100644 --- a/api/templates/post_body.html +++ b/api/templates/post_body.html @@ -25,25 +25,13 @@ - - Any questions at all, mail us any time: {{.ClientCfg.FeedbackEmail}}.
- Best wishes,
- The {{.ClientCfg.SiteName}} Team
- + {{template "email_info" . }} - -

- -

-

- (c) 2015 Mattermost, Inc. 855 El Camino Real, 13A-168, Palo Alto, CA, 94301.
- If you no longer wish to receive these emails, click on the following link: Unsubscribe -

- + {{template "email_footer" . }} diff --git a/api/templates/reset_body.html b/api/templates/reset_body.html index 5e5f6cafc..a608c804a 100644 --- a/api/templates/reset_body.html +++ b/api/templates/reset_body.html @@ -25,25 +25,13 @@ - - Any questions at all, mail us any time: {{.ClientCfg.FeedbackEmail}}.
- Best wishes,
- The {{.ClientCfg.SiteName}} Team
- + {{template "email_info" . }} - -

- -

-

- (c) 2015 Mattermost, Inc. 855 El Camino Real, 13A-168, Palo Alto, CA, 94301.
- If you no longer wish to receive these emails, click on the following link: Unsubscribe -

- + {{template "email_footer" . }} diff --git a/api/templates/signup_team_body.html b/api/templates/signup_team_body.html index 6f3deb28b..2f384ac43 100644 --- a/api/templates/signup_team_body.html +++ b/api/templates/signup_team_body.html @@ -25,25 +25,13 @@ - - Any questions at all, mail us any time: {{.ClientCfg.FeedbackEmail}}.
- Best wishes,
- The {{.ClientCfg.SiteName}} Team
- + {{template "email_info" . }} - -

- -

-

- (c) 2015 Mattermost, Inc. 855 El Camino Real, 13A-168, Palo Alto, CA, 94301.
- If you no longer wish to receive these emails, click on the following link: Unsubscribe -

- + {{template "email_footer" . }} diff --git a/api/templates/verify_body.html b/api/templates/verify_body.html index a93de9a71..97571d9e3 100644 --- a/api/templates/verify_body.html +++ b/api/templates/verify_body.html @@ -25,25 +25,13 @@ - - Any questions at all, mail us any time: {{.ClientCfg.FeedbackEmail}}.
- Best wishes,
- The {{.ClientCfg.SiteName}} Team
- + {{template "email_info" . }} - -

- -

-

- (c) 2015 Mattermost, Inc. 855 El Camino Real, 13A-168, Palo Alto, CA, 94301.
- If you no longer wish to receive these emails, click on the following link: Unsubscribe -

- + {{template "email_footer" . }} diff --git a/api/templates/welcome_body.html b/api/templates/welcome_body.html index 485bc6351..dbb94cf06 100644 --- a/api/templates/welcome_body.html +++ b/api/templates/welcome_body.html @@ -37,15 +37,7 @@ - -

- -

-

- (c) 2015 Mattermost, Inc. 855 El Camino Real, 13A-168, Palo Alto, CA, 94301.
- If you no longer wish to receive these emails, click on the following link: Unsubscribe -

- + {{template "email_footer" . }} -- cgit v1.2.3-1-g7c22