From 571aac869c0c2383a23b0980baf81507e885fd17 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Mon, 20 Feb 2012 11:09:58 +0100
Subject: [fix] problem with reference fields

lp bug: https://launchpad.net/bugs/934330 fixed

bzr revid: nicolas.vanhoren@openerp.com-20120220100958-bujk0yuftdlzk3fz
---
 addons/web/static/src/xml/base.xml | 6 ++----
 1 file changed, 2 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 2d867c25390..8dae18b2915 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1105,11 +1105,9 @@
 <t t-name="FieldReference">
     <table border="0" width="100%" cellpadding="0" cellspacing="0" class="oe_frame oe_forms">
     <tr>
-        <td t-attf-class="oe_form_frame_cell oe_form_selection #{widget.selection.element_class}">
-            <t t-raw="widget.selection.render()"/>
+        <td t-attf-class="oe_form_frame_cell oe_form_selection oe_form_view_reference_selection">
         </td>
-        <td t-attf-class="oe_form_frame_cell oe_form_many2one #{widget.m2o.element_class}" nowrap="true" style="display: none">
-            <t t-raw="widget.m2o.render()"/>
+        <td t-attf-class="oe_form_frame_cell oe_form_many2one oe_form_view_reference_m2o" nowrap="true" style="display: none">
         </td>
     </tr>
     </table>
-- 
cgit v1.2.3


From 383f1750c53cae05210b143ba2457ea541d579d6 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 21 Feb 2012 10:58:56 +0100
Subject: [imp] wip

bzr revid: nicolas.vanhoren@openerp.com-20120221095856-656l1so4ejc06gih
---
 addons/web/static/src/xml/base.xml | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 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 8dae18b2915..10779ee5994 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -728,7 +728,6 @@
     </td>
 </tr>
 <t t-name="ListView.row.form">
-    <t t-raw="frame.render()"/>
 </t>
 
 <t t-name="FormView">
@@ -1519,21 +1518,21 @@
         <td t-if="edited and !options.deletable" class="oe-listview-padding"/>
     </t>
 </t>
-<t t-name="ListView.row.frame" t-extend="WidgetFrame">
-    <t t-jquery="tr">
-        $(document.createElement('t'))
-            .append(this.contents())
-            .attr({
-                't-foreach': this.attr('t-foreach'),
-                't-as': this.attr('t-as')
-            })
-            .replaceAll(this)
-            .after($(document.createElement('td')).append(
-                $(document.createElement('button')).attr({
-                    'class': 'oe-edit-row-save', 'type': 'button'})
-                  .html(' ')))
-            .unwrap();
+<t t-name="ListView.row.frame">
+    <t t-foreach="widget.table" t-as="row">
+        <t t-foreach="row" t-as="td">
+            <td t-att-colspan="td.colspan gt 1 ? td.colspan : undefined"
+                t-att-width="td.width"
+                t-att-valign="td.table ? 'top' : undefined"
+                t-attf-class="oe_form_frame_cell #{td.classname} #{td.element_class}"
+            >
+                <t t-raw="td.render()"/>
+            </td>
+        </t>
     </t>
+    <td>
+        <button class="oe-edit-row-save" type="button"> </button>
+    </td>
 </t>
 <t t-name="view_editor">
     <table class="oe_view_editor">
-- 
cgit v1.2.3


From f4b4ef50887573f14689e59be7a3e6adfc1ba618 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 21 Feb 2012 11:52:29 +0100
Subject: [imp] improved html generation in editable lists

bzr revid: nicolas.vanhoren@openerp.com-20120221105229-xrxcjwx2jtteh444
---
 addons/web/static/src/xml/base.xml | 5 +++--
 1 file changed, 3 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 10779ee5994..98d99f74ef6 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -728,6 +728,8 @@
     </td>
 </tr>
 <t t-name="ListView.row.form">
+    <th t-if="widget.editable_list.options.selectable"></th>
+    <th t-if="widget.editable_list.options.isClarkGable"></th>
 </t>
 
 <t t-name="FormView">
@@ -1522,9 +1524,8 @@
     <t t-foreach="widget.table" t-as="row">
         <t t-foreach="row" t-as="td">
             <td t-att-colspan="td.colspan gt 1 ? td.colspan : undefined"
-                t-att-width="td.width"
                 t-att-valign="td.table ? 'top' : undefined"
-                t-attf-class="oe_form_frame_cell #{td.classname} #{td.element_class}"
+                t-attf-class="oe_form_frame_cell #{td.classname} #{td.element_class} oe-field-cell"
             >
                 <t t-raw="td.render()"/>
             </td>
-- 
cgit v1.2.3


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 50853cbaac022fea60009b49c29bde2bac592c2a Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 23 Feb 2012 14:39:37 +0100
Subject: [FIX] ability to backup databases in case listing databases is
 forbidden (via --no-database-list on the server)

lp bug: https://launchpad.net/bugs/939428 fixed

