diff options
| author | Kunal Chavda (OpenERP) <kch@tinyerp.com> | 2011-09-13 11:14:06 +0530 |
|---|---|---|
| committer | Kunal Chavda (OpenERP) <kch@tinyerp.com> | 2011-09-13 11:14:06 +0530 |
| commit | df1edc236b17979df7a7ef54f59341bb4d1070cd (patch) | |
| tree | 3aabeb3647e6bab3287f284ebda97fed10e26868 /addons/web/static/src/xml/base.xml | |
| parent | 55e3e348726287e59decf47077965b1eb5b5cb42 (diff) | |
| parent | a3a09a6229e251d5d861f11f9e654cd2100483ad (diff) | |
[MERGE]Merge with trunk upto revision no 1011.
bzr revid: kch@tinyerp.com-20110913054406-yrjafv0qdzzijizz
Diffstat (limited to 'addons/web/static/src/xml/base.xml')
| -rw-r--r-- | addons/web/static/src/xml/base.xml | 26 |
1 files changed, 23 insertions, 3 deletions
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 654a4d441e9..ce9f7aad562 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -420,8 +420,6 @@ <table class="view-manager-main-table"> <tr> <td class="view-manager-main-content"> - <a class="oe-shortcut-toggle" title="Add / Remove Shortcut..." - href="javascript: void(0)"> </a> <div class="oe_vm_switch"> <t t-if="views.length != 1" t-foreach="views" t-as="view"> <button type="button" t-att-data-view-type="view.view_type"> @@ -442,6 +440,14 @@ </tr> </table> </t> + +<t t-extend="ViewManager" t-name="ViewManagerAction"> + <t t-jquery=".view-manager-main-content" t-operation="prepend"> + <a class="oe-shortcut-toggle" title="Add / Remove Shortcut..." + href="javascript: void(0)"> </a> + </t> +</t> + <t t-name="Sidebar"> <a class="toggle-sidebar"></a> <div class="sidebar-content"> @@ -566,7 +572,7 @@ </table> </th> </tr> - <tr t-if="options.header"> + <tr t-if="options.header" class="oe-listview-header-columns"> <t t-foreach="columns" t-as="column"> <th t-if="column.meta"> <t t-esc="column.string"/> @@ -1524,4 +1530,18 @@ </p> </div> </t> + +<t t-name="FieldStatus"> + <div t-att-id="widget.element_id"></div> +</t> +<t t-name="FieldStatus.content"> + <ul class="oe-arrow-list"> + <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-arrow-list-selected' : ''"> + <span class="oe-arrow-list-before" t-if="i > 0"></span><span><t t-esc="widget.to_show[i][1]"/></span><span class="oe-arrow-list-after" t-if="i < size - 1"></span> + </li> + </t> + </ul> +</t> </templates>
\ No newline at end of file |