Skip to content

Commit

Permalink
fix upload status colors to work with bs4
Browse files Browse the repository at this point in the history
  • Loading branch information
martenson committed May 11, 2018
1 parent f1eaaea commit 3a4cc36
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions client/galaxy/scripts/mvc/upload/collection/collection-row.js
Expand Up @@ -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();
}
},
Expand Down
6 changes: 3 additions & 3 deletions client/galaxy/scripts/mvc/upload/composite/composite-row.js
Expand Up @@ -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();
Expand Down
6 changes: 3 additions & 3 deletions client/galaxy/scripts/mvc/upload/default/default-row.js
Expand Up @@ -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();
}
},
Expand Down

0 comments on commit 3a4cc36

Please sign in to comment.