diff options
| author | Ymeramees <ymeramees@servu> | 2018-09-05 07:23:34 +0300 |
|---|---|---|
| committer | Ymeramees <ymeramees@servu> | 2018-09-05 07:23:34 +0300 |
| commit | 6c0b6ca6702b7f605b43eee8579ce1181f59f09e (patch) | |
| tree | f282393c57a1b776425dab08e9214538257672a7 /client/components/cards/cardDetails.jade | |
| parent | 1298a07838fb748285bc298b7d8b186dce5fb399 (diff) | |
| parent | 9492daf9bcaade700eb00b11f0d7a969fb66a4bf (diff) | |
| download | wekan-6c0b6ca6702b7f605b43eee8579ce1181f59f09e.tar.gz wekan-6c0b6ca6702b7f605b43eee8579ce1181f59f09e.tar.bz2 wekan-6c0b6ca6702b7f605b43eee8579ce1181f59f09e.zip | |
Merge remote-tracking branch 'upstream/master' into devel
Merge to update to latest upstream/master
Diffstat (limited to 'client/components/cards/cardDetails.jade')
| -rw-r--r-- | client/components/cards/cardDetails.jade | 39 |
1 files changed, 21 insertions, 18 deletions
diff --git a/client/components/cards/cardDetails.jade b/client/components/cards/cardDetails.jade index 10828445..33d6d3b7 100644 --- a/client/components/cards/cardDetails.jade +++ b/client/components/cards/cardDetails.jade @@ -173,25 +173,28 @@ template(name="cardDetails") +attachmentsGalery hr - .activity-title - h3 {{ _ 'activity'}} - if currentUser.isBoardMember - .material-toggle-switch - span.toggle-switch-title {{_ 'hide-system-messages'}} - if hiddenSystemMessages - input.toggle-switch(type="checkbox" id="toggleButton" checked="checked") - else - input.toggle-switch(type="checkbox" id="toggleButton") - label.toggle-label(for="toggleButton") + unless currentUser.isNoComments + .activity-title + h3 {{ _ 'activity'}} + if currentUser.isBoardMember + .material-toggle-switch + span.toggle-switch-title {{_ 'hide-system-messages'}} + if hiddenSystemMessages + input.toggle-switch(type="checkbox" id="toggleButton" checked="checked") + else + input.toggle-switch(type="checkbox" id="toggleButton") + label.toggle-label(for="toggleButton") if currentUser.isBoardMember - +commentForm - if isLoaded.get - if isLinkedCard - +activities(card=this mode="linkedcard") - else if isLinkedBoard - +activities(card=this mode="linkedboard") - else - +activities(card=this mode="card") + unless currentUser.isNoComments + +commentForm + unless currentUser.isNoComments + if isLoaded.get + if isLinkedCard + +activities(card=this mode="linkedcard") + else if isLinkedBoard + +activities(card=this mode="linkedboard") + else + +activities(card=this mode="card") template(name="editCardTitleForm") textarea.js-edit-card-title(rows='1' autofocus) |