diff options
author | Lauri Ojansivu <x@xet7.org> | 2016-11-29 04:05:29 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-11-29 04:05:29 +0200 |
commit | e41eeae09f533c63fbc04eb4e809d34b2c72fa82 (patch) | |
tree | 8a99f00b5c6c23422375a11328d1a8f899959514 /client | |
parent | 56139e33078d2fa137a809801d4631b525dbca49 (diff) | |
parent | 35778d26737c5ca1702c6c1f3ca1be0a90a9e8b8 (diff) | |
download | wekan-e41eeae09f533c63fbc04eb4e809d34b2c72fa82.tar.gz wekan-e41eeae09f533c63fbc04eb4e809d34b2c72fa82.tar.bz2 wekan-e41eeae09f533c63fbc04eb4e809d34b2c72fa82.zip |
Merge pull request #31 from mario-orlicky/show-cards-count
New option to set up minimum limit to show cards count for each list …
Diffstat (limited to 'client')
-rw-r--r-- | client/components/lists/listHeader.jade | 4 | ||||
-rw-r--r-- | client/components/lists/listHeader.js | 8 | ||||
-rw-r--r-- | client/components/main/layouts.styl | 5 | ||||
-rw-r--r-- | client/components/users/userHeader.jade | 5 | ||||
-rw-r--r-- | client/components/users/userHeader.js | 11 |
5 files changed, 33 insertions, 0 deletions
diff --git a/client/components/lists/listHeader.jade b/client/components/lists/listHeader.jade index f9fe065f..4171f824 100644 --- a/client/components/lists/listHeader.jade +++ b/client/components/lists/listHeader.jade @@ -6,6 +6,10 @@ template(name="listHeader") h2.list-header-name( class="{{#if currentUser.isBoardMember}}js-open-inlined-form is-editable{{/if}}") = title + if showCardsCountForList cards.count + = cards.count + span.lowercase + | {{_ 'cards'}} if currentUser.isBoardMember if isWatching i.list-header-watch-icon.fa.fa-eye diff --git a/client/components/lists/listHeader.js b/client/components/lists/listHeader.js index c7ae8e62..4d468f21 100644 --- a/client/components/lists/listHeader.js +++ b/client/components/lists/listHeader.js @@ -13,6 +13,14 @@ BlazeComponent.extendComponent({ return list.findWatcher(Meteor.userId()); }, + limitToShowCardsCount() { + return Meteor.user().getLimitToShowCardsCount(); + }, + + showCardsCountForList(count) { + return count > this.limitToShowCardsCount(); + }, + events() { return [{ 'click .js-open-list-menu': Popup.open('listAction'), diff --git a/client/components/main/layouts.styl b/client/components/main/layouts.styl index 83d4d693..38fd83ec 100644 --- a/client/components/main/layouts.styl +++ b/client/components/main/layouts.styl @@ -374,3 +374,8 @@ a .wrapper height: 100% margin: 0px + +.inline-input + height: 37px + margin: 8px 10px 0 0 + width: 50px diff --git a/client/components/users/userHeader.jade b/client/components/users/userHeader.jade index f7f6222a..ad41e8aa 100644 --- a/client/components/users/userHeader.jade +++ b/client/components/users/userHeader.jade @@ -72,3 +72,8 @@ template(name="changeSettingsPopup") | {{_ 'hide-system-messages'}} if hiddenSystemMessages i.fa.fa-check + li + label.bold + | {{_ 'show-cards-minimum-count'}} + input#show-cards-count-at.inline-input.left(type="number" value="#{showCardsCountAt}" min="1" max="99" onkeydown="return false") + input.js-apply-show-cards-at.left(type="submit" value="{{_ 'apply'}}") diff --git a/client/components/users/userHeader.js b/client/components/users/userHeader.js index 1c390395..98053ed1 100644 --- a/client/components/users/userHeader.js +++ b/client/components/users/userHeader.js @@ -95,10 +95,21 @@ Template.changeSettingsPopup.helpers({ hiddenSystemMessages() { return Meteor.user().hasHiddenSystemMessages(); }, + showCardsCountAt() { + return Meteor.user().getLimitToShowCardsCount(); + }, }); Template.changeSettingsPopup.events({ 'click .js-toggle-system-messages'() { Meteor.call('toggleSystemMessages'); }, + 'click .js-apply-show-cards-at'(evt, tpl) { + evt.preventDefault(); + const minLimit = parseInt(tpl.$('#show-cards-count-at').val(), 10); + if (!isNaN(minLimit)) { + Meteor.call('changeLimitToShowCardsCount', minLimit); + Popup.back(); + } + }, }); |