From b8b0d1538e1ca448e569d77a9918af4168867c9b Mon Sep 17 00:00:00 2001 From: Simon Backx Date: Wed, 15 Mar 2023 14:54:41 +0100 Subject: [PATCH] Added very basic subscription details in preview labs refs https://github.com/TryGhost/Team/issues/2738 --- .../modals/newsletters/edit/design-labs.hbs | 28 +++++++++---------- .../modals/newsletters/edit/design-labs.js | 1 - .../modals/newsletters/edit/preview-labs.hbs | 8 +++++- .../modals/newsletters/edit/preview-labs.js | 1 + 4 files changed, 21 insertions(+), 17 deletions(-) diff --git a/ghost/admin/app/components/modals/newsletters/edit/design-labs.hbs b/ghost/admin/app/components/modals/newsletters/edit/design-labs.hbs index e013518ae5..f1c7180da2 100644 --- a/ghost/admin/app/components/modals/newsletters/edit/design-labs.hbs +++ b/ghost/admin/app/components/modals/newsletters/edit/design-labs.hbs @@ -225,22 +225,20 @@ {{/unless}} - {{#if this.membersUtils.isMembersEnabled }} - - -
-
- - -
+ + +
+
+ +
- - {{/if}} +
+
diff --git a/ghost/admin/app/components/modals/newsletters/edit/design-labs.js b/ghost/admin/app/components/modals/newsletters/edit/design-labs.js index 1193151740..19228e75b1 100644 --- a/ghost/admin/app/components/modals/newsletters/edit/design-labs.js +++ b/ghost/admin/app/components/modals/newsletters/edit/design-labs.js @@ -5,7 +5,6 @@ import {inject as service} from '@ember/service'; export default class EditNewsletterDesignForm extends Component { @service settings; - @service membersUtils; imageExtensions = IMAGE_EXTENSIONS; diff --git a/ghost/admin/app/components/modals/newsletters/edit/preview-labs.hbs b/ghost/admin/app/components/modals/newsletters/edit/preview-labs.hbs index 641351a7f1..3016d3675a 100644 --- a/ghost/admin/app/components/modals/newsletters/edit/preview-labs.hbs +++ b/ghost/admin/app/components/modals/newsletters/edit/preview-labs.hbs @@ -30,7 +30,7 @@

Your email newsletter

By {{or this.session.user.name this.session.user.email}} - {{moment-format (moment-site-tz) "D MMM YYYY"}} + {{moment-format (moment-site-tz) "D MMM YYYY"}} {{#if this.showCommentCta}} {{svg-jar "comments"}} {{/if}} @@ -74,6 +74,12 @@

{{/if}} + {{#if @newsletter.showSubscriptionDetails}} +
+ Subscription details +
+ {{/if}} +