diff --git a/client/galaxy/scripts/mvc/tools/tools-form-base.js b/client/galaxy/scripts/mvc/tools/tools-form-base.js index ccb60e69bd0..e9d7a0d99fc 100644 --- a/client/galaxy/scripts/mvc/tools/tools-form-base.js +++ b/client/galaxy/scripts/mvc/tools/tools-form-base.js @@ -306,7 +306,7 @@ define(['utils/utils', 'utils/deferred', 'mvc/ui/ui-portlet', 'mvc/ui/ui-misc', }); // append message - this.portlet.append(this.message.$el, true); + this.portlet.append(this.message.$el); // append tool section this.portlet.append(this.section.$el); diff --git a/client/galaxy/scripts/mvc/tools/tools-repeat.js b/client/galaxy/scripts/mvc/tools/tools-repeat.js index ba7e222cacc..0b0cf6d8a94 100644 --- a/client/galaxy/scripts/mvc/tools/tools-repeat.js +++ b/client/galaxy/scripts/mvc/tools/tools-repeat.js @@ -44,7 +44,7 @@ var View = Backbone.View.extend({ this.$el.append(this.table.$el); // add button - this.$el.append(Utils.wrap(this.button_new.$el)); + this.$el.append($('
').append(this.button_new.$el)); // clear list this.list = {}; diff --git a/client/galaxy/scripts/mvc/tools/tools-section.js b/client/galaxy/scripts/mvc/tools/tools-section.js index f112fdab365..2c94b8e6c2b 100644 --- a/client/galaxy/scripts/mvc/tools/tools-section.js +++ b/client/galaxy/scripts/mvc/tools/tools-section.js @@ -139,7 +139,7 @@ define(['utils/utils', 'mvc/ui/ui-table', 'mvc/ui/ui-misc', 'mvc/ui/ui-portlet', }); // displays as grouped subsection - sub_section.$el.addClass('ui-table-form-section'); + sub_section.$el.addClass('ui-table-section'); // create table row this.table.add(sub_section.$el); diff --git a/client/galaxy/scripts/mvc/tools/tools-select-content.js b/client/galaxy/scripts/mvc/tools/tools-select-content.js index 5f7bf24e9ba..886e4b8e8be 100644 --- a/client/galaxy/scripts/mvc/tools/tools-select-content.js +++ b/client/galaxy/scripts/mvc/tools/tools-select-content.js @@ -110,7 +110,7 @@ var View = Backbone.View.extend({ // add elements to dom if (_.size(this.list) > 1) { - this.$el.append(Utils.wrap(this.button_type.$el)); + this.$el.append(this.button_type.$el.addClass('ui-bottom-margin')); } for (var i in this.list) { this.$el.append(this.list[i].field.$el); diff --git a/client/galaxy/scripts/mvc/ui/ui-portlet.js b/client/galaxy/scripts/mvc/ui/ui-portlet.js index 683e3094dae..fe2311e93ee 100644 --- a/client/galaxy/scripts/mvc/ui/ui-portlet.js +++ b/client/galaxy/scripts/mvc/ui/ui-portlet.js @@ -84,12 +84,8 @@ var View = Backbone.View.extend({ }, // append - append: function($el, unwrapped) { - if (unwrapped) { - this.$content.append($el); - } else { - this.$content.append(Utils.wrap($el)); - } + append: function($el) { + this.$content.append($el); }, // content diff --git a/client/galaxy/scripts/utils/utils.js b/client/galaxy/scripts/utils/utils.js index 1a67406a146..217f376831b 100644 --- a/client/galaxy/scripts/utils/utils.js +++ b/client/galaxy/scripts/utils/utils.js @@ -218,16 +218,6 @@ function uuid(){ return 'x' + Math.random().toString(36).substring(2, 9); }; -/** - * Wrap an dom element into a paragraph - * @param{Element} $el - DOM element to be wrapped - */ -function wrap($el) { - var wrapper = $('

'); - wrapper.append($el); - return wrapper; -}; - /** * Create a time stamp */ @@ -256,7 +246,6 @@ return { bytesToString: bytesToString, uuid: uuid, time: time, - wrap: wrap, request: request, sanitize: sanitize, textify: textify, diff --git a/config/plugins/visualizations/charts/static/app.css b/config/plugins/visualizations/charts/static/app.css index 80797c00500..3932cea9998 100644 --- a/config/plugins/visualizations/charts/static/app.css +++ b/config/plugins/visualizations/charts/static/app.css @@ -58,7 +58,7 @@ .charts-viewport .info { position: absolute; - margin: 10px 20px 50px 10px; + margin: 20px 20px 50px 10px; } .charts-viewport .text { diff --git a/config/plugins/visualizations/charts/static/build-app.js b/config/plugins/visualizations/charts/static/build-app.js index 52c8f70cad6..d0a5eb85cd1 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'