diff --git a/ghost/staff-service/lib/email-templates/new-free-signup.hbs b/ghost/staff-service/lib/email-templates/new-free-signup.hbs index c2a1007267..1d9e1fb69e 100644 --- a/ghost/staff-service/lib/email-templates/new-free-signup.hbs +++ b/ghost/staff-service/lib/email-templates/new-free-signup.hbs @@ -26,64 +26,46 @@ + {{#if siteIconUrl}} + + + + {{/if}}
{{siteTitle}}
-

Congratulations!

-

You have a new free member.

- - - - - - - -
- - - - - -
-
- {{memberData.initials}} -
- 		-

{{memberData.name}}

- {{#if memberData.showEmail}} -

{{memberData.email}}

- {{/if}} -

Created on {{memberData.createdAt}}{{#if memberData.location}} • {{memberData.location}} {{/if}} -

-
-
- - - - - -
- {{#if referrerSource}} -

Signup info

-
-

Source - - {{referrerSource}} -

- {{#if attributionTitle}} -

Page - - {{attributionTitle}} -

- {{/if}} - {{/if}} -
- - +

New free subscriber to {{siteTitle}}

+
- - - diff --git a/ghost/staff-service/test/staff-service.test.js b/ghost/staff-service/test/staff-service.test.js index 920ee9d37a..1de3d71693 100644 --- a/ghost/staff-service/test/staff-service.test.js +++ b/ghost/staff-service/test/staff-service.test.js @@ -439,9 +439,6 @@ describe('StaffService', function () { mailStub.calledWith( sinon.match.has('html', sinon.match('🥳 Free member signup: Ghost')) ).should.be.true(); - mailStub.calledWith( - sinon.match.has('html', sinon.match('Created on 1 Aug 2022 • France')) - ).should.be.true(); }); it('sends free member signup alert without member name', async function () { @@ -464,18 +461,13 @@ describe('StaffService', function () { mailStub.calledWith( sinon.match.has('html', sinon.match('🥳 Free member signup: member@example.com')) ).should.be.true(); - mailStub.calledWith( - sinon.match.has('html', sinon.match('Created on 1 Aug 2022 • France')) - ).should.be.true(); }); it('sends free member signup alert with attribution', async function () { const member = { name: 'Ghost', email: 'member@example.com', - id: 'abc', - geolocation: '{"country": "France"}', - created_at: '2022-08-01T07:30:39.882Z' + id: 'abc' }; const attribution = { @@ -496,9 +488,6 @@ describe('StaffService', function () { mailStub.calledWith( sinon.match.has('html', sinon.match('🥳 Free member signup: Ghost')) ).should.be.true(); - mailStub.calledWith( - sinon.match.has('html', sinon.match('Created on 1 Aug 2022 • France')) - ).should.be.true(); mailStub.calledWith( sinon.match.has('html', sinon.match('Source'))
- +
+ + + + +
+

Name:

+

{{memberData.name}}{{#if memberData.showEmail}} ({{memberData.email}}){{/if}}

+ {{#if referrerSource}} +

Source:

+

{{referrerSource}}

+ {{#if attributionTitle}} +

Page:

+

{{attributionTitle}}

+ {{/if}} + {{/if}} +
+ - +
View member + + + + + + +
View member
+
@@ -91,21 +73,29 @@
-
-

You can also copy & paste this URL into your browser:

-

{{memberData.adminUrl}}

+ + + + + + + +
+

Or copy and paste this URL into your browser:

+

{{memberData.adminUrl}}

+
-

This message was sent from {{siteDomain}} to {{toEmail}}

+ 		+

This message was sent from {{siteDomain}} to {{toEmail}}
-

Don’t want to receive these emails? Manage your preferences here.

+ 		+

Don’t want to receive these emails? Manage your preferences here.