From 09435ecf76f81af5b2ef673e885b09b31fee67e2 Mon Sep 17 00:00:00 2001 From: Kevin Ansfield Date: Mon, 18 May 2020 13:14:08 +0100 Subject: [PATCH] Co-located component template files no issue Keeps component JS backing files and template files in the same directory which avoids hunting across directories when working with components. Also lets you see all components when looking at one directory, whereas previously template-only or js-only components may not have been obvious without looking at both directories. - ran [codemod](https://github.com/ember-codemods/ember-component-template-colocation-migrator/) for app-level components - manually moved in-repo-addon component templates in `lib/koenig-editor` - removed all explicit `layout` imports as JS/template associations are now made at build-time removing the need for them - updated `.embercli` to default to new flat component structure --- ghost/admin/.ember-cli | 14 ++++++++------ .../components/aspect-ratio-box.hbs | 0 .../components/gh-activating-list-item.hbs | 0 .../app/{templates => }/components/gh-alert.hbs | 0 .../app/{templates => }/components/gh-alerts.hbs | 0 .../app/{templates => }/components/gh-app.hbs | 0 .../components/gh-basic-dropdown.hbs | 0 ghost/admin/app/components/gh-basic-dropdown.js | 3 --- .../components/gh-billing-iframe.hbs | 0 .../components/gh-billing-update-button.hbs | 0 .../app/{templates => }/components/gh-blog-url.hbs | 0 .../components/gh-canvas-header.hbs | 0 .../{templates => }/components/gh-cm-editor.hbs | 0 .../components/gh-contentfilter.hbs | 0 .../components/gh-custom-view-title.hbs | 0 .../components/gh-date-time-picker.hbs | 0 .../components/gh-editor-post-status.hbs | 0 .../app/{templates => }/components/gh-editor.hbs | 0 .../components/gh-error-message.hbs | 0 .../{templates => }/components/gh-feature-flag.hbs | 0 .../{templates => }/components/gh-file-upload.hbs | 0 .../components/gh-file-uploader.hbs | 0 .../components/gh-fullscreen-modal.hbs | 0 .../components/gh-image-uploader-with-preview.hbs | 0 .../components/gh-image-uploader.hbs | 0 .../components/gh-infinity-loader.hbs | 0 ghost/admin/app/components/gh-infinity-loader.js | 5 +---- .../components/gh-koenig-editor.hbs | 0 .../components/gh-link-to-custom-views-index.hbs | 0 .../{templates => }/components/gh-loading-list.hbs | 0 .../components/gh-loading-spinner.hbs | 0 .../components/gh-markdown-editor.hbs | 0 .../components/gh-member-avatar.hbs | 0 .../components/gh-member-label-input.hbs | 0 .../components/gh-member-settings-form.hbs | 0 .../components/gh-members-chart.hbs | 0 .../components/gh-members-contentfilter.hbs | 0 .../components/gh-members-lab-setting.hbs | 0 .../components/gh-members-list-item.hbs | 0 .../components/gh-members-no-members.hbs | 0 .../components/gh-mobile-nav-bar.hbs | 0 .../{templates => }/components/gh-mobiledoc.hbs | 0 .../{templates => }/components/gh-modal-dialog.hbs | 0 .../app/{templates => }/components/gh-nav-menu.hbs | 0 .../app/{templates => }/components/gh-navitem.hbs | 0 .../{templates => }/components/gh-notification.hbs | 0 .../components/gh-notifications.hbs | 0 .../components/gh-post-settings-menu.hbs | 0 .../components/gh-post-settings-menu/email.hbs | 0 .../components/gh-posts-list-item.hbs | 0 .../components/gh-power-select/trigger.hbs | 0 .../app/components/gh-power-select/trigger.js | 3 --- .../components/gh-profile-image.hbs | 0 .../{templates => }/components/gh-progress-bar.hbs | 0 .../components/gh-psm-authors-input.hbs | 0 .../components/gh-psm-tags-input.hbs | 0 .../components/gh-psm-template-select.hbs | 0 .../components/gh-psm-visibility-input.hbs | 0 .../components/gh-publishmenu-draft.hbs | 0 .../components/gh-publishmenu-published.hbs | 0 .../components/gh-publishmenu-scheduled.hbs | 0 .../{templates => }/components/gh-publishmenu.hbs | 0 .../components/gh-scroll-trigger.hbs | 0 .../components/gh-search-input-trigger.hbs | 0 .../{templates => }/components/gh-search-input.hbs | 0 .../{templates => }/components/gh-simplemde.hbs | 0 .../{templates => }/components/gh-site-iframe.hbs | 0 .../components/gh-tag-settings-form.hbs | 0 .../components/gh-tags-list-item.hbs | 0 .../components/gh-tags-management-container.hbs | 0 .../{templates => }/components/gh-task-button.hbs | 0 .../{templates => }/components/gh-text-input.hbs | 0 .../components/gh-theme-error-li.hbs | 0 .../{templates => }/components/gh-theme-table.hbs | 0 .../components/gh-timezone-select.hbs | 0 .../{templates => }/components/gh-token-input.hbs | 0 .../components/gh-token-input/label-token.hbs | 0 .../components/gh-token-input/select-multiple.hbs | 0 .../components/gh-token-input/select-multiple.js | 4 +--- .../components/gh-token-input/suggested-option.hbs | 0 .../components/gh-token-input/tag-token.hbs | 0 .../components/gh-token-input/trigger.hbs | 0 .../{templates => }/components/gh-tour-item.hbs | 0 .../components/gh-unsplash-photo.hbs | 0 .../app/{templates => }/components/gh-unsplash.hbs | 0 .../app/{templates => }/components/gh-uploader.hbs | 0 .../{templates => }/components/gh-url-preview.hbs | 0 .../{templates => }/components/gh-user-active.hbs | 0 .../{templates => }/components/gh-user-invited.hbs | 0 .../components/gh-user-list-item.hbs | 0 .../{templates => }/components/gh-view-title.hbs | 0 .../{templates => }/components/gh-whats-new.hbs | 0 .../{templates => }/components/modal-billing.hbs | 0 .../components/modal-confirm-email-send.hbs | 0 .../components/modal-custom-view-form.hbs | 0 .../components/modal-delete-all.hbs | 0 .../components/modal-delete-integration.hbs | 0 .../components/modal-delete-member.hbs | 0 .../components/modal-delete-post.hbs | 0 .../components/modal-delete-tag.hbs | 0 .../components/modal-delete-theme.hbs | 0 .../components/modal-delete-user.hbs | 0 .../components/modal-delete-webhook.hbs | 0 .../components/modal-impersonate-member.hbs | 0 .../components/modal-import-members.hbs | 0 .../components/modal-invite-new-user.hbs | 0 .../components/modal-leave-editor.hbs | 0 .../components/modal-leave-settings.hbs | 0 .../components/modal-markdown-help.hbs | 0 .../components/modal-members-label-form.hbs | 0 .../components/modal-new-integration.hbs | 0 .../components/modal-post-email-preview.hbs | 0 .../components/modal-re-authenticate.hbs | 0 .../components/modal-regenerate-key.hbs | 0 .../{templates => }/components/modal-search.hbs | 0 .../components/modal-suspend-user.hbs | 0 .../components/modal-theme-warnings.hbs | 0 .../components/modal-transfer-owner.hbs | 0 .../components/modal-unsuspend-user.hbs | 0 .../components/modal-upgrade-host-limit.hbs | 0 .../components/modal-upload-image.hbs | 0 .../components/modal-upload-theme.hbs | 0 .../components/modal-webhook-form.hbs | 0 .../{templates => }/components/modal-whats-new.hbs | 0 .../power-select-vertical-collection-options.hbs | 0 .../power-select-vertical-collection-options.js | 3 --- .../{templates => }/components/kg-action-bar.hbs | 0 .../addon/components/kg-action-bar.js | 3 --- .../components/koenig-alt-input.hbs | 0 .../addon/components/koenig-alt-input.js | 2 -- .../components/koenig-basic-html-input.hbs | 0 .../addon/components/koenig-basic-html-input.js | 3 --- .../components/koenig-caption-input.hbs | 0 .../addon/components/koenig-caption-input.js | 2 -- .../components/koenig-card-bookmark.hbs | 0 .../addon/components/koenig-card-bookmark.js | 3 --- .../components/koenig-card-code.hbs | 0 .../addon/components/koenig-card-code.js | 3 --- .../components/koenig-card-email.hbs | 0 .../addon/components/koenig-card-email.js | 3 --- .../components/koenig-card-embed.hbs | 0 .../addon/components/koenig-card-embed.js | 3 --- .../components/koenig-card-gallery.hbs | 0 .../addon/components/koenig-card-gallery.js | 3 --- .../{templates => }/components/koenig-card-hr.hbs | 0 .../addon/components/koenig-card-hr.js | 2 -- .../components/koenig-card-html.hbs | 0 .../addon/components/koenig-card-html.js | 3 --- .../components/koenig-card-image.hbs | 0 .../addon/components/koenig-card-image.js | 2 -- .../components/koenig-card-markdown.hbs | 0 .../addon/components/koenig-card-markdown.js | 3 --- .../{templates => }/components/koenig-card.hbs | 0 .../koenig-editor/addon/components/koenig-card.js | 2 -- .../{templates => }/components/koenig-editor.hbs | 0 .../addon/components/koenig-editor.js | 2 -- .../components/koenig-link-input.hbs | 0 .../addon/components/koenig-link-input.js | 3 --- .../components/koenig-link-toolbar.hbs | 0 .../addon/components/koenig-link-toolbar.js | 3 --- .../components/koenig-menu-content.hbs | 0 .../addon/components/koenig-menu-content.js | 2 -- .../components/koenig-plus-menu.hbs | 0 .../addon/components/koenig-plus-menu.js | 3 --- .../components/koenig-slash-menu.hbs | 0 .../addon/components/koenig-slash-menu.js | 3 --- .../koenig-text-replacement-html-input.hbs | 0 .../koenig-text-replacement-html-input.js | 3 --- .../{templates => }/components/koenig-toolbar.hbs | 0 .../addon/components/koenig-toolbar.js | 3 --- 170 files changed, 10 insertions(+), 81 deletions(-) rename ghost/admin/app/{templates => }/components/aspect-ratio-box.hbs (100%) rename ghost/admin/app/{templates => }/components/gh-activating-list-item.hbs (100%) rename ghost/admin/app/{templates => }/components/gh-alert.hbs (100%) rename ghost/admin/app/{templates => }/components/gh-alerts.hbs (100%) rename ghost/admin/app/{templates => }/components/gh-app.hbs (100%) rename ghost/admin/app/{templates => }/components/gh-basic-dropdown.hbs (100%) rename ghost/admin/app/{templates => }/components/gh-billing-iframe.hbs (100%) rename ghost/admin/app/{templates => }/components/gh-billing-update-button.hbs (100%) rename ghost/admin/app/{templates => }/components/gh-blog-url.hbs (100%) rename ghost/admin/app/{templates => }/components/gh-canvas-header.hbs (100%) rename ghost/admin/app/{templates => }/components/gh-cm-editor.hbs (100%) rename ghost/admin/app/{templates => }/components/gh-contentfilter.hbs (100%) rename ghost/admin/app/{templates => }/components/gh-custom-view-title.hbs (100%) rename ghost/admin/app/{templates => }/components/gh-date-time-picker.hbs (100%) rename ghost/admin/app/{templates => }/components/gh-editor-post-status.hbs (100%) rename ghost/admin/app/{templates => }/components/gh-editor.hbs (100%) rename ghost/admin/app/{templates => }/components/gh-error-message.hbs (100%) rename ghost/admin/app/{templates => }/components/gh-feature-flag.hbs (100%) rename ghost/admin/app/{templates => }/components/gh-file-upload.hbs (100%) rename ghost/admin/app/{templates => }/components/gh-file-uploader.hbs (100%) rename ghost/admin/app/{templates => }/components/gh-fullscreen-modal.hbs (100%) rename ghost/admin/app/{templates => }/components/gh-image-uploader-with-preview.hbs (100%) rename ghost/admin/app/{templates => }/components/gh-image-uploader.hbs (100%) rename ghost/admin/app/{templates => }/components/gh-infinity-loader.hbs (100%) rename ghost/admin/app/{templates => }/components/gh-koenig-editor.hbs (100%) rename ghost/admin/app/{templates => }/components/gh-link-to-custom-views-index.hbs (100%) rename ghost/admin/app/{templates => }/components/gh-loading-list.hbs (100%) rename ghost/admin/app/{templates => }/components/gh-loading-spinner.hbs (100%) rename ghost/admin/app/{templates => }/components/gh-markdown-editor.hbs (100%) rename ghost/admin/app/{templates => }/components/gh-member-avatar.hbs (100%) rename ghost/admin/app/{templates => }/components/gh-member-label-input.hbs (100%) rename ghost/admin/app/{templates => }/components/gh-member-settings-form.hbs (100%) rename ghost/admin/app/{templates => }/components/gh-members-chart.hbs (100%) rename ghost/admin/app/{templates => }/components/gh-members-contentfilter.hbs (100%) rename ghost/admin/app/{templates => }/components/gh-members-lab-setting.hbs (100%) rename ghost/admin/app/{templates => }/components/gh-members-list-item.hbs (100%) rename ghost/admin/app/{templates => }/components/gh-members-no-members.hbs (100%) rename ghost/admin/app/{templates => }/components/gh-mobile-nav-bar.hbs (100%) rename ghost/admin/app/{templates => }/components/gh-mobiledoc.hbs (100%) rename ghost/admin/app/{templates => }/components/gh-modal-dialog.hbs (100%) rename ghost/admin/app/{templates => }/components/gh-nav-menu.hbs (100%) rename ghost/admin/app/{templates => }/components/gh-navitem.hbs (100%) rename ghost/admin/app/{templates => }/components/gh-notification.hbs (100%) rename ghost/admin/app/{templates => }/components/gh-notifications.hbs (100%) rename ghost/admin/app/{templates => }/components/gh-post-settings-menu.hbs (100%) rename ghost/admin/app/{templates => }/components/gh-post-settings-menu/email.hbs (100%) rename ghost/admin/app/{templates => }/components/gh-posts-list-item.hbs (100%) rename ghost/admin/app/{templates => }/components/gh-power-select/trigger.hbs (100%) rename ghost/admin/app/{templates => }/components/gh-profile-image.hbs (100%) rename ghost/admin/app/{templates => }/components/gh-progress-bar.hbs (100%) rename ghost/admin/app/{templates => }/components/gh-psm-authors-input.hbs (100%) rename ghost/admin/app/{templates => }/components/gh-psm-tags-input.hbs (100%) rename ghost/admin/app/{templates => }/components/gh-psm-template-select.hbs (100%) rename ghost/admin/app/{templates => }/components/gh-psm-visibility-input.hbs (100%) rename ghost/admin/app/{templates => }/components/gh-publishmenu-draft.hbs (100%) rename ghost/admin/app/{templates => }/components/gh-publishmenu-published.hbs (100%) rename ghost/admin/app/{templates => }/components/gh-publishmenu-scheduled.hbs (100%) rename ghost/admin/app/{templates => }/components/gh-publishmenu.hbs (100%) rename ghost/admin/app/{templates => }/components/gh-scroll-trigger.hbs (100%) rename ghost/admin/app/{templates => }/components/gh-search-input-trigger.hbs (100%) rename ghost/admin/app/{templates => }/components/gh-search-input.hbs (100%) rename ghost/admin/app/{templates => }/components/gh-simplemde.hbs (100%) rename ghost/admin/app/{templates => }/components/gh-site-iframe.hbs (100%) rename ghost/admin/app/{templates => }/components/gh-tag-settings-form.hbs (100%) rename ghost/admin/app/{templates => }/components/gh-tags-list-item.hbs (100%) rename ghost/admin/app/{templates => }/components/gh-tags-management-container.hbs (100%) rename ghost/admin/app/{templates => }/components/gh-task-button.hbs (100%) rename ghost/admin/app/{templates => }/components/gh-text-input.hbs (100%) rename ghost/admin/app/{templates => }/components/gh-theme-error-li.hbs (100%) rename ghost/admin/app/{templates => }/components/gh-theme-table.hbs (100%) rename ghost/admin/app/{templates => }/components/gh-timezone-select.hbs (100%) rename ghost/admin/app/{templates => }/components/gh-token-input.hbs (100%) rename ghost/admin/app/{templates => }/components/gh-token-input/label-token.hbs (100%) rename ghost/admin/app/{templates => }/components/gh-token-input/select-multiple.hbs (100%) rename ghost/admin/app/{templates => }/components/gh-token-input/suggested-option.hbs (100%) rename ghost/admin/app/{templates => }/components/gh-token-input/tag-token.hbs (100%) rename ghost/admin/app/{templates => }/components/gh-token-input/trigger.hbs (100%) rename ghost/admin/app/{templates => }/components/gh-tour-item.hbs (100%) rename ghost/admin/app/{templates => }/components/gh-unsplash-photo.hbs (100%) rename ghost/admin/app/{templates => }/components/gh-unsplash.hbs (100%) rename ghost/admin/app/{templates => }/components/gh-uploader.hbs (100%) rename ghost/admin/app/{templates => }/components/gh-url-preview.hbs (100%) rename ghost/admin/app/{templates => }/components/gh-user-active.hbs (100%) rename ghost/admin/app/{templates => }/components/gh-user-invited.hbs (100%) rename ghost/admin/app/{templates => }/components/gh-user-list-item.hbs (100%) rename ghost/admin/app/{templates => }/components/gh-view-title.hbs (100%) rename ghost/admin/app/{templates => }/components/gh-whats-new.hbs (100%) rename ghost/admin/app/{templates => }/components/modal-billing.hbs (100%) rename ghost/admin/app/{templates => }/components/modal-confirm-email-send.hbs (100%) rename ghost/admin/app/{templates => }/components/modal-custom-view-form.hbs (100%) rename ghost/admin/app/{templates => }/components/modal-delete-all.hbs (100%) rename ghost/admin/app/{templates => }/components/modal-delete-integration.hbs (100%) rename ghost/admin/app/{templates => }/components/modal-delete-member.hbs (100%) rename ghost/admin/app/{templates => }/components/modal-delete-post.hbs (100%) rename ghost/admin/app/{templates => }/components/modal-delete-tag.hbs (100%) rename ghost/admin/app/{templates => }/components/modal-delete-theme.hbs (100%) rename ghost/admin/app/{templates => }/components/modal-delete-user.hbs (100%) rename ghost/admin/app/{templates => }/components/modal-delete-webhook.hbs (100%) rename ghost/admin/app/{templates => }/components/modal-impersonate-member.hbs (100%) rename ghost/admin/app/{templates => }/components/modal-import-members.hbs (100%) rename ghost/admin/app/{templates => }/components/modal-invite-new-user.hbs (100%) rename ghost/admin/app/{templates => }/components/modal-leave-editor.hbs (100%) rename ghost/admin/app/{templates => }/components/modal-leave-settings.hbs (100%) rename ghost/admin/app/{templates => }/components/modal-markdown-help.hbs (100%) rename ghost/admin/app/{templates => }/components/modal-members-label-form.hbs (100%) rename ghost/admin/app/{templates => }/components/modal-new-integration.hbs (100%) rename ghost/admin/app/{templates => }/components/modal-post-email-preview.hbs (100%) rename ghost/admin/app/{templates => }/components/modal-re-authenticate.hbs (100%) rename ghost/admin/app/{templates => }/components/modal-regenerate-key.hbs (100%) rename ghost/admin/app/{templates => }/components/modal-search.hbs (100%) rename ghost/admin/app/{templates => }/components/modal-suspend-user.hbs (100%) rename ghost/admin/app/{templates => }/components/modal-theme-warnings.hbs (100%) rename ghost/admin/app/{templates => }/components/modal-transfer-owner.hbs (100%) rename ghost/admin/app/{templates => }/components/modal-unsuspend-user.hbs (100%) rename ghost/admin/app/{templates => }/components/modal-upgrade-host-limit.hbs (100%) rename ghost/admin/app/{templates => }/components/modal-upload-image.hbs (100%) rename ghost/admin/app/{templates => }/components/modal-upload-theme.hbs (100%) rename ghost/admin/app/{templates => }/components/modal-webhook-form.hbs (100%) rename ghost/admin/app/{templates => }/components/modal-whats-new.hbs (100%) rename ghost/admin/app/{templates => }/components/power-select-vertical-collection-options.hbs (100%) rename ghost/admin/lib/koenig-editor/addon/{templates => }/components/kg-action-bar.hbs (100%) rename ghost/admin/lib/koenig-editor/addon/{templates => }/components/koenig-alt-input.hbs (100%) rename ghost/admin/lib/koenig-editor/addon/{templates => }/components/koenig-basic-html-input.hbs (100%) rename ghost/admin/lib/koenig-editor/addon/{templates => }/components/koenig-caption-input.hbs (100%) rename ghost/admin/lib/koenig-editor/addon/{templates => }/components/koenig-card-bookmark.hbs (100%) rename ghost/admin/lib/koenig-editor/addon/{templates => }/components/koenig-card-code.hbs (100%) rename ghost/admin/lib/koenig-editor/addon/{templates => }/components/koenig-card-email.hbs (100%) rename ghost/admin/lib/koenig-editor/addon/{templates => }/components/koenig-card-embed.hbs (100%) rename ghost/admin/lib/koenig-editor/addon/{templates => }/components/koenig-card-gallery.hbs (100%) rename ghost/admin/lib/koenig-editor/addon/{templates => }/components/koenig-card-hr.hbs (100%) rename ghost/admin/lib/koenig-editor/addon/{templates => }/components/koenig-card-html.hbs (100%) rename ghost/admin/lib/koenig-editor/addon/{templates => }/components/koenig-card-image.hbs (100%) rename ghost/admin/lib/koenig-editor/addon/{templates => }/components/koenig-card-markdown.hbs (100%) rename ghost/admin/lib/koenig-editor/addon/{templates => }/components/koenig-card.hbs (100%) rename ghost/admin/lib/koenig-editor/addon/{templates => }/components/koenig-editor.hbs (100%) rename ghost/admin/lib/koenig-editor/addon/{templates => }/components/koenig-link-input.hbs (100%) rename ghost/admin/lib/koenig-editor/addon/{templates => }/components/koenig-link-toolbar.hbs (100%) rename ghost/admin/lib/koenig-editor/addon/{templates => }/components/koenig-menu-content.hbs (100%) rename ghost/admin/lib/koenig-editor/addon/{templates => }/components/koenig-plus-menu.hbs (100%) rename ghost/admin/lib/koenig-editor/addon/{templates => }/components/koenig-slash-menu.hbs (100%) rename ghost/admin/lib/koenig-editor/addon/{templates => }/components/koenig-text-replacement-html-input.hbs (100%) rename ghost/admin/lib/koenig-editor/addon/{templates => }/components/koenig-toolbar.hbs (100%) diff --git a/ghost/admin/.ember-cli b/ghost/admin/.ember-cli index 59bb55fe90..53f3969d16 100644 --- a/ghost/admin/.ember-cli +++ b/ghost/admin/.ember-cli @@ -1,9 +1,11 @@ { - /** - Ember CLI sends analytics information by default. The data is completely - anonymous, but there are times when you might want to disable this behavior. + "component-structure": "flat", + "component-class": "@glimmer/component", + /** + Ember CLI sends analytics information by default. The data is completely + anonymous, but there are times when you might want to disable this behavior. - Setting `disableAnalytics` to true will prevent any data from being sent. - */ - "disableAnalytics": true + Setting `disableAnalytics` to true will prevent any data from being sent. + */ + "disableAnalytics": true } diff --git a/ghost/admin/app/templates/components/aspect-ratio-box.hbs b/ghost/admin/app/components/aspect-ratio-box.hbs similarity index 100% rename from ghost/admin/app/templates/components/aspect-ratio-box.hbs rename to ghost/admin/app/components/aspect-ratio-box.hbs diff --git a/ghost/admin/app/templates/components/gh-activating-list-item.hbs b/ghost/admin/app/components/gh-activating-list-item.hbs similarity index 100% rename from ghost/admin/app/templates/components/gh-activating-list-item.hbs rename to ghost/admin/app/components/gh-activating-list-item.hbs diff --git a/ghost/admin/app/templates/components/gh-alert.hbs b/ghost/admin/app/components/gh-alert.hbs similarity index 100% rename from ghost/admin/app/templates/components/gh-alert.hbs rename to ghost/admin/app/components/gh-alert.hbs diff --git a/ghost/admin/app/templates/components/gh-alerts.hbs b/ghost/admin/app/components/gh-alerts.hbs similarity index 100% rename from ghost/admin/app/templates/components/gh-alerts.hbs rename to ghost/admin/app/components/gh-alerts.hbs diff --git a/ghost/admin/app/templates/components/gh-app.hbs b/ghost/admin/app/components/gh-app.hbs similarity index 100% rename from ghost/admin/app/templates/components/gh-app.hbs rename to ghost/admin/app/components/gh-app.hbs diff --git a/ghost/admin/app/templates/components/gh-basic-dropdown.hbs b/ghost/admin/app/components/gh-basic-dropdown.hbs similarity index 100% rename from ghost/admin/app/templates/components/gh-basic-dropdown.hbs rename to ghost/admin/app/components/gh-basic-dropdown.hbs diff --git a/ghost/admin/app/components/gh-basic-dropdown.js b/ghost/admin/app/components/gh-basic-dropdown.js index 59b7b623fa..66d67f8f01 100644 --- a/ghost/admin/app/components/gh-basic-dropdown.js +++ b/ghost/admin/app/components/gh-basic-dropdown.js @@ -1,9 +1,6 @@ import BasicDropdown from 'ember-basic-dropdown/components/basic-dropdown'; -import templateLayout from '../templates/components/gh-basic-dropdown'; -import {layout} from '@ember-decorators/component'; import {inject as service} from '@ember/service'; -@layout(templateLayout) class GhBasicDropdown extends BasicDropdown { @service dropdown diff --git a/ghost/admin/app/templates/components/gh-billing-iframe.hbs b/ghost/admin/app/components/gh-billing-iframe.hbs similarity index 100% rename from ghost/admin/app/templates/components/gh-billing-iframe.hbs rename to ghost/admin/app/components/gh-billing-iframe.hbs diff --git a/ghost/admin/app/templates/components/gh-billing-update-button.hbs b/ghost/admin/app/components/gh-billing-update-button.hbs similarity index 100% rename from ghost/admin/app/templates/components/gh-billing-update-button.hbs rename to ghost/admin/app/components/gh-billing-update-button.hbs diff --git a/ghost/admin/app/templates/components/gh-blog-url.hbs b/ghost/admin/app/components/gh-blog-url.hbs similarity index 100% rename from ghost/admin/app/templates/components/gh-blog-url.hbs rename to ghost/admin/app/components/gh-blog-url.hbs diff --git a/ghost/admin/app/templates/components/gh-canvas-header.hbs b/ghost/admin/app/components/gh-canvas-header.hbs similarity index 100% rename from ghost/admin/app/templates/components/gh-canvas-header.hbs rename to ghost/admin/app/components/gh-canvas-header.hbs diff --git a/ghost/admin/app/templates/components/gh-cm-editor.hbs b/ghost/admin/app/components/gh-cm-editor.hbs similarity index 100% rename from ghost/admin/app/templates/components/gh-cm-editor.hbs rename to ghost/admin/app/components/gh-cm-editor.hbs diff --git a/ghost/admin/app/templates/components/gh-contentfilter.hbs b/ghost/admin/app/components/gh-contentfilter.hbs similarity index 100% rename from ghost/admin/app/templates/components/gh-contentfilter.hbs rename to ghost/admin/app/components/gh-contentfilter.hbs diff --git a/ghost/admin/app/templates/components/gh-custom-view-title.hbs b/ghost/admin/app/components/gh-custom-view-title.hbs similarity index 100% rename from ghost/admin/app/templates/components/gh-custom-view-title.hbs rename to ghost/admin/app/components/gh-custom-view-title.hbs diff --git a/ghost/admin/app/templates/components/gh-date-time-picker.hbs b/ghost/admin/app/components/gh-date-time-picker.hbs similarity index 100% rename from ghost/admin/app/templates/components/gh-date-time-picker.hbs rename to ghost/admin/app/components/gh-date-time-picker.hbs diff --git a/ghost/admin/app/templates/components/gh-editor-post-status.hbs b/ghost/admin/app/components/gh-editor-post-status.hbs similarity index 100% rename from ghost/admin/app/templates/components/gh-editor-post-status.hbs rename to ghost/admin/app/components/gh-editor-post-status.hbs diff --git a/ghost/admin/app/templates/components/gh-editor.hbs b/ghost/admin/app/components/gh-editor.hbs similarity index 100% rename from ghost/admin/app/templates/components/gh-editor.hbs rename to ghost/admin/app/components/gh-editor.hbs diff --git a/ghost/admin/app/templates/components/gh-error-message.hbs b/ghost/admin/app/components/gh-error-message.hbs similarity index 100% rename from ghost/admin/app/templates/components/gh-error-message.hbs rename to ghost/admin/app/components/gh-error-message.hbs diff --git a/ghost/admin/app/templates/components/gh-feature-flag.hbs b/ghost/admin/app/components/gh-feature-flag.hbs similarity index 100% rename from ghost/admin/app/templates/components/gh-feature-flag.hbs rename to ghost/admin/app/components/gh-feature-flag.hbs diff --git a/ghost/admin/app/templates/components/gh-file-upload.hbs b/ghost/admin/app/components/gh-file-upload.hbs similarity index 100% rename from ghost/admin/app/templates/components/gh-file-upload.hbs rename to ghost/admin/app/components/gh-file-upload.hbs diff --git a/ghost/admin/app/templates/components/gh-file-uploader.hbs b/ghost/admin/app/components/gh-file-uploader.hbs similarity index 100% rename from ghost/admin/app/templates/components/gh-file-uploader.hbs rename to ghost/admin/app/components/gh-file-uploader.hbs diff --git a/ghost/admin/app/templates/components/gh-fullscreen-modal.hbs b/ghost/admin/app/components/gh-fullscreen-modal.hbs similarity index 100% rename from ghost/admin/app/templates/components/gh-fullscreen-modal.hbs rename to ghost/admin/app/components/gh-fullscreen-modal.hbs diff --git a/ghost/admin/app/templates/components/gh-image-uploader-with-preview.hbs b/ghost/admin/app/components/gh-image-uploader-with-preview.hbs similarity index 100% rename from ghost/admin/app/templates/components/gh-image-uploader-with-preview.hbs rename to ghost/admin/app/components/gh-image-uploader-with-preview.hbs diff --git a/ghost/admin/app/templates/components/gh-image-uploader.hbs b/ghost/admin/app/components/gh-image-uploader.hbs similarity index 100% rename from ghost/admin/app/templates/components/gh-image-uploader.hbs rename to ghost/admin/app/components/gh-image-uploader.hbs diff --git a/ghost/admin/app/templates/components/gh-infinity-loader.hbs b/ghost/admin/app/components/gh-infinity-loader.hbs similarity index 100% rename from ghost/admin/app/templates/components/gh-infinity-loader.hbs rename to ghost/admin/app/components/gh-infinity-loader.hbs diff --git a/ghost/admin/app/components/gh-infinity-loader.js b/ghost/admin/app/components/gh-infinity-loader.js index 1a3961c50c..2be0c14a9e 100644 --- a/ghost/admin/app/components/gh-infinity-loader.js +++ b/ghost/admin/app/components/gh-infinity-loader.js @@ -1,6 +1,3 @@ import InfinityLoader from 'ember-infinity/components/infinity-loader'; -import layout from '../templates/components/gh-infinity-loader'; -export default InfinityLoader.extend({ - layout -}); +export default InfinityLoader.extend(); diff --git a/ghost/admin/app/templates/components/gh-koenig-editor.hbs b/ghost/admin/app/components/gh-koenig-editor.hbs similarity index 100% rename from ghost/admin/app/templates/components/gh-koenig-editor.hbs rename to ghost/admin/app/components/gh-koenig-editor.hbs diff --git a/ghost/admin/app/templates/components/gh-link-to-custom-views-index.hbs b/ghost/admin/app/components/gh-link-to-custom-views-index.hbs similarity index 100% rename from ghost/admin/app/templates/components/gh-link-to-custom-views-index.hbs rename to ghost/admin/app/components/gh-link-to-custom-views-index.hbs diff --git a/ghost/admin/app/templates/components/gh-loading-list.hbs b/ghost/admin/app/components/gh-loading-list.hbs similarity index 100% rename from ghost/admin/app/templates/components/gh-loading-list.hbs rename to ghost/admin/app/components/gh-loading-list.hbs diff --git a/ghost/admin/app/templates/components/gh-loading-spinner.hbs b/ghost/admin/app/components/gh-loading-spinner.hbs similarity index 100% rename from ghost/admin/app/templates/components/gh-loading-spinner.hbs rename to ghost/admin/app/components/gh-loading-spinner.hbs diff --git a/ghost/admin/app/templates/components/gh-markdown-editor.hbs b/ghost/admin/app/components/gh-markdown-editor.hbs similarity index 100% rename from ghost/admin/app/templates/components/gh-markdown-editor.hbs rename to ghost/admin/app/components/gh-markdown-editor.hbs diff --git a/ghost/admin/app/templates/components/gh-member-avatar.hbs b/ghost/admin/app/components/gh-member-avatar.hbs similarity index 100% rename from ghost/admin/app/templates/components/gh-member-avatar.hbs rename to ghost/admin/app/components/gh-member-avatar.hbs diff --git a/ghost/admin/app/templates/components/gh-member-label-input.hbs b/ghost/admin/app/components/gh-member-label-input.hbs similarity index 100% rename from ghost/admin/app/templates/components/gh-member-label-input.hbs rename to ghost/admin/app/components/gh-member-label-input.hbs diff --git a/ghost/admin/app/templates/components/gh-member-settings-form.hbs b/ghost/admin/app/components/gh-member-settings-form.hbs similarity index 100% rename from ghost/admin/app/templates/components/gh-member-settings-form.hbs rename to ghost/admin/app/components/gh-member-settings-form.hbs diff --git a/ghost/admin/app/templates/components/gh-members-chart.hbs b/ghost/admin/app/components/gh-members-chart.hbs similarity index 100% rename from ghost/admin/app/templates/components/gh-members-chart.hbs rename to ghost/admin/app/components/gh-members-chart.hbs diff --git a/ghost/admin/app/templates/components/gh-members-contentfilter.hbs b/ghost/admin/app/components/gh-members-contentfilter.hbs similarity index 100% rename from ghost/admin/app/templates/components/gh-members-contentfilter.hbs rename to ghost/admin/app/components/gh-members-contentfilter.hbs diff --git a/ghost/admin/app/templates/components/gh-members-lab-setting.hbs b/ghost/admin/app/components/gh-members-lab-setting.hbs similarity index 100% rename from ghost/admin/app/templates/components/gh-members-lab-setting.hbs rename to ghost/admin/app/components/gh-members-lab-setting.hbs diff --git a/ghost/admin/app/templates/components/gh-members-list-item.hbs b/ghost/admin/app/components/gh-members-list-item.hbs similarity index 100% rename from ghost/admin/app/templates/components/gh-members-list-item.hbs rename to ghost/admin/app/components/gh-members-list-item.hbs diff --git a/ghost/admin/app/templates/components/gh-members-no-members.hbs b/ghost/admin/app/components/gh-members-no-members.hbs similarity index 100% rename from ghost/admin/app/templates/components/gh-members-no-members.hbs rename to ghost/admin/app/components/gh-members-no-members.hbs diff --git a/ghost/admin/app/templates/components/gh-mobile-nav-bar.hbs b/ghost/admin/app/components/gh-mobile-nav-bar.hbs similarity index 100% rename from ghost/admin/app/templates/components/gh-mobile-nav-bar.hbs rename to ghost/admin/app/components/gh-mobile-nav-bar.hbs diff --git a/ghost/admin/app/templates/components/gh-mobiledoc.hbs b/ghost/admin/app/components/gh-mobiledoc.hbs similarity index 100% rename from ghost/admin/app/templates/components/gh-mobiledoc.hbs rename to ghost/admin/app/components/gh-mobiledoc.hbs diff --git a/ghost/admin/app/templates/components/gh-modal-dialog.hbs b/ghost/admin/app/components/gh-modal-dialog.hbs similarity index 100% rename from ghost/admin/app/templates/components/gh-modal-dialog.hbs rename to ghost/admin/app/components/gh-modal-dialog.hbs diff --git a/ghost/admin/app/templates/components/gh-nav-menu.hbs b/ghost/admin/app/components/gh-nav-menu.hbs similarity index 100% rename from ghost/admin/app/templates/components/gh-nav-menu.hbs rename to ghost/admin/app/components/gh-nav-menu.hbs diff --git a/ghost/admin/app/templates/components/gh-navitem.hbs b/ghost/admin/app/components/gh-navitem.hbs similarity index 100% rename from ghost/admin/app/templates/components/gh-navitem.hbs rename to ghost/admin/app/components/gh-navitem.hbs diff --git a/ghost/admin/app/templates/components/gh-notification.hbs b/ghost/admin/app/components/gh-notification.hbs similarity index 100% rename from ghost/admin/app/templates/components/gh-notification.hbs rename to ghost/admin/app/components/gh-notification.hbs diff --git a/ghost/admin/app/templates/components/gh-notifications.hbs b/ghost/admin/app/components/gh-notifications.hbs similarity index 100% rename from ghost/admin/app/templates/components/gh-notifications.hbs rename to ghost/admin/app/components/gh-notifications.hbs diff --git a/ghost/admin/app/templates/components/gh-post-settings-menu.hbs b/ghost/admin/app/components/gh-post-settings-menu.hbs similarity index 100% rename from ghost/admin/app/templates/components/gh-post-settings-menu.hbs rename to ghost/admin/app/components/gh-post-settings-menu.hbs diff --git a/ghost/admin/app/templates/components/gh-post-settings-menu/email.hbs b/ghost/admin/app/components/gh-post-settings-menu/email.hbs similarity index 100% rename from ghost/admin/app/templates/components/gh-post-settings-menu/email.hbs rename to ghost/admin/app/components/gh-post-settings-menu/email.hbs diff --git a/ghost/admin/app/templates/components/gh-posts-list-item.hbs b/ghost/admin/app/components/gh-posts-list-item.hbs similarity index 100% rename from ghost/admin/app/templates/components/gh-posts-list-item.hbs rename to ghost/admin/app/components/gh-posts-list-item.hbs diff --git a/ghost/admin/app/templates/components/gh-power-select/trigger.hbs b/ghost/admin/app/components/gh-power-select/trigger.hbs similarity index 100% rename from ghost/admin/app/templates/components/gh-power-select/trigger.hbs rename to ghost/admin/app/components/gh-power-select/trigger.hbs diff --git a/ghost/admin/app/components/gh-power-select/trigger.js b/ghost/admin/app/components/gh-power-select/trigger.js index 0a8a0e7ebf..b66bcc22db 100644 --- a/ghost/admin/app/components/gh-power-select/trigger.js +++ b/ghost/admin/app/components/gh-power-select/trigger.js @@ -1,8 +1,5 @@ import PowerSelectTrigger from 'ember-power-select/components/power-select/trigger'; -import templateLayout from '../../templates/components/gh-power-select/trigger'; -import {layout} from '@ember-decorators/component'; -@layout(templateLayout) export default class Trigger extends PowerSelectTrigger { } diff --git a/ghost/admin/app/templates/components/gh-profile-image.hbs b/ghost/admin/app/components/gh-profile-image.hbs similarity index 100% rename from ghost/admin/app/templates/components/gh-profile-image.hbs rename to ghost/admin/app/components/gh-profile-image.hbs diff --git a/ghost/admin/app/templates/components/gh-progress-bar.hbs b/ghost/admin/app/components/gh-progress-bar.hbs similarity index 100% rename from ghost/admin/app/templates/components/gh-progress-bar.hbs rename to ghost/admin/app/components/gh-progress-bar.hbs diff --git a/ghost/admin/app/templates/components/gh-psm-authors-input.hbs b/ghost/admin/app/components/gh-psm-authors-input.hbs similarity index 100% rename from ghost/admin/app/templates/components/gh-psm-authors-input.hbs rename to ghost/admin/app/components/gh-psm-authors-input.hbs diff --git a/ghost/admin/app/templates/components/gh-psm-tags-input.hbs b/ghost/admin/app/components/gh-psm-tags-input.hbs similarity index 100% rename from ghost/admin/app/templates/components/gh-psm-tags-input.hbs rename to ghost/admin/app/components/gh-psm-tags-input.hbs diff --git a/ghost/admin/app/templates/components/gh-psm-template-select.hbs b/ghost/admin/app/components/gh-psm-template-select.hbs similarity index 100% rename from ghost/admin/app/templates/components/gh-psm-template-select.hbs rename to ghost/admin/app/components/gh-psm-template-select.hbs diff --git a/ghost/admin/app/templates/components/gh-psm-visibility-input.hbs b/ghost/admin/app/components/gh-psm-visibility-input.hbs similarity index 100% rename from ghost/admin/app/templates/components/gh-psm-visibility-input.hbs rename to ghost/admin/app/components/gh-psm-visibility-input.hbs diff --git a/ghost/admin/app/templates/components/gh-publishmenu-draft.hbs b/ghost/admin/app/components/gh-publishmenu-draft.hbs similarity index 100% rename from ghost/admin/app/templates/components/gh-publishmenu-draft.hbs rename to ghost/admin/app/components/gh-publishmenu-draft.hbs diff --git a/ghost/admin/app/templates/components/gh-publishmenu-published.hbs b/ghost/admin/app/components/gh-publishmenu-published.hbs similarity index 100% rename from ghost/admin/app/templates/components/gh-publishmenu-published.hbs rename to ghost/admin/app/components/gh-publishmenu-published.hbs diff --git a/ghost/admin/app/templates/components/gh-publishmenu-scheduled.hbs b/ghost/admin/app/components/gh-publishmenu-scheduled.hbs similarity index 100% rename from ghost/admin/app/templates/components/gh-publishmenu-scheduled.hbs rename to ghost/admin/app/components/gh-publishmenu-scheduled.hbs diff --git a/ghost/admin/app/templates/components/gh-publishmenu.hbs b/ghost/admin/app/components/gh-publishmenu.hbs similarity index 100% rename from ghost/admin/app/templates/components/gh-publishmenu.hbs rename to ghost/admin/app/components/gh-publishmenu.hbs diff --git a/ghost/admin/app/templates/components/gh-scroll-trigger.hbs b/ghost/admin/app/components/gh-scroll-trigger.hbs similarity index 100% rename from ghost/admin/app/templates/components/gh-scroll-trigger.hbs rename to ghost/admin/app/components/gh-scroll-trigger.hbs diff --git a/ghost/admin/app/templates/components/gh-search-input-trigger.hbs b/ghost/admin/app/components/gh-search-input-trigger.hbs similarity index 100% rename from ghost/admin/app/templates/components/gh-search-input-trigger.hbs rename to ghost/admin/app/components/gh-search-input-trigger.hbs diff --git a/ghost/admin/app/templates/components/gh-search-input.hbs b/ghost/admin/app/components/gh-search-input.hbs similarity index 100% rename from ghost/admin/app/templates/components/gh-search-input.hbs rename to ghost/admin/app/components/gh-search-input.hbs diff --git a/ghost/admin/app/templates/components/gh-simplemde.hbs b/ghost/admin/app/components/gh-simplemde.hbs similarity index 100% rename from ghost/admin/app/templates/components/gh-simplemde.hbs rename to ghost/admin/app/components/gh-simplemde.hbs diff --git a/ghost/admin/app/templates/components/gh-site-iframe.hbs b/ghost/admin/app/components/gh-site-iframe.hbs similarity index 100% rename from ghost/admin/app/templates/components/gh-site-iframe.hbs rename to ghost/admin/app/components/gh-site-iframe.hbs diff --git a/ghost/admin/app/templates/components/gh-tag-settings-form.hbs b/ghost/admin/app/components/gh-tag-settings-form.hbs similarity index 100% rename from ghost/admin/app/templates/components/gh-tag-settings-form.hbs rename to ghost/admin/app/components/gh-tag-settings-form.hbs diff --git a/ghost/admin/app/templates/components/gh-tags-list-item.hbs b/ghost/admin/app/components/gh-tags-list-item.hbs similarity index 100% rename from ghost/admin/app/templates/components/gh-tags-list-item.hbs rename to ghost/admin/app/components/gh-tags-list-item.hbs diff --git a/ghost/admin/app/templates/components/gh-tags-management-container.hbs b/ghost/admin/app/components/gh-tags-management-container.hbs similarity index 100% rename from ghost/admin/app/templates/components/gh-tags-management-container.hbs rename to ghost/admin/app/components/gh-tags-management-container.hbs diff --git a/ghost/admin/app/templates/components/gh-task-button.hbs b/ghost/admin/app/components/gh-task-button.hbs similarity index 100% rename from ghost/admin/app/templates/components/gh-task-button.hbs rename to ghost/admin/app/components/gh-task-button.hbs diff --git a/ghost/admin/app/templates/components/gh-text-input.hbs b/ghost/admin/app/components/gh-text-input.hbs similarity index 100% rename from ghost/admin/app/templates/components/gh-text-input.hbs rename to ghost/admin/app/components/gh-text-input.hbs diff --git a/ghost/admin/app/templates/components/gh-theme-error-li.hbs b/ghost/admin/app/components/gh-theme-error-li.hbs similarity index 100% rename from ghost/admin/app/templates/components/gh-theme-error-li.hbs rename to ghost/admin/app/components/gh-theme-error-li.hbs diff --git a/ghost/admin/app/templates/components/gh-theme-table.hbs b/ghost/admin/app/components/gh-theme-table.hbs similarity index 100% rename from ghost/admin/app/templates/components/gh-theme-table.hbs rename to ghost/admin/app/components/gh-theme-table.hbs diff --git a/ghost/admin/app/templates/components/gh-timezone-select.hbs b/ghost/admin/app/components/gh-timezone-select.hbs similarity index 100% rename from ghost/admin/app/templates/components/gh-timezone-select.hbs rename to ghost/admin/app/components/gh-timezone-select.hbs diff --git a/ghost/admin/app/templates/components/gh-token-input.hbs b/ghost/admin/app/components/gh-token-input.hbs similarity index 100% rename from ghost/admin/app/templates/components/gh-token-input.hbs rename to ghost/admin/app/components/gh-token-input.hbs diff --git a/ghost/admin/app/templates/components/gh-token-input/label-token.hbs b/ghost/admin/app/components/gh-token-input/label-token.hbs similarity index 100% rename from ghost/admin/app/templates/components/gh-token-input/label-token.hbs rename to ghost/admin/app/components/gh-token-input/label-token.hbs diff --git a/ghost/admin/app/templates/components/gh-token-input/select-multiple.hbs b/ghost/admin/app/components/gh-token-input/select-multiple.hbs similarity index 100% rename from ghost/admin/app/templates/components/gh-token-input/select-multiple.hbs rename to ghost/admin/app/components/gh-token-input/select-multiple.hbs diff --git a/ghost/admin/app/components/gh-token-input/select-multiple.js b/ghost/admin/app/components/gh-token-input/select-multiple.js index 5b2e4f7b29..191e539595 100644 --- a/ghost/admin/app/components/gh-token-input/select-multiple.js +++ b/ghost/admin/app/components/gh-token-input/select-multiple.js @@ -1,9 +1,8 @@ import $ from 'jquery'; import PowerSelectMultiple from 'ember-power-select/components/power-select-multiple'; -import templateLayout from '../../templates/components/gh-token-input/select-multiple'; import {action} from '@ember/object'; import {bind} from '@ember/runloop'; -import {layout, tagName} from '@ember-decorators/component'; +import {tagName} from '@ember-decorators/component'; // TODO: convert from jQuery to native DOM const END_ACTIONS = 'click.ghToken mouseup.ghToken touchend.ghToken'; @@ -14,7 +13,6 @@ const END_ACTIONS = 'click.ghToken mouseup.ghToken touchend.ghToken'; // we get another event signalling the end of a drag @tagName('div') -@layout(templateLayout) class GhTokenInputSelectMultiple extends PowerSelectMultiple { _canFocus = true; diff --git a/ghost/admin/app/templates/components/gh-token-input/suggested-option.hbs b/ghost/admin/app/components/gh-token-input/suggested-option.hbs similarity index 100% rename from ghost/admin/app/templates/components/gh-token-input/suggested-option.hbs rename to ghost/admin/app/components/gh-token-input/suggested-option.hbs diff --git a/ghost/admin/app/templates/components/gh-token-input/tag-token.hbs b/ghost/admin/app/components/gh-token-input/tag-token.hbs similarity index 100% rename from ghost/admin/app/templates/components/gh-token-input/tag-token.hbs rename to ghost/admin/app/components/gh-token-input/tag-token.hbs diff --git a/ghost/admin/app/templates/components/gh-token-input/trigger.hbs b/ghost/admin/app/components/gh-token-input/trigger.hbs similarity index 100% rename from ghost/admin/app/templates/components/gh-token-input/trigger.hbs rename to ghost/admin/app/components/gh-token-input/trigger.hbs diff --git a/ghost/admin/app/templates/components/gh-tour-item.hbs b/ghost/admin/app/components/gh-tour-item.hbs similarity index 100% rename from ghost/admin/app/templates/components/gh-tour-item.hbs rename to ghost/admin/app/components/gh-tour-item.hbs diff --git a/ghost/admin/app/templates/components/gh-unsplash-photo.hbs b/ghost/admin/app/components/gh-unsplash-photo.hbs similarity index 100% rename from ghost/admin/app/templates/components/gh-unsplash-photo.hbs rename to ghost/admin/app/components/gh-unsplash-photo.hbs diff --git a/ghost/admin/app/templates/components/gh-unsplash.hbs b/ghost/admin/app/components/gh-unsplash.hbs similarity index 100% rename from ghost/admin/app/templates/components/gh-unsplash.hbs rename to ghost/admin/app/components/gh-unsplash.hbs diff --git a/ghost/admin/app/templates/components/gh-uploader.hbs b/ghost/admin/app/components/gh-uploader.hbs similarity index 100% rename from ghost/admin/app/templates/components/gh-uploader.hbs rename to ghost/admin/app/components/gh-uploader.hbs diff --git a/ghost/admin/app/templates/components/gh-url-preview.hbs b/ghost/admin/app/components/gh-url-preview.hbs similarity index 100% rename from ghost/admin/app/templates/components/gh-url-preview.hbs rename to ghost/admin/app/components/gh-url-preview.hbs diff --git a/ghost/admin/app/templates/components/gh-user-active.hbs b/ghost/admin/app/components/gh-user-active.hbs similarity index 100% rename from ghost/admin/app/templates/components/gh-user-active.hbs rename to ghost/admin/app/components/gh-user-active.hbs diff --git a/ghost/admin/app/templates/components/gh-user-invited.hbs b/ghost/admin/app/components/gh-user-invited.hbs similarity index 100% rename from ghost/admin/app/templates/components/gh-user-invited.hbs rename to ghost/admin/app/components/gh-user-invited.hbs diff --git a/ghost/admin/app/templates/components/gh-user-list-item.hbs b/ghost/admin/app/components/gh-user-list-item.hbs similarity index 100% rename from ghost/admin/app/templates/components/gh-user-list-item.hbs rename to ghost/admin/app/components/gh-user-list-item.hbs diff --git a/ghost/admin/app/templates/components/gh-view-title.hbs b/ghost/admin/app/components/gh-view-title.hbs similarity index 100% rename from ghost/admin/app/templates/components/gh-view-title.hbs rename to ghost/admin/app/components/gh-view-title.hbs diff --git a/ghost/admin/app/templates/components/gh-whats-new.hbs b/ghost/admin/app/components/gh-whats-new.hbs similarity index 100% rename from ghost/admin/app/templates/components/gh-whats-new.hbs rename to ghost/admin/app/components/gh-whats-new.hbs diff --git a/ghost/admin/app/templates/components/modal-billing.hbs b/ghost/admin/app/components/modal-billing.hbs similarity index 100% rename from ghost/admin/app/templates/components/modal-billing.hbs rename to ghost/admin/app/components/modal-billing.hbs diff --git a/ghost/admin/app/templates/components/modal-confirm-email-send.hbs b/ghost/admin/app/components/modal-confirm-email-send.hbs similarity index 100% rename from ghost/admin/app/templates/components/modal-confirm-email-send.hbs rename to ghost/admin/app/components/modal-confirm-email-send.hbs diff --git a/ghost/admin/app/templates/components/modal-custom-view-form.hbs b/ghost/admin/app/components/modal-custom-view-form.hbs similarity index 100% rename from ghost/admin/app/templates/components/modal-custom-view-form.hbs rename to ghost/admin/app/components/modal-custom-view-form.hbs diff --git a/ghost/admin/app/templates/components/modal-delete-all.hbs b/ghost/admin/app/components/modal-delete-all.hbs similarity index 100% rename from ghost/admin/app/templates/components/modal-delete-all.hbs rename to ghost/admin/app/components/modal-delete-all.hbs diff --git a/ghost/admin/app/templates/components/modal-delete-integration.hbs b/ghost/admin/app/components/modal-delete-integration.hbs similarity index 100% rename from ghost/admin/app/templates/components/modal-delete-integration.hbs rename to ghost/admin/app/components/modal-delete-integration.hbs diff --git a/ghost/admin/app/templates/components/modal-delete-member.hbs b/ghost/admin/app/components/modal-delete-member.hbs similarity index 100% rename from ghost/admin/app/templates/components/modal-delete-member.hbs rename to ghost/admin/app/components/modal-delete-member.hbs diff --git a/ghost/admin/app/templates/components/modal-delete-post.hbs b/ghost/admin/app/components/modal-delete-post.hbs similarity index 100% rename from ghost/admin/app/templates/components/modal-delete-post.hbs rename to ghost/admin/app/components/modal-delete-post.hbs diff --git a/ghost/admin/app/templates/components/modal-delete-tag.hbs b/ghost/admin/app/components/modal-delete-tag.hbs similarity index 100% rename from ghost/admin/app/templates/components/modal-delete-tag.hbs rename to ghost/admin/app/components/modal-delete-tag.hbs diff --git a/ghost/admin/app/templates/components/modal-delete-theme.hbs b/ghost/admin/app/components/modal-delete-theme.hbs similarity index 100% rename from ghost/admin/app/templates/components/modal-delete-theme.hbs rename to ghost/admin/app/components/modal-delete-theme.hbs diff --git a/ghost/admin/app/templates/components/modal-delete-user.hbs b/ghost/admin/app/components/modal-delete-user.hbs similarity index 100% rename from ghost/admin/app/templates/components/modal-delete-user.hbs rename to ghost/admin/app/components/modal-delete-user.hbs diff --git a/ghost/admin/app/templates/components/modal-delete-webhook.hbs b/ghost/admin/app/components/modal-delete-webhook.hbs similarity index 100% rename from ghost/admin/app/templates/components/modal-delete-webhook.hbs rename to ghost/admin/app/components/modal-delete-webhook.hbs diff --git a/ghost/admin/app/templates/components/modal-impersonate-member.hbs b/ghost/admin/app/components/modal-impersonate-member.hbs similarity index 100% rename from ghost/admin/app/templates/components/modal-impersonate-member.hbs rename to ghost/admin/app/components/modal-impersonate-member.hbs diff --git a/ghost/admin/app/templates/components/modal-import-members.hbs b/ghost/admin/app/components/modal-import-members.hbs similarity index 100% rename from ghost/admin/app/templates/components/modal-import-members.hbs rename to ghost/admin/app/components/modal-import-members.hbs diff --git a/ghost/admin/app/templates/components/modal-invite-new-user.hbs b/ghost/admin/app/components/modal-invite-new-user.hbs similarity index 100% rename from ghost/admin/app/templates/components/modal-invite-new-user.hbs rename to ghost/admin/app/components/modal-invite-new-user.hbs diff --git a/ghost/admin/app/templates/components/modal-leave-editor.hbs b/ghost/admin/app/components/modal-leave-editor.hbs similarity index 100% rename from ghost/admin/app/templates/components/modal-leave-editor.hbs rename to ghost/admin/app/components/modal-leave-editor.hbs diff --git a/ghost/admin/app/templates/components/modal-leave-settings.hbs b/ghost/admin/app/components/modal-leave-settings.hbs similarity index 100% rename from ghost/admin/app/templates/components/modal-leave-settings.hbs rename to ghost/admin/app/components/modal-leave-settings.hbs diff --git a/ghost/admin/app/templates/components/modal-markdown-help.hbs b/ghost/admin/app/components/modal-markdown-help.hbs similarity index 100% rename from ghost/admin/app/templates/components/modal-markdown-help.hbs rename to ghost/admin/app/components/modal-markdown-help.hbs diff --git a/ghost/admin/app/templates/components/modal-members-label-form.hbs b/ghost/admin/app/components/modal-members-label-form.hbs similarity index 100% rename from ghost/admin/app/templates/components/modal-members-label-form.hbs rename to ghost/admin/app/components/modal-members-label-form.hbs diff --git a/ghost/admin/app/templates/components/modal-new-integration.hbs b/ghost/admin/app/components/modal-new-integration.hbs similarity index 100% rename from ghost/admin/app/templates/components/modal-new-integration.hbs rename to ghost/admin/app/components/modal-new-integration.hbs diff --git a/ghost/admin/app/templates/components/modal-post-email-preview.hbs b/ghost/admin/app/components/modal-post-email-preview.hbs similarity index 100% rename from ghost/admin/app/templates/components/modal-post-email-preview.hbs rename to ghost/admin/app/components/modal-post-email-preview.hbs diff --git a/ghost/admin/app/templates/components/modal-re-authenticate.hbs b/ghost/admin/app/components/modal-re-authenticate.hbs similarity index 100% rename from ghost/admin/app/templates/components/modal-re-authenticate.hbs rename to ghost/admin/app/components/modal-re-authenticate.hbs diff --git a/ghost/admin/app/templates/components/modal-regenerate-key.hbs b/ghost/admin/app/components/modal-regenerate-key.hbs similarity index 100% rename from ghost/admin/app/templates/components/modal-regenerate-key.hbs rename to ghost/admin/app/components/modal-regenerate-key.hbs diff --git a/ghost/admin/app/templates/components/modal-search.hbs b/ghost/admin/app/components/modal-search.hbs similarity index 100% rename from ghost/admin/app/templates/components/modal-search.hbs rename to ghost/admin/app/components/modal-search.hbs diff --git a/ghost/admin/app/templates/components/modal-suspend-user.hbs b/ghost/admin/app/components/modal-suspend-user.hbs similarity index 100% rename from ghost/admin/app/templates/components/modal-suspend-user.hbs rename to ghost/admin/app/components/modal-suspend-user.hbs diff --git a/ghost/admin/app/templates/components/modal-theme-warnings.hbs b/ghost/admin/app/components/modal-theme-warnings.hbs similarity index 100% rename from ghost/admin/app/templates/components/modal-theme-warnings.hbs rename to ghost/admin/app/components/modal-theme-warnings.hbs diff --git a/ghost/admin/app/templates/components/modal-transfer-owner.hbs b/ghost/admin/app/components/modal-transfer-owner.hbs similarity index 100% rename from ghost/admin/app/templates/components/modal-transfer-owner.hbs rename to ghost/admin/app/components/modal-transfer-owner.hbs diff --git a/ghost/admin/app/templates/components/modal-unsuspend-user.hbs b/ghost/admin/app/components/modal-unsuspend-user.hbs similarity index 100% rename from ghost/admin/app/templates/components/modal-unsuspend-user.hbs rename to ghost/admin/app/components/modal-unsuspend-user.hbs diff --git a/ghost/admin/app/templates/components/modal-upgrade-host-limit.hbs b/ghost/admin/app/components/modal-upgrade-host-limit.hbs similarity index 100% rename from ghost/admin/app/templates/components/modal-upgrade-host-limit.hbs rename to ghost/admin/app/components/modal-upgrade-host-limit.hbs diff --git a/ghost/admin/app/templates/components/modal-upload-image.hbs b/ghost/admin/app/components/modal-upload-image.hbs similarity index 100% rename from ghost/admin/app/templates/components/modal-upload-image.hbs rename to ghost/admin/app/components/modal-upload-image.hbs diff --git a/ghost/admin/app/templates/components/modal-upload-theme.hbs b/ghost/admin/app/components/modal-upload-theme.hbs similarity index 100% rename from ghost/admin/app/templates/components/modal-upload-theme.hbs rename to ghost/admin/app/components/modal-upload-theme.hbs diff --git a/ghost/admin/app/templates/components/modal-webhook-form.hbs b/ghost/admin/app/components/modal-webhook-form.hbs similarity index 100% rename from ghost/admin/app/templates/components/modal-webhook-form.hbs rename to ghost/admin/app/components/modal-webhook-form.hbs diff --git a/ghost/admin/app/templates/components/modal-whats-new.hbs b/ghost/admin/app/components/modal-whats-new.hbs similarity index 100% rename from ghost/admin/app/templates/components/modal-whats-new.hbs rename to ghost/admin/app/components/modal-whats-new.hbs diff --git a/ghost/admin/app/templates/components/power-select-vertical-collection-options.hbs b/ghost/admin/app/components/power-select-vertical-collection-options.hbs similarity index 100% rename from ghost/admin/app/templates/components/power-select-vertical-collection-options.hbs rename to ghost/admin/app/components/power-select-vertical-collection-options.hbs diff --git a/ghost/admin/app/components/power-select-vertical-collection-options.js b/ghost/admin/app/components/power-select-vertical-collection-options.js index f108fc74b7..40acf76bd3 100644 --- a/ghost/admin/app/components/power-select-vertical-collection-options.js +++ b/ghost/admin/app/components/power-select-vertical-collection-options.js @@ -1,6 +1,3 @@ import OptionsComponent from 'ember-power-select/components/power-select/options'; -import templateLayout from '../templates/components/power-select-vertical-collection-options'; -import {layout} from '@ember-decorators/component'; -@layout(templateLayout) export default class PowerSelectVerticalCollectionOptions extends OptionsComponent {} diff --git a/ghost/admin/lib/koenig-editor/addon/templates/components/kg-action-bar.hbs b/ghost/admin/lib/koenig-editor/addon/components/kg-action-bar.hbs similarity index 100% rename from ghost/admin/lib/koenig-editor/addon/templates/components/kg-action-bar.hbs rename to ghost/admin/lib/koenig-editor/addon/components/kg-action-bar.hbs diff --git a/ghost/admin/lib/koenig-editor/addon/components/kg-action-bar.js b/ghost/admin/lib/koenig-editor/addon/components/kg-action-bar.js index 3687a95377..0ff1ca580f 100644 --- a/ghost/admin/lib/koenig-editor/addon/components/kg-action-bar.js +++ b/ghost/admin/lib/koenig-editor/addon/components/kg-action-bar.js @@ -1,10 +1,7 @@ import Component from '@ember/component'; -import layout from '../templates/components/kg-action-bar'; import {computed} from '@ember/object'; export default Component.extend({ - layout, - tagName: '', instantClose: false, diff --git a/ghost/admin/lib/koenig-editor/addon/templates/components/koenig-alt-input.hbs b/ghost/admin/lib/koenig-editor/addon/components/koenig-alt-input.hbs similarity index 100% rename from ghost/admin/lib/koenig-editor/addon/templates/components/koenig-alt-input.hbs rename to ghost/admin/lib/koenig-editor/addon/components/koenig-alt-input.hbs diff --git a/ghost/admin/lib/koenig-editor/addon/components/koenig-alt-input.js b/ghost/admin/lib/koenig-editor/addon/components/koenig-alt-input.js index 5f1fd4b7e8..6622575644 100644 --- a/ghost/admin/lib/koenig-editor/addon/components/koenig-alt-input.js +++ b/ghost/admin/lib/koenig-editor/addon/components/koenig-alt-input.js @@ -1,5 +1,4 @@ import Component from '@ember/component'; -import layout from '../templates/components/koenig-alt-input'; import {action, computed} from '@ember/object'; import {kgStyle} from '../helpers/kg-style'; import {inject as service} from '@ember/service'; @@ -9,7 +8,6 @@ export default Component.extend({ tagName: 'figcaption', classNameBindings: ['figCaptionClass'], - layout, alt: '', placeholder: '', diff --git a/ghost/admin/lib/koenig-editor/addon/templates/components/koenig-basic-html-input.hbs b/ghost/admin/lib/koenig-editor/addon/components/koenig-basic-html-input.hbs similarity index 100% rename from ghost/admin/lib/koenig-editor/addon/templates/components/koenig-basic-html-input.hbs rename to ghost/admin/lib/koenig-editor/addon/components/koenig-basic-html-input.hbs diff --git a/ghost/admin/lib/koenig-editor/addon/components/koenig-basic-html-input.js b/ghost/admin/lib/koenig-editor/addon/components/koenig-basic-html-input.js index cbc9479733..e1eccd6323 100644 --- a/ghost/admin/lib/koenig-editor/addon/components/koenig-basic-html-input.js +++ b/ghost/admin/lib/koenig-editor/addon/components/koenig-basic-html-input.js @@ -1,7 +1,6 @@ import Component from '@ember/component'; import Editor from 'mobiledoc-kit/editor/editor'; import cleanBasicHtml from '@tryghost/kg-clean-basic-html'; -import layout from '../templates/components/koenig-basic-html-input'; import parserPlugins from '../options/basic-html-parser-plugins'; import registerKeyCommands, {BASIC_KEY_COMMANDS} from '../options/key-commands'; import validator from 'validator'; @@ -20,8 +19,6 @@ const UNDO_DEPTH = 50; // TODO: extract core to share functionality between this and `{{koenig-editor}}` export default Component.extend({ - layout, - // public attrs autofocus: false, html: null, diff --git a/ghost/admin/lib/koenig-editor/addon/templates/components/koenig-caption-input.hbs b/ghost/admin/lib/koenig-editor/addon/components/koenig-caption-input.hbs similarity index 100% rename from ghost/admin/lib/koenig-editor/addon/templates/components/koenig-caption-input.hbs rename to ghost/admin/lib/koenig-editor/addon/components/koenig-caption-input.hbs diff --git a/ghost/admin/lib/koenig-editor/addon/components/koenig-caption-input.js b/ghost/admin/lib/koenig-editor/addon/components/koenig-caption-input.js index 599bc3cfa2..3d2cd0d228 100644 --- a/ghost/admin/lib/koenig-editor/addon/components/koenig-caption-input.js +++ b/ghost/admin/lib/koenig-editor/addon/components/koenig-caption-input.js @@ -1,6 +1,5 @@ import Component from '@ember/component'; import Key from 'mobiledoc-kit/utils/key'; -import layout from '../templates/components/koenig-caption-input'; import {computed} from '@ember/object'; import {kgStyle} from '../helpers/kg-style'; import {run} from '@ember/runloop'; @@ -11,7 +10,6 @@ export default Component.extend({ tagName: 'figcaption', classNameBindings: ['figCaptionClass'], - layout, caption: '', captureInput: false, diff --git a/ghost/admin/lib/koenig-editor/addon/templates/components/koenig-card-bookmark.hbs b/ghost/admin/lib/koenig-editor/addon/components/koenig-card-bookmark.hbs similarity index 100% rename from ghost/admin/lib/koenig-editor/addon/templates/components/koenig-card-bookmark.hbs rename to ghost/admin/lib/koenig-editor/addon/components/koenig-card-bookmark.hbs diff --git a/ghost/admin/lib/koenig-editor/addon/components/koenig-card-bookmark.js b/ghost/admin/lib/koenig-editor/addon/components/koenig-card-bookmark.js index 082e616f7e..542b9ca00a 100644 --- a/ghost/admin/lib/koenig-editor/addon/components/koenig-card-bookmark.js +++ b/ghost/admin/lib/koenig-editor/addon/components/koenig-card-bookmark.js @@ -1,5 +1,4 @@ import Component from '@ember/component'; -import layout from '../templates/components/koenig-card-bookmark'; import {NO_CURSOR_MOVEMENT} from './koenig-editor'; import {computed} from '@ember/object'; import {utils as ghostHelperUtils} from '@tryghost/helpers'; @@ -14,8 +13,6 @@ export default Component.extend({ ajax: service(), ghostPaths: service(), - layout, - // attrs payload: null, isSelected: false, diff --git a/ghost/admin/lib/koenig-editor/addon/templates/components/koenig-card-code.hbs b/ghost/admin/lib/koenig-editor/addon/components/koenig-card-code.hbs similarity index 100% rename from ghost/admin/lib/koenig-editor/addon/templates/components/koenig-card-code.hbs rename to ghost/admin/lib/koenig-editor/addon/components/koenig-card-code.hbs diff --git a/ghost/admin/lib/koenig-editor/addon/components/koenig-card-code.js b/ghost/admin/lib/koenig-editor/addon/components/koenig-card-code.js index 763a041512..46360026ff 100644 --- a/ghost/admin/lib/koenig-editor/addon/components/koenig-card-code.js +++ b/ghost/admin/lib/koenig-editor/addon/components/koenig-card-code.js @@ -1,6 +1,5 @@ import Component from '@ember/component'; import Ember from 'ember'; -import layout from '../templates/components/koenig-card-code'; import {computed} from '@ember/object'; import {utils as ghostHelperUtils} from '@tryghost/helpers'; import {htmlSafe} from '@ember/string'; @@ -19,8 +18,6 @@ const CM_MODE_MAP = { }; export default Component.extend({ - layout, - // attrs payload: null, isSelected: false, diff --git a/ghost/admin/lib/koenig-editor/addon/templates/components/koenig-card-email.hbs b/ghost/admin/lib/koenig-editor/addon/components/koenig-card-email.hbs similarity index 100% rename from ghost/admin/lib/koenig-editor/addon/templates/components/koenig-card-email.hbs rename to ghost/admin/lib/koenig-editor/addon/components/koenig-card-email.hbs diff --git a/ghost/admin/lib/koenig-editor/addon/components/koenig-card-email.js b/ghost/admin/lib/koenig-editor/addon/components/koenig-card-email.js index 6c0c66ec18..2a23a47076 100644 --- a/ghost/admin/lib/koenig-editor/addon/components/koenig-card-email.js +++ b/ghost/admin/lib/koenig-editor/addon/components/koenig-card-email.js @@ -1,6 +1,5 @@ import Browser from 'mobiledoc-kit/utils/browser'; import Component from '@ember/component'; -import layout from '../templates/components/koenig-card-email'; import {computed} from '@ember/object'; import {formatTextReplacementHtml} from './koenig-text-replacement-html-input'; import {isBlank} from '@ember/utils'; @@ -8,8 +7,6 @@ import {run} from '@ember/runloop'; import {set} from '@ember/object'; export default Component.extend({ - layout, - // attrs payload: null, isSelected: false, diff --git a/ghost/admin/lib/koenig-editor/addon/templates/components/koenig-card-embed.hbs b/ghost/admin/lib/koenig-editor/addon/components/koenig-card-embed.hbs similarity index 100% rename from ghost/admin/lib/koenig-editor/addon/templates/components/koenig-card-embed.hbs rename to ghost/admin/lib/koenig-editor/addon/components/koenig-card-embed.hbs diff --git a/ghost/admin/lib/koenig-editor/addon/components/koenig-card-embed.js b/ghost/admin/lib/koenig-editor/addon/components/koenig-card-embed.js index 3008e7bb7d..5f7187769b 100644 --- a/ghost/admin/lib/koenig-editor/addon/components/koenig-card-embed.js +++ b/ghost/admin/lib/koenig-editor/addon/components/koenig-card-embed.js @@ -1,6 +1,5 @@ /* global noframe */ import Component from '@ember/component'; -import layout from '../templates/components/koenig-card-embed'; import {NO_CURSOR_MOVEMENT} from './koenig-editor'; import {computed} from '@ember/object'; import {utils as ghostHelperUtils} from '@tryghost/helpers'; @@ -16,8 +15,6 @@ export default Component.extend({ ajax: service(), ghostPaths: service(), - layout, - // attrs payload: null, isSelected: false, diff --git a/ghost/admin/lib/koenig-editor/addon/templates/components/koenig-card-gallery.hbs b/ghost/admin/lib/koenig-editor/addon/components/koenig-card-gallery.hbs similarity index 100% rename from ghost/admin/lib/koenig-editor/addon/templates/components/koenig-card-gallery.hbs rename to ghost/admin/lib/koenig-editor/addon/components/koenig-card-gallery.hbs diff --git a/ghost/admin/lib/koenig-editor/addon/components/koenig-card-gallery.js b/ghost/admin/lib/koenig-editor/addon/components/koenig-card-gallery.js index 2df8baa441..700cfd3420 100644 --- a/ghost/admin/lib/koenig-editor/addon/components/koenig-card-gallery.js +++ b/ghost/admin/lib/koenig-editor/addon/components/koenig-card-gallery.js @@ -1,7 +1,6 @@ import $ from 'jquery'; import Component from '@ember/component'; import EmberObject, {computed, set} from '@ember/object'; -import layout from '../templates/components/koenig-card-gallery'; import { IMAGE_EXTENSIONS, IMAGE_MIME_TYPES @@ -19,8 +18,6 @@ const {countWords} = ghostHelperUtils; export default Component.extend({ koenigDragDropHandler: service(), - layout, - // attrs files: null, images: null, diff --git a/ghost/admin/lib/koenig-editor/addon/templates/components/koenig-card-hr.hbs b/ghost/admin/lib/koenig-editor/addon/components/koenig-card-hr.hbs similarity index 100% rename from ghost/admin/lib/koenig-editor/addon/templates/components/koenig-card-hr.hbs rename to ghost/admin/lib/koenig-editor/addon/components/koenig-card-hr.hbs diff --git a/ghost/admin/lib/koenig-editor/addon/components/koenig-card-hr.js b/ghost/admin/lib/koenig-editor/addon/components/koenig-card-hr.js index 1bb882eaff..24566a35d9 100644 --- a/ghost/admin/lib/koenig-editor/addon/components/koenig-card-hr.js +++ b/ghost/admin/lib/koenig-editor/addon/components/koenig-card-hr.js @@ -1,8 +1,6 @@ import Component from '@ember/component'; -import layout from '../templates/components/koenig-card-hr'; export default Component.extend({ - layout, tagName: '', // closure actions diff --git a/ghost/admin/lib/koenig-editor/addon/templates/components/koenig-card-html.hbs b/ghost/admin/lib/koenig-editor/addon/components/koenig-card-html.hbs similarity index 100% rename from ghost/admin/lib/koenig-editor/addon/templates/components/koenig-card-html.hbs rename to ghost/admin/lib/koenig-editor/addon/components/koenig-card-html.hbs diff --git a/ghost/admin/lib/koenig-editor/addon/components/koenig-card-html.js b/ghost/admin/lib/koenig-editor/addon/components/koenig-card-html.js index 9191e3fde9..e2125d2cd1 100644 --- a/ghost/admin/lib/koenig-editor/addon/components/koenig-card-html.js +++ b/ghost/admin/lib/koenig-editor/addon/components/koenig-card-html.js @@ -1,5 +1,4 @@ import Component from '@ember/component'; -import layout from '../templates/components/koenig-card-html'; import {computed} from '@ember/object'; import {utils as ghostHelperUtils} from '@tryghost/helpers'; import {isBlank} from '@ember/utils'; @@ -9,8 +8,6 @@ import {set} from '@ember/object'; const {countWords, countImages} = ghostHelperUtils; export default Component.extend({ - layout, - // attrs payload: null, isSelected: false, diff --git a/ghost/admin/lib/koenig-editor/addon/templates/components/koenig-card-image.hbs b/ghost/admin/lib/koenig-editor/addon/components/koenig-card-image.hbs similarity index 100% rename from ghost/admin/lib/koenig-editor/addon/templates/components/koenig-card-image.hbs rename to ghost/admin/lib/koenig-editor/addon/components/koenig-card-image.hbs diff --git a/ghost/admin/lib/koenig-editor/addon/components/koenig-card-image.js b/ghost/admin/lib/koenig-editor/addon/components/koenig-card-image.js index 10b0cc2cea..900658c542 100644 --- a/ghost/admin/lib/koenig-editor/addon/components/koenig-card-image.js +++ b/ghost/admin/lib/koenig-editor/addon/components/koenig-card-image.js @@ -1,6 +1,5 @@ import $ from 'jquery'; import Component from '@ember/component'; -import layout from '../templates/components/koenig-card-image'; import { IMAGE_EXTENSIONS, IMAGE_MIME_TYPES @@ -16,7 +15,6 @@ const {countWords} = ghostHelperUtils; export default Component.extend({ ui: service(), - layout, // attrs editor: null, diff --git a/ghost/admin/lib/koenig-editor/addon/templates/components/koenig-card-markdown.hbs b/ghost/admin/lib/koenig-editor/addon/components/koenig-card-markdown.hbs similarity index 100% rename from ghost/admin/lib/koenig-editor/addon/templates/components/koenig-card-markdown.hbs rename to ghost/admin/lib/koenig-editor/addon/components/koenig-card-markdown.hbs diff --git a/ghost/admin/lib/koenig-editor/addon/components/koenig-card-markdown.js b/ghost/admin/lib/koenig-editor/addon/components/koenig-card-markdown.js index 96d1531f28..68fb394b3f 100644 --- a/ghost/admin/lib/koenig-editor/addon/components/koenig-card-markdown.js +++ b/ghost/admin/lib/koenig-editor/addon/components/koenig-card-markdown.js @@ -1,6 +1,5 @@ import Component from '@ember/component'; import formatMarkdown from 'ghost-admin/utils/format-markdown'; -import layout from '../templates/components/koenig-card-markdown'; import {computed} from '@ember/object'; import {utils as ghostHelperUtils} from '@tryghost/helpers'; import {htmlSafe} from '@ember/string'; @@ -13,8 +12,6 @@ const {countWords, countImages} = ghostHelperUtils; const MIN_HEIGHT = 130; export default Component.extend({ - layout, - // attrs payload: null, isSelected: false, diff --git a/ghost/admin/lib/koenig-editor/addon/templates/components/koenig-card.hbs b/ghost/admin/lib/koenig-editor/addon/components/koenig-card.hbs similarity index 100% rename from ghost/admin/lib/koenig-editor/addon/templates/components/koenig-card.hbs rename to ghost/admin/lib/koenig-editor/addon/components/koenig-card.hbs diff --git a/ghost/admin/lib/koenig-editor/addon/components/koenig-card.js b/ghost/admin/lib/koenig-editor/addon/components/koenig-card.js index 83e155749c..065bbd684c 100644 --- a/ghost/admin/lib/koenig-editor/addon/components/koenig-card.js +++ b/ghost/admin/lib/koenig-editor/addon/components/koenig-card.js @@ -1,6 +1,5 @@ import Browser from 'mobiledoc-kit/utils/browser'; import Component from '@ember/component'; -import layout from '../templates/components/koenig-card'; import {computed} from '@ember/object'; import {htmlSafe} from '@ember/string'; import {run} from '@ember/runloop'; @@ -11,7 +10,6 @@ const TICK_HEIGHT = 8; export default Component.extend({ koenigUi: service(), - layout, attributeBindings: ['_style:style'], classNameBindings: ['selectedClass'], diff --git a/ghost/admin/lib/koenig-editor/addon/templates/components/koenig-editor.hbs b/ghost/admin/lib/koenig-editor/addon/components/koenig-editor.hbs similarity index 100% rename from ghost/admin/lib/koenig-editor/addon/templates/components/koenig-editor.hbs rename to ghost/admin/lib/koenig-editor/addon/components/koenig-editor.hbs diff --git a/ghost/admin/lib/koenig-editor/addon/components/koenig-editor.js b/ghost/admin/lib/koenig-editor/addon/components/koenig-editor.js index ac4aeb413b..7498fbae32 100644 --- a/ghost/admin/lib/koenig-editor/addon/components/koenig-editor.js +++ b/ghost/admin/lib/koenig-editor/addon/components/koenig-editor.js @@ -13,7 +13,6 @@ import calculateReadingTime from '../utils/reading-time'; import defaultAtoms from '../options/atoms'; import defaultCards, {CARD_COMPONENT_MAP, CARD_ICON_MAP} from '../options/cards'; import formatMarkdown from 'ghost-admin/utils/format-markdown'; -import layout from '../templates/components/koenig-editor'; import registerKeyCommands from '../options/key-commands'; import registerTextExpansions from '../options/text-expansions'; import validator from 'validator'; @@ -170,7 +169,6 @@ function insertImageCards(files, postEditor) { export default Component.extend({ koenigDragDropHandler: service(), - layout, tagName: 'article', classNames: ['koenig-editor', 'w-100', 'flex-grow', 'relative', 'center', 'mb0', 'mt0'], diff --git a/ghost/admin/lib/koenig-editor/addon/templates/components/koenig-link-input.hbs b/ghost/admin/lib/koenig-editor/addon/components/koenig-link-input.hbs similarity index 100% rename from ghost/admin/lib/koenig-editor/addon/templates/components/koenig-link-input.hbs rename to ghost/admin/lib/koenig-editor/addon/components/koenig-link-input.hbs diff --git a/ghost/admin/lib/koenig-editor/addon/components/koenig-link-input.js b/ghost/admin/lib/koenig-editor/addon/components/koenig-link-input.js index 72dfee1eff..fc67b4fdd1 100644 --- a/ghost/admin/lib/koenig-editor/addon/components/koenig-link-input.js +++ b/ghost/admin/lib/koenig-editor/addon/components/koenig-link-input.js @@ -1,5 +1,4 @@ import Component from '@ember/component'; -import layout from '../templates/components/koenig-link-input'; import relativeToAbsolute from '../lib/relative-to-absolute'; import {TOOLBAR_MARGIN} from './koenig-toolbar'; import {computed} from '@ember/object'; @@ -30,8 +29,6 @@ function getScrollParent(node) { export default Component.extend({ config: service(), - layout, - attributeBindings: ['style'], classNames: ['kg-input-bar', 'absolute', 'z-999'], diff --git a/ghost/admin/lib/koenig-editor/addon/templates/components/koenig-link-toolbar.hbs b/ghost/admin/lib/koenig-editor/addon/components/koenig-link-toolbar.hbs similarity index 100% rename from ghost/admin/lib/koenig-editor/addon/templates/components/koenig-link-toolbar.hbs rename to ghost/admin/lib/koenig-editor/addon/components/koenig-link-toolbar.hbs diff --git a/ghost/admin/lib/koenig-editor/addon/components/koenig-link-toolbar.js b/ghost/admin/lib/koenig-editor/addon/components/koenig-link-toolbar.js index a4ac104c79..6cd323cf67 100644 --- a/ghost/admin/lib/koenig-editor/addon/components/koenig-link-toolbar.js +++ b/ghost/admin/lib/koenig-editor/addon/components/koenig-link-toolbar.js @@ -1,5 +1,4 @@ import Component from '@ember/component'; -import layout from '../templates/components/koenig-link-toolbar'; import relativeToAbsolute from '../lib/relative-to-absolute'; import {computed} from '@ember/object'; import {getEventTargetMatchingTag} from 'mobiledoc-kit/utils/element-utils'; @@ -20,8 +19,6 @@ const DELAY = 120; export default Component.extend({ config: service(), - layout, - attributeBindings: ['style'], classNames: ['absolute', 'z-999'], diff --git a/ghost/admin/lib/koenig-editor/addon/templates/components/koenig-menu-content.hbs b/ghost/admin/lib/koenig-editor/addon/components/koenig-menu-content.hbs similarity index 100% rename from ghost/admin/lib/koenig-editor/addon/templates/components/koenig-menu-content.hbs rename to ghost/admin/lib/koenig-editor/addon/components/koenig-menu-content.hbs diff --git a/ghost/admin/lib/koenig-editor/addon/components/koenig-menu-content.js b/ghost/admin/lib/koenig-editor/addon/components/koenig-menu-content.js index c8f659579b..2e7e884531 100644 --- a/ghost/admin/lib/koenig-editor/addon/components/koenig-menu-content.js +++ b/ghost/admin/lib/koenig-editor/addon/components/koenig-menu-content.js @@ -1,11 +1,9 @@ import Component from '@ember/component'; -import layout from '../templates/components/koenig-menu-content'; import {inject as service} from '@ember/service'; export default Component.extend({ config: service(), - layout, tagName: '', itemSections: null, diff --git a/ghost/admin/lib/koenig-editor/addon/templates/components/koenig-plus-menu.hbs b/ghost/admin/lib/koenig-editor/addon/components/koenig-plus-menu.hbs similarity index 100% rename from ghost/admin/lib/koenig-editor/addon/templates/components/koenig-plus-menu.hbs rename to ghost/admin/lib/koenig-editor/addon/components/koenig-plus-menu.hbs diff --git a/ghost/admin/lib/koenig-editor/addon/components/koenig-plus-menu.js b/ghost/admin/lib/koenig-editor/addon/components/koenig-plus-menu.js index 6e3d538c5c..5d99763ec2 100644 --- a/ghost/admin/lib/koenig-editor/addon/components/koenig-plus-menu.js +++ b/ghost/admin/lib/koenig-editor/addon/components/koenig-plus-menu.js @@ -1,13 +1,10 @@ import Component from '@ember/component'; -import layout from '../templates/components/koenig-plus-menu'; import {CARD_MENU} from '../options/cards'; import {computed} from '@ember/object'; import {htmlSafe} from '@ember/string'; import {run} from '@ember/runloop'; export default Component.extend({ - layout, - // public attrs classNames: ['absolute'], attributeBindings: ['style', 'data-kg'], diff --git a/ghost/admin/lib/koenig-editor/addon/templates/components/koenig-slash-menu.hbs b/ghost/admin/lib/koenig-editor/addon/components/koenig-slash-menu.hbs similarity index 100% rename from ghost/admin/lib/koenig-editor/addon/templates/components/koenig-slash-menu.hbs rename to ghost/admin/lib/koenig-editor/addon/components/koenig-slash-menu.hbs diff --git a/ghost/admin/lib/koenig-editor/addon/components/koenig-slash-menu.js b/ghost/admin/lib/koenig-editor/addon/components/koenig-slash-menu.js index 15b17d279a..c4645c94b3 100644 --- a/ghost/admin/lib/koenig-editor/addon/components/koenig-slash-menu.js +++ b/ghost/admin/lib/koenig-editor/addon/components/koenig-slash-menu.js @@ -1,5 +1,4 @@ import Component from '@ember/component'; -import layout from '../templates/components/koenig-slash-menu'; import {CARD_MENU} from '../options/cards'; import {assign} from '@ember/polyfills'; import {computed, set} from '@ember/object'; @@ -10,8 +9,6 @@ import {run} from '@ember/runloop'; const ROW_LENGTH = 3; export default Component.extend({ - layout, - // public attrs classNames: 'absolute', attributeBindings: ['style'], diff --git a/ghost/admin/lib/koenig-editor/addon/templates/components/koenig-text-replacement-html-input.hbs b/ghost/admin/lib/koenig-editor/addon/components/koenig-text-replacement-html-input.hbs similarity index 100% rename from ghost/admin/lib/koenig-editor/addon/templates/components/koenig-text-replacement-html-input.hbs rename to ghost/admin/lib/koenig-editor/addon/components/koenig-text-replacement-html-input.hbs diff --git a/ghost/admin/lib/koenig-editor/addon/components/koenig-text-replacement-html-input.js b/ghost/admin/lib/koenig-editor/addon/components/koenig-text-replacement-html-input.js index e20d686366..ad00520e0d 100644 --- a/ghost/admin/lib/koenig-editor/addon/components/koenig-text-replacement-html-input.js +++ b/ghost/admin/lib/koenig-editor/addon/components/koenig-text-replacement-html-input.js @@ -2,7 +2,6 @@ import Component from '@ember/component'; import Editor from 'mobiledoc-kit/editor/editor'; import cleanTextReplacementHtml from '../lib/clean-text-replacement-html'; import defaultAtoms from '../options/atoms'; -import layout from '../templates/components/koenig-text-replacement-html-input'; import registerKeyCommands, {TEXT_REPLACEMENT_KEY_COMMANDS} from '../options/key-commands'; import validator from 'validator'; import {BLANK_DOC, MOBILEDOC_VERSION} from './koenig-editor'; @@ -60,8 +59,6 @@ function toggleSpecialFormatEditState(editor) { } export default Component.extend({ - layout, - // public attrs autofocus: false, html: null, diff --git a/ghost/admin/lib/koenig-editor/addon/templates/components/koenig-toolbar.hbs b/ghost/admin/lib/koenig-editor/addon/components/koenig-toolbar.hbs similarity index 100% rename from ghost/admin/lib/koenig-editor/addon/templates/components/koenig-toolbar.hbs rename to ghost/admin/lib/koenig-editor/addon/components/koenig-toolbar.hbs diff --git a/ghost/admin/lib/koenig-editor/addon/components/koenig-toolbar.js b/ghost/admin/lib/koenig-editor/addon/components/koenig-toolbar.js index 9142d6c4a6..3376d99bdc 100644 --- a/ghost/admin/lib/koenig-editor/addon/components/koenig-toolbar.js +++ b/ghost/admin/lib/koenig-editor/addon/components/koenig-toolbar.js @@ -1,5 +1,4 @@ import Component from '@ember/component'; -import layout from '../templates/components/koenig-toolbar'; import {computed} from '@ember/object'; import {htmlSafe} from '@ember/string'; import {run} from '@ember/runloop'; @@ -20,8 +19,6 @@ export const TOOLBAR_MARGIN = 15; const TICK_ADJUSTMENT = 8; export default Component.extend({ - layout, - attributeBindings: ['style'], classNames: ['absolute', 'z-999'],