From c0936ac657d3e8d41c3b9e7be917a3ef3075cb8f Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 15 Sep 2011 22:22:09 +0200
Subject: [IMP] Get rid of jQuery accordion. Improved menu (WIP). Now all
 levels are working

bzr revid: fme@openerp.com-20110915202209-5rp3ltzz86msaajz
---
 addons/web/static/src/xml/base.xml | 48 +++++++++++++++-----------------------
 1 file changed, 19 insertions(+), 29 deletions(-)

(limited to 'addons/web/static/src/xml/base.xml')

diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 83ca819b4e6..95e2a7e5770 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -374,45 +374,35 @@
 </ul>
 <t t-name="Menu">
     <table align="center">
-        <tr>
-        <t t-foreach="data.children" t-as="menu">
-            <td>
-                <a href="#" t-att-data-menu="menu.id">
-                    <t t-esc="menu.name"/>
-                </a>
-            </td>
-        </t>
-        </tr>
+    <tr>
+        <td t-foreach="data.children" t-as="menu">
+            <a href="#" t-att-data-menu="menu.id">
+                <t t-esc="menu.name"/>
+            </a>
+        </td>
+    </tr>
     </table>
 </t>
 <t t-name="Menu.secondary">
-    <div style="display: none" class="menu_accordion" t-att-data-menu-parent="menu.id">
+    <div 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="header">h3</t>
+            <t t-set="classname">oe_secondary_menu_item</t>
+            <t t-set="level" t-value="0"/>
             <t t-call="Menu.secondary.children"/>
         </t>
     </div>
 </t>
 <t t-name="Menu.secondary.children">
-    &lt;<t t-esc="header"/>&gt;
-        <a href="#" t-attf-id="menu_#{menu.id}">
-            <span><t t-esc="menu.name"/></span>
-        </a>
-    &lt;/<t t-esc="header"/>&gt;
-    <div class="menu_content">
+    <t t-set="level" t-value="level + 1"/>
+    <a href="#" t-att-class="classname + (menu.children.length ? ' submenu' : ' leaf')" t-att-data-menu="menu.children.length ? undefined : menu.id">
+        <span t-attf-style="padding-left: #{level - 1}em">
+            <t t-esc="menu.children.length ? '+' : '-'"/> <t t-esc="menu.name"/>
+        </span>
+    </a>
+    <div t-attf-class="oe_secondary_submenu oe_secondary_submenu_level_#{level}" t-if="menu.children.length" style="display: none">
         <t t-foreach="menu.children" t-as="menu">
-            <t t-if="!menu.children.length">
-                <a href="#" class="leaf" t-att-data-menu="menu.id">
-                    <span><t t-esc="menu.name"/></span>
-                </a>
-            </t>
-            <t t-if="menu.children.length">
-                <div class="submenu_accordion">
-                    <t t-call="Menu.secondary.children">
-                        <t t-set="header">h4</t>
-                    </t>
-                </div>
-            </t>
+            <t t-set="classname">oe_secondary_submenu_item</t>
+            <t t-call="Menu.secondary.children"/>
         </t>
     </div>
 </t>
-- 
cgit v1.2.3


From 6a281e2d3f3ddd7ce34a1aa2b2c2da8963650d8a Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 15 Sep 2011 23:08:18 +0200
Subject: [IMP] Use unicode font for arrows

bzr revid: fme@openerp.com-20110915210818-15hrzmv24xdimisu
---
 addons/web/static/src/xml/base.xml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'addons/web/static/src/xml/base.xml')

diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 95e2a7e5770..ed78fbaa741 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -395,9 +395,7 @@
 <t t-name="Menu.secondary.children">
     <t t-set="level" t-value="level + 1"/>
     <a href="#" t-att-class="classname + (menu.children.length ? ' submenu' : ' leaf')" t-att-data-menu="menu.children.length ? undefined : menu.id">
-        <span t-attf-style="padding-left: #{level - 1}em">
-            <t t-esc="menu.children.length ? '+' : '-'"/> <t t-esc="menu.name"/>
-        </span>
+        <span t-attf-style="padding-left: #{level - 1}em"> <t t-esc="menu.name"/></span>
     </a>
     <div t-attf-class="oe_secondary_submenu oe_secondary_submenu_level_#{level}" t-if="menu.children.length" style="display: none">
         <t t-foreach="menu.children" t-as="menu">
