diff --git a/ghost/admin/app/components/gh-members-import-table.hbs b/ghost/admin/app/components/gh-members-import-table.hbs index 3b4156f899..fa79b57a80 100644 --- a/ghost/admin/app/components/gh-members-import-table.hbs +++ b/ghost/admin/app/components/gh-members-import-table.hbs @@ -4,14 +4,14 @@ Field
- Data ({{format-number this.currentRecord}} of {{format-number this.allRecords}}) + Sample data (#{{format-number this.currentRecord}})
{{svg-jar "arrow-left" class="w3 h3 fill-middarkgrey" }} {{svg-jar "arrow-right" class="w3 h3 fill-middarkgrey" }}
- Import as... + Import as @@ -23,7 +23,7 @@ {{else}} - No data + No data found in the uploaded CSV. {{/each}} diff --git a/ghost/admin/app/components/modal-import-members.hbs b/ghost/admin/app/components/modal-import-members.hbs index 019f385e07..45491b330a 100644 --- a/ghost/admin/app/components/modal-import-members.hbs +++ b/ghost/admin/app/components/modal-import-members.hbs @@ -46,7 +46,6 @@
-
Validating...
{{/if}} {{/if}} @@ -54,14 +53,12 @@ {{#if this.customizing}} {{#if this.config.enableDeveloperExperiments}} -

Mapping

-

Match the fields in your uploaded file to Ghost members.

{{else}}
@@ -72,9 +69,8 @@ {{/if}}
- + -

Will be applied to all newly imported members

{{/if}} diff --git a/ghost/admin/app/styles/layouts/members.css b/ghost/admin/app/styles/layouts/members.css index 9f89660877..203ed6392c 100644 --- a/ghost/admin/app/styles/layouts/members.css +++ b/ghost/admin/app/styles/layouts/members.css @@ -461,7 +461,7 @@ textarea.gh-member-details-textarea { } .gh-members-import-spinner .gh-loading-content { - padding-bottom: 40px; + padding-bottom: 0px; } .gh-members-import-spinner .description { @@ -708,6 +708,14 @@ p.gh-members-import-errordetail:first-of-type { color: var(--midlightgrey); } +.gh-member-import-nodata span { + display: flex; + min-height: 144px; + align-items: center; + justify-content: center; + color: var(--midgrey); +} + /* Fixing Firefox's select padding */ @-moz-document url-prefix() { .gh-import-member-select select { diff --git a/ghost/admin/tests/integration/components/modal-import-members-test.js b/ghost/admin/tests/integration/components/modal-import-members-test.js index 2c420ff5f5..bd394c3a91 100644 --- a/ghost/admin/tests/integration/components/modal-import-members-test.js +++ b/ghost/admin/tests/integration/components/modal-import-members-test.js @@ -65,7 +65,7 @@ describe('Integration: Component: modal-import-members-test', function () { await fileUpload('input[type="file"]', ['membersfile'], {name: 'test.csv'}); expect(find('label').textContent.trim(), 'labels label') - .to.equal('Labels'); + .to.equal('Label these members'); expect(find('.gh-btn-green').textContent).to.match(/Import/g); await click('.gh-btn-green');