Fix timepicker use when no HTML5 possible Refs #0029395

4 files changed, 16 insertions, 19 deletions

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>