From c1b8608940055adabc8bf4bb85b843eb5cb95412 Mon Sep 17 00:00:00 2001
From: Stefan Parviainen <saparvia@caterva.eu>
Date: Sun, 16 Nov 2014 13:56:45 +0100
Subject: Switch to a better datetime picker widget

---
 view/theme/redbasic/php/theme_init.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'view')

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');
-- 
cgit v1.2.3


From e190adc58980c12c6dffb21dae57194aad354e3c Mon Sep 17 00:00:00 2001
From: Stefan Parviainen <saparvia@caterva.eu>
Date: Mon, 17 Nov 2014 16:51:46 +0100
Subject: Use new date selector for item expiry

---
 view/tpl/jot.tpl | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'view')

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">
-- 
cgit v1.2.3