mirror of
https://github.com/overleaf/overleaf.git
synced 2024-11-21 20:47:08 -05:00
Merge pull request #3249 from overleaf/jel-removed-unused-email-template
Remove CTAEmailTemplate GitOrigin-RevId: bbfbe0c0e20d0dbbf5bf355c0a31de2834fedc34
This commit is contained in:
Jessica Lawshe
Copybot
parent
06316a0f56
commit
5d244fd183
2 changed files with 0 additions and 114 deletions
|
|
@ -1,59 +0,0 @@
|
||||||
const _ = require('underscore')
|
|
||||||
|
|
||||||
module.exports = _.template(`\
|
|
||||||
<table class="row" style="border-collapse: collapse; border-spacing: 0; display: table; padding: 0; position: relative; text-align: left; vertical-align: top; width: 100%;"><tbody><tr style="padding: 0; text-align: left; vertical-align: top;">
|
|
||||||
<th class="small-12 large-12 columns first last" style="Margin: 0 auto; color: #5D6879; font-family: Helvetica, Arial, sans-serif; font-size: 16px; font-weight: normal; 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%;"><tr style="padding: 0; text-align: left; vertical-align: top;"><th style="Margin: 0; color: #5D6879; font-family: Helvetica, Arial, sans-serif; font-size: 16px; font-weight: normal; line-height: 1.3; 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; margin: 0; padding: 0; text-align: left; word-wrap: normal;">
|
|
||||||
<%= title %>
|
|
||||||
</h3>
|
|
||||||
<% } %>
|
|
||||||
<table class="spacer" style="border-collapse: collapse; border-spacing: 0; padding: 0; text-align: left; vertical-align: top; width: 100%;"><tbody><tr style="padding: 0; text-align: left; vertical-align: top;"><td height="20px" style="-moz-hyphens: auto; -webkit-hyphens: auto; Margin: 0; border-collapse: collapse !important; color: #5D6879; font-family: Helvetica, Arial, sans-serif; font-size: 20px; font-weight: normal; hyphens: auto; line-height: 20px; margin: 0; mso-line-height-rule: exactly; padding: 0; text-align: left; vertical-align: top; word-wrap: break-word;"> </td></tr></tbody></table>
|
|
||||||
<% if (greeting) { %>
|
|
||||||
<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;">
|
|
||||||
<%= greeting %>
|
|
||||||
</p>
|
|
||||||
<% } %>
|
|
||||||
<p class="avoid-auto-linking" 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;">
|
|
||||||
<%= message %>
|
|
||||||
</p>
|
|
||||||
<table class="spacer" style="border-collapse: collapse; border-spacing: 0; padding: 0; text-align: left; vertical-align: top; width: 100%;"><tbody><tr style="padding: 0; text-align: left; vertical-align: top;"><td height="20px" style="-moz-hyphens: auto; -webkit-hyphens: auto; Margin: 0; border-collapse: collapse !important; color: #5D6879; font-family: Helvetica, Arial, sans-serif; font-size: 20px; font-weight: normal; hyphens: auto; line-height: 20px; margin: 0; mso-line-height-rule: exactly; padding: 0; text-align: left; vertical-align: top; word-wrap: break-word;"> </td></tr></tbody></table>
|
|
||||||
<center data-parsed="" style="min-width: 532px; width: 100%;">
|
|
||||||
<table class="button float-center" style="Margin: 0 0 16px 0; border-collapse: collapse; border-spacing: 0; float: none; margin: 0 0 16px 0; padding: 0; text-align: center; vertical-align: top; width: auto;"><tr style="padding: 0; text-align: left; vertical-align: top;"><td style="-moz-hyphens: auto; -webkit-hyphens: auto; Margin: 0; border-collapse: collapse !important; border-radius: 9999px; color: #5D6879; font-family: Helvetica, Arial, sans-serif; font-size: 16px; font-weight: normal; hyphens: auto; line-height: 1.3; margin: 0; padding: 0; text-align: left; vertical-align: top; word-wrap: break-word;"><table style="border-collapse: collapse; border-spacing: 0; padding: 0; text-align: left; vertical-align: top; width: 100%;"><tr style="padding: 0; text-align: left; vertical-align: top;"><td style="-moz-hyphens: auto; -webkit-hyphens: auto; Margin: 0; background: #4F9C45; border: none; border-collapse: collapse !important; border-radius: 9999px; color: #fefefe; font-family: Helvetica, Arial, sans-serif; font-size: 16px; font-weight: normal; hyphens: auto; line-height: 1.3; margin: 0; padding: 0; text-align: left; vertical-align: top; word-wrap: break-word;">
|
|
||||||
<a href="<%= ctaURL %>" style="Margin: 0; border: 0 solid #4F9C45; border-radius: 9999px; color: #fefefe; display: inline-block; font-family: Helvetica, Arial, sans-serif; font-size: 16px; font-weight: bold; line-height: 1.3; margin: 0; padding: 8px 16px 8px 16px; text-align: left; text-decoration: none;">
|
|
||||||
<%= ctaText %>
|
|
||||||
</a>
|
|
||||||
</td></tr></table></td></tr></table>
|
|
||||||
</center>
|
|
||||||
<% if (secondaryMessage) { %>
|
|
||||||
<table class="spacer" style="border-collapse: collapse; border-spacing: 0; padding: 0; text-align: left; vertical-align: top; width: 100%;"><tbody><tr style="padding: 0; text-align: left; vertical-align: top;"><td height="20px" style="-moz-hyphens: auto; -webkit-hyphens: auto; Margin: 0; border-collapse: collapse !important; color: #5D6879; font-family: Helvetica, Arial, sans-serif; font-size: 20px; font-weight: normal; hyphens: auto; line-height: 20px; margin: 0; mso-line-height-rule: exactly; padding: 0; text-align: left; vertical-align: top; word-wrap: break-word;"> </td></tr></tbody></table>
|
|
||||||
<p class="avoid-auto-linking" 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;">
|
|
||||||
<%= secondaryMessage %>
|
|
||||||
</p>
|
|
||||||
<% } %>
|
|
||||||
<table class="spacer" style="border-collapse: collapse; border-spacing: 0; padding: 0; text-align: left; vertical-align: top; width: 100%;"><tbody><tr style="padding: 0; text-align: left; vertical-align: top;"><td height="20px" style="-moz-hyphens: auto; -webkit-hyphens: auto; Margin: 0; border-collapse: collapse !important; color: #5D6879; font-family: Helvetica, Arial, sans-serif; font-size: 20px; font-weight: normal; hyphens: auto; line-height: 20px; margin: 0; mso-line-height-rule: exactly; padding: 0; text-align: left; vertical-align: top; word-wrap: break-word;"> </td></tr></tbody></table>
|
|
||||||
<p class="avoid-auto-linking" style="Margin: 0; Margin-bottom: 10px; color: #5D6879; font-family: Helvetica, Arial, sans-serif; font-size: 12px; font-weight: normal; margin: 0; margin-bottom: 10px; padding: 0; text-align: left;">
|
|
||||||
If the button above does not appear, please copy and paste this link into your browser's address bar:<br>
|
|
||||||
<p class="avoid-auto-linking" style="Margin: 0; Margin-bottom: 10px; color: #5D6879; font-family: Helvetica, Arial, sans-serif; font-size: 12px; font-weight: normal; margin: 0; margin-bottom: 10px; padding: 0; text-align: left;"><%= ctaURL %></p>
|
|
||||||
</p>
|
|
||||||
</th>
|
|
||||||
<th class="expander" style="Margin: 0; color: #5D6879; font-family: Helvetica, Arial, sans-serif; font-size: 16px; font-weight: normal; line-height: 1.3; margin: 0; padding: 0 !important; text-align: left; visibility: hidden; width: 0;"></th></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>
|
|
||||||
<% } %>\
|
|
||||||
`)
|
|
||||||
|
|
@ -1,13 +1,11 @@
|
||||||
const _ = require('underscore')
|
const _ = require('underscore')
|
||||||
const settings = require('settings-sharelatex')
|
const settings = require('settings-sharelatex')
|
||||||
const marked = require('marked')
|
|
||||||
const moment = require('moment')
|
const moment = require('moment')
|
||||||
const EmailMessageHelper = require('./EmailMessageHelper')
|
const EmailMessageHelper = require('./EmailMessageHelper')
|
||||||
const StringHelper = require('../Helpers/StringHelper')
|
const StringHelper = require('../Helpers/StringHelper')
|
||||||
const BaseWithHeaderEmailLayout = require(`./Layouts/BaseWithHeaderEmailLayout`)
|
const BaseWithHeaderEmailLayout = require(`./Layouts/BaseWithHeaderEmailLayout`)
|
||||||
const SpamSafe = require('./SpamSafe')
|
const SpamSafe = require('./SpamSafe')
|
||||||
const ctaEmailBody = require('./Bodies/cta-email')
|
const ctaEmailBody = require('./Bodies/cta-email')
|
||||||
const SingleCTAEmailBody = require(`./Bodies/SingleCTAEmailBody`)
|
|
||||||
const NoCTAEmailBody = require(`./Bodies/NoCTAEmailBody`)
|
const NoCTAEmailBody = require(`./Bodies/NoCTAEmailBody`)
|
||||||
|
|
||||||
function _emailBodyPlainText(content, opts, ctaEmail) {
|
function _emailBodyPlainText(content, opts, ctaEmail) {
|
||||||
|
|
@ -78,58 +76,6 @@ function ctaTemplate(content) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
//
|
|
||||||
// DEPRECATED
|
|
||||||
//
|
|
||||||
// Use ctaTemplate instead of CTAEmailTemplate
|
|
||||||
//
|
|
||||||
function CTAEmailTemplate(content) {
|
|
||||||
if (content.greeting == null) {
|
|
||||||
content.greeting = () => 'Hi,'
|
|
||||||
}
|
|
||||||
if (content.secondaryMessage == null) {
|
|
||||||
content.secondaryMessage = () => ''
|
|
||||||
}
|
|
||||||
return {
|
|
||||||
subject(opts) {
|
|
||||||
return content.subject(opts)
|
|
||||||
},
|
|
||||||
layout: BaseWithHeaderEmailLayout,
|
|
||||||
plainTextTemplate(opts) {
|
|
||||||
return `\
|
|
||||||
${content.greeting(opts)}
|
|
||||||
|
|
||||||
${content.message(opts).trim()}
|
|
||||||
|
|
||||||
${content.ctaText(opts)}: ${content.ctaURL(opts)}
|
|
||||||
|
|
||||||
${(typeof content.secondaryMessage === 'function'
|
|
||||||
? content.secondaryMessage(opts).trim()
|
|
||||||
: undefined) || ''}
|
|
||||||
|
|
||||||
Regards,
|
|
||||||
The ${settings.appName} Team - ${settings.siteUrl}\
|
|
||||||
`
|
|
||||||
},
|
|
||||||
compiledTemplate(opts) {
|
|
||||||
return SingleCTAEmailBody({
|
|
||||||
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()),
|
|
||||||
ctaText: content.ctaText(opts),
|
|
||||||
ctaURL: content.ctaURL(opts),
|
|
||||||
gmailGoToAction:
|
|
||||||
typeof content.gmailGoToAction === 'function'
|
|
||||||
? content.gmailGoToAction(opts)
|
|
||||||
: undefined,
|
|
||||||
StringHelper
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function NoCTAEmailTemplate(content) {
|
function NoCTAEmailTemplate(content) {
|
||||||
if (content.greeting == null) {
|
if (content.greeting == null) {
|
||||||
content.greeting = () => 'Hi,'
|
content.greeting = () => 'Hi,'
|
||||||
|
|
@ -558,7 +504,6 @@ function _formatUserNameAndEmail(user, placeholder) {
|
||||||
module.exports = {
|
module.exports = {
|
||||||
templates,
|
templates,
|
||||||
ctaTemplate,
|
ctaTemplate,
|
||||||
CTAEmailTemplate,
|
|
||||||
NoCTAEmailTemplate,
|
NoCTAEmailTemplate,
|
||||||
buildEmail
|
buildEmail
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue