Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

UX: Move delete button to end and mark it as dangerous

This commit is contained in:
Robin Ward 2017-05-11 15:09:23 -04:00
parent 52ae63d5d7
commit ea0ecb67f3
2 changed files with 25 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
app/assets/javascripts/discourse/controllers/topic-bulk-actions.js.es6
View File

@ -4,31 +4,37 @@ const _buttons = [];
const alwaysTrue = () => true;
function addBulkButton(action, key, icon, buttonVisible) {
_buttons.push({
function addBulkButton(action, key, opts) {
opts = opts || {};
const btn = {
action,
label: `topics.bulk.${key}`,
icon,
buttonVisible: buttonVisible || alwaysTrue
});
icon: opts.icon,
buttonVisible: opts.buttonVisible || alwaysTrue,
class: opts.class
};
_buttons.push(btn);
}
// Default buttons
addBulkButton('showChangeCategory', 'change_category', 'pencil');
addBulkButton('deleteTopics', 'delete', 'trash');
addBulkButton('closeTopics', 'close_topics', 'lock');
addBulkButton('archiveTopics', 'archive_topics', 'folder');
addBulkButton('showNotificationLevel', 'notification_level', 'circle-o');
addBulkButton('resetRead', 'reset_read', 'backward');
addBulkButton('unlistTopics', 'unlist_topics', 'eye-slash', topics => {
return topics.some(t => t.visible);
addBulkButton('showChangeCategory', 'change_category', {icon: 'pencil'});
addBulkButton('closeTopics', 'close_topics', {icon: 'lock'});
addBulkButton('archiveTopics', 'archive_topics', {icon: 'folder'});
addBulkButton('showNotificationLevel', 'notification_level', {icon: 'circle-o'});
addBulkButton('resetRead', 'reset_read', {icon: 'backward'});
addBulkButton('unlistTopics', 'unlist_topics', {
icon: 'eye-slash',
buttonVisible: topics => topics.some(t => t.visible)
});
addBulkButton('relistTopics', 'relist_topics', 'eye', topics => {
return topics.some(t => !t.visible);
addBulkButton('relistTopics', 'relist_topics', {
icon: 'eye',
buttonVisible: topics => topics.some(t => !t.visible)
});
addBulkButton('showTagTopics', 'change_tags', 'tag');
addBulkButton('showAppendTagTopics', 'append_tags', 'tag');
addBulkButton('showTagTopics', 'change_tags', {icon: 'tag'});
addBulkButton('showAppendTagTopics', 'append_tags', {icon: 'tag'});
addBulkButton('deleteTopics', 'delete', {icon: 'trash', class: 'btn-danger'});
// Modal for performing bulk actions on topics
export default Ember.Controller.extend(ModalFunctionality, {

2
app/assets/javascripts/discourse/templates/modal/bulk-actions-buttons.hbs
View File

@ -1,5 +1,5 @@
<div class='bulk-buttons'>
{{#each buttons as |button|}}
{{d-button action=button.action label=button.label icon=button.icon}}
{{d-button action=button.action label=button.label icon=button.icon class=button.class}}
{{/each}}
</div>