diff options
| -rw-r--r-- | Gemfile | 1 | ||||
| -rw-r--r-- | Gemfile.lock | 3 | ||||
| -rw-r--r-- | app/assets/javascripts/application.js | 1 | ||||
| -rw-r--r-- | app/assets/javascripts/plugins/bootstrap_timepicker_activation.coffee | 8 | ||||
| -rw-r--r-- | app/assets/stylesheets/application.css.scss.erb | 1 | ||||
| -rw-r--r-- | app/views/access_points/_form.html.erb | 6 |
6 files changed, 17 insertions, 3 deletions
@@ -52,6 +52,7 @@ gem 'tagmanager-rails', '~> 3.0.1.0' #gem 'typeahead-rails', '~> 0.10.1' gem "twitter-typeahead-rails", :git => "https://github.com/ldonnet/twitter-typeahead-rails" gem "breadcrumbs_on_rails" +gem 'bootstrap-timepicker-rails' # Format Output gem 'json' diff --git a/Gemfile.lock b/Gemfile.lock index a9b43d758..316d89ab8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -74,6 +74,8 @@ GEM bcrypt-ruby (3.0.1-java) bootstrap-sass (3.1.1.1) sass (~> 3.2) + bootstrap-timepicker-rails (0.1.3) + railties (>= 3.0) bootswatch-rails (3.1.1.1) railties (>= 3.1) bouncy-castle-java (1.5.0146.1) @@ -385,6 +387,7 @@ DEPENDENCIES acts_as_list (= 0.1.6) acts_as_tree-1.8 (= 1.1.0) bootstrap-sass (~> 3.1.1) + bootstrap-timepicker-rails bootswatch-rails breadcrumbs_on_rails calendar_helper (= 0.2.5) 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 26c80c996..1132f65eb 100644 --- a/app/views/access_points/_form.html.erb +++ b/app/views/access_points/_form.html.erb @@ -11,9 +11,9 @@ <%= form.input :country_code %> <%= form.input :zip_code %> <%= form.input :city_name %> - <%= 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 %> |