diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/static/js/schema.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/static/js/schema.js index 5b98d51b0..98173e781 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/static/js/schema.js +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/static/js/schema.js @@ -71,7 +71,7 @@ define('pgadmin.node.schema', [ var gridHeader = _.template([ '
', - ' ', + ' <%-label%>', '
'].join('\n')), gridBody = $('
').append( gridHeader(attributes) diff --git a/web/pgadmin/browser/server_groups/servers/roles/static/js/role.js b/web/pgadmin/browser/server_groups/servers/roles/static/js/role.js index 10cafe260..639f109de 100644 --- a/web/pgadmin/browser/server_groups/servers/roles/static/js/role.js +++ b/web/pgadmin/browser/server_groups/servers/roles/static/js/role.js @@ -89,7 +89,7 @@ define('pgadmin.node.role', [ template: _.template([ '', '
', - ' multiple="multiple" style="width:100%;" class="pgadmin-controls <%=extraClasses.join(\' \')%>" name="<%=name%>" value="<%-JSON.stringify(value)%>" <%=disabled ? "disabled" : ""%> <%=required ? "required" : ""%>>', ' <% for (var i=0; i < options.length; i++) { %>', ' <% var option = options[i]; %>', ' ', diff --git a/web/pgadmin/browser/server_groups/servers/static/js/variable.js b/web/pgadmin/browser/server_groups/servers/static/js/variable.js index 5d47ff0b3..329967e08 100644 --- a/web/pgadmin/browser/server_groups/servers/static/js/variable.js +++ b/web/pgadmin/browser/server_groups/servers/static/js/variable.js @@ -337,8 +337,8 @@ function(gettext, _, $, Backbone, Backform, Backgrid, Alertify, pgAdmin, pgNode) var self = this, titleTmpl = _.template([ '
', - '', - '', + '<%-label%>', + '', '
'].join('\n')), $gridBody = $('
').append( diff --git a/web/pgadmin/browser/static/js/browser.js b/web/pgadmin/browser/static/js/browser.js index c468e7ecb..64e949b14 100644 --- a/web/pgadmin/browser/static/js/browser.js +++ b/web/pgadmin/browser/static/js/browser.js @@ -226,7 +226,7 @@ define('pgadmin.browser', [ width: 500, isCloseable: false, isPrivate: true, - content: '
', + content: '
', }), // Dependencies of the object 'dependencies': new pgAdmin.Browser.Panel({ diff --git a/web/pgadmin/browser/static/js/collection.js b/web/pgadmin/browser/static/js/collection.js index 951106886..89beb6ca1 100644 --- a/web/pgadmin/browser/static/js/collection.js +++ b/web/pgadmin/browser/static/js/collection.js @@ -99,7 +99,7 @@ define([ '', + '<% if (label != "") { %> <%-label%><% } %><%-tooltip%>', ].join(' ')); if (location == 'header') { btnGroup.appendTo(that.header); @@ -165,9 +165,9 @@ define([ // canDrop can be set to false for individual row from the server side to disable the checkbox if ('canDrop' in model && model.canDrop === false) - this.$el.empty().append(''); + this.$el.empty().append(''); else - this.$el.empty().append(''); + this.$el.empty().append(''); this.delegateEvents(); return this; diff --git a/web/pgadmin/browser/static/js/menu.js b/web/pgadmin/browser/static/js/menu.js index f40c06e30..e716b1e86 100644 --- a/web/pgadmin/browser/static/js/menu.js +++ b/web/pgadmin/browser/static/js/menu.js @@ -208,7 +208,7 @@ define([ pgAdmin.Browser.MenuGroup = function(opts, items, prev, ctx) { var template = _.template([ '<% if (above) { %><% } %>', - '