bzr revid: xmo@openerp.com-20120223133937-3115jyzjtbzequbq
---
 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 09ae4457221..1a2f80df8b3 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -154,7 +154,7 @@
                             <option t-att-value="db"><t t-esc="db"/></option>
                         </t>
                     </select>
-                    <input t-if="!db_list" name="drop_db" class="required"
+                    <input t-if="!db_list" name="backup_db" class="required"
                            type="text" autofocus="autofocus"/>
                 </td>
             </tr>
-- 
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


From e91dee1e97d5b7f371ee2ab86c77d4067d6e4af9 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 27 Feb 2012 14:45:31 +0100
Subject: [ADD] Added shortcut to dropdown menu. Completely removed old Header

bzr revid: fme@openerp.com-20120227134531-uf646x2w13zqsslz
---
 addons/web/static/src/xml/base.xml | 52 +++++++++-----------------------------
 1 file changed, 12 insertions(+), 40 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 9b361f13e8f..29618c90bdc 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -23,7 +23,6 @@
             <div class="oe_menu_placeholder"/>
             <div class="oe_dropdown_menu_placeholder"/>
         </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>
@@ -339,43 +338,6 @@
         <div id="oe_db_options" class="oe_db_options"></div>
     </div>
 </t>
-<t t-name="Header">
-    <div>
-        <a t-att-href="'/' + widget.qs" class="company_logo_link">
-            <div class="company_logo" />
-        </a>
-    </div>
-</t>
-<t t-name="Header-content">
-    <h1 class="header_title">
-        <t t-esc="user.company_id[1]"/> (<t t-esc="widget.session.db"/>)<br/>
-        <small class="username"><t t-esc="user.name"/></small>
-    </h1>
-    <div class="header_corner">
-        <ul class="block">
-            <li>
-                <a t-att-href="'/' + widget.qs" title="Home" class="home"><img t-att-src='_s + "/web/static/src/img/header-home.png"' width="16" height="16" border="0"/></a>
-            </li>
-            <li class="preferences">
-                <a href="javascript:void(0)" title="Preferences" class="preferences"><img t-att-src='_s + "/web/static/src/img/header-preferences.png"' width="16" height="16" border="0"/></a>
-            </li>
-            <li>
-                <a href="javascript:void(0)" title="About" class="about"><img t-att-src='_s + "/web/static/src/img/header-about.png"' width="16" height="16" border="0"/></a>
-            </li>
-        </ul>
-        <div class="block">
-            <a href="javascript:void(0)" class="logout">LOGOUT</a>
-        </div>
-
-    </div>
-    <div class="oe-shortcuts"> </div>
-</t>
-<ul t-name="Shortcuts">
-    <li t-foreach="shortcuts" t-as="shortcut"
-            t-att-data-id="shortcut.res_id"
-            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">
@@ -414,17 +376,27 @@
     <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
+                <img class="oe_topbar_avatar" t-att-data-default-src="_s + '/web/static/src/img/topbar-avatar.png'"/>
+                <span class="oe_topbar_name"/>
             </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>
+                <li><hr/></li>
+                <li><a href="#" data-menu="about">About OpenERP</a></li>
+                <li><hr/></li>
             </ul>
         </li>
     </ul>
 </t>
+<t t-name="DropDownMenu.shortcut">
+    <li t-foreach="shortcuts" t-as="shortcut">
+        <a href="#" data-menu="shortcut" t-att-data-id="shortcut.res_id" t-att-data-shortcut-id="shortcut.id">
+            <t t-esc="shortcut.name"/>
+        </a>
+    </li>
+</t>
 
 <t t-name="ViewManager">
     <table class="view-manager-main-table" cellpadding="0" cellspacing="0">
-- 
cgit v1.2.3


From ad681179d0e2b8ee95c085b2131cd9a7e426eb40 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 27 Feb 2012 14:59:11 +0100
Subject: [CHG] Menu doesn't fold by default

bzr revid: fme@openerp.com-20120227135911-9l0csum251wvkfv8
---
 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 29618c90bdc..c9c3bb65857 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -364,7 +364,7 @@
         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'">
+    <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"/>
-- 
cgit v1.2.3


From 2d03b80c7dcb5d65973a0ea383df72416dbb66ac Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 28 Feb 2012 14:41:21 +0100
Subject: [IMP] New menus

bzr revid: fme@openerp.com-20120228134121-bxs33qrpevrfkctp
---
 addons/web/static/src/xml/base.xml | 55 +++++++++++++++++---------------------
 1 file changed, 24 insertions(+), 31 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 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">
-- 
cgit v1.2.3


From 32cd30b7f5f87ae1e8684070ef89f1c1a0ded9e5 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 28 Feb 2012 15:26:41 +0100
Subject: [ADD] Added new logo and footer

bzr revid: fme@openerp.com-20120228142641-p4qsssmutq30r0z3
---
 addons/web/static/src/xml/base.xml | 7 +++----
 1 file changed, 3 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 66c6b316393..d2d30c5d580 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -24,14 +24,13 @@
             <div class="oe_dropdown_menu_placeholder"/>
         </div>
         <div class="oe_leftbar">
