github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-09-16 02:52:31 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2982 from overleaf/jel-no-cta-emails-cleanup

Browse source 
Tidy "No CTA" emails and update footer color in all emails

GitOrigin-RevId: bf4d88400a6165b4b2ba3880374921dcda9a2cef
This commit is contained in:
Jessica Lawshe 2020-07-16 10:41:19 -05:00 committed by Copybot
parent d7ff985554
commit f0e9a37c7a
4 changed files with 114 additions and 104 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

77
services/web/app/src/Features/Email/Bodies/NoCTAEmailBody.js
View file

@ -5,52 +5,37 @@ module.exports = _.template(`\
<tbody>
<tr style="padding: 0; vertical-align: top;">
<th class="small-12 columns" style="line-height: 1.3; margin: 0 auto; padding: 0; padding-bottom: 16px; padding-left: 16px; padding-right: 16px; text-align: left; width: 564px;">
<table style="border-collapse: collapse; border-spacing: 0; padding: 0; text-align: left; vertical-align: top; width: 100%; color: #5D6879; font-family: Helvetica, Arial, sans-serif; font-size: 16px; font-weight: normal; line-height: 1.3;"><tr style="padding: 0; text-align: left; vertical-align: top;">
<th style="margin: 0; padding: 0; text-align: left;">
<% if (title) { %>
<h3 class="avoid-auto-linking" style="margin: 0; color: #5D6879; font-family: Georgia, serif; font-size: 24px; font-weight: normal; line-height: 1.3; padding: 0; text-align: left; word-wrap: normal;">
<%= title %>
</h3>
<% } %>
</th>
<tr><td>
<p style="height: 20px; margin: 0; padding: 0;">&#xA0;</p>
<table style="border-collapse: collapse; border-spacing: 0; padding: 0; text-align: left; vertical-align: top; width: 100%; color: #5D6879; font-family: Helvetica, Arial, sans-serif; font-size: 16px; font-weight: normal; line-height: 1.3;">
<tr style="padding: 0; text-align: left; vertical-align: top;">
<th style="margin: 0; padding: 0; text-align: left;">
<% if (title) { %>
<h3 class="avoid-auto-linking" style="margin: 0; color: #5D6879; font-family: Georgia, serif; font-size: 24px; font-weight: normal; line-height: 1.3; padding: 0; text-align: left; word-wrap: normal;">
<%= title %>
</h3>
<% } %>
</th>
<tr>
<td>
<p style="height: 20px; margin: 0; padding: 0;">&#xA0;</p>
<% if (greeting) { %>
<p style="margin: 0 10px 0 0; padding: 0;">
<%= greeting %>
</p>
<% } %>
<% if (greeting) { %>
<p style="margin: 0 0 10px 0; padding: 0;">
<%= greeting %>
</p>
<% } %>
<p class="avoid-auto-linking" style="margin: 0 10px 0 0; padding: 0;">
<%= message %>
</p>
<% if (secondaryMessage) { %>
<p class="avoid-auto-linking" style="margin: 0 10px 0 0; padding: 0;">
<%= secondaryMessage %>
</p>
<% } %>
</td></tr>
</tr>
</table>
</th>
</tr></tbody></table>
<% if (gmailGoToAction) { %>
<script type="application/ld+json">
<%=
StringHelper.stringifyJsonForScript({
"@context": "http://schema.org",
"@type": "EmailMessage",
"potentialAction": {
"@type": "ViewAction",
"target": gmailGoToAction.target,
"url": gmailGoToAction.target,
"name": gmailGoToAction.name
},
"description": gmailGoToAction.description
})
%>
</script>
<% } %>\
<% (message).forEach(function(paragraph) { %>
<p class="avoid-auto-linking" style="margin: 0 0 10px 0; padding: 0;">
<%= paragraph %>
</p>
<% }) %>
</td>
</tr>
</tr>
</table>
</th>
</tr>
</tbody>
</table>
\
`)

128
services/web/app/src/Features/Email/EmailBuilder.js
View file

