diff options
author | Lauri Ojansivu <x@xet7.org> | 2019-03-04 12:10:11 +0200 |
---|---|---|
committer | Lauri Ojansivu <x@xet7.org> | 2019-03-04 12:10:11 +0200 |
commit | 6c0df108c7f4a4f1793d4d49a3b808a340d9ff48 (patch) | |
tree | 950d413360a24de568b3cd329806e01008f15c80 /client/components | |
parent | 5f3ffcb0eb0c844a34a285f82a6dc58379351e89 (diff) | |
parent | 9d6d5e1a14c2a3ef22d90eaccffd352d06253117 (diff) | |
download | wekan-6c0df108c7f4a4f1793d4d49a3b808a340d9ff48.tar.gz wekan-6c0df108c7f4a4f1793d4d49a3b808a340d9ff48.tar.bz2 wekan-6c0df108c7f4a4f1793d4d49a3b808a340d9ff48.zip |
Merge branch 'edge' into meteor-1.8
Diffstat (limited to 'client/components')
-rw-r--r-- | client/components/boards/boardHeader.jade | 30 | ||||
-rw-r--r-- | client/components/boards/boardHeader.js | 53 | ||||
-rw-r--r-- | client/components/sidebar/sidebar.jade | 30 |
3 files changed, 83 insertions, 30 deletions
diff --git a/client/components/boards/boardHeader.jade b/client/components/boards/boardHeader.jade index 78b05c84..823bd806 100644 --- a/client/components/boards/boardHeader.jade +++ b/client/components/boards/boardHeader.jade @@ -133,6 +133,36 @@ template(name="boardVisibilityList") i.fa.fa-check span.sub-name {{_ 'public-desc'}} +template(name="boardChangeVisibilityPopup") + +boardVisibilityList + +template(name="boardChangeWatchPopup") + ul.pop-over-list + li + with "watching" + a.js-select-watch + i.fa.fa-eye.colorful + | {{_ 'watching'}} + if watchCheck + i.fa.fa-check + span.sub-name {{_ 'watching-info'}} + li + with "tracking" + a.js-select-watch + i.fa.fa-bell.colorful + | {{_ 'tracking'}} + if watchCheck + i.fa.fa-check + span.sub-name {{_ 'tracking-info'}} + li + with "muted" + a.js-select-watch + i.fa.fa-bell-slash.colorful + | {{_ 'muted'}} + if watchCheck + i.fa.fa-check + span.sub-name {{_ 'muted-info'}} + template(name="createBoard") form label diff --git a/client/components/boards/boardHeader.js b/client/components/boards/boardHeader.js index 08fcd473..86fbebb3 100644 --- a/client/components/boards/boardHeader.js +++ b/client/components/boards/boardHeader.js @@ -1,3 +1,49 @@ +Template.boardMenuPopup.events({ + 'click .js-rename-board': Popup.open('boardChangeTitle'), + 'click .js-custom-fields'() { + Sidebar.setView('customFields'); + Popup.close(); + }, + 'click .js-open-archives'() { + Sidebar.setView('archives'); + Popup.close(); + }, + 'click .js-change-board-color': Popup.open('boardChangeColor'), + 'click .js-change-language': Popup.open('changeLanguage'), + 'click .js-archive-board ': Popup.afterConfirm('archiveBoard', function() { + const currentBoard = Boards.findOne(Session.get('currentBoard')); + currentBoard.archive(); + // XXX We should have some kind of notification on top of the page to + // confirm that the board was successfully archived. + FlowRouter.go('home'); + }), + 'click .js-delete-board': Popup.afterConfirm('deleteBoard', function() { + const currentBoard = Boards.findOne(Session.get('currentBoard')); + Popup.close(); + Boards.remove(currentBoard._id); + FlowRouter.go('home'); + }), + 'click .js-outgoing-webhooks': Popup.open('outgoingWebhooks'), + 'click .js-import-board': Popup.open('chooseBoardSource'), + 'click .js-subtask-settings': Popup.open('boardSubtaskSettings'), +}); + +Template.boardMenuPopup.helpers({ + exportUrl() { + const params = { + boardId: Session.get('currentBoard'), + }; + const queryParams = { + authToken: Accounts._storedLoginToken(), + }; + return FlowRouter.path('/api/boards/:boardId/export', params, queryParams); + }, + exportFilename() { + const boardId = Session.get('currentBoard'); + return `wekan-export-board-${boardId}.json`; + }, +}); + Template.boardChangeTitlePopup.events({ submit(evt, tpl) { const newTitle = tpl.$('.js-board-name').val().trim(); @@ -35,8 +81,12 @@ BlazeComponent.extendComponent({ 'click .js-star-board'() { Meteor.user().toggleBoardStar(Session.get('currentBoard')); }, + 'click .js-open-board-menu': Popup.open('boardMenu'), 'click .js-change-visibility': Popup.open('boardChangeVisibility'), 'click .js-watch-board': Popup.open('boardChangeWatch'), + 'click .js-open-archived-board'() { + Modal.open('archivedBoards'); + }, 'click .js-toggle-board-view'() { const currentUser = Meteor.user(); if (currentUser.profile.boardView === 'board-view-swimlanes') { @@ -136,6 +186,9 @@ const CreateBoard = BlazeComponent.extendComponent({ this.setVisibility(this.currentData()); }, 'click .js-change-visibility': this.toggleVisibilityMenu, + 'click .js-import': Popup.open('boardImportBoard'), + submit: this.onSubmit, + 'click .js-import-board': Popup.open('chooseBoardSource'), 'click .js-board-template': Popup.open('searchElement'), }]; }, diff --git a/client/components/sidebar/sidebar.jade b/client/components/sidebar/sidebar.jade index a7881656..4e4d355c 100644 --- a/client/components/sidebar/sidebar.jade +++ b/client/components/sidebar/sidebar.jade @@ -56,36 +56,6 @@ template(name="membersWidget") button.js-member-invite-accept.primary {{_ 'accept'}} button.js-member-invite-decline {{_ 'decline'}} -template(name="boardChangeVisibilityPopup") - +boardVisibilityList - -template(name="boardChangeWatchPopup") - ul.pop-over-list - li - with "watching" - a.js-select-watch - i.fa.fa-eye.colorful - | {{_ 'watching'}} - if watchCheck - i.fa.fa-check - span.sub-name {{_ 'watching-info'}} - li - with "tracking" - a.js-select-watch - i.fa.fa-bell.colorful - | {{_ 'tracking'}} - if watchCheck - i.fa.fa-check - span.sub-name {{_ 'tracking-info'}} - li - with "muted" - a.js-select-watch - i.fa.fa-bell-slash.colorful - | {{_ 'muted'}} - if watchCheck - i.fa.fa-check - span.sub-name {{_ 'muted-info'}} - template(name="boardChangeColorPopup") .board-backgrounds-list.clearfix each backgroundColors |