+            <a href="#" class="oe_logo"><img t-att-src='_s + "/web/static/src/img/logo.png"'/></a>
+
             <div class="oe_secondary_menus_container"/>
-            <!--
-            <a href="#" class="oe_logo"><img src="img/logo.png"/></a>
 
             <div class="oe_footer">
-                Powered by <a href="http://www.openerp.com" class="openerp"><span class="red">Open</span>ERP</a>
+                Powered by <a href="http://www.openerp.com"><span>Open</span>ERP</a>
             </div>
-            -->
         </div>
         <div class="oe_application"/>
     </div>
-- 
cgit v1.2.3


From 2f2c246fac6bcef23687e7623e8addc9b92a8998 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 29 Feb 2012 14:02:35 +0100
Subject: [IMP] Improve menus. Works when client is reloaded

bzr revid: fme@openerp.com-20120229130235-bx8ptrz4xah1aqct
---
 addons/web/static/src/xml/base.xml | 8 ++++----
 1 file changed, 4 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 d2d30c5d580..d1dbf9845c9 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -327,9 +327,7 @@
 <t t-name="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>
+            <t t-call="Menu.secondary.link"/>
         </li>
     </ul>
 </t>
@@ -359,7 +357,9 @@
 <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-att-data-menu="menu.id"
+        t-att-data-action-model="menu.action ? menu.action.split(',')[0] : ''"
+        t-att-data-action-id="menu.action ? menu.action.split(',')[1] : ''">
         <t t-esc="menu.name"/>
     </a>
 </t>
-- 
cgit v1.2.3


From c7809cafe795e2e29f5e1605691028f2c0159860 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 29 Feb 2012 15:15:27 +0100
Subject: [IMP] Renamed DropDownMenu to UserMenu

bzr revid: fme@openerp.com-20120229141527-tuhkt0isveefy2kp
---
 addons/web/static/src/xml/base.xml | 8 ++++----
 1 file changed, 4 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 d1dbf9845c9..7b5643ec8f9 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -21,7 +21,7 @@
     <div class="oe_webclient">
         <div class="oe_topbar">
             <div class="oe_menu_placeholder"/>
-            <div class="oe_dropdown_menu_placeholder"/>
+            <div class="oe_user_menu_placeholder"/>
         </div>
         <div class="oe_leftbar">
             <a href="#" class="oe_logo"><img t-att-src='_s + "/web/static/src/img/logo.png"'/></a>
@@ -364,8 +364,8 @@
     </a>
 </t>
 
-<t t-name="DropDownMenu">
-    <ul class="oe_dropdown_menu oe_topbar_item">
+<t t-name="UserMenu">
+    <ul class="oe_user_menu oe_topbar_item">
         <li class="oe_dropdown">
             <a href="#" class="oe_dropdown_toggle">
                 <img class="oe_topbar_avatar" t-att-data-default-src="_s + '/web/static/src/img/topbar-avatar.png'"/>
@@ -382,7 +382,7 @@
         </li>
     </ul>
 </t>
-<t t-name="DropDownMenu.shortcut">
+<t t-name="UserMenu.shortcut">
     <li t-foreach="shortcuts" t-as="shortcut">
         <a href="#" data-menu="shortcut" t-att-data-id="shortcut.res_id" t-att-data-shortcut-id="shortcut.id">
             <t t-esc="shortcut.name"/>
-- 
cgit v1.2.3


From 71c94be053fe84cdde22da8e7bf016d825665151 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 29 Feb 2012 16:55:26 +0100
Subject: [ADD] Added systray zone in webclient

bzr revid: fme@openerp.com-20120229155526-14gpto9k1qtcl1m8
---
 addons/web/static/src/xml/base.xml | 1 +
 1 file changed, 1 insertion(+)

(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 7b5643ec8f9..08887e5b837 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -22,6 +22,7 @@
         <div class="oe_topbar">
             <div class="oe_menu_placeholder"/>
             <div class="oe_user_menu_placeholder"/>
+            <div class="oe_systray"/>
         </div>
         <div class="oe_leftbar">
             <a href="#" class="oe_logo"><img t-att-src='_s + "/web/static/src/img/logo.png"'/></a>
-- 
cgit v1.2.3


From 08b4442e081a2ce7abb209ea7b2a70a781879699 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Tue, 20 Mar 2012 11:56:01 +0100
Subject: [FIX] align image widget (same behavior as 6.0)

bzr revid: chs@openerp.com-20120320105601-gpp0315e8637zpsw
---
 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 1a2f80df8b3..a0643105055 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1128,7 +1128,7 @@
     </div>
 </t>
 <t t-name="FieldBinaryImage">
-    <table cellpadding="0" cellspacing="0" border="0">
+    <table cellpadding="0" cellspacing="0" border="0" width="100%">
     <tr>
         <td align="center">
             <img t-att-src='_s + "/web/static/src/img/placeholder.png"' class="oe-binary-image"
-- 
cgit v1.2.3