diff --git a/Gemfile b/Gemfile index beab8ce0..ebc72f9e 100644 --- a/Gemfile +++ b/Gemfile @@ -88,9 +88,6 @@ gem 'jquery-ui-rails', '~> 6.0.1' # for languages validation gem 'iso-639' -# as date picker -gem 'bootstrap3-datetimepicker-rails', '~> 4.17.47' - # data tables gem 'ajax-datatables-rails' gem 'jquery-datatables-rails' diff --git a/Gemfile.lock b/Gemfile.lock index 053841e6..5e436859 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -99,8 +99,6 @@ GEM autoprefixer-rails (>= 5.2.1) sassc (>= 2.0.0) bootstrap-switch-rails (3.3.3) - bootstrap3-datetimepicker-rails (4.17.47) - momentjs-rails (>= 2.8.1) builder (3.2.4) byebug (11.1.3) cancancan (3.5.0) @@ -292,8 +290,6 @@ GEM mini_mime (1.1.5) mini_portile2 (2.8.6) minitest (5.23.1) - momentjs-rails (2.29.4.1) - railties (>= 3.1) monetize (1.13.0) money (~> 6.12) money (6.19.0) @@ -618,7 +614,6 @@ DEPENDENCIES awesome_nested_set bootstrap-sass (~> 3.4.0) bootstrap-switch-rails (= 3.3.3) - bootstrap3-datetimepicker-rails (~> 4.17.47) byebug cancancan capybara diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index cf12a085..9a3b692a 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -31,8 +31,6 @@ //= require momentjs //= require leaflet //= require holderjs -//= require bootstrap-datetimepicker -//= require osem-datepickers //= require osem-datatables //= require osem-tickets //= require bootstrap-switch diff --git a/app/assets/javascripts/osem-datepickers.js b/app/assets/javascripts/osem-datepickers.js deleted file mode 100644 index cc23aaa4..00000000 --- a/app/assets/javascripts/osem-datepickers.js +++ /dev/null @@ -1,47 +0,0 @@ -// get current_date -var today = new Date().toISOString().slice(0, 10); -$(function () { - $("input[id^='datetimepicker']").datetimepicker({ - useCurrent: false, - sideBySide: true, - format: 'YYYY-MM-DD HH:mm' - }); - - $('.datetimepicker').datetimepicker({ - useCurrent: false, - sideBySide: true, - format: 'YYYY-MM-DD HH:mm' - }); - - $("#conference-start-datepicker").datetimepicker({ - useCurrent: false, - ignoreReadonly: true, - format: "YYYY-MM-DD", - }); - - $("#conference-end-datepicker").datetimepicker({ - useCurrent: false, - ignoreReadonly: true, - format: "YYYY-MM-DD" - }); - - $("#conference-start-datepicker").on("dp.change",function (e) { - $('#conference-end-datepicker').data("DateTimePicker").minDate(e.date); - if (!$('#conference-end-datepicker').val()) { - $('#conference-end-datepicker').data("DateTimePicker").date(e.date); - } - }); - - $("#conference-start-datepicker").change(function (e) { - $('#conference-start-datepicker').val()?$('#conference-end-datepicker').data("DateTimePicker").minDate(e.date):$('#conference-end-datepicker').data("DateTimePicker").minDate(null); - }); - - $("#conference-end-datepicker").on("dp.change",function (e) { - $('#conference-start-datepicker').data("DateTimePicker").maxDate(e.date); - }); - - $("#conference-end-datepicker").change(function (e) { - $('#conference-end-datepicker').val()?$('#conference-start-datepicker').data("DateTimePicker").maxDate(e.date):$('#conference-start-datepicker').data("DateTimePicker").maxDate(null); - }); - -} ); diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index 576997ae..02dbfc64 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -9,7 +9,6 @@ *= require osem-splash *= require osem-fonts *= require bootstrap-markdown - *= require bootstrap-datetimepicker *= require leaflet *= require bootstrap3-switch *= require osem-payments diff --git a/app/assets/stylesheets/jquery-ui-timepicker-addon.css b/app/assets/stylesheets/jquery-ui-timepicker-addon.css deleted file mode 100644 index b93a85f6..00000000 --- a/app/assets/stylesheets/jquery-ui-timepicker-addon.css +++ /dev/null @@ -1,10 +0,0 @@ -.ui-timepicker-div .ui-widget-header { margin-bottom: 8px; } -.ui-timepicker-div dl { text-align: left; } -.ui-timepicker-div dl dt { height: 25px; margin-bottom: -25px; } -.ui-timepicker-div dl dd { margin: 0 10px 10px 65px; } -.ui-timepicker-div td { font-size: 90%; } -.ui-tpicker-grid-label { background: none; border: none; margin: 0; padding: 0; } - -.ui-timepicker-rtl{ direction: rtl; } -.ui-timepicker-rtl dl { text-align: right; } -.ui-timepicker-rtl dl dd { margin: 0 65px 10px 10px; } \ No newline at end of file diff --git a/app/assets/stylesheets/strap-on.scss b/app/assets/stylesheets/strap-on.scss index 571161e6..feeecb29 100644 --- a/app/assets/stylesheets/strap-on.scss +++ b/app/assets/stylesheets/strap-on.scss @@ -5,7 +5,6 @@ $navbar-default-color: #ffffff; $navbar-default-link-color: #ffffff; $navbar-default-link-hover-color: #000000; -@import 'bootstrap-datetimepicker'; @import "bootstrap-sprockets"; //