github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-20 17:41:33 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

UX: indicate active tag sorting method

Browse Source
This commit is contained in:
Arpit Jalan
2018-03-20 22:44:05 +05:30
parent 70c41e067b
commit dcbd9635f4
5 changed files with 31 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/assets/javascripts/discourse/controllers/tags-index.js.es6
View File

@ -2,6 +2,8 @@ import computed from 'ember-addons/ember-computed-decorators';
export default Ember.Controller.extend({ export default Ember.Controller.extend({
sortProperties: ['count:desc', 'id'], sortProperties: ['count:desc', 'id'],
sortedByCount: true,
sortedByName: false,
canAdminTags: Ember.computed.alias("currentUser.staff"), canAdminTags: Ember.computed.alias("currentUser.staff"),
groupedByCategory: Ember.computed.notEmpty('model.extras.categories'), groupedByCategory: Ember.computed.notEmpty('model.extras.categories'),
@ -18,11 +20,19 @@ export default Ember.Controller.extend({
actions: { actions: {
sortByCount() { sortByCount() {
this.set('sortProperties', ['count:desc', 'id']); this.setProperties({
sortProperties: ['count:desc', 'id'],
sortedByCount: true,
sortedByName: false
});
}, },
sortById() { sortById() {
this.set('sortProperties', ['id']); this.setProperties({
sortProperties: ['id'],
sortedByCount: false,
sortedByName: true
});
} }
} }
}); });

14
app/assets/javascripts/discourse/controllers/user-private-messages-tags.js.es6
View File

@ -1,14 +1,24 @@
export default Ember.Controller.extend({ export default Ember.Controller.extend({
sortProperties: ['count:desc', 'id'], sortProperties: ['count:desc', 'id'],
tagsForUser: null, tagsForUser: null,
sortedByCount: true,
sortedByName: false,
actions: { actions: {
sortByCount() { sortByCount() {
this.set('sortProperties', ['count:desc', 'id']); this.setProperties({
sortProperties: ['count:desc', 'id'],
sortedByCount: true,
sortedByName: false
});
}, },
sortById() { sortById() {
this.set('sortProperties', ['id']); this.setProperties({
sortProperties: ['id'],
sortedByCount: false,
sortedByName: true
});
} }
} }
}); });

4
app/assets/javascripts/discourse/templates/tags/index.hbs
View File

@ -13,8 +13,8 @@
<div class='tag-sort-options'> <div class='tag-sort-options'>
{{i18n "tagging.sort_by"}} {{i18n "tagging.sort_by"}}
<a {{action "sortByCount"}}>{{i18n "tagging.sort_by_count"}}</a> <span class="tag-sort-count {{if sortedByCount 'active'}}"><a {{action "sortByCount"}}>{{i18n "tagging.sort_by_count"}}</a></span>
<a {{action "sortById"}}>{{i18n "tagging.sort_by_name"}}</a> <span class="tag-sort-name {{if sortedByName 'active'}}"><a {{action "sortById"}}>{{i18n "tagging.sort_by_name"}}</a></span>
</div> </div>
<hr/> <hr/>

4
app/assets/javascripts/discourse/templates/user-private-messages-tags.hbs
View File

@ -6,8 +6,8 @@
<div class='tag-sort-options'> <div class='tag-sort-options'>
{{i18n "tagging.sort_by"}} {{i18n "tagging.sort_by"}}
<a {{action "sortByCount"}}>{{i18n "tagging.sort_by_count"}}</a> <span class="tag-sort-count {{if sortedByCount 'active'}}"><a {{action "sortByCount"}}>{{i18n "tagging.sort_by_count"}}</a></span>
<a {{action "sortById"}}>{{i18n "tagging.sort_by_name"}}</a> <span class="tag-sort-name {{if sortedByName 'active'}}"><a {{action "sortById"}}>{{i18n "tagging.sort_by_name"}}</a></span>
</div> </div>
<hr/> <hr/>

3
app/assets/stylesheets/common/base/tagging.scss
View File

@ -206,6 +206,9 @@ header .discourse-tag {color: $tag-color }
a { a {
text-decoration: underline; text-decoration: underline;
} }
span.active a {
font-weight: bold;
}
} }
.autocomplete { .autocomplete {