diff --git a/services/web/app/coffee/Features/Email/Bodies/SingleCTAEmailBody.coffee b/services/web/app/coffee/Features/Email/Bodies/SingleCTAEmailBody.coffee index 00a878c276..cf4adf8cd7 100644 --- a/services/web/app/coffee/Features/Email/Bodies/SingleCTAEmailBody.coffee +++ b/services/web/app/coffee/Features/Email/Bodies/SingleCTAEmailBody.coffee @@ -4,7 +4,7 @@ settings = require "settings-sharelatex" module.exports = _.template """
-

+

<%= title %>

 
@@ -23,7 +23,7 @@ module.exports = _.template """
<% if (secondaryMessage) { %> -
 
+
 

<%= secondaryMessage %>

diff --git a/services/web/app/coffee/Features/Email/Bodies/ol-SingleCTAEmailBody.coffee b/services/web/app/coffee/Features/Email/Bodies/ol-SingleCTAEmailBody.coffee new file mode 100644 index 0000000000..45bc00383c --- /dev/null +++ b/services/web/app/coffee/Features/Email/Bodies/ol-SingleCTAEmailBody.coffee @@ -0,0 +1,49 @@ +_ = require("underscore") +settings = require "settings-sharelatex" + +module.exports = _.template """ + + +
+
+

+ <%= title %> +

+
 
+

+ <%= greeting %> +

+

+ <%= message %> +

+
 
+
+
+ + <%= ctaText %> + +
+
+ <% if (secondaryMessage) { %> +
 
+

+ <%= secondaryMessage %> +

+ <% } %> +
+<% if (gmailGoToAction) { %> + +<% } %> +""" \ No newline at end of file diff --git a/services/web/app/coffee/Features/Email/EmailBuilder.coffee b/services/web/app/coffee/Features/Email/EmailBuilder.coffee index 0a06a2a175..8b672bc4c5 100644 --- a/services/web/app/coffee/Features/Email/EmailBuilder.coffee +++ b/services/web/app/coffee/Features/Email/EmailBuilder.coffee @@ -1,19 +1,14 @@ _ = require('underscore') +settings = require("settings-sharelatex") PersonalEmailLayout = require("./Layouts/PersonalEmailLayout") NotificationEmailLayout = require("./Layouts/NotificationEmailLayout") -BaseWithHeaderEmailLayout = require("./Layouts/BaseWithHeaderEmailLayout") - -SingleCTAEmailBody = require("./Bodies/SingleCTAEmailBody") - - -settings = require("settings-sharelatex") - +BaseWithHeaderEmailLayout = require("./Layouts/" + settings.brandPrefix + "BaseWithHeaderEmailLayout") +SingleCTAEmailBody = require("./Bodies/" + settings.brandPrefix + "SingleCTAEmailBody") templates = {} - templates.registered = subject: _.template "Activate your #{settings.appName} Account" layout: PersonalEmailLayout diff --git a/services/web/app/coffee/Features/Email/Layouts/BaseWithHeaderEmailLayout.coffee b/services/web/app/coffee/Features/Email/Layouts/BaseWithHeaderEmailLayout.coffee index 6d25df2197..d141f64ff7 100644 --- a/services/web/app/coffee/Features/Email/Layouts/BaseWithHeaderEmailLayout.coffee +++ b/services/web/app/coffee/Features/Email/Layouts/BaseWithHeaderEmailLayout.coffee @@ -7,11 +7,8 @@ module.exports = _.template """ - - - Project invite + + + + + + + + + +
+
+ +
+
+ + +
+
+

+ Overleaf +

+
+
+
+
 
+
+
 
+ + <%= body %> + +
+
 
+

+ #{ settings.appName} • #{ settings.siteUrl } +

+
+
+ +
+
+ +
                                                           
+ + +""" diff --git a/services/web/test/unit/coffee/Email/EmailBuilderTests.coffee b/services/web/test/unit/coffee/Email/EmailBuilderTests.coffee index 4ee0e0ed05..a6cbc7d1ea 100644 --- a/services/web/test/unit/coffee/Email/EmailBuilderTests.coffee +++ b/services/web/test/unit/coffee/Email/EmailBuilderTests.coffee @@ -13,7 +13,9 @@ describe "EmailBuilder", -> beforeEach -> - @settings = appName: "testApp" + @settings = + appName: "testApp" + brandPrefix: '' @EmailBuilder = SandboxedModule.require modulePath, requires: "settings-sharelatex":@settings "logger-sharelatex": log:->