From 3644361b1f3f429e15efde6e80e1cb26456cdad8 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 23 Feb 2012 14:11:40 +0100
Subject: [IMP] Webclient not OldWidget anymore. Renamed template to
 'WebClient'

Made a seperate revision because of edi addon dependency

bzr revid: fme@openerp.com-20120223131140-2p7uycfs2el6ibei
---
 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 98d99f74ef6..3d791fbbbd1 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -17,7 +17,7 @@
         </div>
     </div>
 </t>
-<t t-name="Interface">
+<t t-name="WebClient">
     <table border="0" cellpadding="0" cellspacing="0" width="100%" height="100%" class="main_table">
     <tr>
         <td colspan="2" valign="top">
-- 
cgit v1.2.3


From 865ffbd4cc0a8cd16f3b0e17f7a2b28e6408262b Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 23 Feb 2012 14:55:03 +0100
Subject: [BREAK] Prepare main div container for new layout

bzr revid: fme@openerp.com-20120223135503-e89bnthvhbv2z58a
---
 addons/web/static/src/xml/base.xml | 36 +++++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 17 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 3d791fbbbd1..89e28398bc9 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -18,15 +18,24 @@
     </div>
 </t>
 <t t-name="WebClient">
-    <table border="0" cellpadding="0" cellspacing="0" width="100%" height="100%" class="main_table">
-    <tr>
-        <td colspan="2" valign="top">
+    <div class="oe_webclient">
+        <div class="oe_topbar">
             <div id="oe_header" class="header"></div>
             <div id="oe_menu" class="menu"></div>
-        </td>
-    </tr>
-    <tr>
-        <td colspan="2" valign="top" height="100%">
+        </div>
+        <div class="oe_leftbar">
+            <!--
+            <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" id="oe_secondary_menu" class="secondary_menu"></td>
@@ -36,16 +45,9 @@
                 </td>
             </tr>
             </table>
-        </td>
-    </tr>
-    <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>
-            </div>
-        </td>
-    </tr>
-    </table>
+
+        </div>
+    </div>
 </t>
 <t t-name="Loading">
     <div id="oe_loading">
-- 
cgit v1.2.3


From a90d466ccbb23f8bc00c6fb5bcb1ce86adbdae68 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 23 Feb 2012 16:02:30 +0100
Subject: [ADD] Add styles for new main menu

bzr revid: fme@openerp.com-20120223150230-n935rq8bv65a6gbj
---
 addons/web/static/src/xml/base.xml | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 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 89e28398bc9..81d9f5ccd09 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -20,9 +20,9 @@
 <t t-name="WebClient">
     <div class="oe_webclient">
         <div class="oe_topbar">
-            <div id="oe_header" class="header"></div>
-            <div id="oe_menu" class="menu"></div>
+            <div class="oe_menu_placeholder" id="oe_menu_temporary_id"/>
         </div>
+        <div id="oe_header" class="header"></div>
         <div class="oe_leftbar">
             <!--
             <a href="#" class="oe_logo"><img src="img/logo.png"/></a>
@@ -45,7 +45,6 @@
                 </td>
             </tr>
             </table>
-
         </div>
     </div>
 </t>
@@ -375,15 +374,13 @@
         ><t t-esc="shortcut.name"/></li>
 </ul>
 <t t-name="Menu">
-    <table align="center">
-    <tr>
-        <td t-foreach="widget.data.data.children" t-as="menu">
+    <ul class="oe_menu" t-if="widget.data">
+        <li t-foreach="widget.data.data.children" t-as="menu">
             <a href="#" t-att-data-menu="menu.id">
                 <t t-esc="menu.name"/>
             </a>
-        </td>
-    </tr>
-    </table>
+        </li>
+    </ul>
 </t>
 <t t-name="Menu.secondary">
     <div t-attf-class="oe_toggle_secondary_menu">
-- 
cgit v1.2.3


From 2e681ad98b808a1dbee47526eb845766a9574c06 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 23 Feb 2012 16:39:21 +0100
Subject: [CHG] Updated Secondary Menu (moved in a div)

bzr revid: fme@openerp.com-20120223153921-u23y5ylp2sqhs3ev
---
 addons/web/static/src/xml/base.xml | 12 ++++++------
 1 file changed, 6 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 81d9f5ccd09..2e78ef83848 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -20,7 +20,7 @@
 <t t-name="WebClient">
     <div class="oe_webclient">
         <div class="oe_topbar">
-            <div class="oe_menu_placeholder" id="oe_menu_temporary_id"/>
+            <div class="oe_menu_placeholder"/>
         </div>
         <div id="oe_header" class="header"></div>
         <div class="oe_leftbar">
@@ -38,7 +38,9 @@
             <!-- 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" id="oe_secondary_menu" class="secondary_menu"></td>
+                <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>
@@ -373,6 +375,7 @@
             t-att-data-shortcut-id="shortcut.id"
         ><t t-esc="shortcut.name"/></li>
 </ul>
+
 <t t-name="Menu">
     <ul class="oe_menu" t-if="widget.data">
         <li t-foreach="widget.data.data.children" t-as="menu">
@@ -383,10 +386,6 @@
     </ul>
 </t>
 <t t-name="Menu.secondary">
-    <div t-attf-class="oe_toggle_secondary_menu">
-        <span class="oe_menu_fold" title="Fold menu"><t t-raw="'&amp;laquo;'"/></span>
-        <span class="oe_menu_unfold" title="Unfold menu"><t t-raw="'&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" t-translation="off">oe_secondary_menu_item</t>
@@ -409,6 +408,7 @@
         </t>
     </div>
 </t>
+
 <t t-name="ViewManager">
     <table class="view-manager-main-table" cellpadding="0" cellspacing="0">
     <tbody>
-- 
cgit v1.2.3


From b64f4c6875b099aa780c5cfd15bfcacec88c2003 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 23 Feb 2012 18:44:39 +0100
Subject: [ADD] Added dropdown menu.

bzr revid: fme@openerp.com-20120223174439-nlyeqjobi230e7xx
---
 addons/web/static/src/xml/base.xml | 19 ++++++++++++++++++-
 1 file changed, 18 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 2e78ef83848..9b361f13e8f 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -21,8 +21,9 @@
     <div class="oe_webclient">
         <div class="oe_topbar">
             <div class="oe_menu_placeholder"/>
+            <div class="oe_dropdown_menu_placeholder"/>
         </div>
-        <div id="oe_header" class="header"></div>
+        <div id="oe_header" class="header" style="display: none"></div>
         <div class="oe_leftbar">
             <!--
             <a href="#" class="oe_logo"><img src="img/logo.png"/></a>
@@ -409,6 +410,22 @@
     </div>
 </t>
 
+<t t-name="DropDownMenu">
+    <ul class="oe_dropdown_menu oe_topbar_item">
+        <li class="oe_dropdown">
+            <a href="#" class="oe_dropdown_toggle">
+                <img class="oe_topbar_avatar" src="http://www.amigrave.com/ClarkGableSmall.jpg"/>
+                Clark Gable
+            </a>
+            <ul class="oe_dropdown_options">
+                <!--<li><a href="#" data-menu="profile">Profile</a></li>-->
+                <li><a href="#" data-menu="settings">Settings</a></li>
+                <li><a href="#" data-menu="logout">Log out</a></li>
+            </ul>
+        </li>
+    </ul>
+</t>
+
 <t t-name="ViewManager">
     <table class="view-manager-main-table" cellpadding="0" cellspacing="0">
     <tbody>
-- 
cgit v1.2.3