Open platform to collect and prioritize feedback
better email text (#242)
Guilherme Oenning7c4d50f0d454
diff --git a/app/handlers/signin.go b/app/handlers/signin.goindex 876f0e80c..fa58c2ecf 100644--- a/app/handlers/signin.go+++ b/app/handlers/signin.go@@ -144,9 +144,15 @@ func SignInByEmail() web.HandlerFunc {return c.Failure(err)}- subject := fmt.Sprintf("Sign in to %s feedback forum", c.Tenant().Name)+ subject := fmt.Sprintf("Sign in to %s", c.Tenant().Name)link := fmt.Sprintf("%s/signin/verify?k=%s", c.BaseURL(), input.Model.VerificationKey)- message := fmt.Sprintf("Click and confirm that you want to sign in. This link will expire in 15 minutes and can only be used once. <br /><br /> <a href='%s'>%s</a>", link, link)+ message := fmt.Sprintf(`+ Click the link below to sign in.+ <br /><br />+ <a href='%s'>%s</a>+ <br /><br />+ <span style="color:#b3b3b1;font-size:11px">This link will expire in 15 minutes and can only be used once.</span>+ `, link, link)err = c.Services().Emailer.Send(c.Tenant().Name, input.Model.Email, subject, message)if err != nil {return c.Failure(err)diff --git a/app/handlers/signup.go b/app/handlers/signup.goindex 059648fe4..65b919185 100644--- a/app/handlers/signup.go+++ b/app/handlers/signup.go@@ -72,9 +72,15 @@ func CreateTenant() web.HandlerFunc {return c.Failure(err)}- subject := "Verify your new Fider instance"+ subject := "Confirm your new Fider instance"link := fmt.Sprintf("%s/signup/verify?k=%s", c.TenantBaseURL(tenant), input.Model.VerificationKey)- message := fmt.Sprintf("Click and confirm that you created a new Fider instance. This link will expire in 48 hours and can only be used once. <br /><br /> <a href='%s'>%s</a>", link, link)+ message := fmt.Sprintf(`+ Click the link below to confirm your new Fider instance.+ <br /><br />+ <a href='%s'>%s</a>+ <br /><br />+ <span style="color:#b3b3b1;font-size:11px">This link will expire in 48 hours and can only be used once.</span>+ `, link, link)err = c.Services().Emailer.Send("Fider", user.Email, subject, message)if err != nil {return c.Failure(err)diff --git a/public/assets/styles/main.scss b/public/assets/styles/main.scssindex bc849909a..dbde8e045 100644--- a/public/assets/styles/main.scss+++ b/public/assets/styles/main.scss@@ -65,6 +65,9 @@ code {color: #6a737d;border-left: 0.25em solid #dfe2e5;}+ img {+ max-width: 100%;+ }pre {overflow: hidden;padding: 16px;diff --git a/public/components/common/SignInControl.tsx b/public/components/common/SignInControl.tsxindex c3a23e798..7662cc7af 100644--- a/public/components/common/SignInControl.tsx+++ b/public/components/common/SignInControl.tsx@@ -42,7 +42,7 @@ export class SignInControl extends React.Component<SignInControlProps, SignInConif (this.state.sent) {return (<div>- <p>We sent a sign in link to <b>{this.state.email}</b>. <br /> Please check your inbox.</p>+ <p>We just emailed a confirmation link to <b>{this.state.email}</b>. <br /> Click the link and you’ll be signed in.</p><p><a href="#" onClick={() => page.hideSignIn()}>OK</a></p></div>);diff --git a/public/pages/signup/SignUpPage.tsx b/public/pages/signup/SignUpPage.tsxindex d455b980a..9ea9002f0 100644--- a/public/pages/signup/SignUpPage.tsx+++ b/public/pages/signup/SignUpPage.tsx@@ -110,7 +110,7 @@ export class SignUpPage extends React.Component<SignUpPageProps, SignUpPageState<div id="submitted-modal" className="ui modal small"><div className="header">Thank you for registering!</div><div className="content">- <p>Please check your inbox for a confirmation link to finish your registration.</p>+ <p>We just emailed a confirmation link to <b>{this.state.email}</b>. <br /> Click the link to finish your registration.</p></div></div>);