aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
authorRedMatrix <info@friendica.com>2014-11-18 08:33:04 +1100
committerRedMatrix <info@friendica.com>2014-11-18 08:33:04 +1100
commit5aba2e82dff5a550aef33f054d27b10602b7dafa (patch)
treecb400e785b59d25f0881491d50d6aa3ca653165b /view
parentb11ed7f88e4683315a4f5aa02692cb61facf32a7 (diff)
parente190adc58980c12c6dffb21dae57194aad354e3c (diff)
downloadvolse-hubzilla-5aba2e82dff5a550aef33f054d27b10602b7dafa.tar.gz
volse-hubzilla-5aba2e82dff5a550aef33f054d27b10602b7dafa.tar.bz2
volse-hubzilla-5aba2e82dff5a550aef33f054d27b10602b7dafa.zip
Merge pull request #695 from pafcu/master
Switch to a better datetime picker widget
Diffstat (limited to 'view')
-rw-r--r--view/theme/redbasic/php/theme_init.php5
-rwxr-xr-xview/tpl/jot.tpl7
2 files changed, 3 insertions, 9 deletions
diff --git a/view/theme/redbasic/php/theme_init.php b/view/theme/redbasic/php/theme_init.php
index 2fbca2ef0..dd4542e8a 100644
--- a/view/theme/redbasic/php/theme_init.php
+++ b/view/theme/redbasic/php/theme_init.php
@@ -4,15 +4,14 @@ head_add_css('library/font_awesome/css/font-awesome.min.css');
head_add_css('library/bootstrap/css/bootstrap-theme.min.css');
head_add_css('library/bootstrap/css/bootstrap.min.css');
head_add_css('view/css/bootstrap-red.css');
-head_add_css('library/bootstrap-datetimepicker/css/bootstrap-datetimepicker.min.css');
+head_add_css('library/datetimepicker/jquery.datetimepicker.css');
//head_add_css('library/colorpicker/css/colorpicker.css');
head_add_css('library/bootstrap-colorpicker/dist/css/bootstrap-colorpicker.min.css');
require_once('view/php/theme_init.php');
head_add_js('library/bootstrap/js/bootstrap.min.js');
head_add_js('library/bootstrap/js/bootbox.min.js');
-head_add_js('library/bootstrap-datetimepicker/js/moment.min.js');
-head_add_js('library/bootstrap-datetimepicker/js/bootstrap-datetimepicker.min.js');
+head_add_js('library/datetimepicker/jquery.datetimepicker.js');
//head_add_js('library/colorpicker/js/colorpicker.js');
head_add_js('library/bootstrap-colorpicker/dist/js/bootstrap-colorpicker.js');
//head_add_js('library/bootstrap-colorpicker/src/js/docs.js');
diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl
index 29dc41525..c77d49a74 100755
--- a/view/tpl/jot.tpl
+++ b/view/tpl/jot.tpl
@@ -108,12 +108,7 @@
</div>
<!-- <div class="modal-body"> -->
<div class="modal-body form-group" style="width:90%">
- <div class="input-group input-group-sm date" id="datetimepicker1">
- <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-date-format="YYYY-MM-DD HH:mm" size="20"/>
- </div>
+ <div class='date'><input type='text' placeholder='yyyy-mm-dd HH:MM' name='start_text' id='expiration-date' class="form-control" /></div><script type='text/javascript'>$(function () {var picker = $('#expiration-date').datetimepicker({format:'Y-m-d H:i', minDate: 0 }); })</script>
</div>
<!-- </div> -->
<div class="modal-footer">