diff options
| author | Xavier Morel <xmo@openerp.com> | 2011-12-12 17:22:10 +0100 |
|---|---|---|
| committer | Xavier Morel <xmo@openerp.com> | 2011-12-12 17:22:10 +0100 |
| commit | ca292d50e74bf2e803a388972da9fd614da9dbce (patch) | |
| tree | 26fa79cfd0dc0b53a693a87e034ba1a43f7fc687 /addons/web/static/src | |
| parent | 33642e464a43aff6c2e48f43a97d3e8236854afe (diff) | |
[FIX] don't lose indentations and explicit line breaks in readonly text fields
bzr revid: xmo@openerp.com-20111212162210-o2z70yf3cybpajvq
Diffstat (limited to 'addons/web/static/src')
| -rw-r--r-- | addons/web/static/src/css/base.css | 4 | ||||
| -rw-r--r-- | addons/web/static/src/js/view_page.js | 4 | ||||
| -rw-r--r-- | addons/web/static/src/xml/base.xml | 3 |
3 files changed, 9 insertions, 2 deletions
diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index a52510b8275..e9737dfd0af 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1120,6 +1120,10 @@ label.error { background-color: white; } +.openerp .oe_form_readonly .oe_form_field_text div.field_text { + white-space: pre-wrap; +} + /* Inputs */ .openerp .oe_forms input[type="text"], .openerp .oe_forms input[type="password"], .openerp .oe_forms select, .openerp .oe_forms textarea { diff --git a/addons/web/static/src/js/view_page.js b/addons/web/static/src/js/view_page.js index 2ca07152a56..abcfb5131dd 100644 --- a/addons/web/static/src/js/view_page.js +++ b/addons/web/static/src/js/view_page.js @@ -59,6 +59,9 @@ openerp.web.page = function (openerp) { /** @namespace */ openerp.web.page = {}; + openerp.web.page.WidgetFrameReadonly = openerp.web.form.WidgetFrame.extend({ + template: 'WidgetFrame.readonly' + }); openerp.web.page.FieldReadonly = openerp.web.form.Field.extend({ }); @@ -197,6 +200,7 @@ openerp.web.page = function (openerp) { force_readonly: true }); openerp.web.page.readonly = openerp.web.form.widgets.clone({ + 'frame': 'openerp.web.page.WidgetFrameReadonly', 'char': 'openerp.web.page.FieldCharReadonly', 'email': 'openerp.web.page.FieldEmailReadonly', 'url': 'openerp.web.page.FieldUrlReadonly', diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 9333a3bdbca..8333b6c94a0 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -869,8 +869,7 @@ <t t-name="FieldChar.readonly"> <div t-att-id="widget.element_id" - t-attf-class="field_#{widget.type} #{_(['integer', 'float', 'float_time']).contains(widget.type) ? 'oe-number' : ''}" - style="width: 100%"> + t-attf-class="field_#{widget.type} #{_(['integer', 'float', 'float_time']).contains(widget.type) ? 'oe-number' : ''}"> </div> </t> <t t-name="FieldURI.readonly"> |