From 17ed27fbcde339566387948f1999d86f51e17d8e Mon Sep 17 00:00:00 2001 From: Arun Kollan Date: Thu, 10 Mar 2016 15:31:43 +0000 Subject: [PATCH] Make the dialogue control sizing slightly more compact and properly control textarea resizing. --- web/pgadmin/static/css/overrides.css | 18 ++++++++++++ web/pgadmin/static/js/backform.pgadmin.js | 34 ++++++++++++++++++----- 2 files changed, 45 insertions(+), 7 deletions(-) diff --git a/web/pgadmin/static/css/overrides.css b/web/pgadmin/static/css/overrides.css index 657828df0..9726cecd9 100755 --- a/web/pgadmin/static/css/overrides.css +++ b/web/pgadmin/static/css/overrides.css @@ -283,6 +283,24 @@ iframe { padding-right: 3px; padding-left: 3px; } +.pgadmin-controls > textarea.form-control, +.pgadmin-controls > textarea.form-control[disabled] { + min-width: 100%; + max-width: 100%; +} +.pgadmin-controls > div.checkbox, .pgadmin-controls > div.checkbox[disabled] { + height: 28px; +} + +.pgadmin-controls > .uneditable-input, .pgadmin-controls > .pgadmin-node-select, +.pgadmin-controls > input.form-control, .pgadmin-controls > select.form-control, +.pgadmin-controls > .uneditable-input[disabled], +.pgadmin-controls > .pgadmin-node-select[disabled], +.pgadmin-controls > input.form-control[disabled], +.pgadmin-controls > select.form-control[disabled] { + height: 28px; + padding: 3px 6px !important; +} .obj_properties fieldset > div > .pgadmin-control-group > label { height: 30px; diff --git a/web/pgadmin/static/js/backform.pgadmin.js b/web/pgadmin/static/js/backform.pgadmin.js index e74cfadc1..b7ffc265d 100644 --- a/web/pgadmin/static/js/backform.pgadmin.js +++ b/web/pgadmin/static/js/backform.pgadmin.js @@ -254,13 +254,33 @@ * Reference: * http://stackoverflow.com/questions/11338592/how-can-i-bind-to-the-change-event-of-a-textarea-in-jquery */ - Backform.TextareaControl.prototype.events = { - "change textarea": "onChange", - "keyup textarea": "onChange", - "paste textarea": "onChange", - "selectionchange textarea": "onChange", - "focus textarea": "clearInvalid" - }; + _.extend( + Backform.TextareaControl.prototype, { + defaults: _.extend( + Backform.TextareaControl.prototype.defaults, { + rows: 5 + }), + events : { + "change textarea": "onChange", + "keyup textarea": "onChange", + "paste textarea": "onChange", + "selectionchange textarea": "onChange", + "focus textarea": "clearInvalid" + }, + template: _.template([ + '', + '
', + ' ', + ' <% if (helpMessage && helpMessage.length) { %>', + ' <%=helpMessage%>', + ' <% } %>', + '
' + ].join("\n")) + }); /* * Overriding the render function of the select control to allow us to use