diff options
| author | Fabien Meghazi <fme@openerp.com> | 2012-07-02 10:41:19 +0200 |
|---|---|---|
| committer | Fabien Meghazi <fme@openerp.com> | 2012-07-02 10:41:19 +0200 |
| commit | 2571ad25eb21c7c8b8f766edb5ceb171d140afda (patch) | |
| tree | 8939670247b053e780bf4192c448d1ba73a5cb8c | |
| parent | 9e4f8eb50c9d80bf719333a9376817dccc56305f (diff) | |
[FIX] Fixed Status bar wrapping problems
bzr revid: fme@openerp.com-20120702084119-cfmdc7vqonwb05f8
| -rw-r--r-- | addons/web/static/src/js/view_form.js | 5 | ||||
| -rw-r--r-- | addons/web/static/src/xml/base.xml | 20 |
2 files changed, 14 insertions, 11 deletions
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 8bc2a3894c8..116bb0338d9 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -4359,10 +4359,13 @@ instance.web.form.FieldBinaryImage = instance.web.form.FieldBinary.extend({ }); instance.web.form.FieldStatus = instance.web.form.AbstractField.extend({ - tagName: "span", + template: "FieldStatus", start: function() { this._super(); this.selected_value = null; + if (this.$element.parent().is('header')) { + this.$element.after('<div class="oe_clear"/>'); + } // preview in start only for selection fields, because of the dynamic behavior of many2one fields. if (this.field.type in ['selection']) { this.render_list(); diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 46fab28d791..e38260d3e75 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -1006,17 +1006,17 @@ <span></span> </span> </t> +<t t-name="FieldStatus"> + <ul class="oe_form_steps"/> +</t> <t t-name="FieldStatus.content"> - <ul class="oe_form_steps"> - <t t-set="size" t-value="widget.to_show.length"/> - <t t-foreach="_.range(size)" t-as="i"> - <li t-att-class="widget.to_show[i][0] === widget.selected_value ? 'oe_form_steps_active' : ''"> - <span><t t-esc="widget.to_show[i][1]"/></span> - <img t-att-src='_s + "/web/static/src/img/form_steps.png"' class="oe_form_steps_arrow" t-if="i < size - 1"/> - </li> - </t> - </ul> - <div class="oe_clear"/> + <t t-set="size" t-value="widget.to_show.length"/> + <t t-foreach="_.range(size)" t-as="i"> + <li t-att-class="widget.to_show[i][0] === widget.selected_value ? 'oe_form_steps_active' : ''"> + <span><t t-esc="widget.to_show[i][1]"/></span> + <img t-att-src='_s + "/web/static/src/img/form_steps.png"' class="oe_form_steps_arrow" t-if="i < size - 1"/> + </li> + </t> </t> <t t-name="FieldBinaryImage"> <span class="oe_form_field oe_form_field_image"> |