From 05e0fb8fbe0676babdc07e2c13a3290edad66783 Mon Sep 17 00:00:00 2001 From: Benjamin Tissoires Date: Thu, 26 Jul 2018 08:53:38 +0200 Subject: [PATCH 1/2] UI: list headers: show the card count smaller The card count was at the same level than the title, which made reading the list title harder. Use the quiet and small class to put it in the following line and not make it jump out of the screen --- client/components/lists/listHeader.jade | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/client/components/lists/listHeader.jade b/client/components/lists/listHeader.jade index 617714491..45c07cb50 100644 --- a/client/components/lists/listHeader.jade +++ b/client/components/lists/listHeader.jade @@ -15,9 +15,8 @@ template(name="listHeader") |/#{wipLimit.value}) if showCardsCountForList cards.count - = cards.count - span - | {{_ 'cards-count'}} + |  + p.quiet.small {{cards.count}} {{_ 'cards-count'}} if isMiniScreen if currentList if isWatching From e57269ed57d5870083da91bdfde69f7ebe6bd139 Mon Sep 17 00:00:00 2001 From: Benjamin Tissoires Date: Thu, 26 Jul 2018 15:50:51 +0200 Subject: [PATCH 2/2] UI: lists: only output the number of cards for each swimlane --- client/components/lists/listHeader.jade | 2 +- client/components/lists/listHeader.js | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/client/components/lists/listHeader.jade b/client/components/lists/listHeader.jade index 45c07cb50..25ab8c20b 100644 --- a/client/components/lists/listHeader.jade +++ b/client/components/lists/listHeader.jade @@ -16,7 +16,7 @@ template(name="listHeader") if showCardsCountForList cards.count |  - p.quiet.small {{cards.count}} {{_ 'cards-count'}} + p.quiet.small {{cardsCount}} {{_ 'cards-count'}} if isMiniScreen if currentList if isWatching diff --git a/client/components/lists/listHeader.js b/client/components/lists/listHeader.js index 4b6bf1965..abcc46397 100644 --- a/client/components/lists/listHeader.js +++ b/client/components/lists/listHeader.js @@ -22,6 +22,16 @@ BlazeComponent.extendComponent({ return Meteor.user().getLimitToShowCardsCount(); }, + cardsCount() { + const list = Template.currentData(); + let swimlaneId = ''; + const boardView = Meteor.user().profile.boardView; + if (boardView === 'board-view-swimlanes') + swimlaneId = this.parentComponent().parentComponent().data()._id; + + return list.cards(swimlaneId).count(); + }, + reachedWipLimit() { const list = Template.currentData(); return list.getWipLimit('enabled') && list.getWipLimit('value') <= list.cards().count();