From f23e8bc8012b0ffbde807b05133ae6aecfa907d7 Mon Sep 17 00:00:00 2001 From: Naz Date: Fri, 13 Aug 2021 16:23:35 +0400 Subject: [PATCH] Changed post publish menu copy with "send" state refs https://github.com/TryGhost/Team/issues/947 - Before making a bigger changes - introducing an inline component with send/send&publish/publish dropdown, have made minimal copy changes to reflect what's about to happen after the publish menu submit button is pressed --- ghost/admin/app/components/gh-publishmenu-draft.hbs | 2 +- ghost/admin/app/components/gh-publishmenu-draft.js | 4 ++++ ghost/admin/app/components/gh-publishmenu.js | 9 +++++++-- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ghost/admin/app/components/gh-publishmenu-draft.hbs b/ghost/admin/app/components/gh-publishmenu-draft.hbs index c2c8b5c8ae..5af0996fa3 100644 --- a/ghost/admin/app/components/gh-publishmenu-draft.hbs +++ b/ghost/admin/app/components/gh-publishmenu-draft.hbs @@ -1,5 +1,5 @@
-
Ready to publish your {{@post.displayName}}?
+
Ready to {{this.nextActionName}} this {{@post.displayName}}?
diff --git a/ghost/admin/app/components/gh-publishmenu-draft.js b/ghost/admin/app/components/gh-publishmenu-draft.js index 342815bbe3..c0beaf0719 100644 --- a/ghost/admin/app/components/gh-publishmenu-draft.js +++ b/ghost/admin/app/components/gh-publishmenu-draft.js @@ -24,6 +24,10 @@ export default class GhPublishMenuDraftComponent extends Component { return this.session.user.isAdmin && (this.totalMemberCount === 0 || this.countTotalMembersTask.isRunning); } + get nextActionName() { + return this.args.post.get('emailOnly') ? 'send' : 'publish'; + } + constructor() { super(...arguments); this.args.post.set('publishedAtBlogTZ', this.args.post.publishedAtUTC); diff --git a/ghost/admin/app/components/gh-publishmenu.js b/ghost/admin/app/components/gh-publishmenu.js index 7e77c320f1..313499cea6 100644 --- a/ghost/admin/app/components/gh-publishmenu.js +++ b/ghost/admin/app/components/gh-publishmenu.js @@ -95,13 +95,18 @@ export default Component.extend({ return runningText || 'Publishing'; }), - buttonText: computed('postState', 'saveType', function () { + buttonText: computed('postState', 'saveType', 'post.emailOnly', function () { let saveType = this.saveType; let postState = this.postState; + let emailOnly = this.get('post.emailOnly'); let buttonText; if (postState === 'draft') { - buttonText = saveType === 'publish' ? 'Publish' : 'Schedule'; + if (emailOnly) { + buttonText = saveType === 'publish' ? 'Send' : 'Schedule'; + } else { + buttonText = saveType === 'publish' ? 'Publish' : 'Schedule'; + } } if (postState === 'published') {