From f76d7e9cd2252c11b1902a5b00d9febefacacbd5 Mon Sep 17 00:00:00 2001 From: Kevin Ansfield Date: Tue, 24 May 2022 18:20:35 +0100 Subject: [PATCH] Renamed `editor-labs` component directory to `editor` no issue - cleanup now the old publish flow is no more --- .../components/{editor-labs => editor}/modals/preview.hbs | 8 ++++---- .../components/{editor-labs => editor}/modals/preview.js | 0 .../{editor-labs => editor}/modals/preview/browser.hbs | 0 .../{editor-labs => editor}/modals/preview/browser.js | 0 .../{editor-labs => editor}/modals/preview/email.hbs | 0 .../{editor-labs => editor}/modals/preview/email.js | 0 .../{editor-labs => editor}/modals/preview/mobile.hbs | 0 .../{editor-labs => editor}/modals/preview/mobile.js | 0 .../{editor-labs => editor}/modals/preview/social.hbs | 0 .../{editor-labs => editor}/modals/preview/social.js | 0 .../{editor-labs => editor}/modals/publish-flow.hbs | 8 ++++---- .../{editor-labs => editor}/modals/publish-flow.js | 0 .../modals/publish-flow/complete-with-email-error.hbs | 0 .../modals/publish-flow/complete-with-email-error.js | 0 .../modals/publish-flow/complete.hbs | 0 .../modals/publish-flow/confirm.hbs | 0 .../modals/publish-flow/confirm.js | 0 .../modals/publish-flow/options.hbs | 6 +++--- .../modals/publish-flow/options.js | 0 .../{editor-labs => editor}/modals/update-flow.hbs | 0 .../{editor-labs => editor}/modals/update-flow.js | 0 .../{editor-labs => editor}/publish-management.hbs | 0 .../{editor-labs => editor}/publish-management.js | 0 .../publish-options/email-recipients.hbs | 0 .../publish-options/publish-at.hbs | 0 .../{editor-labs => editor}/publish-options/publish-at.js | 0 .../publish-options/publish-type.hbs | 0 .../publish-options/publish-type.js | 0 ghost/admin/app/templates/editor.hbs | 2 +- 29 files changed, 12 insertions(+), 12 deletions(-) rename ghost/admin/app/components/{editor-labs => editor}/modals/preview.hbs (94%) rename ghost/admin/app/components/{editor-labs => editor}/modals/preview.js (100%) rename ghost/admin/app/components/{editor-labs => editor}/modals/preview/browser.hbs (100%) rename ghost/admin/app/components/{editor-labs => editor}/modals/preview/browser.js (100%) rename ghost/admin/app/components/{editor-labs => editor}/modals/preview/email.hbs (100%) rename ghost/admin/app/components/{editor-labs => editor}/modals/preview/email.js (100%) rename ghost/admin/app/components/{editor-labs => editor}/modals/preview/mobile.hbs (100%) rename ghost/admin/app/components/{editor-labs => editor}/modals/preview/mobile.js (100%) rename ghost/admin/app/components/{editor-labs => editor}/modals/preview/social.hbs (100%) rename ghost/admin/app/components/{editor-labs => editor}/modals/preview/social.js (100%) rename ghost/admin/app/components/{editor-labs => editor}/modals/publish-flow.hbs (90%) rename ghost/admin/app/components/{editor-labs => editor}/modals/publish-flow.js (100%) rename ghost/admin/app/components/{editor-labs => editor}/modals/publish-flow/complete-with-email-error.hbs (100%) rename ghost/admin/app/components/{editor-labs => editor}/modals/publish-flow/complete-with-email-error.js (100%) rename ghost/admin/app/components/{editor-labs => editor}/modals/publish-flow/complete.hbs (100%) rename ghost/admin/app/components/{editor-labs => editor}/modals/publish-flow/confirm.hbs (100%) rename ghost/admin/app/components/{editor-labs => editor}/modals/publish-flow/confirm.js (100%) rename ghost/admin/app/components/{editor-labs => editor}/modals/publish-flow/options.hbs (97%) rename ghost/admin/app/components/{editor-labs => editor}/modals/publish-flow/options.js (100%) rename ghost/admin/app/components/{editor-labs => editor}/modals/update-flow.hbs (100%) rename ghost/admin/app/components/{editor-labs => editor}/modals/update-flow.js (100%) rename ghost/admin/app/components/{editor-labs => editor}/publish-management.hbs (100%) rename ghost/admin/app/components/{editor-labs => editor}/publish-management.js (100%) rename ghost/admin/app/components/{editor-labs => editor}/publish-options/email-recipients.hbs (100%) rename ghost/admin/app/components/{editor-labs => editor}/publish-options/publish-at.hbs (100%) rename ghost/admin/app/components/{editor-labs => editor}/publish-options/publish-at.js (100%) rename ghost/admin/app/components/{editor-labs => editor}/publish-options/publish-type.hbs (100%) rename ghost/admin/app/components/{editor-labs => editor}/publish-options/publish-type.js (100%) diff --git a/ghost/admin/app/components/editor-labs/modals/preview.hbs b/ghost/admin/app/components/editor/modals/preview.hbs similarity index 94% rename from ghost/admin/app/components/editor-labs/modals/preview.hbs rename to ghost/admin/app/components/editor/modals/preview.hbs index e035c97a43..1cafde3639 100644 --- a/ghost/admin/app/components/editor-labs/modals/preview.hbs +++ b/ghost/admin/app/components/editor/modals/preview.hbs @@ -51,14 +51,14 @@ {{else}} {{#if (eq this.tab "browser")}} - {{/if}} {{#if (and (eq this.tab "mobile"))}} - @@ -66,7 +66,7 @@ {{#unless @data.publishOptions.user.isContributor}} {{#if (and (eq this.tab "email") @data.publishOptions.post.isPost)}} - diff --git a/ghost/admin/app/components/editor-labs/modals/preview.js b/ghost/admin/app/components/editor/modals/preview.js similarity index 100% rename from ghost/admin/app/components/editor-labs/modals/preview.js rename to ghost/admin/app/components/editor/modals/preview.js diff --git a/ghost/admin/app/components/editor-labs/modals/preview/browser.hbs b/ghost/admin/app/components/editor/modals/preview/browser.hbs similarity index 100% rename from ghost/admin/app/components/editor-labs/modals/preview/browser.hbs rename to ghost/admin/app/components/editor/modals/preview/browser.hbs diff --git a/ghost/admin/app/components/editor-labs/modals/preview/browser.js b/ghost/admin/app/components/editor/modals/preview/browser.js similarity index 100% rename from ghost/admin/app/components/editor-labs/modals/preview/browser.js rename to ghost/admin/app/components/editor/modals/preview/browser.js diff --git a/ghost/admin/app/components/editor-labs/modals/preview/email.hbs b/ghost/admin/app/components/editor/modals/preview/email.hbs similarity index 100% rename from ghost/admin/app/components/editor-labs/modals/preview/email.hbs rename to ghost/admin/app/components/editor/modals/preview/email.hbs diff --git a/ghost/admin/app/components/editor-labs/modals/preview/email.js b/ghost/admin/app/components/editor/modals/preview/email.js similarity index 100% rename from ghost/admin/app/components/editor-labs/modals/preview/email.js rename to ghost/admin/app/components/editor/modals/preview/email.js diff --git a/ghost/admin/app/components/editor-labs/modals/preview/mobile.hbs b/ghost/admin/app/components/editor/modals/preview/mobile.hbs similarity index 100% rename from ghost/admin/app/components/editor-labs/modals/preview/mobile.hbs rename to ghost/admin/app/components/editor/modals/preview/mobile.hbs diff --git a/ghost/admin/app/components/editor-labs/modals/preview/mobile.js b/ghost/admin/app/components/editor/modals/preview/mobile.js similarity index 100% rename from ghost/admin/app/components/editor-labs/modals/preview/mobile.js rename to ghost/admin/app/components/editor/modals/preview/mobile.js diff --git a/ghost/admin/app/components/editor-labs/modals/preview/social.hbs b/ghost/admin/app/components/editor/modals/preview/social.hbs similarity index 100% rename from ghost/admin/app/components/editor-labs/modals/preview/social.hbs rename to ghost/admin/app/components/editor/modals/preview/social.hbs diff --git a/ghost/admin/app/components/editor-labs/modals/preview/social.js b/ghost/admin/app/components/editor/modals/preview/social.js similarity index 100% rename from ghost/admin/app/components/editor-labs/modals/preview/social.js rename to ghost/admin/app/components/editor/modals/preview/social.js diff --git a/ghost/admin/app/components/editor-labs/modals/publish-flow.hbs b/ghost/admin/app/components/editor/modals/publish-flow.hbs similarity index 90% rename from ghost/admin/app/components/editor-labs/modals/publish-flow.hbs rename to ghost/admin/app/components/editor/modals/publish-flow.hbs index 962cbb6b3c..b388b12c9f 100644 --- a/ghost/admin/app/components/editor-labs/modals/publish-flow.hbs +++ b/ghost/admin/app/components/editor/modals/publish-flow.hbs @@ -23,13 +23,13 @@
{{#if this.emailErrorMessage}} - {{else if this.isConfirming}} - {{else if this.isComplete}} - {{else}} - -
@@ -82,7 +82,7 @@ {{/if}} {{#liquid-if (eq this.openSection "emailRecipients")}}
-
@@ -125,7 +125,7 @@ {{#liquid-if (eq this.openSection "publishAt")}}
-
diff --git a/ghost/admin/app/components/editor-labs/modals/publish-flow/options.js b/ghost/admin/app/components/editor/modals/publish-flow/options.js similarity index 100% rename from ghost/admin/app/components/editor-labs/modals/publish-flow/options.js rename to ghost/admin/app/components/editor/modals/publish-flow/options.js diff --git a/ghost/admin/app/components/editor-labs/modals/update-flow.hbs b/ghost/admin/app/components/editor/modals/update-flow.hbs similarity index 100% rename from ghost/admin/app/components/editor-labs/modals/update-flow.hbs rename to ghost/admin/app/components/editor/modals/update-flow.hbs diff --git a/ghost/admin/app/components/editor-labs/modals/update-flow.js b/ghost/admin/app/components/editor/modals/update-flow.js similarity index 100% rename from ghost/admin/app/components/editor-labs/modals/update-flow.js rename to ghost/admin/app/components/editor/modals/update-flow.js diff --git a/ghost/admin/app/components/editor-labs/publish-management.hbs b/ghost/admin/app/components/editor/publish-management.hbs similarity index 100% rename from ghost/admin/app/components/editor-labs/publish-management.hbs rename to ghost/admin/app/components/editor/publish-management.hbs diff --git a/ghost/admin/app/components/editor-labs/publish-management.js b/ghost/admin/app/components/editor/publish-management.js similarity index 100% rename from ghost/admin/app/components/editor-labs/publish-management.js rename to ghost/admin/app/components/editor/publish-management.js diff --git a/ghost/admin/app/components/editor-labs/publish-options/email-recipients.hbs b/ghost/admin/app/components/editor/publish-options/email-recipients.hbs similarity index 100% rename from ghost/admin/app/components/editor-labs/publish-options/email-recipients.hbs rename to ghost/admin/app/components/editor/publish-options/email-recipients.hbs diff --git a/ghost/admin/app/components/editor-labs/publish-options/publish-at.hbs b/ghost/admin/app/components/editor/publish-options/publish-at.hbs similarity index 100% rename from ghost/admin/app/components/editor-labs/publish-options/publish-at.hbs rename to ghost/admin/app/components/editor/publish-options/publish-at.hbs diff --git a/ghost/admin/app/components/editor-labs/publish-options/publish-at.js b/ghost/admin/app/components/editor/publish-options/publish-at.js similarity index 100% rename from ghost/admin/app/components/editor-labs/publish-options/publish-at.js rename to ghost/admin/app/components/editor/publish-options/publish-at.js diff --git a/ghost/admin/app/components/editor-labs/publish-options/publish-type.hbs b/ghost/admin/app/components/editor/publish-options/publish-type.hbs similarity index 100% rename from ghost/admin/app/components/editor-labs/publish-options/publish-type.hbs rename to ghost/admin/app/components/editor/publish-options/publish-type.hbs diff --git a/ghost/admin/app/components/editor-labs/publish-options/publish-type.js b/ghost/admin/app/components/editor/publish-options/publish-type.js similarity index 100% rename from ghost/admin/app/components/editor-labs/publish-options/publish-type.js rename to ghost/admin/app/components/editor/publish-options/publish-type.js diff --git a/ghost/admin/app/templates/editor.hbs b/ghost/admin/app/templates/editor.hbs index 452dc44e13..1e3fb16489 100644 --- a/ghost/admin/app/templates/editor.hbs +++ b/ghost/admin/app/templates/editor.hbs @@ -28,7 +28,7 @@
{{#unless this.post.isNew}} -