diff options
| author | Antony Lesuisse <al@openerp.com> | 2011-12-30 16:01:08 +0100 |
|---|---|---|
| committer | Antony Lesuisse <al@openerp.com> | 2011-12-30 16:01:08 +0100 |
| commit | b63986589e62b529a7cdc6b135e9f0d418505106 (patch) | |
| tree | 4860148449962f3f983f60ce7016345ac77b0026 /addons/web/static/src/xml/base.xml | |
| parent | 20763e97810b9d2ca23a3f7e9c1c048321a91264 (diff) | |
[FIX] ViewManager sidebar, partially revert commit 1848 al@openerp.com-20111230105341-d26r8iaczoq1xx34
bzr revid: al@openerp.com-20111230150108-e6g4bx0mo69taifd
Diffstat (limited to 'addons/web/static/src/xml/base.xml')
| -rw-r--r-- | addons/web/static/src/xml/base.xml | 60 |
1 files changed, 29 insertions, 31 deletions
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index d7d9372a2e3..71cc6dcf832 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -56,7 +56,7 @@ <tr> <td colspan="2"> <div id="oe_footer" class="oe_footer"> - <p class="oe_footer_powered">Powered by <a href="http://www.openerp.com/">OpenERP</a></p> + <p class="oe_footer_powered">Powered by <a href="http://www.openerp.com">OpenERP</a></p> </div> </td> </tr> @@ -413,43 +413,40 @@ <t t-name="ViewManager"> <table class="view-manager-main-table" cellpadding="0" cellspacing="0"> <tbody> - <tr> - <td rowspan="2" class="view-manager-main-sidebar" height="100%"> - <t t-foreach="views" t-as="view"> - <div t-attf-id="#{prefix}_sidebar_#{view.view_type}" class="sidebar-main-div closed-sidebar" style="display: none"/> - </t> - </td> - </tr> - <tr> - <td class="view-manager-main-content"> - <div class="oe-view-manager-header"> - <h2 class="oe_view_title" t-if="self.flags.display_title !== false"> - <span class="oe_view_title_text"><t t-esc="self.display_title()"/></span> - </h2> - <div class="oe_vm_switch"> - <t t-if="views.length != 1" t-foreach="views" t-as="view"> + <tr> + <td class="view-manager-main-content"> + <div class="oe-view-manager-header"> + <h2 class="oe_view_title" t-if="self.flags.display_title !== false"> + <span class="oe_view_title_text"><t t-esc="self.display_title()"/></span> + </h2> + <div class="oe_vm_switch"> + <t t-if="views.length != 1" t-foreach="views" t-as="view"> - <button type="button" t-attf-class="oe_vm_switch_#{view.view_type}" t-att-data-view-type="view.view_type" t-att-title="view.view_type"> - <span><t t-esc="view.label || view.view_type"/></span> - </button> - </t> - </div> + <button type="button" t-attf-class="oe_vm_switch_#{view.view_type}" t-att-data-view-type="view.view_type" t-att-title="view.view_type"> + <span><t t-esc="view.label || view.view_type"/></span> + </button> + </t> </div> - <div t-attf-id="#{prefix}_search" t-opentag="true"/> - <t t-foreach="views" t-as="view"> - <div t-attf-id="#{prefix}_view_#{view.view_type}"/> - </t> - </td> - <td> - </td> - </tr> + </div> + <div t-attf-id="#{prefix}_search" t-opentag="true"/> + <t t-foreach="views" t-as="view"> + <div t-attf-id="#{prefix}_view_#{view.view_type}"/> + </t> + </td> + <td class="view-manager-main-sidebar" height="100%"> + <t t-foreach="views" t-as="view"> + <div t-attf-id="#{prefix}_sidebar_#{view.view_type}" class="sidebar-main-div closed-sidebar" style="display: none"/> + </t> + </td> + </tr> </tbody> </table> </t> <t t-extend="ViewManager" t-name="ViewManagerAction"> - <t t-jquery=".view-manager-main-sidebar" t-operation="before"> - <td class="oe_view_manager_menu_tips"> + <t t-jquery=".view-manager-main-table tbody" t-operation="prepend"> + <tr> + <td class="oe_view_manager_menu_tips" colspan="2"> <blockquote t-if="self.action.help and !self.flags.low_profile and !(self.action.id in self.session.hidden_menutips)"> <p><t t-esc="self.action.help"/></p> @@ -459,6 +456,7 @@ </div> </blockquote> </td> + </tr> </t> <t t-jquery="h2.oe_view_title" t-operation="prepend"> <a t-if="self.flags.display_title !== false" class="oe-shortcut-toggle" title="Add / Remove Shortcut..." |