From c8aece99ebb1bfb17df787bb74022acda7d609e8 Mon Sep 17 00:00:00 2001 From: Aysam Guerler Date: Thu, 5 Feb 2015 22:25:22 -0500 Subject: [PATCH] Workflow: Add style for workflow tool form --- .../scripts/mvc/tools/tools-form-base.js | 11 +- .../scripts/mvc/tools/tools-form-workflow.js | 1 + client/galaxy/scripts/mvc/ui/ui-portlet.js | 4 +- .../visualizations/charts/static/build-app.js | 2 +- .../charts/static/views/viewport.js | 2 +- static/scripts/mvc/tools/tools-form-base.js | 11 +- .../scripts/mvc/tools/tools-form-workflow.js | 1 + static/scripts/mvc/ui/ui-portlet.js | 4 +- .../packed/mvc/tools/tools-form-base.js | 2 +- .../packed/mvc/tools/tools-form-workflow.js | 2 +- static/scripts/packed/mvc/ui/ui-portlet.js | 2 +- static/style/blue/base.css | 35 +++--- static/style/src/less/ui.less | 101 ++++++++++++------ 13 files changed, 106 insertions(+), 72 deletions(-) diff --git a/client/galaxy/scripts/mvc/tools/tools-form-base.js b/client/galaxy/scripts/mvc/tools/tools-form-base.js index f8b88ccbe75..ccb60e69bd0 100644 --- a/client/galaxy/scripts/mvc/tools/tools-form-base.js +++ b/client/galaxy/scripts/mvc/tools/tools-form-base.js @@ -18,7 +18,9 @@ define(['utils/utils', 'utils/deferred', 'mvc/ui/ui-portlet', 'mvc/ui/ui-misc', // shows form in narrow view mode narrow : false, // shows errors on start - initial_errors : false + initial_errors : false, + // portlet style + cls_portlet : 'ui-portlet-limited' }; // configure options @@ -294,7 +296,7 @@ define(['utils/utils', 'utils/deferred', 'mvc/ui/ui-portlet', 'mvc/ui/ui-misc', this.portlet = new Portlet.View({ icon : 'fa-wrench', title : '' + options.name + ' ' + options.description + ' (Galaxy Tool Version ' + options.version + ')', - cls : 'ui-portlet-slim', + cls : this.options.cls_portlet, operations: { requirements : requirements_button, menu : menu_button, @@ -303,11 +305,6 @@ define(['utils/utils', 'utils/deferred', 'mvc/ui/ui-portlet', 'mvc/ui/ui-misc', buttons : this.buttons }); - // remove padding - if (options.narrow) { - this.portlet.$content.css('padding', '0px'); - } - // append message this.portlet.append(this.message.$el, true); diff --git a/client/galaxy/scripts/mvc/tools/tools-form-workflow.js b/client/galaxy/scripts/mvc/tools/tools-form-workflow.js index 49c3abf786f..0b19f6ef1e9 100644 --- a/client/galaxy/scripts/mvc/tools/tools-form-workflow.js +++ b/client/galaxy/scripts/mvc/tools/tools-form-workflow.js @@ -28,6 +28,7 @@ define(['utils/utils', 'mvc/tools/tools-form-base'], this.options.is_dynamic = false; this.options.narrow = true; this.options.initial_errors = true; + this.options.cls_portlet = 'ui-portlet-narrow'; // declare fields as optional Utils.deepeach(options.inputs, function(item) { diff --git a/client/galaxy/scripts/mvc/ui/ui-portlet.js b/client/galaxy/scripts/mvc/ui/ui-portlet.js index e1e7b2008cd..683e3094dae 100644 --- a/client/galaxy/scripts/mvc/ui/ui-portlet.js +++ b/client/galaxy/scripts/mvc/ui/ui-portlet.js @@ -67,7 +67,7 @@ var View = Backbone.View.extend({ } // append operations - this.$operations = $(this.el).find('.operations'); + this.$operations = $(this.el).find('.portlet-operations'); if (this.options.operations) { // link functions var self = this; @@ -157,7 +157,7 @@ var View = Backbone.View.extend({ if (options.title) { tmpl += '
' + - '
' + + '
' + '
'; if (options.icon) diff --git a/config/plugins/visualizations/charts/static/build-app.js b/config/plugins/visualizations/charts/static/build-app.js index b525f31f6a5..52c8f70cad6 100644 --- a/config/plugins/visualizations/charts/static/build-app.js +++ b/config/plugins/visualizations/charts/static/build-app.js @@ -3,4 +3,4 @@ // (c) 2009-2014 Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors // Underscore may be freely distributed under the MIT license. -define("mvc/ui/ui-modal",[],function(){var e=Backbone.View.extend({elMain:"body",optionsDefault:{title:"ui-modal",body:"",backdrop:!0,height:null,width:null,closing_events:!1,closing_callback:null},buttonList:{},initialize:function(e){e&&this._create(e)},show:function(e){this.initialize(e),this.options.height?(this.$body.css("height",this.options.height),this.$body.css("overflow","hidden")):this.$body.css("max-height",$(window).height()/2),this.options.width&&this.$dialog.css("width",this.options.width),this.visible?this.$el.show():this.$el.fadeIn("fast"),this.visible=!0},hide:function(){this.visible=!1,this.$el.fadeOut("fast"),this.options.closing_callback&&this.options.closing_callback()},enableButton:function(e){var t=this.buttonList[e];this.$buttons.find("#"+t).prop("disabled",!1)},disableButton:function(e){var t=this.buttonList[e];this.$buttons.find("#"+t).prop("disabled",!0)},showButton:function(e){var t=this.buttonList[e];this.$buttons.find("#"+t).show()},hideButton:function(e){var t=this.buttonList[e];this.$buttons.find("#"+t).hide()},getButton:function(e){var t=this.buttonList[e];return this.$buttons.find("#"+t)},scrollTop:function(){return this.$body.scrollTop()},_create:function(e){var t=this;this.options=_.defaults(e,this.optionsDefault),this.options.body=="progress"&&(this.options.body=$('
')),this.$el&&(this.$el.remove(),$(document).off("keyup.ui-modal")),this.setElement(this._template(this.options.title)),this.$dialog=this.$el.find(".modal-dialog"),this.$body=this.$el.find(".modal-body"),this.$footer=this.$el.find(".modal-footer"),this.$buttons=this.$el.find(".buttons"),this.$backdrop=this.$el.find(".modal-backdrop"),this.$body.html(this.options.body),this.options.backdrop||this.$backdrop.removeClass("in");if(this.options.buttons){this.buttonList={};var n=0;$.each(this.options.buttons,function(e,r){var i="button-"+n++;t.$buttons.append($('').text(e).click(r)).append(" "),t.buttonList[e]=i})}else this.$footer.hide();$(this.elMain).append($(this.el)),this.options.closing_events&&($(document).on("keyup.ui-modal",function(e){e.keyCode==27&&t.hide()}),this.$el.find(".modal-backdrop").on("click",function(){t.hide()}))},_template:function(e){return'