diff options
| author | Lauri Ojansivu <x@xet7.org> | 2019-01-22 17:33:27 +0200 |
|---|---|---|
| committer | Lauri Ojansivu <x@xet7.org> | 2019-01-22 17:33:27 +0200 |
| commit | 46a468b06dd5d4ca2338140bb2fd32958ccef85f (patch) | |
| tree | 9a7656c0fa92c0895c25d958764f090c74d0c129 /client/components/cards/cardDetails.jade | |
| parent | 8d4eef66493f464035616fec7ac8b2f14720ce57 (diff) | |
| parent | 1b445ad789a41d97b7cf4e16af35f52ae0be694b (diff) | |
| download | wekan-46a468b06dd5d4ca2338140bb2fd32958ccef85f.tar.gz wekan-46a468b06dd5d4ca2338140bb2fd32958ccef85f.tar.bz2 wekan-46a468b06dd5d4ca2338140bb2fd32958ccef85f.zip | |
Merge branch 'edge' into meteor-1.8
Diffstat (limited to 'client/components/cards/cardDetails.jade')
| -rw-r--r-- | client/components/cards/cardDetails.jade | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/client/components/cards/cardDetails.jade b/client/components/cards/cardDetails.jade index a6dc3dde..c1e771cb 100644 --- a/client/components/cards/cardDetails.jade +++ b/client/components/cards/cardDetails.jade @@ -1,6 +1,6 @@ template(name="cardDetails") section.card-details.js-card-details.js-perfect-scrollbar: .card-details-canvas - .card-details-header + .card-details-header(class='{{#if colorClass}}card-details-{{colorClass}}{{/if}}') +inlinedForm(classNames="js-card-details-title") +editCardTitleForm else @@ -234,6 +234,7 @@ template(name="cardDetailsActionsPopup") li: a.js-due-date {{_ 'editCardDueDatePopup-title'}} li: a.js-end-date {{_ 'editCardEndDatePopup-title'}} li: a.js-spent-time {{_ 'editCardSpentTimePopup-title'}} + li: a.js-set-card-color {{_ 'setCardColor-title'}} hr ul.pop-over-list li: a.js-move-card-to-top {{_ 'moveCardToTop-title'}} @@ -335,7 +336,17 @@ template(name="cardMorePopup") span.date(title=card.createdAt) {{ moment createdAt 'LLL' }} a.js-delete(title="{{_ 'card-delete-notice'}}") {{_ 'delete'}} - +template(name="setCardColorPopup") + p.quiet + span.clearfix + label {{_ "select-color"}} + form.edit-label + .palette-colors: each colors + span.card-label.palette-color.js-palette-color(class="card-details-{{color}}") + if(isSelected color) + i.fa.fa-check + button.primary.confirm.js-submit {{_ 'save'}} + button.js-remove-color.negate.wide.right {{_ 'unset-color'}} template(name="cardDeletePopup") p {{_ "card-delete-pop"}} |