diff --git a/ghost/admin/app/components/gh-tag-settings-form.js b/ghost/admin/app/components/gh-tag-settings-form.js index 2b359b678f..0176fd7a1c 100644 --- a/ghost/admin/app/components/gh-tag-settings-form.js +++ b/ghost/admin/app/components/gh-tag-settings-form.js @@ -1,4 +1,3 @@ -/* global key */ import Component from '@ember/component'; import Ember from 'ember'; import {computed} from '@ember/object'; @@ -12,8 +11,7 @@ export default Component.extend({ config: service(), tag: null, - - isViewingSubview: false, + scratchTag: null, // Allowed actions setProperty: () => {}, @@ -98,30 +96,6 @@ export default Component.extend({ clearCoverImage() { this.setProperty('featureImage', ''); - }, - - openMeta() { - this.set('isViewingSubview', true); - }, - - closeMeta() { - this.set('isViewingSubview', false); } - }, - - reset() { - this.set('isViewingSubview', false); - if (this.$()) { - this.$('.settings-menu-pane').scrollTop(0); - } - }, - - focusIn() { - key.setScope('tag-settings-form'); - }, - - focusOut() { - key.setScope('default'); } - }); diff --git a/ghost/admin/app/templates/components/gh-tag-settings-form.hbs b/ghost/admin/app/templates/components/gh-tag-settings-form.hbs index 09cc0b0777..f8327a487b 100644 --- a/ghost/admin/app/templates/components/gh-tag-settings-form.hbs +++ b/ghost/admin/app/templates/components/gh-tag-settings-form.hbs @@ -2,54 +2,58 @@
Start with # to create internal tags. Learn - more
-+ Start with # to create internal tags + Learn more +
+Maximum: 500 characters. You’ve used {{gh-count-down-characters this.scratchTag.description 500}}
+ + {{gh-textarea + id="tag-description" + name="description" + class="gh-tag-details-textarea" + tabindex="3" + value=this.scratchTag.description + focus-out=(action 'setProperty' 'description' this.scratchTag.description) + }} +Maximum: 500 characters. You’ve used {{gh-count-down-characters this.scratchTag.description 500}}
{{/gh-form-group}}Recommended: 70 characters. You’ve used {{gh-count-down-characters this.scratchTag.metaTitle 70}}
+ + {{gh-text-input + id="meta-title" + name="metaTitle" + placeholder=this.scratchTag.name + tabindex="4" + value=this.scratchTag.metaTitle + focus-out=(action "setProperty" "metaTitle" this.scratchTag.metaTitle) + }} +Recommended: 70 characters. You’ve used {{gh-count-down-characters this.scratchTag.metaTitle 70}}
{{/gh-form-group}} {{#gh-form-group errors=this.tag.errors hasValidated=this.tag.hasValidated property="metaDescription"}} - - {{gh-textarea - id="meta-description" - name="metaDescription" - class="gh-tag-details-textarea" - placeholder=this.scratchTag.description - tabindex="5" - value=this.scratchTag.metaDescription - focus-out=(action "setProperty" "metaDescription" this.scratchTag.metaDescription) - }} -Recommended: 156 characters. You’ve used {{gh-count-down-characters this.scratchTag.metaDescription 156}}
+ + {{gh-textarea + id="meta-description" + name="metaDescription" + class="gh-tag-details-textarea" + placeholder=this.scratchTag.description + tabindex="5" + value=this.scratchTag.metaDescription + focus-out=(action "setProperty" "metaDescription" this.scratchTag.metaDescription) + }} +Recommended: 156 characters. You’ve used {{gh-count-down-characters this.scratchTag.metaDescription 156}}
{{/gh-form-group}}