From 906a5b442e9c48d563f4558411eb8e89f661653a Mon Sep 17 00:00:00 2001 From: Nathan Gray Date: Mon, 8 Dec 2014 16:06:09 +0000 Subject: [PATCH] Set textarea to get height from rows attribute, some better styling so they are not so small --- etemplate/js/et2_widget_textbox.js | 6 +++++- etemplate/templates/default/etemplate2.css | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/etemplate/js/et2_widget_textbox.js b/etemplate/js/et2_widget_textbox.js index 068ccdb6e8..f64b0484fd 100644 --- a/etemplate/js/et2_widget_textbox.js +++ b/etemplate/js/et2_widget_textbox.js @@ -182,7 +182,11 @@ var et2_textbox = et2_inputWidget.extend( * @param _size Rather arbitrary size units, approximately characters */ set_size: function(_size) { - if (typeof _size != 'undefined' && _size != this.input.attr("size")) + if (this.options.multiline || this.options.rows > 1 || this.options.cols > 1) + { + this.input.css('width', _size + "em"); + } + else if (typeof _size != 'undefined' && _size != this.input.attr("size")) { this.size = _size; this.input.attr("size", this.size); diff --git a/etemplate/templates/default/etemplate2.css b/etemplate/templates/default/etemplate2.css index 083e6cc231..b1bb2fd32b 100644 --- a/etemplate/templates/default/etemplate2.css +++ b/etemplate/templates/default/etemplate2.css @@ -440,7 +440,7 @@ action buttons, left aligned for "extra" controls .et2_customfield_list { width: 100%; } -.et2_customfield_list input { +.et2_customfield_list input, .et2_customfield_list textarea { max-width: 100ex; } /* Custom field list inside nextmatch rows gets an icon for each row */