From dd9a409b3a80cbe56daabfc79d36e23afe0eff1b Mon Sep 17 00:00:00 2001
From: Luc Donnet
Date: Wed, 29 Oct 2014 12:36:13 +0100
Subject: Fix timepicker use when no HTML5 possible Refs #0029395

---
 app/assets/javascripts/application.js              |  4 +++-
 .../plugins/bootstrap_timepicker_activation.coffee | 23 +++++++++-------------
 2 files changed, 12 insertions(+), 15 deletions(-)

(limited to 'app/assets/javascripts')

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
-- 
cgit v1.2.3