-- 
cgit v1.2.3


From 3efa2e0a1acb052e3e7fc2ad9e4334ec05e7fa5a Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 19 Sep 2011 16:46:31 +0200
Subject: [ADD] Menu folding (WIP)

bzr revid: fme@openerp.com-20110919144631-b534cjz9iw598f3j
---
 addons/web/static/src/xml/base.xml | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'addons/web/static/src/xml/base.xml')

diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 3d02d22c235..28c0a7508ff 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -375,7 +375,7 @@
 <t t-name="Menu">
     <table align="center">
     <tr>
-        <td t-foreach="data.children" t-as="menu">
+        <td t-foreach="widget.data.data.children" t-as="menu">
             <a href="#" t-att-data-menu="menu.id">
                 <t t-esc="menu.name"/>
             </a>
@@ -384,7 +384,11 @@
     </table>
 </t>
 <t t-name="Menu.secondary">
-    <div style="display: none" class="oe_secondary_menu" t-att-data-menu-parent="menu.id">
+    <div t-attf-class="oe_toggle_secondary_menu #{widget.folded ? 'folded' : 'unfolded'}">
+        <span class="oe_menu_fold" title="Fold menu">&amp;laquo;</span>
+        <span class="oe_menu_unfold" title="Unfold menu">&amp;raquo;</span>
+    </div>
+    <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">oe_secondary_menu_item</t>
             <t t-set="level" t-value="0"/>
@@ -394,8 +398,8 @@
 </t>
 <t t-name="Menu.secondary.children">
     <t t-set="level" t-value="level + 1"/>
-    <a href="#" t-att-class="classname + (menu.children.length ? ' submenu' : ' leaf')" t-att-data-menu="menu.children.length ? undefined : menu.id">
-        <span t-attf-style="padding-left: #{level - 1}em"> <t t-esc="menu.name"/></span>
+    <a href="#" t-att-class="classname + (menu.children.length ? ' submenu' : ' leaf') + ' oe_menu_level_#{level}'" 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>
     </a>
     <div t-attf-class="oe_secondary_submenu oe_secondary_submenu_level_#{level}" t-if="menu.children.length" style="display: none">
         <t t-foreach="menu.children" t-as="menu">
-- 
cgit v1.2.3


From 744be5db04bfccdf8d6745a4a3a253b2b95034de Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 19 Sep 2011 17:59:43 +0200
Subject: [ADD] Float menu (WIP)

bzr revid: fme@openerp.com-20110919155943-fdx57kbr0q9a2ywe
---
 addons/web/static/src/xml/base.xml | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

(limited to 'addons/web/static/src/xml/base.xml')

diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 28c0a7508ff..6d1ed16091e 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -38,11 +38,17 @@
         </td>
     </tr>
     <tr>
-        <td valign="top" id="oe_secondary_menu" class="secondary_menu">
-        </td>
-        <td valign="top" class="oe-application-container">
-            <div id="oe_app" class="oe-application">
-            </div>
+        <td colspan="2" valign="top" height="100%">
+            <table cellspacing="0" cellpadding="0" border="0" height="100%">
+            <tr>
+                <td valign="top" id="oe_secondary_menu" class="secondary_menu">
+                </td>
+                <td valign="top" class="oe-application-container">
+                    <div id="oe_app" class="oe-application">
+                    </div>
+                </td>
+            </tr>
+            </table>
         </td>
     </tr>
     <tr>
@@ -384,7 +390,7 @@
     </table>
 </t>
 <t t-name="Menu.secondary">
-    <div t-attf-class="oe_toggle_secondary_menu #{widget.folded ? 'folded' : 'unfolded'}">
+    <div t-attf-class="oe_toggle_secondary_menu">
         <span class="oe_menu_fold" title="Fold menu">&amp;laquo;</span>
         <span class="oe_menu_unfold" title="Unfold menu">&amp;raquo;</span>
     </div>
