From 736888ee8ac660e1e293aa317d8bafa72465f698 Mon Sep 17 00:00:00 2001 From: Paul Gear Date: Tue, 28 Oct 2014 07:46:08 +1000 Subject: [PATCH] Integrate bootstrap datetimepicker PR#308 --- .scrutinizer.yml | 4 ++-- html/css/bootstrap-datetimepicker.min.css | 1 + html/index.php | 4 +++- html/js/bootstrap-datetimepicker.min.js | 1 + 4 files changed, 7 insertions(+), 3 deletions(-) create mode 120000 html/css/bootstrap-datetimepicker.min.css create mode 120000 html/js/bootstrap-datetimepicker.min.js diff --git a/.scrutinizer.yml b/.scrutinizer.yml index c5c1afdcb..8f3959d51 100644 --- a/.scrutinizer.yml +++ b/.scrutinizer.yml @@ -3,6 +3,6 @@ imports: - javascript - php -# please keep the excluded paths list sorted +# FIXME: find a way to keep excluded_paths list sorted filter: - excluded_paths: [ html/includes/geshi/*, html/includes/jpgraph/*, html/js/bootstrap*, html/js/jqplot/*, html/js/jquery.cycle*, html/js/jquery-ui-timepicker-addon.js, html/js/sorttable.js, html/js/tw-sack.js, includes/phpmailer/*, html/css/bootstrap*, html/includes/Slim/*, html/css/toastr*, html/js/toastr* ] + excluded_paths: [ html/includes/geshi/*, html/includes/jpgraph/*, html/js/bootstrap*, html/js/jqplot/*, html/js/jquery.cycle*, html/js/jquery-ui-timepicker-addon.js, html/js/sorttable.js, html/js/tw-sack.js, includes/phpmailer/*, html/css/bootstrap*, html/includes/Slim/*, html/css/toastr*, html/js/toastr*, html/js/datetime/* ] diff --git a/html/css/bootstrap-datetimepicker.min.css b/html/css/bootstrap-datetimepicker.min.css new file mode 120000 index 000000000..c1a038730 --- /dev/null +++ b/html/css/bootstrap-datetimepicker.min.css @@ -0,0 +1 @@ +../js/datetime/build/css/bootstrap-datetimepicker.min.css \ No newline at end of file diff --git a/html/index.php b/html/index.php index 2486f8799..67ee28720 100755 --- a/html/index.php +++ b/html/index.php @@ -128,12 +128,14 @@ if ($config['page_title']) { $config['page_title_prefix'] = $config['page_title' if ($config['page_refresh']) { echo(' ' . "\n"); } ?> - + + + diff --git a/html/js/bootstrap-datetimepicker.min.js b/html/js/bootstrap-datetimepicker.min.js new file mode 120000 index 000000000..c6dd8dd95 --- /dev/null +++ b/html/js/bootstrap-datetimepicker.min.js @@ -0,0 +1 @@ +datetime/build/js/bootstrap-datetimepicker.min.js \ No newline at end of file