From a946ebf66fee4f4877a69f0bb6066a8a458e7eb3 Mon Sep 17 00:00:00 2001 From: Aysam Guerler Date: Thu, 13 Nov 2014 16:38:49 -0500 Subject: [PATCH] Ui: Resize select fields --- client/galaxy/scripts/mvc/tools/tools-form.js | 1 - .../scripts/mvc/ui/ui-select-default.js | 4 +- .../visualizations/charts/static/build-app.js | 2 +- lib/galaxy/tools/parameters/basic.py | 1 + static/scripts/mvc/tools/tools-form.js | 1 - static/scripts/mvc/ui/ui-select-default.js | 4 +- static/scripts/packed/mvc/tools/tools-form.js | 2 +- .../packed/mvc/ui/ui-select-default.js | 2 +- static/style/blue/base.css | 18 ++++----- static/style/src/less/ui.less | 39 +++++-------------- 10 files changed, 26 insertions(+), 48 deletions(-) diff --git a/client/galaxy/scripts/mvc/tools/tools-form.js b/client/galaxy/scripts/mvc/tools/tools-form.js index 1b81f4f9151..5e3d02ba826 100644 --- a/client/galaxy/scripts/mvc/tools/tools-form.js +++ b/client/galaxy/scripts/mvc/tools/tools-form.js @@ -334,7 +334,6 @@ define(['utils/utils', 'utils/deferred', 'mvc/ui/ui-portlet', 'mvc/ui/ui-misc', this.portlet = new Portlet.View({ icon : 'fa-wrench', title: '' + this.model.name + ' ' + this.model.description, - cls : 'ui-portlet-short', operations: { menu : menu }, diff --git a/client/galaxy/scripts/mvc/ui/ui-select-default.js b/client/galaxy/scripts/mvc/ui/ui-select-default.js index c7ffa059556..2705211a8b8 100644 --- a/client/galaxy/scripts/mvc/ui/ui-select-default.js +++ b/client/galaxy/scripts/mvc/ui/ui-select-default.js @@ -109,7 +109,7 @@ var View = Backbone.View.extend({ show: function() { this.unwait(); this.$select.show(); - this.$el.show(); + this.$el.css('display', 'inline-block'); }, /** Hide the select field @@ -247,10 +247,10 @@ var View = Backbone.View.extend({ */ _template: function(options) { return '
' + + '' + '
' + '' + '
' + - '' + '
'; } }); diff --git a/config/plugins/visualizations/charts/static/build-app.js b/config/plugins/visualizations/charts/static/build-app.js index b8f40014cfe..267dd515331 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-2013 Jeremy Ashkenas, DocumentCloud Inc. // 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'