From 2733c1d3a065dd4ce0a42ac6f6d8ad60ddeec364 Mon Sep 17 00:00:00 2001 From: Maxime Quandalle Date: Thu, 10 Dec 2015 00:34:44 -0500 Subject: Add a button to move selected cards This is an alternative to drag and drop to move a set of selected cards. This feature was available at the list level until I deleted it in 5bdf91b, so it makes sense to add it back at the multi-selection level. --- client/components/sidebar/sidebarFilters.jade | 7 +++++++ client/components/sidebar/sidebarFilters.js | 8 ++++++++ i18n/en.i18n.json | 20 +++++++++++--------- 3 files changed, 26 insertions(+), 9 deletions(-) diff --git a/client/components/sidebar/sidebarFilters.jade b/client/components/sidebar/sidebarFilters.jade index 0e935e3f..2b326493 100644 --- a/client/components/sidebar/sidebarFilters.jade +++ b/client/components/sidebar/sidebarFilters.jade @@ -67,6 +67,9 @@ template(name="multiselectionSidebar") else if someSelectedElementHave 'member' _id i.fa.fa-ellipsis-h hr + a.sidebar-btn.js-move-selection + i.fa.fa-share + span {{_ 'move-selection'}} a.sidebar-btn.js-archive-selection i.fa.fa-archive span {{_ 'archive-selection'}} @@ -80,3 +83,7 @@ template(name="disambiguateMultiMemberPopup") p {{_ 'what-to-do'}} button.wide.js-unassign-member {{_ 'unassign-member'}} button.wide.js-assign-member {{_ 'assign-member'}} + +template(name="moveSelectionPopup") + +boardLists + diff --git a/client/components/sidebar/sidebarFilters.js b/client/components/sidebar/sidebarFilters.js index 50e76200..ba4e4df9 100644 --- a/client/components/sidebar/sidebarFilters.js +++ b/client/components/sidebar/sidebarFilters.js @@ -93,6 +93,7 @@ BlazeComponent.extendComponent({ return popup.call(this.currentData(), evt); } }, + 'click .js-move-selection': Popup.open('moveSelection'), 'click .js-archive-selection'() { mutateSelectedCards('archive'); EscapeActions.executeUpTo('multiselection'); @@ -122,3 +123,10 @@ Template.disambiguateMultiMemberPopup.events({ Popup.close(); }, }); + +Template.moveSelectionPopup.events({ + 'click .js-select-list'() { + mutateSelectedCards('move', this._id); + EscapeActions.executeUpTo('multiselection'); + }, +}); diff --git a/i18n/en.i18n.json b/i18n/en.i18n.json index 67479c28..74c27843 100644 --- a/i18n/en.i18n.json +++ b/i18n/en.i18n.json @@ -92,16 +92,16 @@ "close": "Close", "close-board": "Close Board", "close-board-pop": "You will be able to restore the board by clicking the “Archives” button from the home header.", + "color-black": "black", + "color-blue": "blue", "color-green": "green", - "color-yellow": "yellow", + "color-lime": "lime", "color-orange": "orange", - "color-red": "red", + "color-pink": "pink", "color-purple": "purple", - "color-blue": "blue", + "color-red": "red", "color-sky": "sky", - "color-lime": "lime", - "color-pink": "pink", - "color-black": "black", + "color-yellow": "yellow", "comment": "Comment", "comment-placeholder": "Write a comment", "computer": "Computer", @@ -135,9 +135,9 @@ "email-invite-text": "Dear __user__,\n\n__inviter__ invites you to join board \"__board__\" for collaborations.\n\nPlease follow the link below:\n\n__url__\n\nThanks.\n", "email-resetPassword-subject": "Reset your password on __url__", "email-resetPassword-text": "Hello __user__,\n\nTo reset your password, simply click the link below.\n\n__url__\n\nThanks.\n", + "email-sent": "Email sent", "email-verifyEmail-subject": "Verify your email address on __url__", "email-verifyEmail-text": "Hello __user__,\n\nTo verify your account email, simply click the link below.\n\n__url__\n\nThanks.\n", - "email-sent": "Email sent", "error-board-doesNotExist": "This board does not exist", "error-board-notAdmin": "You need to be admin of this board to do that", "error-board-notAMember": "You need to be a member of this board to do that", @@ -187,12 +187,14 @@ "lists": "Lists", "log-out": "Log Out", "loginPopup-title": "Log In", - "mapMembersPopup-title": "Map members", "mapMembersAddPopup-title": "Select Wekan member", + "mapMembersPopup-title": "Map members", "memberMenuPopup-title": "Member Settings", "members": "Members", "menu": "Menu", + "move-selection": "Move selection", "moveCardPopup-title": "Move Card", + "moveSelectionPopup-title": "Move selection", "multi-selection": "Multi-Selection", "multi-selection-on": "Multi-Selection is on", "my-boards": "My Boards", @@ -211,8 +213,8 @@ "password": "Password", "paste-or-dragdrop": "to paste, or drag & drop image file to it (image only)", "preview": "Preview", - "previewClipboardImagePopup-title": "Preview", "previewAttachedImagePopup-title": "Preview", + "previewClipboardImagePopup-title": "Preview", "private": "Private", "private-desc": "This board is private. Only people added to the board can view and edit it.", "profile": "Profile", -- cgit v1.2.3-1-g7c22