From f07f60b3da21fa6980ae7b29af2c2bdf180adc60 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 28 Jun 2011 18:42:38 +0200
Subject: [PATCH] [IMP] Use label@colspan in order to diferentiate fields label
 from paragraph

bzr revid: fme@openerp.com-20110628164238-zctbvza7isf4166t
---
 addons/base/static/src/js/form.js   | 10 ++++++++--
 addons/base/static/src/xml/base.xml |  3 +++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/addons/base/static/src/js/form.js b/addons/base/static/src/js/form.js
index 8044c425661..b7a61cc885a 100644
--- a/addons/base/static/src/js/form.js
+++ b/addons/base/static/src/js/form.js
@@ -677,12 +677,18 @@ openerp.base.form.WidgetButton = openerp.base.form.Widget.extend({
 
 openerp.base.form.WidgetLabel = openerp.base.form.Widget.extend({
     init: function(view, node) {
-        this.is_field_label = true;
         this.element_name = 'label_' + node.attrs.name;
 
         this._super(view, node);
 
-        this.template = "WidgetLabel";
+        // TODO fme: support for attrs.align
+        if (this.node.tag == 'label' && this.node.attrs.colspan) {
+            this.is_field_label = false;
+            this.template = "WidgetParagraph";
+        } else {
+            this.is_field_label = true;
+            this.template = "WidgetLabel";
+        }
         this.colspan = 1;
     },
     render: function () {
diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml
index de95a4294e8..9bef00147d3 100644
--- a/addons/base/static/src/xml/base.xml
+++ b/addons/base/static/src/xml/base.xml
@@ -468,6 +468,9 @@
         <t t-if="widget.string and widget.node.tag != 'label'">:</t>
     </label>
 </t>
+<t t-name="WidgetParagraph">
+    <p class="oe_form_paragraph"><t t-esc="widget.string"/></p>
+</t>
 <t t-name="FieldChar">
     <input type="text"
         t-att-name="widget.name"