diff options
| author | Jiten (OpenERP) <jra@tinyerp.com> | 2012-07-04 11:04:45 +0530 |
|---|---|---|
| committer | Jiten (OpenERP) <jra@tinyerp.com> | 2012-07-04 11:04:45 +0530 |
| commit | 23da92dd683f9ebc93c2b6c767c902f466f08a1b (patch) | |
| tree | 988d02bbffecaea9861ab76979fc72e0381f95a5 /addons/web/static/src/xml/base.xml | |
| parent | ff179d6b98473b87f382c5a6ee2c3d3970d07e1e (diff) | |
| parent | fa5ef483d5381b683e0cf4f54bfd6e97d69c4d39 (diff) | |
[MERGE] Merged from openerp-web.
bzr revid: jra@tinyerp.com-20120704053445-9vu5ib96396m1oxe
Diffstat (limited to 'addons/web/static/src/xml/base.xml')
| -rw-r--r-- | addons/web/static/src/xml/base.xml | 32 |
1 files changed, 17 insertions, 15 deletions
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 13be46806cb..29a7a61aa30 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -619,7 +619,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"> @@ -665,7 +667,7 @@ <t t-name="ListView.row.save"> <td> - <button class='oe_i oe_list_edit_row_save' type='button' name='save'>S</button> + <button class='oe_i oe_list_edit_row_save' type='button' name='save'/> </td> </t> @@ -684,7 +686,7 @@ <button type="button" class="oe_button oe_form_button_create">Create</button> </span> <span class="oe_form_buttons_edit"> - <button type="button" class="oe_button oe_form_button_save oe_highlight_on_dirty">Save</button> <span class="oe_fade">or</span> <a href="#" class="oe_bold oe_form_button_cancel">Discard</a> + <button type="button" class="oe_button oe_form_button_save oe_highlight">Save</button> <span class="oe_fade">or</span> <a href="#" class="oe_bold oe_form_button_cancel">Discard</a> </span> </t> </div> @@ -874,7 +876,7 @@ </t> <t t-name="FieldEmail"> <span class="oe_form_field oe_form_field_email oe_form_field_with_button"> - <a t-if="widget.get('effective_readonly')" href="#" class="oe_form_uri"/> + <a t-if="widget.get('effective_readonly')" href="#" class="oe_form_uri" target="_blank"/> <t t-if="!widget.get('effective_readonly')"> <div> <input type="text" @@ -1006,17 +1008,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"> @@ -1202,7 +1204,7 @@ <div t-name="SearchView" class="oe_searchview"> <div class="oe_searchview_facets"/> <div class="oe_searchview_clear"/> - <div class="oe_searchview_unfold_drawer"/> + <div class="oe_searchview_unfold_drawer" title="Advanced Search..."/> <div class="oe_searchview_drawer"/> </div> |