diff --git a/pages.php b/pages.php index 79dd25f..02be4aa 100644 --- a/pages.php +++ b/pages.php @@ -54,6 +54,8 @@ define("PAGES", [ ], "scripts" => [ "static/js/summernote.min.js", + "static/js/moment.min.js", + "static/js/bootstrap-datetimepicker.min.js", "static/js/jquery.easy-autocomplete.min.js", "static/js/edittask.js" ] diff --git a/pages/edittask.php b/pages/edittask.php index 2389f9e..99a72bb 100644 --- a/pages/edittask.php +++ b/pages/edittask.php @@ -70,10 +70,10 @@ redirectifnotloggedin(); : " placeholder="" />
- : " /> + : " />
- : "/> + : "/>
diff --git a/static/css/app.css b/static/css/app.css index 22cae2a..27801be 100644 --- a/static/css/app.css +++ b/static/css/app.css @@ -82,7 +82,10 @@ overflow-wrap: break-word !important; } - +.panel-body { + /* For some reason, the datetimepicker doesn't work unless we do this. */ + position: relative; +} @media screen and (max-width: 767px) { button.navbar-toggle[data-toggle="collapse"] { diff --git a/static/fonts/glyphicons-halflings-regular.eot b/static/fonts/glyphicons-halflings-regular.eot new file mode 100644 index 0000000..b93a495 Binary files /dev/null and b/static/fonts/glyphicons-halflings-regular.eot differ diff --git a/static/fonts/glyphicons-halflings-regular.svg b/static/fonts/glyphicons-halflings-regular.svg new file mode 100644 index 0000000..94fb549 --- /dev/null +++ b/static/fonts/glyphicons-halflings-regular.svg @@ -0,0 +1,288 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/static/fonts/glyphicons-halflings-regular.ttf b/static/fonts/glyphicons-halflings-regular.ttf new file mode 100644 index 0000000..1413fc6 Binary files /dev/null and b/static/fonts/glyphicons-halflings-regular.ttf differ diff --git a/static/fonts/glyphicons-halflings-regular.woff b/static/fonts/glyphicons-halflings-regular.woff new file mode 100644 index 0000000..9e61285 Binary files /dev/null and b/static/fonts/glyphicons-halflings-regular.woff differ diff --git a/static/fonts/glyphicons-halflings-regular.woff2 b/static/fonts/glyphicons-halflings-regular.woff2 new file mode 100644 index 0000000..64539b5 Binary files /dev/null and b/static/fonts/glyphicons-halflings-regular.woff2 differ diff --git a/static/js/edittask.js b/static/js/edittask.js index fc3280b..10c5c36 100644 --- a/static/js/edittask.js +++ b/static/js/edittask.js @@ -44,4 +44,14 @@ var options = { } }; -$("#assigned-to-box").easyAutocomplete(options); \ No newline at end of file +$("#assigned-to-box").easyAutocomplete(options); + +$(function () { + $('#assigned-on-box').datetimepicker({ + format: "ddd MMMM D YYYY h:mm a" + }); + $('#due-by-box').datetimepicker({ + format: "ddd MMMM D YYYY h:mm a"/*"YYYY-M-DTH:m"*/, + useCurrent: false + }); +}); \ No newline at end of file