diff options
| author | Vishmita <vja@tinyerp.com> | 2012-08-24 16:18:42 +0530 |
|---|---|---|
| committer | Vishmita <vja@tinyerp.com> | 2012-08-24 16:18:42 +0530 |
| commit | 884fc88106b96b94759937fb2152ff48b94eb7aa (patch) | |
| tree | c23f7baf328c72fc15d5c8a479cd19cdf266a563 /addons/web/static/src/xml/base.xml | |
| parent | d2144a9f4c73a2119c63522ea605f68e6b7142ed (diff) | |
| parent | e28ec55117cfb6813e52caf571b71ba7a7ab92e5 (diff) | |
[Merge]Merge trunk
bzr revid: vja@tinyerp.com-20120824104842-53uvwrf393oo25al
Diffstat (limited to 'addons/web/static/src/xml/base.xml')
| -rw-r--r-- | addons/web/static/src/xml/base.xml | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 317e2d4e242..360be40f402 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -1017,12 +1017,12 @@ <t t-name="FieldMany2One"> <span class="oe_form_field oe_form_field_many2one oe_form_field_with_button" t-att-style="widget.node.attrs.style"> <t t-if="widget.get('effective_readonly')"> - <a t-if="! widget.get_definition_options().no_open" href="#" class="oe_form_uri"/> - <span t-if="widget.get_definition_options().no_open" href="#" class="oe_form_uri"/> + <a t-if="! widget.options.no_open" href="#" class="oe_form_uri"/> + <span t-if="widget.options.no_open" href="#" class="oe_form_uri"/> <span class="oe_form_m2o_follow"/> </t> <t t-if="!widget.get('effective_readonly')"> - <a t-if="! widget.get_definition_options().no_open" href="#" tabindex="-1" + <a t-if="! widget.options.no_open" href="#" tabindex="-1" class="oe_m2o_cm_button oe_e">/</a> <div> <input type="text" @@ -1083,19 +1083,14 @@ </span> </t> <t t-name="FieldStatus"> - <ul class="" t-att-style="widget.node.attrs.style"/> + <ul t-att-class="widget.options.clickable ? 'oe_form_steps_clickable' : 'oe_form_steps'" t-att-style="widget.node.attrs.style"/> </t> <t t-name="FieldStatus.content"> - <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' : 'oe_form_steps_inactive'"> - <div class="oe_form_steps_button" t-att-data-id="widget.to_show[i][0]"> - <t t-esc="widget.to_show[i][1]"/> - <span class="oe_form_steps_arrow"> - <span></span> - </span> - <img t-att-src='_s + "/web/static/src/img/form_steps.png"' class="oe_form_steps_arrow" t-if="i < size - 1"/> - </div> + <t t-foreach="widget.selection" t-as="i"> + <li t-att-class="i[0] === widget.selected_value ? 'oe_active' : ''" t-att-data-id="i[0]"> + <span class="label"><t t-esc="i[1]"/></span> + <!-- are you mit ? --> + <span class="arrow"><span></span></span> </li> </t> </t> @@ -1741,7 +1736,7 @@ <div class="oe_blockui_spin" style="height: 50px"> </div> <br /> - <div style="color:white">Loading...</div> + <div class="oe_throbber_message" style="color:white"></div> </div> </t> </templates> |