diff options
| author | Lauri Ojansivu <x@xet7.org> | 2017-10-01 09:42:15 +0300 |
|---|---|---|
| committer | Lauri Ojansivu <x@xet7.org> | 2017-10-01 09:42:15 +0300 |
| commit | a0cccb736c198f8610273e133df256c48c5f5b05 (patch) | |
| tree | 3fcf5da5a8935a938222db46a5440184accc295a /client/components/cards | |
| parent | 6ec14ee52bca394189a0f1d41d20b597e90f6320 (diff) | |
| parent | 61ee107c27ea4b5be3b8b9bcb6d6a36de65dfcd1 (diff) | |
| download | wekan-a0cccb736c198f8610273e133df256c48c5f5b05.tar.gz wekan-a0cccb736c198f8610273e133df256c48c5f5b05.tar.bz2 wekan-a0cccb736c198f8610273e133df256c48c5f5b05.zip | |
Merge branch 'improve-activities' of https://github.com/nztqa/wekan into nztqa-improve-activities
Diffstat (limited to 'client/components/cards')
| -rw-r--r-- | client/components/cards/cardDetails.jade | 10 | ||||
| -rw-r--r-- | client/components/cards/cardDetails.js | 8 |
2 files changed, 17 insertions, 1 deletions
diff --git a/client/components/cards/cardDetails.jade b/client/components/cards/cardDetails.jade index 09e0532c..60b20a8a 100644 --- a/client/components/cards/cardDetails.jade +++ b/client/components/cards/cardDetails.jade @@ -85,7 +85,15 @@ template(name="cardDetails") +attachmentsGalery hr - h2 {{ _ 'activity'}} + .activity-title + h2 {{ _ 'activity'}} + .material-toggle-switch + span.toggle-switch-title {{_ 'hide-system-messages'}} + if hiddenSystemMessages + input.toggle-switch(type="checkbox" id="toggleButton" checked="checked" disabled) + else + input.toggle-switch(type="checkbox" id="toggleButton") + label.toggle-label(for="toggleButton") if currentUser.isBoardMember +commentForm if isLoaded.get diff --git a/client/components/cards/cardDetails.js b/client/components/cards/cardDetails.js index 587cd1bc..ecffe7aa 100644 --- a/client/components/cards/cardDetails.js +++ b/client/components/cards/cardDetails.js @@ -28,6 +28,11 @@ BlazeComponent.extendComponent({ return card.findWatcher(Meteor.userId()); }, + hiddenSystemMessages() { + console.log('doo:', Meteor.user().hasHiddenSystemMessages()); + return Meteor.user().hasHiddenSystemMessages(); + }, + canModifyCard() { return Meteor.user() && Meteor.user().isBoardMember() && !Meteor.user().isCommentOnly(); }, @@ -99,6 +104,9 @@ BlazeComponent.extendComponent({ this.parentComponent().showOverlay.set(true); this.parentComponent().mouseHasEnterCardDetails = true; }, + 'click #toggleButton'() { + $('div.activity.js-card-activity:not(:has(.activity-comment))').toggle(); + }, }]; }, }).register('cardDetails'); |