diff options
| author | Michel Etienne | 2014-11-05 11:51:10 +0100 |
|---|---|---|
| committer | Michel Etienne | 2014-11-05 11:51:10 +0100 |
| commit | 0906ff71269c2bcec1a6445a6fb53900be66be9b (patch) | |
| tree | 873ecea902e1ace619ce872ba90f2c876e3251d4 /app/assets/javascripts | |
| parent | c828656898b1bc728e6fa89c4d527fd009dc7777 (diff) | |
| parent | 2b86d2428d5da8be4499fc1fec2976f6c70fa34e (diff) | |
| download | chouette-core-0906ff71269c2bcec1a6445a6fb53900be66be9b.tar.bz2 | |
Merge branch 'sismo' into gtfs_v2
Diffstat (limited to 'app/assets/javascripts')
4 files changed, 14 insertions, 25 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/exports/index.js.coffee b/app/assets/javascripts/exports/index.js.coffee index 0f6c524dc..655819507 100644 --- a/app/assets/javascripts/exports/index.js.coffee +++ b/app/assets/javascripts/exports/index.js.coffee @@ -1,5 +1 @@ -$(".exports.index").ready -> - $(".progress-bar.failed").addClass("progress-bar-danger").prepend("100%") - $(".progress-bar.pending").addClass("progress-bar-info").prepend("10%") - $(".progress-bar.processing").addClass("progress-bar-info").prepend("50%") - $(".progress-bar.completed").addClass("progress-bar-success").prepend("100%")
\ No newline at end of file +$(".exports.index").ready ->
\ No newline at end of file diff --git a/app/assets/javascripts/import_tasks/index.js.coffee b/app/assets/javascripts/import_tasks/index.js.coffee index bb3b3c9fb..8966a2960 100644 --- a/app/assets/javascripts/import_tasks/index.js.coffee +++ b/app/assets/javascripts/import_tasks/index.js.coffee @@ -1,5 +1 @@ -$(".import_tasks.index").ready -> - $(".progress-bar.failed").addClass("progress-bar-danger").prepend("100%") - $(".progress-bar.pending").addClass("progress-bar-info").prepend("10%") - $(".progress-bar.processing").addClass("progress-bar-info").prepend("50%") - $(".progress-bar.completed").addClass("progress-bar-success").prepend("100%")
\ No newline at end of file +$(".import_tasks.index").ready ->
\ No newline at end of file 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 |