diff --git a/api/api.go b/api/api.go
index 8203b07a62..3fbb7d0dfb 100644
--- a/api/api.go
+++ b/api/api.go
@@ -17,9 +17,10 @@ var ServerTemplates *template.Template
type ServerTemplatePage Page
func NewServerTemplatePage(templateName string) *ServerTemplatePage {
+
return &ServerTemplatePage{
TemplateName: templateName,
- Props: make(map[string]string),
+ Props: props := make(map[string]string),
ClientProps: utils.ClientProperties,
}
}
diff --git a/api/templates/email_change_body.html b/api/templates/email_change_body.html
index 3f041d09de..0ec4ace2a5 100644
--- a/api/templates/email_change_body.html
+++ b/api/templates/email_change_body.html
@@ -23,7 +23,7 @@
- Any questions at all, mail us any time: {{.FeedbackEmail}}.
+ Any questions at all, mail us any time: {{.ClientProps.FeedbackEmail}}.
Best wishes,
The {{.ClientProps.SiteName}} Team
|
@@ -38,7 +38,7 @@
(c) 2015 SpinPunch, 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
+ If you no longer wish to receive these emails, click on the following link: Unsubscribe
diff --git a/api/templates/find_teams_body.html b/api/templates/find_teams_body.html
index fe134811a8..9d34b7a232 100644
--- a/api/templates/find_teams_body.html
+++ b/api/templates/find_teams_body.html
@@ -31,7 +31,7 @@
- Any questions at all, mail us any time: {{.FeedbackEmail}}.
+ Any questions at all, mail us any time: {{.ClientProps.FeedbackEmail}}.
Best wishes,
The {{.ClientProps.SiteName}} Team
|
@@ -46,7 +46,7 @@
(c) 2015 SpinPunch, 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
+ If you no longer wish to receive these emails, click on the following link: Unsubscribe
diff --git a/api/templates/invite_body.html b/api/templates/invite_body.html
index 401111b75c..9e1ce33b2e 100644
--- a/api/templates/invite_body.html
+++ b/api/templates/invite_body.html
@@ -26,7 +26,7 @@
- Any questions at all, mail us any time: {{.FeedbackEmail}}.
+ Any questions at all, mail us any time: {{.ClientProps.FeedbackEmail}}.
Best wishes,
The {{.ClientProps.SiteName}} Team
|
@@ -41,7 +41,7 @@
(c) 2015 SpinPunch, 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
+ If you no longer wish to receive these emails, click on the following link: Unsubscribe
diff --git a/api/templates/password_change_body.html b/api/templates/password_change_body.html
index 6a32e89dba..3fef3a5c86 100644
--- a/api/templates/password_change_body.html
+++ b/api/templates/password_change_body.html
@@ -23,7 +23,7 @@
- Any questions at all, mail us any time: {{.FeedbackEmail}}.
+ Any questions at all, mail us any time: {{.ClientProps.FeedbackEmail}}.
Best wishes,
The {{.ClientProps.SiteName}} Team
|
@@ -38,7 +38,7 @@
(c) 2015 SpinPunch, 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
+ If you no longer wish to receive these emails, click on the following link: Unsubscribe
diff --git a/api/templates/post_body.html b/api/templates/post_body.html
index 0c906807a0..a6b81e2f62 100644
--- a/api/templates/post_body.html
+++ b/api/templates/post_body.html
@@ -26,7 +26,7 @@
- Any questions at all, mail us any time: {{.FeedbackEmail}}.
+ Any questions at all, mail us any time: {{.ClientProps.FeedbackEmail}}.
Best wishes,
The {{.ClientProps.SiteName}} Team
|
@@ -41,7 +41,7 @@
(c) 2015 SpinPunch, 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
+ If you no longer wish to receive these emails, click on the following link: Unsubscribe
diff --git a/api/templates/reset_body.html b/api/templates/reset_body.html
index 3e4938a09b..dc6152627b 100644
--- a/api/templates/reset_body.html
+++ b/api/templates/reset_body.html
@@ -26,7 +26,7 @@
- Any questions at all, mail us any time: {{.FeedbackEmail}}.
+ Any questions at all, mail us any time: {{.ClientProps.FeedbackEmail}}.
Best wishes,
The {{.ClientProps.SiteName}} Team
|
@@ -41,7 +41,7 @@
(c) 2015 SpinPunch, 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
+ If you no longer wish to receive these emails, click on the following link: Unsubscribe
diff --git a/api/templates/signup_team_body.html b/api/templates/signup_team_body.html
index ef58aa92c1..f5c0e62b04 100644
--- a/api/templates/signup_team_body.html
+++ b/api/templates/signup_team_body.html
@@ -29,7 +29,7 @@
- Any questions at all, mail us any time: {{.FeedbackEmail}}.
+ Any questions at all, mail us any time: {{.ClientProps.FeedbackEmail}}.
Best wishes,
The {{.ClientProps.SiteName}} Team
|
@@ -44,7 +44,7 @@
(c) 2015 SpinPunch, 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
+ If you no longer wish to receive these emails, click on the following link: Unsubscribe
diff --git a/api/templates/verify_body.html b/api/templates/verify_body.html
index ac60e4fada..8187c89082 100644
--- a/api/templates/verify_body.html
+++ b/api/templates/verify_body.html
@@ -26,7 +26,7 @@
- Any questions at all, mail us any time: {{.FeedbackEmail}}.
+ Any questions at all, mail us any time: {{.ClientProps.FeedbackEmail}}.
Best wishes,
The {{.ClientProps.SiteName}} Team
|
@@ -41,7 +41,7 @@
(c) 2015 SpinPunch, 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
+ If you no longer wish to receive these emails, click on the following link: Unsubscribe
diff --git a/api/templates/welcome_body.html b/api/templates/welcome_body.html
index 4d4f03a2da..c75e14c6ac 100644
--- a/api/templates/welcome_body.html
+++ b/api/templates/welcome_body.html
@@ -23,7 +23,7 @@
- Any questions at all, mail us any time: {{.FeedbackEmail}}.
+ Any questions at all, mail us any time: {{.ClientProps.FeedbackEmail}}.
Best wishes,
The {{.ClientProps.SiteName}} Team
|
@@ -38,7 +38,7 @@
(c) 2015 SpinPunch, 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
+ If you no longer wish to receive these emails, click on the following link: Unsubscribe
diff --git a/utils/config.go b/utils/config.go
index 9f66e9f377..722964934e 100644
--- a/utils/config.go
+++ b/utils/config.go
@@ -277,11 +277,13 @@ func getClientProperties(c *Config) map[string]string {
props["Version"] = c.ServiceSettings.Version
props["SiteName"] = c.ServiceSettings.SiteName
props["ByPassEmail"] = strconv.FormatBool(c.EmailSettings.ByPassEmail)
+ props["FeedbackEmail"] = c.EmailSettings.FeedbackEmail
props["ShowEmailAddress"] = strconv.FormatBool(c.PrivacySettings.ShowEmailAddress)
props["AllowPublicLink"] = strconv.FormatBool(c.TeamSettings.AllowPublicLink)
props["SegmentDeveloperKey"] = c.ClientSettings.SegmentDeveloperKey
props["GoogleDeveloperKey"] = c.ClientSettings.GoogleDeveloperKey
props["AnalyticsUrl"] = c.ServiceSettings.AnalyticsUrl
+
props["ByPassEmail"] = strconv.FormatBool(c.EmailSettings.ByPassEmail)
props["ProfileHeight"] = fmt.Sprintf("%v", c.ImageSettings.ProfileHeight)
props["ProfileWidth"] = fmt.Sprintf("%v", c.ImageSettings.ProfileWidth)