tqt
/
Ghost-Admin
mirror of https://github.com/TryGhost/Ghost-Admin.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Members import refinements 

no refs.
- updated and removed copy on mapping screen
This commit is contained in:
Peter Zimon 2020-07-09 14:42:29 +02:00
parent ea2c900812
commit fe5403ee17
4 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/components/gh-members-import-table.hbs
View File

@ -4,14 +4,14 @@
<th class="table-cell-field"><span class="f-small midgrey ttu fw5">Field</span></th>
<th class="table-cell-data">
<div class="flex items-center justify-between">
<span class="f-small midgrey ttu fw5 nudge-top--1">Data <span class="midlightgrey fw4">({{format-number this.currentRecord}} of {{format-number this.allRecords}})</span></span>
<span class="f-small midgrey ttu fw5 nudge-top--1">Sample data <span class="midlightgrey fw4">(#{{format-number this.currentRecord}})</span></span>
<div class="flex items-center bg-white br2 ml1 nr1 gh-members-import-datanav">
<a href="#" {{action "prev"}} class="pa1 flex items-center justify-center br b--whitegrey {{unless this.hasPrevRecord "o-30"}}" data-test-import-prev>{{svg-jar "arrow-left" class="w3 h3 fill-middarkgrey" }}</a>
<a href="#" {{action "next"}} class="pa1 flex items-center justify-center {{unless this.hasNextRecord "o-30"}}" data-test-import-next>{{svg-jar "arrow-right" class="w3 h3 fill-middarkgrey" }}</a>
</div>
</div>
</th>
<th><span class="f-small midgrey ttu fw5">Import as...</span></th>
<th><span class="f-small midgrey ttu fw5">Import as</span></th>
</tr>
</thead>
<tbody>
@ -23,7 +23,7 @@
</tr>
{{else}}
<tr>
<td><span>No data</span></td>
<td colspan="3" class="gh-member-import-nodata"><span>No data found in the uploaded CSV.</span></td>
</tr>
{{/each}}
</tbody>

6
app/components/modal-import-members.hbs
View File

@ -46,7 +46,6 @@
<div class="gh-loading-content">
<div class="gh-loading-spinner"></div>
</div>
<div class="description midgrey">Validating...</div>
</div>
{{/if}}
{{/if}}
@ -54,14 +53,12 @@
{{#if this.customizing}}
<GhFormGroup>
{{#if this.config.enableDeveloperExperiments}}
<h4 class="fw6 f8 dib mb1">Mapping</h4>
<div class="gh-members-import-scrollarea">
<GhMembersImportTable
@importData={{this.fileData}}
@mapping={{this.mapping}}
@updateMapping={{action "updateMapping"}}/>
</div>
<p>Match the fields in your uploaded file to Ghost members.</p>
{{else}}
<div class="bg-whitegrey-l2 ba b--whitegrey br3">
<div class="flex flex-column items-center justify-center gh-members-import-file">
@ -72,9 +69,8 @@
{{/if}}
<div class="mt4">
<label for="label-input"><span class="fw6 f8 dib mb1">Labels</span></label>
<label for="label-input"><span class="fw6 f8 dib mb1">Label these members</span></label>
<GhMemberLabelInput @member={{this.labels}} @triggerId="label-input" />
<p>Will be applied to all newly imported members</p>
</div>
</GhFormGroup>
{{/if}}

10
app/styles/layouts/members.css
View File

@ -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 {

2
tests/integration/components/modal-import-members-test.js
View File

@ -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');