diff options
| author | Luc Donnet | 2014-08-20 09:01:30 +0200 |
|---|---|---|
| committer | Luc Donnet | 2014-08-20 09:01:30 +0200 |
| commit | 824f721868554bcb3b890175b04af72b610f574f (patch) | |
| tree | 31babdf7d11c26105b18e19ddc6d1e7d736ab458 /app | |
| parent | 8a06d5a3d182a2a00987f86a8a4cc03f836102cc (diff) | |
| download | chouette-core-824f721868554bcb3b890175b04af72b610f574f.tar.bz2 | |
Initialize timepicker for html5 and non html5 browser on access point
Diffstat (limited to 'app')
4 files changed, 13 insertions, 3 deletions
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index fc3b1fecb..682945294 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -13,6 +13,7 @@ //= require morris //= require bootstrap //= require twitter/typeahead.min +//= require bootstrap-timepicker //= require tagmanager //= require_directory ./plugins //= require_directory . diff --git a/app/assets/javascripts/plugins/bootstrap_timepicker_activation.coffee b/app/assets/javascripts/plugins/bootstrap_timepicker_activation.coffee new file mode 100644 index 000000000..bfa7c5587 --- /dev/null +++ b/app/assets/javascripts/plugins/bootstrap_timepicker_activation.coffee @@ -0,0 +1,8 @@ +jQuery -> + if(!(Modernizr.inputtypes && Modernizr.inputtypes.time)) + $('input[type="time"]').timepicker( + template: false, + showInputs: false, + minuteStep: 1, + showMeridian: false, + )
\ No newline at end of file diff --git a/app/assets/stylesheets/application.css.scss.erb b/app/assets/stylesheets/application.css.scss.erb index fe5ae26e0..348ab3ef0 100644 --- a/app/assets/stylesheets/application.css.scss.erb +++ b/app/assets/stylesheets/application.css.scss.erb @@ -26,6 +26,7 @@ $body-bg: #eee; @import "morris"; @import "formtastic"; @import "twitter-typeahead-rails"; +@import "bootstrap-timepicker"; @import "vendor/openlayers_style"; @import "vendor/openlayers_ie6-style"; diff --git a/app/views/access_points/_form.html.erb b/app/views/access_points/_form.html.erb index f70b03ac3..b124f9237 100644 --- a/app/views/access_points/_form.html.erb +++ b/app/views/access_points/_form.html.erb @@ -9,9 +9,9 @@ :collection => Chouette::AccessPoint.access_point_types, :include_blank => false, :member_label => Proc.new { |access_point_type| t("access_types.label.#{access_point_type}") } %> <%= form.input :street_name %> <%= form.input :country_code %> - <%= form.input :comment %> - <%= form.input :openning_time, :as => :time_select %> - <%= form.input :closing_time, :as => :time_select %> + <%= form.input :comment %> + <%= form.input :openning_time, :as => :time_picker, :input_html => { :class => "form-control input-sm dateselect-time"}, :wrapper_html => { :class => "input-append bootstrap-timepicker" } %> + <%= form.input :closing_time, :as => :time_picker, :input_html => { :class => "form-control input-sm dateselect-time"}, :wrapper_html => { :class => "input-append bootstrap-timepicker" } %> <%= form.input :mobility_restricted_suitability,:as => :boolean %> <%= form.input :stairs_availability,:as => :boolean %> <%= form.input :lift_availability,:as => :boolean %> |