diff options
| author | Vidhin Mehta (OpenERP) <vme@tinyerp.com> | 2012-07-03 19:19:40 +0530 |
|---|---|---|
| committer | Vidhin Mehta (OpenERP) <vme@tinyerp.com> | 2012-07-03 19:19:40 +0530 |
| commit | d86457a270afeb4ee2e5f7cfb906c73639fa54f2 (patch) | |
| tree | 546b5fb24c38652a34728aa89bb6f27001ea9df6 /addons/web/static/src/xml | |
| parent | c6ffd20a31c1413adb71716c952f36d74e15533c (diff) | |
| parent | 50413828c552636b596b1b572addc68fae5c261c (diff) | |
[merge]main branch.
bzr revid: vme@tinyerp.com-20120703134940-27u7n3k8lp43hzep
Diffstat (limited to 'addons/web/static/src/xml')
| -rw-r--r-- | addons/web/static/src/xml/base.xml | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 6e0bd2417f1..ce130dc0e1e 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -621,7 +621,9 @@ <button type="button" class="oe_button oe_list_add oe_highlight"> <t t-esc="widget.options.addable"/> </button> - <span class="oe_fade">or</span> <a href="#" class="oe_bold oe_list_button_import">Import</a> + <t t-if="widget.options.import_enabled"> + <span class="oe_fade">or</span> <a href="#" class="oe_bold oe_list_button_import">Import</a> + </t> </t> </div> <t t-name="ListView.pager"> @@ -1008,17 +1010,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"> |