-- 
cgit v1.2.3


From a195b6912b86e40b08a7e3edd60f5f16a30b654c Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 19 Sep 2011 23:10:45 +0200
Subject: [IMP] Improved float submenu positioning

bzr revid: fme@openerp.com-20110919211045-6kqn99p5d8lece6t
---
 addons/web/static/src/xml/base.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/web/static/src/xml/base.xml')

diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 6d1ed16091e..c04963f47cf 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -39,7 +39,7 @@
     </tr>
     <tr>
         <td colspan="2" valign="top" height="100%">
-            <table cellspacing="0" cellpadding="0" border="0" height="100%">
+            <table cellspacing="0" cellpadding="0" border="0" height="100%" width="100%">
             <tr>
                 <td valign="top" id="oe_secondary_menu" class="secondary_menu">
                 </td>
-- 
cgit v1.2.3


From 4b5f6715821c99fe01264787e2dee18ab29e1c9e Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 19 Sep 2011 23:49:04 +0200
Subject: [IMP] Improved menu

bzr revid: fme@openerp.com-20110919214904-5vxnkt80rx48shjo
---
 addons/web/static/src/xml/base.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/web/static/src/xml/base.xml')

diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index c04963f47cf..1ff156d8c4d 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -407,7 +407,7 @@
     <a href="#" t-att-class="classname + (menu.children.length ? ' submenu' : ' leaf') + ' oe_menu_level_#{level}'" 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>
     </a>
-    <div t-attf-class="oe_secondary_submenu oe_secondary_submenu_level_#{level}" t-if="menu.children.length" style="display: none">
+    <div t-attf-class="oe_secondary_submenu oe_secondary_submenu_level_#{level}" t-if="menu.children.length" t-att-style="menu_first ? undefined : 'display: none'">
         <t t-foreach="menu.children" t-as="menu">
             <t t-set="classname">oe_secondary_submenu_item</t>
             <t t-call="Menu.secondary.children"/>
-- 
cgit v1.2.3


From e61618897111ee6184afb3625d79cedd9e072b07 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 20 Sep 2011 12:23:50 +0200
Subject: [IMP] Menu is now working ok in folded mode

bzr revid: fme@openerp.com-20110920102350-je1313hpdtnvg1yp
---
 addons/web/static/src/xml/base.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'addons/web/static/src/xml/base.xml')

diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 1ff156d8c4d..aa0c0286e9c 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -404,10 +404,10 @@
 </t>
 <t t-name="Menu.secondary.children">
     <t t-set="level" t-value="level + 1"/>
-    <a href="#" t-att-class="classname + (menu.children.length ? ' submenu' : ' leaf') + ' oe_menu_level_#{level}'" t-att-data-menu="menu.children.length ? undefined : menu.id">
+    <a href="#" 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>
     </a>
-    <div t-attf-class="oe_secondary_submenu oe_secondary_submenu_level_#{level}" t-if="menu.children.length" t-att-style="menu_first ? undefined : 'display: none'">
+    <div t-attf-class="oe_secondary_submenu" t-if="menu.children.length" t-att-style="menu_first and level == 1 ? undefined : 'display: none'">
         <t t-foreach="menu.children" t-as="menu">
             <t t-set="classname">oe_secondary_submenu_item</t>
             <t t-call="Menu.secondary.children"/>
-- 
cgit v1.2.3


From 873cc6f5e01f885485a9b5e1155101b30f396b99 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 20 Sep 2011 15:41:42 +0200
Subject: [FIX] Many fixes

bzr revid: fme@openerp.com-20110920134142-jccggvzzu46708kx
---
 addons/web/static/src/xml/base.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'addons/web/static/src/xml/base.xml')

diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index aa0c0286e9c..e1d4f12597b 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -404,7 +404,9 @@
 </t>
 <t t-name="Menu.secondary.children">
     <t t-set="level" t-value="level + 1"/>
-    <a href="#" 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">
+    <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>
     </a>
     <div t-attf-class="oe_secondary_submenu" t-if="menu.children.length" t-att-style="menu_first and level == 1 ? undefined : 'display: none'">
-- 
cgit v1.2.3