From 9b73fdac10894ff5b83630010e552ee1f6b38a8e Mon Sep 17 00:00:00 2001 From: Sveinung Gundersen Date: Sat, 6 Apr 2019 04:13:35 +0200 Subject: [PATCH 1/2] Fixed "Run Workflow" button jumping when clicked --- client/galaxy/scripts/mvc/tool/tool-form-composite.js | 1 + 1 file changed, 1 insertion(+) diff --git a/client/galaxy/scripts/mvc/tool/tool-form-composite.js b/client/galaxy/scripts/mvc/tool/tool-form-composite.js index 0427ea695a0..f16e9970b36 100644 --- a/client/galaxy/scripts/mvc/tool/tool-form-composite.js +++ b/client/galaxy/scripts/mvc/tool/tool-form-composite.js @@ -688,6 +688,7 @@ var View = Backbone.View.extend({ wait_text: "Sending...", percentage: -1 }); + this.execute_btn.$el.addClass("float-right mt-3") if (this.wp_form) { this.wp_form.portlet[enabled ? "enable" : "disable"](); } From 3ec5547ec64f8c2938f82e9a2a6f9093c7adbb2c Mon Sep 17 00:00:00 2001 From: Dannon Baker Date: Mon, 8 Apr 2019 14:28:44 -0400 Subject: [PATCH 2/2] Add unique identifier to run workflow button, style explicitly instead of on the fly --- client/galaxy/scripts/mvc/tool/tool-form-composite.js | 4 ++-- client/galaxy/style/scss/base.scss | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/client/galaxy/scripts/mvc/tool/tool-form-composite.js b/client/galaxy/scripts/mvc/tool/tool-form-composite.js index f16e9970b36..2ac0ec16e44 100644 --- a/client/galaxy/scripts/mvc/tool/tool-form-composite.js +++ b/client/galaxy/scripts/mvc/tool/tool-form-composite.js @@ -222,6 +222,7 @@ var View = Backbone.View.extend({ _renderHeader: function() { var self = this; this.execute_btn = new Ui.Button({ + id: "run-workflow", icon: "fa-check", title: _l("Run workflow"), cls: "btn btn-primary", @@ -233,7 +234,7 @@ var View = Backbone.View.extend({ .addClass("h4") .empty() .append(`Workflow: ${this.model.get("name")}`) - .append(this.execute_btn.$el.addClass("float-right mt-3")); + .append(this.execute_btn.$el); }, /** Render message */ @@ -688,7 +689,6 @@ var View = Backbone.View.extend({ wait_text: "Sending...", percentage: -1 }); - this.execute_btn.$el.addClass("float-right mt-3") if (this.wp_form) { this.wp_form.portlet[enabled ? "enable" : "disable"](); } diff --git a/client/galaxy/style/scss/base.scss b/client/galaxy/style/scss/base.scss index 738aa4fc9bd..4d0c44942f9 100644 --- a/client/galaxy/style/scss/base.scss +++ b/client/galaxy/style/scss/base.scss @@ -728,6 +728,11 @@ div.form-row-error-message { margin-top: 5px; } +#run-workflow { + @include float-right; + @extend .mt-3; +} + .workflow-right { background: white; }