diff options
| author | Sam X. Chen <sam.xi.chen@gmail.com> | 2019-07-25 16:27:34 -0400 |
|---|---|---|
| committer | Sam X. Chen <sam.xi.chen@gmail.com> | 2019-07-25 16:27:34 -0400 |
| commit | 2c042e7f119ac404a1060d10d368d1bbd9d15e9c (patch) | |
| tree | 4f6fb032e42829fec8076ad90561bdf51d3e04e7 /client/components/cards | |
| parent | 8f899fca7286b076db7551fbbfd4434cf4b561e8 (diff) | |
| parent | 5f56ba4fb9f024f86f157e3116f5dc3eca79a32f (diff) | |
| download | wekan-2c042e7f119ac404a1060d10d368d1bbd9d15e9c.tar.gz wekan-2c042e7f119ac404a1060d10d368d1bbd9d15e9c.tar.bz2 wekan-2c042e7f119ac404a1060d10d368d1bbd9d15e9c.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'client/components/cards')
| -rw-r--r-- | client/components/cards/attachments.jade | 26 | ||||
| -rw-r--r-- | client/components/cards/cardCustomFields.jade | 16 | ||||
| -rw-r--r-- | client/components/cards/minicard.jade | 4 |
3 files changed, 33 insertions, 13 deletions
diff --git a/client/components/cards/attachments.jade b/client/components/cards/attachments.jade index 0f79323b..2a96f4f4 100644 --- a/client/components/cards/attachments.jade +++ b/client/components/cards/attachments.jade @@ -37,17 +37,19 @@ template(name="attachmentsGalery") i.fa.fa-download | {{_ 'download'}} if currentUser.isBoardMember - if isImage - a(class="{{#if $eq ../coverId _id}}js-remove-cover{{else}}js-add-cover{{/if}}") - i.fa.fa-thumb-tack - if($eq ../coverId _id) - | {{_ 'remove-cover'}} - else - | {{_ 'add-cover'}} - a.js-confirm-delete - i.fa.fa-close - | {{_ 'delete'}} + unless currentUser.isCommentOnly + if isImage + a(class="{{#if $eq ../coverId _id}}js-remove-cover{{else}}js-add-cover{{/if}}") + i.fa.fa-thumb-tack + if($eq ../coverId _id) + | {{_ 'remove-cover'}} + else + | {{_ 'add-cover'}} + a.js-confirm-delete + i.fa.fa-close + | {{_ 'delete'}} if currentUser.isBoardMember - li.attachment-item.add-attachment - a.js-add-attachment {{_ 'add-attachment' }} + unless currentUser.isCommentOnly + li.attachment-item.add-attachment + a.js-add-attachment {{_ 'add-attachment' }} diff --git a/client/components/cards/cardCustomFields.jade b/client/components/cards/cardCustomFields.jade index c4fa6863..0a4d26e5 100644 --- a/client/components/cards/cardCustomFields.jade +++ b/client/components/cards/cardCustomFields.jade @@ -31,6 +31,10 @@ template(name="cardCustomField-text") = value else | {{_ 'edit'}} + else + +viewer + = value + template(name="cardCustomField-number") if canModifyCard @@ -45,6 +49,9 @@ template(name="cardCustomField-number") = value else | {{_ 'edit'}} + else + if value + = value template(name="cardCustomField-date") if canModifyCard @@ -55,6 +62,11 @@ template(name="cardCustomField-date") | {{showDate}} else | {{_ 'edit'}} + else + if value + div.card-date + time(datetime="{{showISODate}}") + | {{showDate}} template(name="cardCustomField-dropdown") if canModifyCard @@ -79,3 +91,7 @@ template(name="cardCustomField-dropdown") = selectedItem else | {{_ 'edit'}} + else + if value + +viewer + = selectedItem diff --git a/client/components/cards/minicard.jade b/client/components/cards/minicard.jade index bc362982..f714baae 100644 --- a/client/components/cards/minicard.jade +++ b/client/components/cards/minicard.jade @@ -8,7 +8,9 @@ template(name="minicard") if labels .minicard-labels each labels - .minicard-label(class="card-label-{{color}}" title="{{name}}") + span.card-label(class="card-label-{{color}}" title=name) + +viewer + = name .minicard-title .handle .fa.fa-arrows |