diff options
| author | Fabien Meghazi <fme@openerp.com> | 2012-03-13 20:47:48 +0100 |
|---|---|---|
| committer | Fabien Meghazi <fme@openerp.com> | 2012-03-13 20:47:48 +0100 |
| commit | 01088067fd3f85a2f63c0f02195deab7ccf3b7e5 (patch) | |
| tree | 8a3af5cc0f9115cd2b558557d1d44c215252626d /addons/web/static/src | |
| parent | aea6b6fafcc781db2b4bf279a5d42fe5c172ab77 (diff) | |
[FIX] Fix colspan
bzr revid: fme@openerp.com-20120313194748-nlzfmz8t9ylz6hke
Diffstat (limited to 'addons/web/static/src')
| -rw-r--r-- | addons/web/static/src/js/view_form.js | 5 | ||||
| -rw-r--r-- | addons/web/static/src/xml/base.xml | 7 |
2 files changed, 8 insertions, 4 deletions
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 7a254d87302..32e6cbac0ba 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -1176,6 +1176,7 @@ openerp.web.form.WidgetGroup = openerp.web.form.Widget.extend({ } else { $table = this.$element.find('table:first'); } + $table.addClass('oe_layout_table'); var $tr, cols = parseInt(self.node_attrs['col'] || 4, 10), row_cols = cols; @@ -1188,11 +1189,11 @@ openerp.web.form.WidgetGroup = openerp.web.form.Widget.extend({ return; } if (!$tr || row_cols < colspan) { - $tr = $('<tr/>').appendTo($table); + $tr = $('<tr/>').addClass('oe_layout_row').appendTo($table); row_cols = cols; } row_cols -= colspan; - var $td = $('<td/>'); + var $td = $('<td/>').addClass('oe_layout_cell').attr('colspan', colspan); $tr.append($td.append($child)); }); } diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 9f5022d4d70..d4c20342573 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -857,14 +857,17 @@ </t> </t> <t t-name="WidgetGroup"> + <t t-set="table"> + <table border="1" cellpadding="0" cellspacing="0" width="100%"/> + </t> <t t-if="widget.node_attrs.string"> <fieldset class="oe_group_box"> <legend><t t-esc="widget.node_attrs.string"/></legend> - <table border="1"/> + <t t-raw="table"/> </fieldset> </t> <t t-if="!widget.node_attrs.string"> - <table border="1"/> + <t t-raw="table"/> </t> </t> <t t-name="WidgetNotebook"> |