@ -1,6 +1,7 @@
const _ = require('underscore')
const settings = require('settings-sharelatex')
const marked = require('marked')
const EmailMessageHelper = require('./EmailMessageHelper')
const StringHelper = require('../Helpers/StringHelper')
const BaseWithHeaderEmailLayout = require(`./Layouts/BaseWithHeaderEmailLayout`)
const SpamSafe = require('./SpamSafe')
@ -58,8 +59,8 @@ function NoCTAEmailTemplate(content) {
if (content.greeting == null) {
content.greeting = () => 'Hi,'
}
if (content.secondaryMessage == null) {
content.secondaryMessage = () => ''
if (!content.message) {
throw new Error('missing message')
}
return {
subject(opts) {
@ -69,10 +70,9 @@ function NoCTAEmailTemplate(content) {
plainTextTemplate(opts) {
return `\
${content.greeting(opts)}
${content.message(opts).trim()}
${(typeof content.secondaryMessage === 'function'
? content.secondaryMessage(opts).trim()
: undefined) || ''}
${content.message(opts, true).join('\r\n\r\n')}
Regards,
The ${settings.appName} Team - ${settings.siteUrl}\
`
@ -82,12 +82,7 @@ The ${settings.appName} Team - ${settings.siteUrl}\
title:
typeof content.title === 'function' ? content.title(opts) : undefined,
greeting: content.greeting(opts),
message: marked(content.message(opts).trim()),
secondaryMessage: marked(content.secondaryMessage(opts).trim()),
gmailGoToAction:
typeof content.gmailGoToAction === 'function'
? content.gmailGoToAction(opts)
: undefined,
message: content.message(opts),
StringHelper
})
}
@ -237,9 +232,10 @@ templates.passwordChanged = NoCTAEmailTemplate({
return `Password Changed`
},
message(opts) {
return `We're contacting you to notify you that your password has been set or changed.
If you have recently set your password for the first time, or if you just changed your password, you don't need to take any further action. If you didn't set or change your password, please contact us.`
return [
`We're contacting you to notify you that your password has been set or changed.`,
`If you have recently set your password for the first time, or if you just changed your password, you don't need to take any further action. If you didn't set or change your password, please contact us.`
]
}
})
@ -482,9 +478,10 @@ templates.emailThirdPartyIdentifierLinked = NoCTAEmailTemplate({
return `Accounts Linked`
},
message(opts) {
let message = `We're contacting you to notify you that your ${opts.provider}
account is now linked to your ${settings.appName} account.`
return message
let message = `We're contacting you to notify you that your ${
opts.provider
} account is now linked to your ${settings.appName} account.`
return [message]
}
})
@ -498,9 +495,10 @@ templates.emailThirdPartyIdentifierUnlinked = NoCTAEmailTemplate({
return `Accounts No Longer Linked`
},
message(opts) {
let message = `We're contacting you to notify you that your ${opts.provider}
account is no longer linked with your ${settings.appName} account.`
return message
let message = `We're contacting you to notify you that your ${
opts.provider
} account is no longer linked with your ${settings.appName} account.`
return [message]
}
})
@ -514,19 +512,22 @@ templates.ownershipTransferConfirmationPreviousOwner = NoCTAEmailTemplate({
)
return `${projectName} - Owner change`
},
message(opts) {
message(opts, isPlainText) {
const nameAndEmail = _.escape(
_formatUserNameAndEmail(opts.newOwner, 'a collaborator')
)
const projectName = _.escape(
SpamSafe.safeProjectName(opts.project.name, 'your project')
)
return `\
As per your request, we have made ${nameAndEmail} the owner of ${projectName}.
If you haven't asked to change the owner of **${projectName}**, please get in touch
with us via ${settings.adminEmail}.
`
const projectNameDisplay = isPlainText
? projectName
: `<b>${projectName}</b>`
return [
`As per your request, we have made ${nameAndEmail} the owner of ${projectNameDisplay}.`,
`If you haven't asked to change the owner of ${projectNameDisplay}, please get in touch with us via ${
settings.adminEmail
}.`
]
}
})
@ -573,33 +574,50 @@ templates.userOnboardingEmail = NoCTAEmailTemplate({
title(opts) {
return `Getting more out of ${settings.appName}`
},
message(opts) {
return `\
Thanks for signing up for ${
settings.appName
} recently. We hope you've been finding it useful!
Here are some key features to help you get the most out of the service:
<a href="https://www.overleaf.com/learn/latex/Learn_LaTeX_in_30_minutes?utm_source=overleaf&utm_medium=email&utm_campaign=onboarding">Learn LaTeX in 30 minutes</a>: In this tutorial we provide a quick and easy first introduction to LaTeX with no prior knowledge required. By the time you are finished, you will have written your first LaTeX document!
<a href="https://www.overleaf.com/latex/templates?utm_source=overleaf&utm_medium=email&utm_campaign=onboarding">Find a beautiful template</a>: If you're looking for a template or example to get started, we've a large selection available in our template gallery, including CVs, project reports, journal articles and more.
<a href="https://www.overleaf.com/learn/how-to/Sharing_a_project?utm_source=overleaf&utm_medium=email&utm_campaign=onboarding">Work with your collaborators</a>: One of the key features of Overleaf is the ability to share projects and collaborate on them with other users. Find out how to share your projecs with your colleagues in this quick how-to guide.
If you have any questions, please let us know, and thanks again for using Overleaf.
John
Dr John Hammersley <br />
Co-founder & CEO <br />
<a href="http://www.overleaf.com">www.overleaf.com</a>
<hr>
`
},
secondaryMessage() {
return `Don't want onboarding emails like this from us? Don't worry, this is the only one.
If you've previously subscribed to emails about product offers and company news and events,
you can unsubscribe <a href="${settings.siteUrl}/user/settings">here</a>.`
message(opts, isPlainText) {
const learnLatexLink = EmailMessageHelper.displayLink(
'Learn LaTeX in 30 minutes',
`${
settings.siteUrl
}/learn/latex/Learn_LaTeX_in_30_minutes?utm_source=overleaf&utm_medium=email&utm_campaign=onboarding`,
isPlainText
)
const templatesLinks = EmailMessageHelper.displayLink(
'Find a beautiful template',
`${
settings.siteUrl
}/latex/templates?utm_source=overleaf&utm_medium=email&utm_campaign=onboarding`,
isPlainText
)
const collaboratorsLink = EmailMessageHelper.displayLink(
'Work with your collaborators',
`${
settings.siteUrl
}/learn/how-to/Sharing_a_project?utm_source=overleaf&utm_medium=email&utm_campaign=onboarding`,
isPlainText
)
const siteLink = EmailMessageHelper.displayLink(
'www.overleaf.com',
settings.siteUrl,
isPlainText
)
const userSettingsLink = EmailMessageHelper.displayLink(
'here',
`${settings.siteUrl}/user/settings`,
isPlainText
)
return [
`Thanks for signing up for ${
settings.appName
} recently. We hope you've been finding it useful! Here are some key features to help you get the most out of the service:`,
`${learnLatexLink}: In this tutorial we provide a quick and easy first introduction to LaTeX with no prior knowledge required. By the time you are finished, you will have written your first LaTeX document!`,
`${templatesLinks}: If you're looking for a template or example to get started, we've a large selection available in our template gallery, including CVs, project reports, journal articles and more.`,
`${collaboratorsLink}: One of the key features of Overleaf is the ability to share projects and collaborate on them with other users. Find out how to share your projecs with your colleagues in this quick how-to guide.`,
`If you have any questions, please let us know, and thanks again for using Overleaf.`,
`John`,
`Dr John Hammersley <br />Co-founder & CEO <br />${siteLink}<hr>`,
`Don't want onboarding emails like this from us? Don't worry, this is the only one. If you've previously subscribed to emails about product offers and company news and events, you can unsubscribe ${userSettingsLink}.`
]
}
})

7
services/web/app/src/Features/Email/EmailMessageHelper.js Normal file
View file

@ -0,0 +1,7 @@
function displayLink(text, url, isPlainText) {
return isPlainText ? `${text} (${url})` : `<a href="${url}">${text}</a>`
}
module.exports = {
displayLink
}

6
services/web/app/src/Features/Email/Layouts/BaseWithHeaderEmailLayout.js
View file

@ -14,7 +14,7 @@ module.exports = _.template(`\
.avoid-auto-linking a,
.avoid-auto-linking a[href] {
color: #4F9C45 !important;
color: #138A07 !important;
text-decoration: none !important;
-moz-hyphens: none;
-ms-hyphens: none;
@ -22,7 +22,7 @@ module.exports = _.template(`\
hyphens: none; }
.avoid-auto-linking a:visited,
.avoid-auto-linking a[href]:visited {
color: #4F9C45; }
color: #138A07; }
.avoid-auto-linking a:hover,
.avoid-auto-linking a[href]:hover {
color: #3d7935; }
@ -366,7 +366,7 @@ module.exports = _.template(`\
<p style="Margin: 0; Margin-bottom: 10px; color: #5D6879; font-family: Helvetica, Arial, sans-serif; font-size: 16px; font-weight: normal; line-height: 1.3; margin: 0; margin-bottom: 10px; padding: 0; text-align: left;"><small style="color: #5D6879; font-size: 80%;">
${settings.appName} &bull; <a href="${
settings.siteUrl
}" style="Margin: 0; color: #4F9C45; font-family: Helvetica, Arial, sans-serif; font-weight: normal; line-height: 1.3; margin: 0; padding: 0; text-align: left; text-decoration: none;">${
}" style="Margin: 0; color: #0F7A06; font-family: Helvetica, Arial, sans-serif; font-weight: normal; line-height: 1.3; margin: 0; padding: 0; text-align: left; text-decoration: none;">${
settings.siteUrl
}</a>
</small></p>