opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-10-24 12:13:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6124 from martenson/fix-upload-colorstate

Browse Source 
[18.05] fix upload status colors to work with bs4
This commit is contained in:
Dannon
2018-05-14 06:47:45 -04:00
committed by GitHub
parent 5f99db40d2 3a4cc360a4
commit 19c5c7395e
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/galaxy/scripts/mvc/upload/collection/collection-row.js
+2 -2
View File
@@ -128,11 +128,11 @@ export default Backbone.View.extend({
var enabled = this.model.get("enabled");
this.$text_content.attr("disabled", !enabled);
if (status == "success") {
this.$el.addClass("success");
this.$el.addClass("table-success");
this.$percentage.html("100%");
}
if (status == "error") {
this.$el.addClass("danger");
this.$el.addClass("table-danger");
this.$info_progress.hide();
}
},
client/galaxy/scripts/mvc/upload/composite/composite-row.js
+3 -3
View File
@@ -223,18 +223,18 @@ export default Backbone.View.extend({
this.$status.removeClass().addClass(this.status_classes[status]);
this.model.set("enabled", status != "running");
this.$text_content.attr("disabled", !this.model.get("enabled"));
this.$el.removeClass("success danger warning");
this.$el.removeClass("table-success table-danger table-warning");
if (status == "running" || status == "ready") {
this.model.set("percentage", 0);
}
this.$source.find(".button")[status == "running" ? "addClass" : "removeClass"]("disabled");
if (status == "success") {
this.$el.addClass("success");
this.$el.addClass("table-success");
this.model.set("percentage", 100);
this.$percentage.html("100%");
}
if (status == "error") {
this.$el.addClass("danger");
this.$el.addClass("table-danger");
this.model.set("percentage", 0);
this.$info_progress.hide();
this.$info_text.show();
client/galaxy/scripts/mvc/upload/default/default-row.js
+3 -3
View File
@@ -225,13 +225,13 @@ export default Backbone.View.extend({
this.$info_progress.show();
this.$el.removeClass().addClass("upload-row");
if (status == "success") {
this.$el.addClass("success");
this.$el.addClass("table-success");
this.$percentage.html("100%");
} else if (status == "error") {
this.$el.addClass("danger");
this.$el.addClass("table-danger");
this.$info_progress.hide();
} else if (status == "warning") {
this.$el.addClass("warning");
this.$el.addClass("table-warning");
this.$info_progress.hide();
}
},