diff options
author | Lauri Ojansivu <x@xet7.org> | 2017-11-21 12:42:08 +0200 |
---|---|---|
committer | Lauri Ojansivu <x@xet7.org> | 2017-11-21 12:42:08 +0200 |
commit | dc9ac5b58a0b41f3a424b267308eb925f01d6f48 (patch) | |
tree | 4bb8ab549e39cbd8218ed714b07fc265600ae600 /client/components/boards | |
parent | ee69eb03d4a72e8c67c377d8da3b169660cac67b (diff) | |
parent | f31d007177d5ab52e2a5ffaae70fdb73159dd695 (diff) | |
download | wekan-dc9ac5b58a0b41f3a424b267308eb925f01d6f48.tar.gz wekan-dc9ac5b58a0b41f3a424b267308eb925f01d6f48.tar.bz2 wekan-dc9ac5b58a0b41f3a424b267308eb925f01d6f48.zip |
Merge branch 'devel'
Diffstat (limited to 'client/components/boards')
-rw-r--r-- | client/components/boards/boardsList.jade | 6 | ||||
-rw-r--r-- | client/components/boards/boardsList.js | 12 | ||||
-rw-r--r-- | client/components/boards/boardsList.styl | 18 |
3 files changed, 36 insertions, 0 deletions
diff --git a/client/components/boards/boardsList.jade b/client/components/boards/boardsList.jade index ae82dfa9..95ce3678 100644 --- a/client/components/boards/boardsList.jade +++ b/client/components/boards/boardsList.jade @@ -20,6 +20,12 @@ template(name="boardList") i.fa.js-star-board( class="fa-star{{#if isStarred}} is-star-active{{else}}-o{{/if}}" title="{{_ 'star-board-title'}}") + + if hasSpentTimeCards + i.fa.js-has-spenttime-cards( + class="fa-circle{{#if hasOvertimeCards}} has-overtime-card-active{{else}} no-overtime-card-active{{/if}}" + title="{{#if hasOvertimeCards}}{{_ 'has-overtime-cards'}}{{else}}{{_ 'has-spenttime-cards'}}{{/if}}") + p.board-list-item-desc= description li.js-add-board a.board-list-item.label {{_ 'add-board'}} diff --git a/client/components/boards/boardsList.js b/client/components/boards/boardsList.js index e4bb050e..4ec4b534 100644 --- a/client/components/boards/boardsList.js +++ b/client/components/boards/boardsList.js @@ -1,3 +1,5 @@ +const subManager = new SubsManager(); + BlazeComponent.extendComponent({ boards() { return Boards.find({ @@ -13,6 +15,16 @@ BlazeComponent.extendComponent({ return user && user.hasStarred(this.currentData()._id); }, + hasOvertimeCards() { + subManager.subscribe('board', this.currentData()._id); + return this.currentData().hasOvertimeCards(); + }, + + hasSpentTimeCards() { + subManager.subscribe('board', this.currentData()._id); + return this.currentData().hasSpentTimeCards(); + }, + isInvited() { const user = Meteor.user(); return user && user.isInvitedTo(this.currentData()._id); diff --git a/client/components/boards/boardsList.styl b/client/components/boards/boardsList.styl index 4b5245f9..6318ea94 100644 --- a/client/components/boards/boardsList.styl +++ b/client/components/boards/boardsList.styl @@ -17,6 +17,7 @@ $spaceBetweenTiles = 16px opacity: 1 .board-list-item + overflow: hidden; background-color: #999 color: #f6f6f6 height: 90px @@ -73,6 +74,23 @@ $spaceBetweenTiles = 16px transition-duration: .15s transition-property: color, font-size, background + .fa-circle + bottom: 0; + font-size: 10px; + height: 10px; + line-height: 10px; + padding: 9px 9px; + position: absolute; + right: 0; + transition-duration: .15s + transition-property: color, font-size, background + + .has-overtime-card-active + color: #eb4646 !important + + .no-overtime-card-active + color: #3cb500 !important + .is-star-active color: white |