odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] Fix colspan 

bzr revid: fme@openerp.com-20120313194748-nlzfmz8t9ylz6hke
This commit is contained in:
Fabien Meghazi 2012-03-13 20:47:48 +01:00
parent aea6b6fafc
commit 01088067fd
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
addons/web/static/src/js/view_form.js
View File

@ -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));
});
}

7
addons/web/static/src/xml/base.xml
View File

@ -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">