diff options
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 9 | ||||
| -rw-r--r-- | app/assets/javascripts/application.js | 4 | ||||
| -rw-r--r-- | app/assets/javascripts/plugins/bootstrap_timepicker_activation.coffee | 23 | ||||
| -rw-r--r-- | app/assets/stylesheets/application.css.scss.erb | 2 | ||||
| -rw-r--r-- | app/views/shared/_header.erb | 6 |
6 files changed, 23 insertions, 23 deletions
@@ -57,9 +57,9 @@ gem 'simple_form' gem 'rails-assets-tagmanager', '~> 3.0.1.0' gem 'rails-assets-typeahead.js', '~> 0.10.5' gem "breadcrumbs_on_rails" -gem 'bootstrap-timepicker-rails' gem 'rails-assets-typeahead.js-bootstrap3.less' gem 'rails-assets-respond' +gem 'rails-assets-eonasdan-bootstrap-datetimepicker', '~> 3.1.3' # Format Output gem 'json' diff --git a/Gemfile.lock b/Gemfile.lock index 617a8cc82..672d1ced5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -64,8 +64,6 @@ GEM arel (3.0.3) bcrypt-ruby (3.0.1) bcrypt-ruby (3.0.1-java) - bootstrap-timepicker-rails (0.1.3) - railties (>= 3.0) bouncy-castle-java (1.5.0146.1) breadcrumbs_on_rails (2.3.0) builder (3.0.4) @@ -243,7 +241,12 @@ GEM rails-assets-bootstrap (3.1.1) rails-assets-jquery (>= 1.9.0) rails-assets-bootstrap-sass-official (3.1.1.2) + rails-assets-eonasdan-bootstrap-datetimepicker (3.1.3) + rails-assets-bootstrap (>= 3.0) + rails-assets-jquery (>= 1.8.3) + rails-assets-moment (>= 2.8.0) rails-assets-jquery (2.1.1) + rails-assets-moment (2.8.3) rails-assets-respond (1.4.2) rails-assets-tagmanager (3.0.1) rails-assets-jquery (>= 1.0.0) @@ -379,7 +382,6 @@ DEPENDENCIES activerecord-jdbcpostgresql-adapter (~> 1.3.3) acts_as_list (= 0.1.6) acts_as_tree-1.8 (= 1.1.0) - bootstrap-timepicker-rails breadcrumbs_on_rails calendar_helper (= 0.2.5) capistrano @@ -419,6 +421,7 @@ DEPENDENCIES rabl rails (= 3.2.18) rails-assets-bootstrap-sass-official (~> 3.1.1) + rails-assets-eonasdan-bootstrap-datetimepicker rails-assets-respond rails-assets-tagmanager (~> 3.0.1.0) rails-assets-typeahead.js (~> 0.10.5) diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index ed6e05c4c..01142c849 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -13,7 +13,9 @@ //= require morris //= require bootstrap-sass-official //= require typeahead.js -//= require bootstrap-timepicker +//= require moment +//= require moment/locale/fr +//= require eonasdan-bootstrap-datetimepicker //= 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 index 9945022bc..1c40ebdb5 100644 --- a/app/assets/javascripts/plugins/bootstrap_timepicker_activation.coffee +++ b/app/assets/javascripts/plugins/bootstrap_timepicker_activation.coffee @@ -1,16 +1,11 @@ jQuery -> if(!(Modernizr.inputtypes && Modernizr.inputtypes.time)) - $('.timepicker_basic').timepicker( - template: false, - showInputs: false, - minuteStep: 1, - showMeridian: false, - ) - $('.timepicker_seconds').timepicker( - template: false, - showInputs: false, - minuteStep: 1, - secondStep: 1, - showMeridian: false, - showSeconds: true - )
\ No newline at end of file + $('.timepicker_basic').datetimepicker({ + pickDate: false, + language: $(".dropdown.languages > a > img").attr("data-locale") || 'en', + }) + $('.timepicker_seconds').datetimepicker({ + pickDate: false, + language: $(".dropdown.languages > a > img").attr("data-locale") || 'en', + useSeconds: true, + })
\ 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 156fc75cb..3ea2b36ed 100644 --- a/app/assets/stylesheets/application.css.scss.erb +++ b/app/assets/stylesheets/application.css.scss.erb @@ -24,7 +24,7 @@ $body-bg: #eee; @import "jquery.ui.all"; @import "morris"; @import "formtastic"; -@import "bootstrap-timepicker"; +@import 'eonasdan-bootstrap-datetimepicker'; @import "vendor/openlayers_style"; @import "vendor/openlayers_ie6-style"; diff --git a/app/views/shared/_header.erb b/app/views/shared/_header.erb index 8070241f9..3b7c90926 100644 --- a/app/views/shared/_header.erb +++ b/app/views/shared/_header.erb @@ -75,11 +75,11 @@ <ul class="nav navbar-nav navbar-right"> <li class="dropdown languages"> <a href="#" class="dropdown-toggle" data-toggle="dropdown"> - <%= image_tag("language_engine/#{selected_language}_flag.png") %><b class='caret'></b> + <%= image_tag("language_engine/#{selected_language}_flag.png", { :'data-locale' => "#{selected_language}" } ) %><b class='caret'></b> </a> <ul class="dropdown-menu"> - <li><%= link_to_language :fr %></li> - <li><%= link_to_language :en %></li> + <li><%= link_to_language :fr, { :class => language_class( :fr ) } %></li> + <li><%= link_to_language :en, { :class => language_class( :en ) } %></li> </ul> </li> <li><%= link_to t('layouts.help'), help_path, :class =>("current" if help_page?), :target => "chouette_help" %></li> |