mirror of
https://github.com/wekan/wekan.git
synced 2025-12-16 15:30:13 +01:00
Add comments only in activity feed
This commit is contained in:
parent
415343bbd0
commit
b503ba1144
6 changed files with 70 additions and 3 deletions
|
|
@ -31,7 +31,7 @@ template(name="boardActivities")
|
||||||
.activity-checklist(href="{{ card.absoluteUrl }}")
|
.activity-checklist(href="{{ card.absoluteUrl }}")
|
||||||
+viewer
|
+viewer
|
||||||
= checklist.title
|
= checklist.title
|
||||||
|
|
||||||
if($eq activityType 'addChecklistItem')
|
if($eq activityType 'addChecklistItem')
|
||||||
| {{{_ 'activity-checklist-item-added' checklist.title cardLink}}}.
|
| {{{_ 'activity-checklist-item-added' checklist.title cardLink}}}.
|
||||||
.activity-checklist(href="{{ card.absoluteUrl }}")
|
.activity-checklist(href="{{ card.absoluteUrl }}")
|
||||||
|
|
@ -90,7 +90,7 @@ template(name="boardActivities")
|
||||||
|
|
||||||
template(name="cardActivities")
|
template(name="cardActivities")
|
||||||
each currentCard.activities
|
each currentCard.activities
|
||||||
.activity
|
.activity.js-card-activity
|
||||||
+userAvatar(userId=user._id)
|
+userAvatar(userId=user._id)
|
||||||
p.activity-desc
|
p.activity-desc
|
||||||
+memberName(user=user)
|
+memberName(user=user)
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,10 @@
|
||||||
@import 'nib'
|
@import 'nib'
|
||||||
|
|
||||||
|
.activity-title
|
||||||
|
margin: 0 0.5em 0.8em
|
||||||
|
display: flex
|
||||||
|
justify-content:space-between
|
||||||
|
|
||||||
.activities
|
.activities
|
||||||
clear: both
|
clear: both
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -85,7 +85,12 @@ template(name="cardDetails")
|
||||||
+attachmentsGalery
|
+attachmentsGalery
|
||||||
|
|
||||||
hr
|
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
|
if currentUser.isBoardMember
|
||||||
+commentForm
|
+commentForm
|
||||||
if isLoaded.get
|
if isLoaded.get
|
||||||
|
|
|
||||||
|
|
@ -99,6 +99,9 @@ BlazeComponent.extendComponent({
|
||||||
this.parentComponent().showOverlay.set(true);
|
this.parentComponent().showOverlay.set(true);
|
||||||
this.parentComponent().mouseHasEnterCardDetails = true;
|
this.parentComponent().mouseHasEnterCardDetails = true;
|
||||||
},
|
},
|
||||||
|
'click #toggleButton'() {
|
||||||
|
$('div.activity.js-card-activity:not(:has(.activity-comment))').toggle();
|
||||||
|
},
|
||||||
}];
|
}];
|
||||||
},
|
},
|
||||||
}).register('cardDetails');
|
}).register('cardDetails');
|
||||||
|
|
|
||||||
|
|
@ -630,6 +630,58 @@ button
|
||||||
a, .quiet
|
a, .quiet
|
||||||
color: white
|
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)
|
@media screen and (max-width: 800px)
|
||||||
.edit-controls,
|
.edit-controls,
|
||||||
.add-controls
|
.add-controls
|
||||||
|
|
|
||||||
|
|
@ -83,6 +83,8 @@ BlazeComponent.extendComponent({
|
||||||
evt.stopImmediatePropagation();
|
evt.stopImmediatePropagation();
|
||||||
evt.preventDefault();
|
evt.preventDefault();
|
||||||
Utils.goBoardId(Session.get('currentBoard'));
|
Utils.goBoardId(Session.get('currentBoard'));
|
||||||
|
} else {
|
||||||
|
$('.toggle-switch').prop('checked', false);
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue