diff --git a/public/build.json b/public/build.json index e3e5d2bb55..17d6038790 100644 --- a/public/build.json +++ b/public/build.json @@ -81,7 +81,6 @@ "lib/public/js/legacy/widgets/dialog.js", "lib/public/js/legacy/webpage/page_header.js", "lib/public/js/legacy/webpage/loaders.js", - "lib/public/js/legacy/wn/widgets/footer.js", "lib/public/js/legacy/model/local_data.js", "lib/public/js/legacy/model/doclist.js", "lib/public/js/wn/app.js" diff --git a/public/js/legacy/widgets/form/fields.js b/public/js/legacy/widgets/form/fields.js index f11b242d92..057bf63331 100644 --- a/public/js/legacy/widgets/form/fields.js +++ b/public/js/legacy/widgets/form/fields.js @@ -43,9 +43,9 @@ Field.prototype.make_body = function() { // parent element if(this.parent) - this.wrapper = $a(this.parent, (this.with_label ? 'div' : 'span')); + this.wrapper = $a(this.parent, (this.with_label || this.df.fieldtype=="HTML" ? 'div' : 'span')); else - this.wrapper = document.createElement((this.with_label ? 'div' : 'span')); + this.wrapper = document.createElement((this.with_label || this.df.fieldtype=="HTML" ? 'div' : 'span')); this.label_area = $a(this.wrapper, 'div', '', {margin:'0px 0px 2px 0px', minHeight:'1em'}); diff --git a/public/js/legacy/wn/widgets/footer.js b/public/js/legacy/wn/widgets/footer.js deleted file mode 100644 index a3a4fca87b..0000000000 --- a/public/js/legacy/wn/widgets/footer.js +++ /dev/null @@ -1,48 +0,0 @@ -// Copyright (c) 2012 Web Notes Technologies Pvt Ltd (http://erpnext.com) -// -// MIT License (MIT) -// -// Permission is hereby granted, free of charge, to any person obtaining a -// copy of this software and associated documentation files (the "Software"), -// to deal in the Software without restriction, including without limitation -// the rights to use, copy, modify, merge, publish, distribute, sublicense, -// and/or sell copies of the Software, and to permit persons to whom the -// Software is furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, -// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A -// PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT -// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF -// CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE -// OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -// - -// a simple footer - -// args - parent, columns, items -// items as [{column:1, label:'x', description:'y', onclick:function}] -wn.widgets.Footer = function(args) { - $.extend(this, args); - this.make = function() { - this.wrapper = $a(this.parent, 'div', 'std-footer'); - this.table = make_table(this.wrapper, 1, this.columns, [], {width:100/this.columns + '%'}); - this.render_items(); - } - this.render_items = function() { - for(var i=0; i