aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRedMatrix <info@friendica.com>2014-10-07 17:55:28 +1100
committerRedMatrix <info@friendica.com>2014-10-07 17:55:28 +1100
commit9df4ceb74672eccf28b28d8daddf911b73f9aeae (patch)
tree455616c481dc53463f669c0e489f7a2bb68cf2ab
parentc6e86ae0d9df1081313ef1e8c4c6a3e484e15f4c (diff)
parent55a937375df5b21da7cece5ec4b4cb5deb49245b (diff)
downloadvolse-hubzilla-9df4ceb74672eccf28b28d8daddf911b73f9aeae.tar.gz
volse-hubzilla-9df4ceb74672eccf28b28d8daddf911b73f9aeae.tar.bz2
volse-hubzilla-9df4ceb74672eccf28b28d8daddf911b73f9aeae.zip
Merge pull request #621 from solstag/master
datetimepicker data-format now data-date-format
-rwxr-xr-xview/tpl/event_form.tpl4
-rwxr-xr-xview/tpl/jot.tpl2
2 files changed, 3 insertions, 3 deletions
diff --git a/view/tpl/event_form.tpl b/view/tpl/event_form.tpl
index af10e6c73..b2455e26c 100755
--- a/view/tpl/event_form.tpl
+++ b/view/tpl/event_form.tpl
@@ -84,7 +84,7 @@
<span class="input-group-addon"><!-- <span class="glyphicon glyphicon-calendar"></span> -->
<span class="icon-calendar"></span>
</span>
- <input id="start-date" value='{{$stext}}' type='text' class="form-control" data-format="YYYY-MM-DD HH:mm" size="20"/>
+ <input id="start-date" value='{{$stext}}' type='text' class="form-control" data-date-format="YYYY-MM-DD HH:mm" size="20"/>
</div>
</div>
<!-- </div> -->
@@ -123,7 +123,7 @@
<span class="input-group-addon"><!-- <span class="glyphicon glyphicon-calendar"></span> -->
<span class="icon-calendar"></span>
</span>
- <input id="finish-date" value='{{$ftext}}' type='text' class="form-control" data-format="YYYY-MM-DD HH:mm" size="20"/>
+ <input id="finish-date" value='{{$ftext}}' type='text' class="form-control" data-date-format="YYYY-MM-DD HH:mm" size="20"/>
</div>
</div>
<!-- </div> -->
diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl
index c51dc02a5..be896adb5 100755
--- a/view/tpl/jot.tpl
+++ b/view/tpl/jot.tpl
@@ -112,7 +112,7 @@
<span class="input-group-addon"><!-- <span class="glyphicon glyphicon-calendar"></span> -->
<span class="icon-calendar"></span>
</span>
- <input id="expiration-date" type='text' class="form-control" data-format="YYYY-MM-DD HH:mm" size="20"/>
+ <input id="expiration-date" type='text' class="form-control" data-date-format="YYYY-MM-DD HH:mm" size="20"/>
</div>
</div>
<!-- </div> -->