From b503ba1144454234c3b9f852aefcde6e4a262a63 Mon Sep 17 00:00:00 2001 From: nztqa Date: Mon, 25 Sep 2017 14:52:55 +0900 Subject: Add comments only in activity feed --- client/components/activities/activities.jade | 4 +-- client/components/activities/activities.styl | 5 +++ client/components/cards/cardDetails.jade | 7 +++- client/components/cards/cardDetails.js | 3 ++ client/components/forms/forms.styl | 52 ++++++++++++++++++++++++++++ client/components/lists/listBody.js | 2 ++ 6 files changed, 70 insertions(+), 3 deletions(-) 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..3a144557 100644 --- a/client/components/cards/cardDetails.jade +++ b/client/components/cards/cardDetails.jade @@ -85,7 +85,12 @@ template(name="cardDetails") +attachmentsGalery hr - h2 {{ _ 'activity'}} + .activity-title + h2 {{ _ 'activity'}} + .material-toggle-switch + span.toggle-switch-title {{_ 'hide-system-messages'}} + 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 7c6c3ce7..d622c912 100644 --- a/client/components/cards/cardDetails.js +++ b/client/components/cards/cardDetails.js @@ -99,6 +99,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..4c8ff7b0 100644 --- a/client/components/forms/forms.styl +++ b/client/components/forms/forms.styl @@ -630,6 +630,58 @@ 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: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..011c92c8 100644 --- a/client/components/lists/listBody.js +++ b/client/components/lists/listBody.js @@ -83,6 +83,8 @@ BlazeComponent.extendComponent({ evt.stopImmediatePropagation(); evt.preventDefault(); Utils.goBoardId(Session.get('currentBoard')); + } else { + $('.toggle-switch').prop('checked', false); } }, -- cgit v1.2.3-1-g7c22 From 61ee107c27ea4b5be3b8b9bcb6d6a36de65dfcd1 Mon Sep 17 00:00:00 2001 From: nztqa Date: Mon, 25 Sep 2017 20:27:54 +0900 Subject: Disable button when "Hide system messages" in user profile setting is valid --- client/components/cards/cardDetails.jade | 5 ++++- client/components/cards/cardDetails.js | 5 +++++ client/components/forms/forms.styl | 5 +++-- client/components/lists/listBody.js | 4 +++- 4 files changed, 15 insertions(+), 4 deletions(-) diff --git a/client/components/cards/cardDetails.jade b/client/components/cards/cardDetails.jade index 3a144557..60b20a8a 100644 --- a/client/components/cards/cardDetails.jade +++ b/client/components/cards/cardDetails.jade @@ -89,7 +89,10 @@ template(name="cardDetails") h2 {{ _ 'activity'}} .material-toggle-switch span.toggle-switch-title {{_ 'hide-system-messages'}} - input.toggle-switch(type="checkbox" id="toggleButton") + 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 diff --git a/client/components/cards/cardDetails.js b/client/components/cards/cardDetails.js index d622c912..ed23b359 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(); }, diff --git a/client/components/forms/forms.styl b/client/components/forms/forms.styl index 4c8ff7b0..1947c11d 100644 --- a/client/components/forms/forms.styl +++ b/client/components/forms/forms.styl @@ -668,11 +668,11 @@ button left: 20px background-color: #179588 -.toggle-switch:disabled ~ .toggle-label +.toggle-switch:checked:disabled ~ .toggle-label background-color: #d5d5d5 pointer-events: none - &after + &:after background-color: #bcbdbc .toggle-switch @@ -682,6 +682,7 @@ button 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 011c92c8..794f33c2 100644 --- a/client/components/lists/listBody.js +++ b/client/components/lists/listBody.js @@ -84,7 +84,9 @@ BlazeComponent.extendComponent({ evt.preventDefault(); Utils.goBoardId(Session.get('currentBoard')); } else { - $('.toggle-switch').prop('checked', false); + if (!Meteor.user().hasHiddenSystemMessages()) { + $('.toggle-switch').prop('checked', false); + } } }, -- cgit v1.2.3-1-g7c22 From 7d3fed56ae2baf5d07294bff8998198b257c855a Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Sun, 1 Oct 2017 09:47:53 +0300 Subject: Slider for Comments only in activity feed. Thanks to nztqa ! Closes #1182 --- CHANGELOG.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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. -- cgit v1.2.3-1-g7c22