From 5478fc93dbe3be14c4a38754881e00dc0b6a38f9 Mon Sep 17 00:00:00 2001 From: Maxime Quandalle Date: Mon, 15 Jun 2015 17:16:56 +0200 Subject: Improve the multi-selection experience New features: - select all filtered cards - assign or unassign a member to selected cards - archive selected cards This commit also fix the card sort indexes calculation when a multi- selection is drag-dropped. --- client/components/sidebar/sidebarFilters.jade | 65 +++++++++++++++++++-------- 1 file changed, 46 insertions(+), 19 deletions(-) (limited to 'client/components/sidebar/sidebarFilters.jade') diff --git a/client/components/sidebar/sidebarFilters.jade b/client/components/sidebar/sidebarFilters.jade index 29b65f3b..a40232d2 100644 --- a/client/components/sidebar/sidebarFilters.jade +++ b/client/components/sidebar/sidebarFilters.jade @@ -1,7 +1,7 @@ //- - XXX There is a *lot* of code duplication in the above templates and in the + XXX There is a *lot* of code duplication in the below templates and in the corresponding JavaScript components. We will probably need the upcoming #let - and #each x in y constructors. + and #each x in y constructors to fix this. template(name="filterSidebar") ul.sidebar-list @@ -16,22 +16,27 @@ template(name="filterSidebar") span.quiet {{_ "label-default" color}} if Filter.labelIds.isSelected _id i.fa.fa-check + hr + ul.sidebar-list + each currentBoard.members + if isActive + with getUser userId + li(class="{{#if Filter.members.isSelected _id}}active{{/if}}") + a.name.js-toogle-member-filter + +userAvatar(userId=this._id) + span.sidebar-list-item-description + = profile.name + | ({{ username }}) + if Filter.members.isSelected _id + i.fa.fa-check + if Filter.isActive hr - ul.sidebar-list - each currentBoard.members - if isActive - with getUser userId - li(class="{{#if Filter.members.isSelected _id}}active{{/if}}") - a.name.js-toogle-member-filter - +userAvatar(userId=this._id) - span.sidebar-list-item-description - = profile.name - | ({{ username }}) - if Filter.members.isSelected _id - i.fa.fa-check - hr - a.js-clear-all(class="{{#unless Filter.isActive}}disabled{{/unless}}") - | {{_ 'filter-clear'}} + a.sidebar-btn.js-clear-all + i.fa.fa-filter + span {{_ 'filter-clear'}} + a.sidebar-btn.js-filter-to-selection + i.fa.fa-check-square-o + span Filter to selection template(name="multiselectionSidebar") ul.sidebar-list @@ -48,10 +53,32 @@ template(name="multiselectionSidebar") i.fa.fa-check else if someSelectedElementHave 'label' _id i.fa.fa-ellipsis-h - //- - XXX We should be able to assign a member to the list of selected cards. + hr + ul.sidebar-list + each currentBoard.members + if isActive + with getUser userId + li(class="{{#if Filter.members.isSelected _id}}active{{/if}}") + a.name.js-toogle-member-multiselection + +userAvatar(userId=this._id) + span.sidebar-list-item-description + = profile.name + | ({{ username }}) + if allSelectedElementHave 'member' _id + i.fa.fa-check + else if someSelectedElementHave 'member' _id + i.fa.fa-ellipsis-h + hr + a.sidebar-btn.js-archive-selection + i.fa.fa-archive + span Archive selection template(name="disambiguateMultiLabelPopup") p What do you want to do? button.wide.js-remove-label Remove the label button.wide.js-add-label Add the label + +template(name="disambiguateMultiMemberPopup") + p What do you want to do? + button.wide.js-unassign-member Unassign member + button.wide.js-assign-member Assign member -- cgit v1.2.3-1-g7c22