aboutsummaryrefslogtreecommitdiffstats
path: root/app/assets/javascripts
diff options
context:
space:
mode:
authorMichel Etienne2014-11-04 15:02:14 +0100
committerMichel Etienne2014-11-04 15:02:14 +0100
commitdb89e7c94cbf7fdea3d46dcf37ac643075f79000 (patch)
treeb7903021b2058d31860db2fc351f6fe006c578db /app/assets/javascripts
parent6841cc3d36990a0ed12c78f371112af9b3590f72 (diff)
parentc9fd03422743d3d716bbd7199184c035c1b0d4c9 (diff)
downloadchouette-core-db89e7c94cbf7fdea3d46dcf37ac643075f79000.tar.bz2
Merge branch 'sismo' of github.com:afimb/chouette2 into sismo
Diffstat (limited to 'app/assets/javascripts')
-rw-r--r--app/assets/javascripts/exports/index.js.coffee6
-rw-r--r--app/assets/javascripts/import_tasks/index.js.coffee6
2 files changed, 2 insertions, 10 deletions
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