[IMP] New menus

bzr revid: fme@openerp.com-20120228134121-bxs33qrpevrfkctp

1 files changed, 24 insertions, 31 deletions

diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index c9c3bb65857..66c6b316393 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -24,30 +24,16 @@
             <div class="oe_dropdown_menu_placeholder"/>
         </div>
         <div class="oe_leftbar">
+            <div class="oe_secondary_menus_container"/>
             <!--
             <a href="#" class="oe_logo"><img src="img/logo.png"/></a>
 
-            <div class="oe_secondary_menu"/>
-
             <div class="oe_footer">
                 Powered by <a href="http://www.openerp.com" class="openerp"><span class="red">Open</span>ERP</a>
             </div>
             -->
         </div>
-        <div class="oe_application">
-            <!-- This table will be removed as soon as we decide what will happen to the sidebar -->
-            <table cellspacing="0" cellpadding="0" border="0" height="100%" width="100%">
-            <tr>
-                <td valign="top" class="secondary_menu">
-                    <div class="oe_secondary_menu"/>
-                </td>
-                <td valign="top" class="oe-application-container">
-                    <div id="oe_app" class="oe-application">
-                    </div>
-                </td>
-            </tr>
-            </table>
-        </div>
+        <div class="oe_application"/>
     </div>
 </t>
 <t t-name="Loading">
@@ -351,25 +337,32 @@
 <t t-name="Menu.secondary">
     <div t-foreach="widget.data.data.children" t-as="menu" style="display: none" class="oe_secondary_menu" t-att-data-menu-parent="menu.id">
         <t t-foreach="menu.children" t-as="menu">
-            <t t-set="classname" t-translation="off">oe_secondary_menu_item</t>
-            <t t-set="level" t-value="0"/>
-            <t t-call="Menu.secondary.children"/>
+            <div class="oe_secondary_menu_section">
+                <t t-esc="menu.name"/>
+                <!--
+                    Shall the section be still clickable ?
+                    <t t-call="Menu.secondary.link"/>
+                -->
+            </div>
+            <t t-call="Menu.secondary.submenu"/>
         </t>
     </div>
 </t>
-<t t-name="Menu.secondary.children">
-    <t t-set="level" t-value="level + 1"/>
-    <a href="#" t-att-id="menu.children.length ? 'menu_' + menu.id : undefined"
-        t-att-class="classname + (menu.children.length ? ' submenu' : ' leaf') + (menu_first and level == 1 ? ' opened' : '')"
-        t-att-data-menu="menu.children.length ? undefined : menu.id">
-        <span t-attf-style="padding-left: #{(level - 2) * 20}px"> <t t-esc="menu.name"/></span>
+<t t-name="Menu.secondary.submenu">
+    <ul t-if="menu.children.length" class="oe_secondary_submenu">
+        <li t-foreach="menu.children" t-as="menu">
+            <t t-call="Menu.secondary.link"/>
+            <!--<span class="oe_menu_label">8</span>-->
+            <t t-call="Menu.secondary.submenu"/>
+        </li>
+    </ul>
+</t>
+<t t-name="Menu.secondary.link">
+    <a href="#"
+        t-att-class="menu.children.length ? 'oe_menu_toggler' : 'oe_menu_leaf'"
+        t-att-data-menu="menu.id">
+        <t t-esc="menu.name"/>
     </a>
-    <div t-attf-class="oe_secondary_submenu" t-if="menu.children.length" t-att-style="level == 1 ? undefined : 'display: none'">
-        <t t-foreach="menu.children" t-as="menu">
-            <t t-set="classname" t-translation="off">oe_secondary_submenu_item</t>
-            <t t-call="Menu.secondary.children"/>
-        </t>
-    </div>
 </t>
 
 <t t-name="DropDownMenu">