summaryrefslogtreecommitdiffstats
path: root/client/components/cards/cardDetails.jade
diff options
context:
space:
mode:
authorIgnatzHome <ignatz@maschath.de>2018-05-17 20:21:07 +0200
committerIgnatzHome <ignatz@maschath.de>2018-05-17 20:21:07 +0200
commit9518a5c11ee5bc8556ad7af2d0bef1aa8ae47874 (patch)
tree47ffe9a487aa6d66bbb4cd327ca248c4b30fda4a /client/components/cards/cardDetails.jade
parentc0c7b269a794fb28ddf5ffc17744f6724041de96 (diff)
parent8b16955cc27b29ae507be084adccc4fad61b05ef (diff)
downloadwekan-9518a5c11ee5bc8556ad7af2d0bef1aa8ae47874.tar.gz
wekan-9518a5c11ee5bc8556ad7af2d0bef1aa8ae47874.tar.bz2
wekan-9518a5c11ee5bc8556ad7af2d0bef1aa8ae47874.zip
resolving merge conflicts
Diffstat (limited to 'client/components/cards/cardDetails.jade')
-rw-r--r--client/components/cards/cardDetails.jade17
1 files changed, 17 insertions, 0 deletions
diff --git a/client/components/cards/cardDetails.jade b/client/components/cards/cardDetails.jade
index 047d7518..b888210b 100644
--- a/client/components/cards/cardDetails.jade
+++ b/client/components/cards/cardDetails.jade
@@ -65,6 +65,22 @@ template(name="cardDetails")
a.card-label.add-label.js-add-labels(title="{{_ 'card-labels-title'}}")
i.fa.fa-plus
+ if startAt
+ .card-details-item.card-details-item-start
+ h3.card-details-item-title {{_ 'card-start'}}
+ +cardStartDate
+
+ if dueAt
+ .card-details-item.card-details-item-due
+ h3.card-details-item-title {{_ 'card-due'}}
+ +cardDueDate
+
+ each customFieldsWD
+ .card-details-item.card-details-item-customfield
+ h3.card-details-item-title
+ = definition.name
+ +cardCustomField
+
.card-details-items
if spentTime
.card-details-item.card-details-item-spent
@@ -144,6 +160,7 @@ template(name="cardDetailsActionsPopup")
li: a.js-labels {{_ 'card-edit-labels'}}
li: a.js-attachments {{_ 'card-edit-attachments'}}
li: a.js-received-date {{_ 'editCardReceivedDatePopup-title'}}
+ li: a.js-custom-fields {{_ 'card-edit-custom-fields'}}
li: a.js-start-date {{_ 'editCardStartDatePopup-title'}}
li: a.js-due-date {{_ 'editCardDueDatePopup-title'}}
li: a.js-end-date {{_ 'editCardEndDatePopup-title'}}