diff options
| author | Unknown <unknown@example.com> | 2020-07-21 16:11:51 +0200 |
|---|---|---|
| committer | Unknown <unknown@example.com> | 2020-07-21 16:11:51 +0200 |
| commit | ca8f2a70a4469c961e39354b14d41841a19ad6d7 (patch) | |
| tree | a24489d015d1860fa5b6c757706d0b3aecff26f7 /client/components/boards | |
| parent | 232bc746f4b2d09945fdfe68e3aa14ff6f4e79f6 (diff) | |
| parent | f6e9f5a5e8423fed9eaadaf196b46273eca241d0 (diff) | |
| download | wekan-ca8f2a70a4469c961e39354b14d41841a19ad6d7.tar.gz wekan-ca8f2a70a4469c961e39354b14d41841a19ad6d7.tar.bz2 wekan-ca8f2a70a4469c961e39354b14d41841a19ad6d7.zip | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'client/components/boards')
| -rw-r--r-- | client/components/boards/boardHeader.jade | 20 | ||||
| -rw-r--r-- | client/components/boards/boardsList.js | 6 |
2 files changed, 10 insertions, 16 deletions
diff --git a/client/components/boards/boardHeader.jade b/client/components/boards/boardHeader.jade index 4c0edac4..1daf0618 100644 --- a/client/components/boards/boardHeader.jade +++ b/client/components/boards/boardHeader.jade @@ -99,13 +99,13 @@ template(name="boardHeaderBar") a.board-header-btn.js-toggle-board-view( title="{{_ 'board-view'}}") i.fa.fa-caret-down - if $eq boardView 'board-view-lists' - i.fa.fa-trello if $eq boardView 'board-view-swimlanes' i.fa.fa-th-large + if $eq boardView 'board-view-lists' + i.fa.fa-trello if $eq boardView 'board-view-cal' i.fa.fa-calendar - span {{#if boardView}}{{_ boardView}}{{else}}{{_ 'board-view-lists'}}{{/if}} + span {{#if boardView}}{{_ boardView}}{{else}}{{_ 'board-view-swimlanes'}}{{/if}} if canModifyBoard a.board-header-btn.js-multiselection-activate( @@ -173,13 +173,6 @@ template(name="boardChangeWatchPopup") template(name="boardChangeViewPopup") ul.pop-over-list li - with "board-view-lists" - a.js-open-lists-view - i.fa.fa-trello.colorful - | {{_ 'board-view-lists'}} - if $eq Utils.boardView "board-view-lists" - i.fa.fa-check - li with "board-view-swimlanes" a.js-open-swimlanes-view i.fa.fa-th-large.colorful @@ -187,6 +180,13 @@ template(name="boardChangeViewPopup") if $eq Utils.boardView "board-view-swimlanes" i.fa.fa-check li + with "board-view-lists" + a.js-open-lists-view + i.fa.fa-trello.colorful + | {{_ 'board-view-lists'}} + if $eq Utils.boardView "board-view-lists" + i.fa.fa-check + li with "board-view-cal" a.js-open-cal-view i.fa.fa-calendar.colorful diff --git a/client/components/boards/boardsList.js b/client/components/boards/boardsList.js index eee119ea..145f6789 100644 --- a/client/components/boards/boardsList.js +++ b/client/components/boards/boardsList.js @@ -25,10 +25,6 @@ BlazeComponent.extendComponent({ }, onRendered() { - function userIsAllowedToMove() { - return Meteor.user(); - } - const itemsSelector = '.js-board:not(.placeholder)'; const $boards = this.$('.js-boards'); @@ -77,8 +73,6 @@ BlazeComponent.extendComponent({ handle: '.board-handle', }); } - - $boards.sortable('option', 'disabled', !userIsAllowedToMove()); }); }, |