diff options
| author | Vidhin Mehta (OpenERP) <vme@tinyerp.com> | 2012-08-21 17:31:22 +0530 |
|---|---|---|
| committer | Vidhin Mehta (OpenERP) <vme@tinyerp.com> | 2012-08-21 17:31:22 +0530 |
| commit | 05bf985ace55c49b67251a0569a4754e98eb1a7a (patch) | |
| tree | 485d9e235ed0bd70301263f548e1cc5971232c2d /addons/web/static/src/xml | |
| parent | 63702d6064d6dd457ccd82aa56ac44d375fe001c (diff) | |
| parent | 6647c92bb78e5c50227da2d427db5268ea62f2d9 (diff) | |
[merge]trunk.
bzr revid: vme@tinyerp.com-20120821120122-7lgndirsyuaop6mi
Diffstat (limited to 'addons/web/static/src/xml')
| -rw-r--r-- | addons/web/static/src/xml/base.xml | 40 |
1 files changed, 25 insertions, 15 deletions
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 0eddd914f01..330a5b3928f 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -975,6 +975,14 @@ /> </div> </t> +<t t-name="FieldTextHtml"> + <div t-att-class="'oe_form_field oe_form_field_html' + (widget.get('effective_readonly') ? ' oe_form_embedded_html' : '')" + t-att-style="widget.node.attrs.style"> + <t t-if="! widget.get('effective_readonly')"> + <textarea/> + </t> + </div> +</t> <t t-name="web.datepicker"> <span> <t t-set="placeholder" t-value="widget.getParent().node and widget.getParent().node.attrs.placeholder"/> @@ -1009,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" @@ -1075,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> @@ -1728,5 +1731,12 @@ <div t-name="Many2ManyKanban.quick_create" class="oe_kanban_quick_create"> <input t-att-placeholder="_t('Type name to search')"/> </div> - +<t t-name="Throbber"> + <div> + <div class="oe_blockui_spin" style="height: 50px"> + </div> + <br /> + <div class="oe_throbber_message" style="color:white"></div> + </div> +</t> </templates> |