summaryrefslogtreecommitdiffstats
path: root/client/components/cards/cardDetails.jade
diff options
context:
space:
mode:
authorLauri Ojansivu <x@xet7.org>2017-11-21 10:03:02 +0200
committerLauri Ojansivu <x@xet7.org>2017-11-21 10:03:02 +0200
commite162fe3c0fc425efe925dd15f55771f9a3ee60f3 (patch)
treeb2015f2a7b8d099aa554027e482c8f9676a960d3 /client/components/cards/cardDetails.jade
parentf3e7646cfa065ceea0cf1aaff1f5adbde457a32a (diff)
parent6dba4ccd4d0c8d7443e7d9c39ddafed2b8f1b6ca (diff)
downloadwekan-e162fe3c0fc425efe925dd15f55771f9a3ee60f3.tar.gz
wekan-e162fe3c0fc425efe925dd15f55771f9a3ee60f3.tar.bz2
wekan-e162fe3c0fc425efe925dd15f55771f9a3ee60f3.zip
Merge branch 'card-spent-time' of https://github.com/thuanpq/wekan into thuanpq-card-spent-time
Diffstat (limited to 'client/components/cards/cardDetails.jade')
-rw-r--r--client/components/cards/cardDetails.jade9
1 files changed, 9 insertions, 0 deletions
diff --git a/client/components/cards/cardDetails.jade b/client/components/cards/cardDetails.jade
index 859b80c3..4c68c2f7 100644
--- a/client/components/cards/cardDetails.jade
+++ b/client/components/cards/cardDetails.jade
@@ -46,6 +46,14 @@ template(name="cardDetails")
h3.card-details-item-title {{_ 'card-due'}}
+cardDueDate
+ .card-details-items
+ if spentTime
+ .card-details-item.card-details-item-spent
+ if isOvertime
+ h3.card-details-item-title {{_ 'overtime-hours'}}
+ else
+ h3.card-details-item-title {{_ 'spent-time-hours'}}
+ +cardSpentTime
//- XXX We should use "editable" to avoid repetiting ourselves
if canModifyCard
@@ -119,6 +127,7 @@ template(name="cardDetailsActionsPopup")
li: a.js-attachments {{_ 'card-edit-attachments'}}
li: a.js-start-date {{_ 'editCardStartDatePopup-title'}}
li: a.js-due-date {{_ 'editCardDueDatePopup-title'}}
+ li: a.js-spent-time {{_ 'editCardSpentTimePopup-title'}}
hr
ul.pop-over-list
li: a.js-move-card-to-top {{_ 'moveCardToTop-title'}}