From a2ef0e1ae551c9184511a88d3790b184bf053958 Mon Sep 17 00:00:00 2001 From: Simon Detheridge Date: Fri, 5 Oct 2018 12:04:00 +0100 Subject: [PATCH 1/3] Add additional CTA link to emails Some mail clients don't show the CTA button correctly, or at all. Add an additional, smaller link to the bottom of the email for people who can't see the button. bug: sharelatex/web-sharelatex-internal#987 Signed-off-by: Simon Detheridge --- .../coffee/Features/Email/Bodies/SingleCTAEmailBody.coffee | 5 +++++ .../Features/Email/Bodies/ol-SingleCTAEmailBody.coffee | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/services/web/app/coffee/Features/Email/Bodies/SingleCTAEmailBody.coffee b/services/web/app/coffee/Features/Email/Bodies/SingleCTAEmailBody.coffee index bffa485f07..192f572beb 100644 --- a/services/web/app/coffee/Features/Email/Bodies/SingleCTAEmailBody.coffee +++ b/services/web/app/coffee/Features/Email/Bodies/SingleCTAEmailBody.coffee @@ -32,6 +32,11 @@ module.exports = _.template """ <%= secondaryMessage %>

<% } %> +
 
+

+ If the button above does not appear, please open the link in your browser here:
+ <%= ctaURL %> +

diff --git a/services/web/app/coffee/Features/Email/Bodies/ol-SingleCTAEmailBody.coffee b/services/web/app/coffee/Features/Email/Bodies/ol-SingleCTAEmailBody.coffee index ee9907c019..2b522d6c6c 100644 --- a/services/web/app/coffee/Features/Email/Bodies/ol-SingleCTAEmailBody.coffee +++ b/services/web/app/coffee/Features/Email/Bodies/ol-SingleCTAEmailBody.coffee @@ -32,6 +32,11 @@ module.exports = _.template """ <%= secondaryMessage %>

<% } %> +
 
+

+ If the button above does not appear, please open the link in your browser here:
+ <%= ctaURL %> +

From d316a761061ff09b5dc9bea0d046089a95fc79ce Mon Sep 17 00:00:00 2001 From: Simon Detheridge Date: Fri, 5 Oct 2018 13:16:42 +0100 Subject: [PATCH 2/3] Revert "add plain text link to email address confirmation emails" This reverts commit 48cd7e604dcc5f3b7ae8eb699f14b44bc073f107. --- services/web/app/coffee/Features/Email/EmailBuilder.coffee | 2 -- 1 file changed, 2 deletions(-) diff --git a/services/web/app/coffee/Features/Email/EmailBuilder.coffee b/services/web/app/coffee/Features/Email/EmailBuilder.coffee index f88fff3057..3326f8522b 100644 --- a/services/web/app/coffee/Features/Email/EmailBuilder.coffee +++ b/services/web/app/coffee/Features/Email/EmailBuilder.coffee @@ -97,8 +97,6 @@ templates.confirmEmail = CTAEmailTemplate({ title: () -> "Confirm Email" message: () -> "Please confirm your email on #{settings.appName}." ctaText: () -> "Confirm Email" - secondaryMessage: (opts) -> - "If the button does not appear, open this link in your browser: #{opts.confirmEmailUrl}" ctaURL: (opts) -> opts.confirmEmailUrl }) From 286f25529a11213cb35b8d45ed20393738258b27 Mon Sep 17 00:00:00 2001 From: Simon Detheridge Date: Fri, 5 Oct 2018 13:19:05 +0100 Subject: [PATCH 3/3] Remove secondary CTA link from account merge confirmation email bug: sharelatex/web-sharelatex-internal#987 Signed-off-by: Simon Detheridge --- services/web/app/coffee/Features/Email/EmailBuilder.coffee | 2 -- 1 file changed, 2 deletions(-) diff --git a/services/web/app/coffee/Features/Email/EmailBuilder.coffee b/services/web/app/coffee/Features/Email/EmailBuilder.coffee index 3326f8522b..2f37901dbe 100644 --- a/services/web/app/coffee/Features/Email/EmailBuilder.coffee +++ b/services/web/app/coffee/Features/Email/EmailBuilder.coffee @@ -51,8 +51,6 @@ templates.accountMergeToOverleafAddress = CTAEmailTemplate({ """ ctaText: () -> "Confirm Account Merge" ctaURL: (opts) -> opts.tokenLinkUrl - secondaryMessage: (opts) -> - "If the button does not appear, open this link in your browser: #{opts.tokenLinkUrl}" }) templates.accountMergeToSharelatexAddress = templates.accountMergeToOverleafAddress