IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

UX: Improve tag info style (#15177)

Browse Source
This commit is contained in:
Kris
2021-12-03 10:22:05 -05:00
committed by GitHub
parent 643f82d8d6
commit b01ded9c89
5 changed files with 91 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/discourse/app/templates/components/d-navigation.hbs
View File

@@ -31,7 +31,7 @@
{{#if tag}}
{{#if showToggleInfo}}
{{d-button icon="wrench" class="btn-default" ariaLabel="tagging.info" action=toggleInfo id="show-tag-info"}}
{{d-button icon=(if currentUser.staff "wrench" "info-circle") class="btn-default" ariaLabel="tagging.info" action=toggleInfo id="show-tag-info"}}
{{/if}}
{{/if}}

61
app/assets/javascripts/discourse/app/templates/components/tag-info.hbs
View File

@@ -17,24 +17,11 @@
<div class="tag-name-wrapper">
{{discourse-tag tagInfo.name tagName="div" size="large"}}
{{#if canAdminTag}}
<a href {{action "edit"}} id="edit-tag" title={{i18n "tagging.edit_tag"}}>{{d-icon "pencil-alt"}}</a>
{{d-button action=(action "edit") class="btn-flat edit-tag" title=(i18n "tagging.edit_tag") icon="pencil-alt" }}
{{/if}}
</div>
{{#if canAdminTag}}
<div class="tag-description-wrapper">
{{tagInfo.description}}
</div>
{{/if}}
{{/if}}
{{#if canAdminTag}}
{{plugin-outlet name="tag-custom-settings" args=(hash tag=tagInfo) connectorTagName="" tagName="section"}}
<div class="tag-actions">
{{d-button class="btn-default" action=(action "toggleEditControls") icon="cog" label="tagging.edit_synonyms" id="edit-synonyms"}}
{{#if deleteAction}}
{{d-button class="btn-danger delete-tag" action=(action "deleteTag") icon="far-trash-alt" label="tagging.delete_tag" id="delete-tag"}}
{{/if}}
<div class="tag-description-wrapper">
{{tagInfo.description}}
</div>
{{/if}}
</div>
@@ -53,7 +40,10 @@
{{#if tagInfo.category_restricted}}
{{i18n "tagging.category_restricted"}}
{{else}}
{{html-safe (i18n "tagging.default_info" basePath=(base-path))}}
{{html-safe (i18n "tagging.default_info")}}
{{#if canAdminTag}}
{{html-safe (i18n "tagging.staff_info" basePath=(base-path))}}
{{/if}}
{{/if}}
{{/if}}
</div>
@@ -81,20 +71,31 @@
{{#if editSynonymsMode}}
<section class="add-synonyms field">
<label for="add-synonyms">{{i18n "tagging.add_synonyms_label"}}</label>
{{tag-chooser
id="add-synonyms"
tags=newSynonyms
blockedTags=(array tagInfo.name)
everyTag=true
excludeSynonyms=true
excludeHasSynonyms=true
unlimitedTagCount=true}}
<div>
{{tag-chooser
id="add-synonyms"
tags=newSynonyms
blockedTags=(array tagInfo.name)
everyTag=true
excludeSynonyms=true
excludeHasSynonyms=true
unlimitedTagCount=true}}
{{d-button
class="ok"
action=(action "addSynonyms")
disabled=addSynonymsDisabled
icon="check"}}
</div>
</section>
{{d-button
class="btn-default"
action=(action "addSynonyms")
disabled=addSynonymsDisabled
label="tagging.add_synonyms"}}
{{/if}}
{{#if canAdminTag}}
{{plugin-outlet name="tag-custom-settings" args=(hash tag=tagInfo) connectorTagName="" tagName="section"}}
<div class="tag-actions">
{{d-button class="btn-default" action=(action "toggleEditControls") icon="cog" label="tagging.edit_synonyms" id="edit-synonyms"}}
{{#if deleteAction}}
{{d-button class="btn-danger delete-tag" action=(action "deleteTag") icon="far-trash-alt" label="tagging.delete_tag" id="delete-tag"}}
{{/if}}
</div>
{{/if}}
{{/if}}
{{#if loading}}

4
app/assets/javascripts/discourse/tests/acceptance/tags-test.js
View File

@@ -441,7 +441,7 @@ acceptance("Tag info", function (needs) {
await click("#show-tag-info");
assert.ok(exists(".tag-info .tag-name"), "show tag");
await click("#edit-tag");
await click(".edit-tag");
assert.strictEqual(
query("#edit-name").value,
"happy-monkey",
@@ -470,7 +470,7 @@ acceptance("Tag info", function (needs) {
assert.strictEqual(count("#show-tag-info"), 1);
await click("#show-tag-info");
assert.ok(exists("#edit-tag"), "can rename tag");
assert.ok(exists(".edit-tag"), "can rename tag");
assert.ok(exists("#edit-synonyms"), "can edit synonyms");
assert.ok(exists("#delete-tag"), "can delete tag");