From 0b00a8095ce34c753e5edac86d4b62e8aaa1b1e0 Mon Sep 17 00:00:00 2001 From: dollybean Date: Tue, 4 Feb 2020 02:28:45 -0800 Subject: Customize of some card's functions --- client/components/boards/boardHeader.js | 1 + 1 file changed, 1 insertion(+) (limited to 'client/components/boards') diff --git a/client/components/boards/boardHeader.js b/client/components/boards/boardHeader.js index eea43bd3..8dea0f85 100644 --- a/client/components/boards/boardHeader.js +++ b/client/components/boards/boardHeader.js @@ -30,6 +30,7 @@ Template.boardMenuPopup.events({ 'click .js-outgoing-webhooks': Popup.open('outgoingWebhooks'), 'click .js-import-board': Popup.open('chooseBoardSource'), 'click .js-subtask-settings': Popup.open('boardSubtaskSettings'), + 'click .js-Date-settings': Popup.open('boardDateSettings') }); Template.boardMenuPopup.helpers({ -- cgit v1.2.3-1-g7c22 From 13506945388be72b65df630eb71aee9b026c1472 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Wed, 5 Feb 2020 01:18:01 +0200 Subject: Add Board Card Settings to Show on Card only some of it's fields. Default WYSIWYG comment editor not enabled, use markdown instead. --- client/components/boards/boardHeader.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'client/components/boards') diff --git a/client/components/boards/boardHeader.js b/client/components/boards/boardHeader.js index 8ab117f6..9040ed83 100644 --- a/client/components/boards/boardHeader.js +++ b/client/components/boards/boardHeader.js @@ -30,7 +30,7 @@ Template.boardMenuPopup.events({ 'click .js-outgoing-webhooks': Popup.open('outgoingWebhooks'), 'click .js-import-board': Popup.open('chooseBoardSource'), 'click .js-subtask-settings': Popup.open('boardSubtaskSettings'), - 'click .js-card-settings': Popup.open('boardCardSettings') + 'click .js-card-settings': Popup.open('boardCardSettings'), }); Template.boardMenuPopup.helpers({ -- cgit v1.2.3-1-g7c22 From bf78b093bad7d463ee325ad96e8b485264d4a3be Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Fri, 7 Feb 2020 03:16:16 +0200 Subject: Try to disable dragging Swimlanes/Lists/Cards/Checklists/Subtasks on small mobile smartphones webbrowsers, and hide drag handles on mobile web. Thanks to xet7 ! --- client/components/boards/boardBody.js | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'client/components/boards') diff --git a/client/components/boards/boardBody.js b/client/components/boards/boardBody.js index 55b8c0a1..e70a9f67 100644 --- a/client/components/boards/boardBody.js +++ b/client/components/boards/boardBody.js @@ -205,21 +205,19 @@ BlazeComponent.extendComponent({ } else { showDesktopDragHandles = false; } - if ( - Utils.isMiniScreen() || - (!Utils.isMiniScreen() && showDesktopDragHandles) - ) { + if (!Utils.isMiniScreen() && showDesktopDragHandles) { $swimlanesDom.sortable({ handle: '.js-swimlane-header-handle', }); - } else { + } else if (!Utils.isMiniScreen() && !showDesktopDragHandles) { $swimlanesDom.sortable({ handle: '.swimlane-header', }); } - // Disable drag-dropping if the current user is not a board member or is comment only + // Disable drag-dropping if the current user is not a board member or is miniscreen $swimlanesDom.sortable('option', 'disabled', !userIsMember()); + $swimlanesDom.sortable('option', 'disabled', Utils.isMiniScreen()); }); function userIsMember() { -- cgit v1.2.3-1-g7c22 From e7d23435934e044c90a1818f84798cb79194169c Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Tue, 31 Mar 2020 23:32:32 +0300 Subject: Move "Rules" from "Board View" to "Board Settings". Thanks to helioguardabaxo and xet7 ! Closes #2973 --- client/components/boards/boardHeader.jade | 14 -------------- client/components/boards/boardHeader.js | 4 ---- 2 files changed, 18 deletions(-) (limited to 'client/components/boards') diff --git a/client/components/boards/boardHeader.jade b/client/components/boards/boardHeader.jade index 53a74f76..4c0edac4 100644 --- a/client/components/boards/boardHeader.jade +++ b/client/components/boards/boardHeader.jade @@ -193,20 +193,6 @@ template(name="boardChangeViewPopup") | {{_ 'board-view-cal'}} if $eq Utils.boardView "board-view-cal" i.fa.fa-check - if currentUser.isAdmin - hr - li - with "board-view-rules" - a.js-open-rules-view(title="{{_ 'rules'}}") - i.fa.fa-magic - | {{_ 'rules'}} - else if currentUser.isBoardAdmin - hr - li - with "board-view-rules" - a.js-open-rules-view(title="{{_ 'rules'}}") - i.fa.fa-magic - | {{_ 'rules'}} template(name="createBoard") form diff --git a/client/components/boards/boardHeader.js b/client/components/boards/boardHeader.js index 9040ed83..dc553134 100644 --- a/client/components/boards/boardHeader.js +++ b/client/components/boards/boardHeader.js @@ -191,10 +191,6 @@ Template.boardChangeViewPopup.events({ Utils.setBoardView('board-view-cal'); Popup.close(); }, - 'click .js-open-rules-view'() { - Modal.openWide('rulesMain'); - Popup.close(); - }, }); const CreateBoard = BlazeComponent.extendComponent({ -- cgit v1.2.3-1-g7c22 From f09219cbfd620e04fd48539bd11eced20c81137b Mon Sep 17 00:00:00 2001 From: Nico Date: Thu, 9 Apr 2020 01:55:01 +0200 Subject: Remove export button if WITH_API is not enabled #2938 https://github.com/wekan/wekan/issues/2938#issuecomment-589782402 --- client/components/boards/boardHeader.js | 16 ---------------- 1 file changed, 16 deletions(-) (limited to 'client/components/boards') diff --git a/client/components/boards/boardHeader.js b/client/components/boards/boardHeader.js index dc553134..be0146ec 100644 --- a/client/components/boards/boardHeader.js +++ b/client/components/boards/boardHeader.js @@ -33,22 +33,6 @@ Template.boardMenuPopup.events({ 'click .js-card-settings': Popup.open('boardCardSettings'), }); -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(event, templateInstance) { const newTitle = templateInstance -- cgit v1.2.3-1-g7c22 From edf52bc4382823ed8768251954371094a849213e Mon Sep 17 00:00:00 2001 From: Nico Date: Sun, 12 Apr 2020 00:56:35 +0200 Subject: Public boards overview --- client/components/boards/boardsList.jade | 2 +- client/components/boards/boardsList.js | 18 +++++++++++++----- 2 files changed, 14 insertions(+), 6 deletions(-) (limited to 'client/components/boards') diff --git a/client/components/boards/boardsList.jade b/client/components/boards/boardsList.jade index 79bae502..f1118aa8 100644 --- a/client/components/boards/boardsList.jade +++ b/client/components/boards/boardsList.jade @@ -55,7 +55,7 @@ template(name="boardList") title="{{_ 'archive-board'}}") template(name="boardListHeaderBar") - h1 {{_ 'my-boards'}} + h1 {{_ title }} .board-header-btns.right a.board-header-btn.js-open-archived-board i.fa.fa-archive diff --git a/client/components/boards/boardsList.js b/client/components/boards/boardsList.js index 3918af82..0ff1c4fb 100644 --- a/client/components/boards/boardsList.js +++ b/client/components/boards/boardsList.js @@ -7,6 +7,9 @@ Template.boardListHeaderBar.events({ }); Template.boardListHeaderBar.helpers({ + title(){ + return FlowRouter.getRouteName() == 'home' ? 'my-boards' :'public'; + }, templatesBoardId() { return Meteor.user() && Meteor.user().getTemplatesBoardId(); }, @@ -21,12 +24,17 @@ BlazeComponent.extendComponent({ }, boards() { + let query = { + archived: false, + type: 'board', + } + if (FlowRouter.getRouteName() == 'home') + query['members.userId'] = Meteor.userId() + else + query.permission = 'public' + return Boards.find( - { - archived: false, - 'members.userId': Meteor.userId(), - type: 'board', - }, + query, { sort: ['title'] }, ); }, -- cgit v1.2.3-1-g7c22 From 35ae07e2a65c5ab5ba6784cdb67631918a41ccc3 Mon Sep 17 00:00:00 2001 From: salleman Date: Mon, 13 Apr 2020 15:46:29 +0200 Subject: debug isBoardAdmin on main page --- client/components/boards/boardsList.jade | 2 +- client/components/boards/boardsList.js | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'client/components/boards') diff --git a/client/components/boards/boardsList.jade b/client/components/boards/boardsList.jade index f1118aa8..46086693 100644 --- a/client/components/boards/boardsList.jade +++ b/client/components/boards/boardsList.jade @@ -39,7 +39,7 @@ template(name="boardList") i.fa.js-archive-board( class="fa-archive" title="{{_ 'archive-board'}}") - else if currentUser.isBoardAdmin + else if isAdministrable i.fa.js-clone-board( class="fa-clone" title="{{_ 'duplicate-board'}}") diff --git a/client/components/boards/boardsList.js b/client/components/boards/boardsList.js index 0ff1c4fb..65bed16a 100644 --- a/client/components/boards/boardsList.js +++ b/client/components/boards/boardsList.js @@ -42,6 +42,10 @@ BlazeComponent.extendComponent({ const user = Meteor.user(); return user && user.hasStarred(this.currentData()._id); }, + isAdministrable() { + const user = Meteor.user(); + return user && user.isBoardAdmin(this.currentData()._id); + }, hasOvertimeCards() { subManager.subscribe('board', this.currentData()._id, false); -- cgit v1.2.3-1-g7c22 From 10fcc19b7f9307e71f01b6abca055806d69f7d4e Mon Sep 17 00:00:00 2001 From: boeserwolf Date: Sun, 19 Apr 2020 12:30:21 +0300 Subject: Add sortDefault helper for sorting boards --- client/components/boards/boardArchive.js | 2 +- client/components/boards/boardsList.js | 16 ++++++---------- 2 files changed, 7 insertions(+), 11 deletions(-) (limited to 'client/components/boards') diff --git a/client/components/boards/boardArchive.js b/client/components/boards/boardArchive.js index d3e65bd8..9f4d60a1 100644 --- a/client/components/boards/boardArchive.js +++ b/client/components/boards/boardArchive.js @@ -7,7 +7,7 @@ BlazeComponent.extendComponent({ return Boards.find( { archived: true }, { - sort: ['title'], + sort: { sort: 1 /* boards default sorting */ } }, ); }, diff --git a/client/components/boards/boardsList.js b/client/components/boards/boardsList.js index 65bed16a..aabc98e8 100644 --- a/client/components/boards/boardsList.js +++ b/client/components/boards/boardsList.js @@ -7,8 +7,8 @@ Template.boardListHeaderBar.events({ }); Template.boardListHeaderBar.helpers({ - title(){ - return FlowRouter.getRouteName() == 'home' ? 'my-boards' :'public'; + title() { + return FlowRouter.getRouteName() == 'home' ? 'my-boards' : 'public'; }, templatesBoardId() { return Meteor.user() && Meteor.user().getTemplatesBoardId(); @@ -27,16 +27,12 @@ BlazeComponent.extendComponent({ let query = { archived: false, type: 'board', - } + }; if (FlowRouter.getRouteName() == 'home') - query['members.userId'] = Meteor.userId() - else - query.permission = 'public' + query['members.userId'] = Meteor.userId(); + else query.permission = 'public'; - return Boards.find( - query, - { sort: ['title'] }, - ); + return Boards.find(query, { sort: { sort: 1 /* boards default sorting */ } }); }, isStarred() { const user = Meteor.user(); -- cgit v1.2.3-1-g7c22 From ef5f38f431dbedbecc81135702764cdc08797177 Mon Sep 17 00:00:00 2001 From: boeserwolf Date: Sun, 19 Apr 2020 12:45:04 +0300 Subject: Make boards sortable --- client/components/boards/boardsList.jade | 4 +-- client/components/boards/boardsList.js | 54 ++++++++++++++++++++++++++++++++ client/components/boards/boardsList.styl | 15 ++++++++- 3 files changed, 70 insertions(+), 3 deletions(-) (limited to 'client/components/boards') diff --git a/client/components/boards/boardsList.jade b/client/components/boards/boardsList.jade index 46086693..bbce1d6f 100644 --- a/client/components/boards/boardsList.jade +++ b/client/components/boards/boardsList.jade @@ -1,10 +1,10 @@ template(name="boardList") .wrapper - ul.board-list.clearfix + ul.board-list.clearfix.js-boards li.js-add-board a.board-list-item.label {{_ 'add-board'}} each boards - li(class="{{#if isStarred}}starred{{/if}}" class=colorClass) + li(class="{{#if isStarred}}starred{{/if}}" class=colorClass).js-board if isInvited .board-list-item span.details diff --git a/client/components/boards/boardsList.js b/client/components/boards/boardsList.js index aabc98e8..d2d44407 100644 --- a/client/components/boards/boardsList.js +++ b/client/components/boards/boardsList.js @@ -1,4 +1,5 @@ const subManager = new SubsManager(); +const { calculateIndex, enableClickOnTouch } = Utils; Template.boardListHeaderBar.events({ 'click .js-open-archived-board'() { @@ -23,6 +24,59 @@ BlazeComponent.extendComponent({ Meteor.subscribe('setting'); }, + onRendered() { + const self = this; + function userIsAllowedToMove() { + return Meteor.user(); + } + + const itemsSelector = '.js-board:not(.placeholder)'; + + const $boards = this.$('.js-boards'); + $boards.sortable({ + connectWith: '.js-boards', + tolerance: 'pointer', + appendTo: '.board-list', + helper: 'clone', + distance: 7, + items: itemsSelector, + placeholder: 'board-wrapper placeholder', + start(evt, ui) { + ui.helper.css('z-index', 1000); + ui.placeholder.height(ui.helper.height()); + EscapeActions.executeUpTo('popup-close'); + }, + stop(evt, ui) { + // To attribute the new index number, we need to get the DOM element + // of the previous and the following card -- if any. + const prevCardDom = ui.item.prev('.js-board').get(0); + const nextCardDom = ui.item.next('.js-board').get(0); + const sortIndex = calculateIndex(prevCardDom, nextCardDom, 1); + + const boardDomElement = ui.item.get(0); + const board = Blaze.getData(boardDomElement); + // Normally the jquery-ui sortable library moves the dragged DOM element + // to its new position, which disrupts Blaze reactive updates mechanism + // (especially when we move the last card of a list, or when multiple + // users move some cards at the same time). To prevent these UX glitches + // we ask sortable to gracefully cancel the move, and to put back the + // DOM in its initial state. The card move is then handled reactively by + // Blaze with the below query. + $boards.sortable('cancel'); + + board.move(sortIndex.base); + }, + }); + + // ugly touch event hotfix + enableClickOnTouch(itemsSelector); + + // Disable drag-dropping if the current user is not a board member or is comment only + this.autorun(() => { + $boards.sortable('option', 'disabled', !userIsAllowedToMove()); + }); + }, + boards() { let query = { archived: false, diff --git a/client/components/boards/boardsList.styl b/client/components/boards/boardsList.styl index ae366e83..d12a0337 100644 --- a/client/components/boards/boardsList.styl +++ b/client/components/boards/boardsList.styl @@ -11,6 +11,19 @@ $spaceBetweenTiles = 16px box-sizing: border-box position: relative + &.placeholder:after + content: ''; + display: block; + background: darken(white, 20%) + border-radius: 3px; + height: 106px; + margin: 8px; + + &.ui-sortable-helper + cursor: grabbing + transform: rotate(4deg) + display: block !important + &.starred .fa-star, .fa-star-o @@ -183,7 +196,7 @@ $spaceBetweenTiles = 16px overflow: scroll li - width: 50% + width: 50% .board-list-item overflow: hidden -- cgit v1.2.3-1-g7c22 From 1a065ff351b5c37536d73cc3d46b736fe310e32c Mon Sep 17 00:00:00 2001 From: boeserwolf Date: Sun, 19 Apr 2020 15:52:43 +0300 Subject: Refactor variable names --- client/components/boards/boardsList.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'client/components/boards') diff --git a/client/components/boards/boardsList.js b/client/components/boards/boardsList.js index d2d44407..c700084f 100644 --- a/client/components/boards/boardsList.js +++ b/client/components/boards/boardsList.js @@ -49,9 +49,9 @@ BlazeComponent.extendComponent({ stop(evt, ui) { // To attribute the new index number, we need to get the DOM element // of the previous and the following card -- if any. - const prevCardDom = ui.item.prev('.js-board').get(0); - const nextCardDom = ui.item.next('.js-board').get(0); - const sortIndex = calculateIndex(prevCardDom, nextCardDom, 1); + const prevBoardDom = ui.item.prev('.js-board').get(0); + const nextBoardBom = ui.item.next('.js-board').get(0); + const sortIndex = calculateIndex(prevBoardDom, nextBoardBom, 1); const boardDomElement = ui.item.get(0); const board = Blaze.getData(boardDomElement); -- cgit v1.2.3-1-g7c22 From b2acc3ba45c48d3bb3b25e84bc31f5b80e7961d4 Mon Sep 17 00:00:00 2001 From: Marc Hartmayer Date: Tue, 21 Apr 2020 17:06:39 +0200 Subject: Multiple lint issue fixes Found by using the command `meteor npm run lint:eslint:fix`. --- client/components/boards/boardsList.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'client/components/boards') diff --git a/client/components/boards/boardsList.js b/client/components/boards/boardsList.js index c700084f..847ea395 100644 --- a/client/components/boards/boardsList.js +++ b/client/components/boards/boardsList.js @@ -9,7 +9,7 @@ Template.boardListHeaderBar.events({ Template.boardListHeaderBar.helpers({ title() { - return FlowRouter.getRouteName() == 'home' ? 'my-boards' : 'public'; + return FlowRouter.getRouteName() === 'home' ? 'my-boards' : 'public'; }, templatesBoardId() { return Meteor.user() && Meteor.user().getTemplatesBoardId(); @@ -82,7 +82,7 @@ BlazeComponent.extendComponent({ archived: false, type: 'board', }; - if (FlowRouter.getRouteName() == 'home') + if (FlowRouter.getRouteName() === 'home') query['members.userId'] = Meteor.userId(); else query.permission = 'public'; -- cgit v1.2.3-1-g7c22 From 9e95c06415e614e587d684ff9660cc53c5f8c8d3 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Wed, 22 Apr 2020 21:00:31 +0300 Subject: Fix lint errors in lint error fix. Thanks to xet7 ! --- client/components/boards/boardArchive.js | 2 +- client/components/boards/boardsList.js | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'client/components/boards') diff --git a/client/components/boards/boardArchive.js b/client/components/boards/boardArchive.js index 9f4d60a1..5a5cf772 100644 --- a/client/components/boards/boardArchive.js +++ b/client/components/boards/boardArchive.js @@ -7,7 +7,7 @@ BlazeComponent.extendComponent({ return Boards.find( { archived: true }, { - sort: { sort: 1 /* boards default sorting */ } + sort: { sort: 1 /* boards default sorting */ }, }, ); }, diff --git a/client/components/boards/boardsList.js b/client/components/boards/boardsList.js index 847ea395..9208fdb2 100644 --- a/client/components/boards/boardsList.js +++ b/client/components/boards/boardsList.js @@ -86,7 +86,9 @@ BlazeComponent.extendComponent({ query['members.userId'] = Meteor.userId(); else query.permission = 'public'; - return Boards.find(query, { sort: { sort: 1 /* boards default sorting */ } }); + return Boards.find(query, { + sort: { sort: 1 /* boards default sorting */ }, + }); }, isStarred() { const user = Meteor.user(); -- cgit v1.2.3-1-g7c22 From 6476503137fc41cf52e913aa33aed6bb1abaac6a Mon Sep 17 00:00:00 2001 From: Marc Hartmayer Date: Thu, 23 Apr 2020 02:09:01 +0200 Subject: Fix drag-and-drop and scrolling on mobile devices Use drag handles on "miniscreens" whenever useful, this is especially useful on mobile device. This should hopefully fix https://github.com/wekan/wekan/issues/2947. While at it, simplify the condition Utils.isMiniScreen() || (!Utils.isMiniScreen() && showDesktopDragHandles) to Utils.isMiniScreen() || showDesktopDragHandle --- client/components/boards/boardBody.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'client/components/boards') diff --git a/client/components/boards/boardBody.js b/client/components/boards/boardBody.js index e70a9f67..29922fcc 100644 --- a/client/components/boards/boardBody.js +++ b/client/components/boards/boardBody.js @@ -205,7 +205,7 @@ BlazeComponent.extendComponent({ } else { showDesktopDragHandles = false; } - if (!Utils.isMiniScreen() && showDesktopDragHandles) { + if (Utils.isMiniScreen() || showDesktopDragHandles) { $swimlanesDom.sortable({ handle: '.js-swimlane-header-handle', }); @@ -215,9 +215,8 @@ BlazeComponent.extendComponent({ }); } - // Disable drag-dropping if the current user is not a board member or is miniscreen + // Disable drag-dropping if the current user is not a board member $swimlanesDom.sortable('option', 'disabled', !userIsMember()); - $swimlanesDom.sortable('option', 'disabled', Utils.isMiniScreen()); }); function userIsMember() { -- cgit v1.2.3-1-g7c22 From f1b18d79cdbfd9c9edecf4f93a89e88ee1c6faea Mon Sep 17 00:00:00 2001 From: Marc Hartmayer Date: Fri, 24 Apr 2020 22:41:24 +0200 Subject: Don't interpret dragging an element as a click Remove `enableClickOnTouch` as this behavior is not intuitive. --- client/components/boards/boardBody.js | 5 +---- client/components/boards/boardsList.js | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) (limited to 'client/components/boards') diff --git a/client/components/boards/boardBody.js b/client/components/boards/boardBody.js index 29922fcc..4e473f18 100644 --- a/client/components/boards/boardBody.js +++ b/client/components/boards/boardBody.js @@ -1,7 +1,7 @@ import { Cookies } from 'meteor/ostrio:cookies'; const cookies = new Cookies(); const subManager = new SubsManager(); -const { calculateIndex, enableClickOnTouch } = Utils; +const { calculateIndex } = Utils; const swimlaneWhileSortingHeight = 150; BlazeComponent.extendComponent({ @@ -191,9 +191,6 @@ BlazeComponent.extendComponent({ }, }); - // ugly touch event hotfix - enableClickOnTouch('.js-swimlane:not(.placeholder)'); - this.autorun(() => { let showDesktopDragHandles = false; currentUser = Meteor.user(); diff --git a/client/components/boards/boardsList.js b/client/components/boards/boardsList.js index 9208fdb2..df319ce0 100644 --- a/client/components/boards/boardsList.js +++ b/client/components/boards/boardsList.js @@ -1,5 +1,5 @@ const subManager = new SubsManager(); -const { calculateIndex, enableClickOnTouch } = Utils; +const { calculateIndex } = Utils; Template.boardListHeaderBar.events({ 'click .js-open-archived-board'() { @@ -68,9 +68,6 @@ BlazeComponent.extendComponent({ }, }); - // ugly touch event hotfix - enableClickOnTouch(itemsSelector); - // Disable drag-dropping if the current user is not a board member or is comment only this.autorun(() => { $boards.sortable('option', 'disabled', !userIsAllowedToMove()); -- cgit v1.2.3-1-g7c22 From e63e7b11318502e9f1238fcd7efff3c30590b29c Mon Sep 17 00:00:00 2001 From: Marc Hartmayer Date: Sat, 25 Apr 2020 13:25:21 +0200 Subject: Allow variable height for board list items This fixes https://github.com/wekan/wekan/issues/3041. --- client/components/boards/boardsList.styl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'client/components/boards') diff --git a/client/components/boards/boardsList.styl b/client/components/boards/boardsList.styl index d12a0337..347881d6 100644 --- a/client/components/boards/boardsList.styl +++ b/client/components/boards/boardsList.styl @@ -33,7 +33,7 @@ $spaceBetweenTiles = 16px overflow: hidden; background-color: #999 color: #f6f6f6 - height: 90px + height: auto font-size: 16px line-height: 22px border-radius: 3px -- cgit v1.2.3-1-g7c22 From ed0c64a270031448a9956b40084da6f075f8601a Mon Sep 17 00:00:00 2001 From: Marc Hartmayer Date: Sat, 25 Apr 2020 13:26:21 +0200 Subject: Allow words in title/description to be able to break and wrap onto the next line --- client/components/boards/boardsList.styl | 1 + 1 file changed, 1 insertion(+) (limited to 'client/components/boards') diff --git a/client/components/boards/boardsList.styl b/client/components/boards/boardsList.styl index 347881d6..d92c9cf3 100644 --- a/client/components/boards/boardsList.styl +++ b/client/components/boards/boardsList.styl @@ -44,6 +44,7 @@ $spaceBetweenTiles = 16px margin: ($spaceBetweenTiles/2) position: relative text-decoration: none + word-wrap: break-word &.tile background-size: auto -- cgit v1.2.3-1-g7c22 From eddcb2260bdfba62ecd3e8f8fe6da6e6927ccc47 Mon Sep 17 00:00:00 2001 From: Marc Hartmayer Date: Mon, 27 Apr 2020 01:15:10 +0200 Subject: Reactivate the touch event fix for the boards list This fixes https://github.com/wekan/wekan/issues/3049. --- client/components/boards/boardsList.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'client/components/boards') diff --git a/client/components/boards/boardsList.js b/client/components/boards/boardsList.js index df319ce0..9208fdb2 100644 --- a/client/components/boards/boardsList.js +++ b/client/components/boards/boardsList.js @@ -1,5 +1,5 @@ const subManager = new SubsManager(); -const { calculateIndex } = Utils; +const { calculateIndex, enableClickOnTouch } = Utils; Template.boardListHeaderBar.events({ 'click .js-open-archived-board'() { @@ -68,6 +68,9 @@ BlazeComponent.extendComponent({ }, }); + // ugly touch event hotfix + enableClickOnTouch(itemsSelector); + // Disable drag-dropping if the current user is not a board member or is comment only this.autorun(() => { $boards.sortable('option', 'disabled', !userIsAllowedToMove()); -- cgit v1.2.3-1-g7c22 From 6afc9259f084717a0cc3ce6d66979fd7c1471939 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Tue, 28 Apr 2020 15:14:10 +0300 Subject: Smaller height for Add Board button. Thanks to xet7 ! --- client/components/boards/boardsList.styl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'client/components/boards') diff --git a/client/components/boards/boardsList.styl b/client/components/boards/boardsList.styl index d92c9cf3..97d4f195 100644 --- a/client/components/boards/boardsList.styl +++ b/client/components/boards/boardsList.styl @@ -69,7 +69,7 @@ $spaceBetweenTiles = 16px .label font-weight: normal - line-height:90px + line-height: 56px :hover background-color:#939393 -- cgit v1.2.3-1-g7c22