diff options
author | Lauri Ojansivu <x@xet7.org> | 2017-10-01 09:48:52 +0300 |
---|---|---|
committer | Lauri Ojansivu <x@xet7.org> | 2017-10-01 09:48:52 +0300 |
commit | a1d06727399a0d5a0cc11aee6a16ea253548727d (patch) | |
tree | 714a3cdb3f10b17e015c819ddac85dfec6c21722 | |
parent | 6ec14ee52bca394189a0f1d41d20b597e90f6320 (diff) | |
parent | 7d3fed56ae2baf5d07294bff8998198b257c855a (diff) | |
download | wekan-a1d06727399a0d5a0cc11aee6a16ea253548727d.tar.gz wekan-a1d06727399a0d5a0cc11aee6a16ea253548727d.tar.bz2 wekan-a1d06727399a0d5a0cc11aee6a16ea253548727d.zip |
Merge branch 'nztqa-improve-activities' into devel
Slider for Comments only in activity feed.
Thanks to nztqa ! Closes #1182
-rw-r--r-- | CHANGELOG.md | 6 | ||||
-rw-r--r-- | client/components/activities/activities.jade | 4 | ||||
-rw-r--r-- | client/components/activities/activities.styl | 5 | ||||
-rw-r--r-- | client/components/cards/cardDetails.jade | 10 | ||||
-rw-r--r-- | client/components/cards/cardDetails.js | 8 | ||||
-rw-r--r-- | client/components/forms/forms.styl | 53 | ||||
-rw-r--r-- | client/components/lists/listBody.js | 4 |
7 files changed, 86 insertions, 4 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 27650432..29ae3e9e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,10 @@ # Upcoming Wekan relelase -This release fixes the following bugs: +This release adds the following new features: + +* [Slider for Comments only in activity feed](https://github.com/wekan/wekan/issues/1247). + +and fixes the following bugs: * [Data inconsistency when copying card](https://github.com/wekan/wekan/pull/1246). Note: There is no feature for copying card attachment yet. diff --git a/client/components/activities/activities.jade b/client/components/activities/activities.jade index be12a728..deaee25e 100644 --- a/client/components/activities/activities.jade +++ b/client/components/activities/activities.jade @@ -31,7 +31,7 @@ template(name="boardActivities") .activity-checklist(href="{{ card.absoluteUrl }}") +viewer = checklist.title - + if($eq activityType 'addChecklistItem') | {{{_ 'activity-checklist-item-added' checklist.title cardLink}}}. .activity-checklist(href="{{ card.absoluteUrl }}") @@ -90,7 +90,7 @@ template(name="boardActivities") template(name="cardActivities") each currentCard.activities - .activity + .activity.js-card-activity +userAvatar(userId=user._id) p.activity-desc +memberName(user=user) diff --git a/client/components/activities/activities.styl b/client/components/activities/activities.styl index 2285fc0a..36efd771 100644 --- a/client/components/activities/activities.styl +++ b/client/components/activities/activities.styl @@ -1,5 +1,10 @@ @import 'nib' +.activity-title + margin: 0 0.5em 0.8em + display: flex + justify-content:space-between + .activities clear: both 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'); diff --git a/client/components/forms/forms.styl b/client/components/forms/forms.styl index 646da657..1947c11d 100644 --- a/client/components/forms/forms.styl +++ b/client/components/forms/forms.styl @@ -630,6 +630,59 @@ button a, .quiet color: white +// Material Design Toggle Switch +.material-toggle-switch + display: flex + +.toggle-label + position: relative + display: block + height: 20px + width: 44px + background-color: #a6a6a6 + border-radius: 100px + cursor: pointer + transition: all 0.3s ease + + &:after + position: absolute + left: -2px + top: -3px + display: block + width: 26px + height: 26px + border-radius: 100px + background-color: #fff + box-shadow: 0px 3px 3px rgba(0,0,0,0.05) + content: '' + transition: all 0.3s ease + + &:active + &:after + transform: scale(1.15, 0.85) + +.toggle-switch:checked ~ .toggle-label + background-color: #6fbeb5 + + &:after + left: 20px + background-color: #179588 + +.toggle-switch:checked:disabled ~ .toggle-label + background-color: #d5d5d5 + pointer-events: none + + &:after + background-color: #bcbdbc + +.toggle-switch + display: none + +.toggle-switch-title + margin: 0 0.5em + display: flex + + @media screen and (max-width: 800px) .edit-controls, .add-controls diff --git a/client/components/lists/listBody.js b/client/components/lists/listBody.js index 724e805b..794f33c2 100644 --- a/client/components/lists/listBody.js +++ b/client/components/lists/listBody.js @@ -83,6 +83,10 @@ BlazeComponent.extendComponent({ evt.stopImmediatePropagation(); evt.preventDefault(); Utils.goBoardId(Session.get('currentBoard')); + } else { + if (!Meteor.user().hasHiddenSystemMessages()) { + $('.toggle-switch').prop('checked', false); + } } }, |