From cdd3f4042281343149df820837e737b39d864c5f Mon Sep 17 00:00:00 2001 From: Zimo Date: Mon, 25 Mar 2019 09:37:44 +0100 Subject: [PATCH] Fixed button and title cases for Tags screen no refs. Set "New tag" button and "Tag settings" to sentence case to be consistent with the rest of the UI. (Previously they were title case.) --- ghost/admin/app/components/gh-tag-settings-form.js | 4 ++-- ghost/admin/app/templates/settings/tags-loading.hbs | 2 +- ghost/admin/app/templates/settings/tags.hbs | 2 +- ghost/admin/app/templates/settings/tags/index.hbs | 2 +- ghost/admin/tests/acceptance/settings/tags-test.js | 2 +- .../tests/integration/components/gh-tag-settings-form-test.js | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ghost/admin/app/components/gh-tag-settings-form.js b/ghost/admin/app/components/gh-tag-settings-form.js index da03fa3609..47343b67e2 100644 --- a/ghost/admin/app/components/gh-tag-settings-form.js +++ b/ghost/admin/app/components/gh-tag-settings-form.js @@ -32,9 +32,9 @@ export default Component.extend({ title: computed('tag.isNew', function () { if (this.get('tag.isNew')) { - return 'New Tag'; + return 'New tag'; } else { - return 'Tag Settings'; + return 'Tag settings'; } }), diff --git a/ghost/admin/app/templates/settings/tags-loading.hbs b/ghost/admin/app/templates/settings/tags-loading.hbs index 88f10c9390..d63c062842 100644 --- a/ghost/admin/app/templates/settings/tags-loading.hbs +++ b/ghost/admin/app/templates/settings/tags-loading.hbs @@ -2,7 +2,7 @@
{{#gh-view-title}}Tags{{/gh-view-title}}
- {{#link-to "settings.tags.new" class="gh-btn gh-btn-green"}}New Tag{{/link-to}} + {{#link-to "settings.tags.new" class="gh-btn gh-btn-green"}}New tag{{/link-to}}
diff --git a/ghost/admin/app/templates/settings/tags.hbs b/ghost/admin/app/templates/settings/tags.hbs index bf296c55e9..53c5c0142b 100644 --- a/ghost/admin/app/templates/settings/tags.hbs +++ b/ghost/admin/app/templates/settings/tags.hbs @@ -2,7 +2,7 @@
{{#gh-view-title}}Tags{{/gh-view-title}}
- {{#link-to "settings.tags.new" class="gh-btn gh-btn-green"}}New Tag{{/link-to}} + {{#link-to "settings.tags.new" class="gh-btn gh-btn-green"}}New tag{{/link-to}}
diff --git a/ghost/admin/app/templates/settings/tags/index.hbs b/ghost/admin/app/templates/settings/tags/index.hbs index bc68ac2a62..79d6c3812e 100644 --- a/ghost/admin/app/templates/settings/tags/index.hbs +++ b/ghost/admin/app/templates/settings/tags/index.hbs @@ -1,6 +1,6 @@

You haven't added any tags yet!

- {{#link-to "settings.tags.new"}}{{/link-to}} + {{#link-to "settings.tags.new"}}{{/link-to}}
diff --git a/ghost/admin/tests/acceptance/settings/tags-test.js b/ghost/admin/tests/acceptance/settings/tags-test.js index 44c439fbad..d6da7b9ded 100644 --- a/ghost/admin/tests/acceptance/settings/tags-test.js +++ b/ghost/admin/tests/acceptance/settings/tags-test.js @@ -122,7 +122,7 @@ describe('Acceptance: Settings - Tags', function () { // it shows selected tag form expect(find('.tag-settings-pane h4').textContent, 'settings pane title') - .to.equal('Tag Settings'); + .to.equal('Tag settings'); expect(find('.tag-settings-pane input[name="name"]').value, 'loads correct tag into form') .to.equal(tag1.name); diff --git a/ghost/admin/tests/integration/components/gh-tag-settings-form-test.js b/ghost/admin/tests/integration/components/gh-tag-settings-form-test.js index 07eda6647a..6c94726f25 100644 --- a/ghost/admin/tests/integration/components/gh-tag-settings-form-test.js +++ b/ghost/admin/tests/integration/components/gh-tag-settings-form-test.js @@ -56,10 +56,10 @@ describe('Integration: Component: gh-tag-settings-form', function () { await render(hbs` {{gh-tag-settings-form tag=tag setProperty=(action setProperty)}} `); - expect(find('.tag-settings-pane h4').textContent, 'existing tag title').to.equal('Tag Settings'); + expect(find('.tag-settings-pane h4').textContent, 'existing tag title').to.equal('Tag settings'); this.set('tag.isNew', true); - expect(find('.tag-settings-pane h4').textContent, 'new tag title').to.equal('New Tag'); + expect(find('.tag-settings-pane h4').textContent, 'new tag title').to.equal('New tag'); }); it('renders main settings', async function () {