summaryrefslogtreecommitdiffstats
path: root/client/components/cards/cardDate.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/cardDate.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/cardDate.jade')
-rw-r--r--client/components/cards/cardDate.jade16
1 files changed, 0 insertions, 16 deletions
diff --git a/client/components/cards/cardDate.jade b/client/components/cards/cardDate.jade
index 525f27ed..2e447506 100644
--- a/client/components/cards/cardDate.jade
+++ b/client/components/cards/cardDate.jade
@@ -1,19 +1,3 @@
-template(name="editCardDate")
- .edit-card-date
- form.edit-date
- .fields
- .left
- label(for="date") {{_ 'date'}}
- input.js-date-field#date(type="text" name="date" value=showDate placeholder=dateFormat autofocus)
- .right
- label(for="time") {{_ 'time'}}
- input.js-time-field#time(type="text" name="time" value=showTime placeholder=timeFormat)
- .js-datepicker
- if error.get
- .warning {{_ error.get}}
- button.primary.wide.left.js-submit-date(type="submit") {{_ 'save'}}
- button.js-delete-date.negate.wide.right.js-delete-date {{_ 'delete'}}
-
template(name="dateBadge")
if canModifyCard
a.js-edit-date.card-date(title="{{showTitle}}" class="{{classes}}")