From 9b18066adcb6fa9a5a9847a2292d1fef4f1aa5a4 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 7 Sep 2011 18:33:15 +0200
Subject: [FIX] Fixed FieldSelection problems with false values

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

bzr revid: fme@openerp.com-20110907163315-b014e9pulr3nsqt4
---
 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 677488d9d7d..ae03c8789b6 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -799,10 +799,8 @@
         t-att-id="widget.element_id + '_field'"
         t-att-class="'field_' + widget.type"
         style="width: 100%">
-            <t t-foreach="widget.field_index" t-as="options">
-                <option t-att-value="options.ikey">
-                    <t t-esc="options.label"/>
-                </option>
+            <t t-foreach="widget.values" t-as="option">
+                <option><t t-esc="option[1]"/></option>
             </t>
     </select>
 </t>
-- 
cgit v1.2.3


From bba27daf04ff27b1f3c71e0dee7c73375efc11a4 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 8 Sep 2011 12:14:06 +0200
Subject: [FIX] don't display non-searchable (non-stored without a fnct_search)
 function fields

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

bzr revid: xmo@openerp.com-20110908101406-f6r8bgt155nq65in
---
 addons/web/static/src/xml/base.xml | 3 ++-
 1 file changed, 2 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 ae03c8789b6..5ac1929fce3 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1111,7 +1111,8 @@
     <div t-att-id="element_id">
         <select class="searchview_extended_prop_field">
             <t t-foreach="attrs.fields" t-as="field">
-                <option t-att="{'selected': field === attrs.selected ? 'selected' : null}"
+                <option t-if="typeof field.store === 'undefined' || field.store || field.fnct_search"
+                        t-att="{'selected': field === attrs.selected ? 'selected' : null}"
                         t-att-value="field.name">
                     <t t-esc="field.string"/>
                 </option>
-- 
cgit v1.2.3


From 32bccb877b711fd3cf20d290db0a8390c0e676b7 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 8 Sep 2011 14:55:10 +0200
Subject: [IMP] look of non-selectable or non-editable editable list views when
 a row is being edited

dynamically add and remove padding rows

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

bzr revid: xmo@openerp.com-20110908125510-fb7vcjsixj5sqhpz
---
 addons/web/static/src/xml/base.xml | 22 ++++++----------------
 1 file changed, 6 insertions(+), 16 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 5ac1929fce3..7a6610850b3 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -566,7 +566,7 @@
                 </table>
             </th>
         </tr>
-        <tr t-if="options.header">
+        <tr t-if="options.header" class="oe-listview-header-columns">
             <t t-foreach="columns" t-as="column">
                 <th t-if="column.meta">
                     <t t-esc="column.string"/>
@@ -1211,21 +1211,11 @@
     <button type="button" class="oe_formopenpopup-form-close">Cancel</button>
 </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'}).text('Save')))
-            .before($(document.createElement('td')).append(
-                $(document.createElement('button')).attr({
-                    'class': 'oe-edit-row-cancel', 'type': 'button'}).text('Cancel')))
-            .unwrap();
+    <t t-jquery="tr" t-operation="prepend">
+        <td><button type="button" class="oe-edit-row-cancel">Cancel</button></td>
+    </t>
+    <t t-jquery="tr" t-operation="append">
+        <td><button type="button" class="oe-edit-row-save">Save</button></td>
     </t>
 </t>
 
-- 
cgit v1.2.3


From c5ac762b2062ca7626ed85b0321450b87d073e0c Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 8 Sep 2011 17:06:45 +0200
Subject: [imp] setup of templates for status widget

bzr revid: nicolas.vanhoren@openerp.com-20110908150645-uqj6f9f5icnsf3jx
---
 addons/web/static/src/xml/base.xml | 6 ++++++
 1 file changed, 6 insertions(+)

(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 7a6610850b3..55fc09c6e47 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1376,5 +1376,11 @@
             Depending on your needs, OpenERP is available through a web or application client.
         </p>
     </div>
+</t>
+<t t-name="FieldStatus">
+    <div t-att-id="widget.element_id"></div>
+</t>
+<t t-name="FieldStatus.content">
+    
 </t>
 </templates>
-- 
cgit v1.2.3


From e63c4a5feaccb044c15c685d94c54a46de25b292 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 8 Sep 2011 17:09:32 +0200
Subject: [imp] improved status widget templates behavior

bzr revid: nicolas.vanhoren@openerp.com-20110908150932-kfyot4ivb6auhnod
---
 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 55fc09c6e47..89549e5c18f 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1381,6 +1381,6 @@
     <div t-att-id="widget.element_id"></div>
 </t>
 <t t-name="FieldStatus.content">
-    
+    Je suis un gentil poulet.
 </t>
 </templates>
-- 
cgit v1.2.3


From 9cf066a790fa58d1c1206a9462bbb1480a1ff284 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 8 Sep 2011 17:11:53 +0200
Subject: [imp] put first example of status field with css

bzr revid: nicolas.vanhoren@openerp.com-20110908151153-7jiqei1abo90q6sx
---
 addons/web/static/src/xml/base.xml | 12 +++++++++++-
 1 file changed, 11 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 89549e5c18f..5889e44aa55 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1381,6 +1381,16 @@
     <div t-att-id="widget.element_id"></div>
 </t>
 <t t-name="FieldStatus.content">
-    Je suis un gentil poulet.
+    <ul class="oe-arrow-list">
+    <li>
+        <span>Je suis</span><span class="oe-arrow-list-after"></span>
+    </li>
+    <li>
+        <span class="oe-arrow-list-before"></span><span>un gentil</span><span class="oe-arrow-list-after"></span>
+    </li>
+    <li>
+        <span class="oe-arrow-list-before"></span><span>poulet</span>
+    </li>
+    </ul>
 </t>
 </templates>
-- 
cgit v1.2.3


From 40d3b9cb49ec6e45110fdba8ba46f11dfe867160 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 8 Sep 2011 17:23:37 +0200
Subject: [imp] added selected indication in status widget

bzr revid: nicolas.vanhoren@openerp.com-20110908152337-6xsfyicntnm6t7mx
---
 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 5889e44aa55..32296d1a0c2 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1385,7 +1385,7 @@
     <li>
         <span>Je suis</span><span class="oe-arrow-list-after"></span>
     </li>
-    <li>
+    <li class="oe-arrow-list-selected">
         <span class="oe-arrow-list-before"></span><span>un gentil</span><span class="oe-arrow-list-after"></span>
     </li>
     <li>
-- 
cgit v1.2.3


From 38df96f12482bef061a73bd647a58fce7ddbe2e5 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 8 Sep 2011 17:37:15 +0200
Subject: [imp] now status widget list possible selections

bzr revid: nicolas.vanhoren@openerp.com-20110908153715-k3ur78w85kb24iv7
---
 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 32296d1a0c2..02c013d954a 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1382,15 +1382,19 @@
 </t>
 <t t-name="FieldStatus.content">
     <ul class="oe-arrow-list">
-    <li>
-        <span>Je suis</span><span class="oe-arrow-list-after"></span>
-    </li>
+        <t t-set="size" t-value="widget.field.selection.length"/>
+        <t t-foreach="_.range(size)" t-as="i">
+            <li>
+                <span class="oe-arrow-list-before" t-if="i &gt; 0"></span><span><t t-esc="widget.field.selection[i][1]"/></span><span class="oe-arrow-list-after" t-if="i &lt; size - 1"></span>
+            </li>
+        </t>
+        <!--
     <li class="oe-arrow-list-selected">
         <span class="oe-arrow-list-before"></span><span>un gentil</span><span class="oe-arrow-list-after"></span>
     </li>
     <li>
         <span class="oe-arrow-list-before"></span><span>poulet</span>
-    </li>
+    </li>-->
     </ul>
 </t>
 </templates>
-- 
cgit v1.2.3


From c2ad26f34ce4bbf3338db0ef7e2355058a3ae1e9 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 8 Sep 2011 17:45:51 +0200
Subject: [imp] now status widget correctly highlights the selected item

bzr revid: nicolas.vanhoren@openerp.com-20110908154551-oti347kv6f7h0q2y
---
 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 02c013d954a..3719d4744ef 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1384,7 +1384,7 @@
     <ul class="oe-arrow-list">
         <t t-set="size" t-value="widget.field.selection.length"/>
         <t t-foreach="_.range(size)" t-as="i">
-            <li>
+            <li t-att-class="i === widget.selected_index ? 'oe-arrow-list-selected' : ''">
                 <span class="oe-arrow-list-before" t-if="i &gt; 0"></span><span><t t-esc="widget.field.selection[i][1]"/></span><span class="oe-arrow-list-after" t-if="i &lt; size - 1"></span>
             </li>
         </t>
-- 
cgit v1.2.3


From ec24f26ca66f65b76d991585353c65c9d0d7d1e8 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 8 Sep 2011 18:04:51 +0200
Subject: [imp] improved css of status widget

bzr revid: nicolas.vanhoren@openerp.com-20110908160451-gh5josp0nmn3vn7u
---
 addons/web/static/src/xml/base.xml | 7 -------
 1 file changed, 7 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 3719d4744ef..c46dbd6ab72 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1388,13 +1388,6 @@
                 <span class="oe-arrow-list-before" t-if="i &gt; 0"></span><span><t t-esc="widget.field.selection[i][1]"/></span><span class="oe-arrow-list-after" t-if="i &lt; size - 1"></span>
             </li>
         </t>
-        <!--
-    <li class="oe-arrow-list-selected">
-        <span class="oe-arrow-list-before"></span><span>un gentil</span><span class="oe-arrow-list-after"></span>
-    </li>
-    <li>
-        <span class="oe-arrow-list-before"></span><span>poulet</span>
-    </li>-->
     </ul>
 </t>
 </templates>
-- 
cgit v1.2.3


From 7987d3a2f6ebc1256a33320c0d2d964687c11be4 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 8 Sep 2011 18:35:36 +0200
Subject: [imp] added possibility to only show some states in status widget

bzr revid: nicolas.vanhoren@openerp.com-20110908163536-bewx1817u96t11rc
---
 addons/web/static/src/xml/base.xml | 6 +++---
 1 file changed, 3 insertions(+), 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 c46dbd6ab72..385d7bfd48b 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1382,10 +1382,10 @@
 </t>
 <t t-name="FieldStatus.content">
     <ul class="oe-arrow-list">
-        <t t-set="size" t-value="widget.field.selection.length"/>
+        <t t-set="size" t-value="widget.to_show.length"/>
         <t t-foreach="_.range(size)" t-as="i">
-            <li t-att-class="i === widget.selected_index ? 'oe-arrow-list-selected' : ''">
-                <span class="oe-arrow-list-before" t-if="i &gt; 0"></span><span><t t-esc="widget.field.selection[i][1]"/></span><span class="oe-arrow-list-after" t-if="i &lt; size - 1"></span>
+            <li t-att-class="widget.to_show[i][0] === widget.selected_value ? 'oe-arrow-list-selected' : ''">
+                <span class="oe-arrow-list-before" t-if="i &gt; 0"></span><span><t t-esc="widget.to_show[i][1]"/></span><span class="oe-arrow-list-after" t-if="i &lt; size - 1"></span>
             </li>
         </t>
     </ul>
-- 
cgit v1.2.3


From bd92c1282bab819d05f5020d25b72cd19d7ccf37 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Fri, 9 Sep 2011 15:42:44 +0200
Subject: [REV] base.xml changes of
 xmo@openerp.com-20110908125510-fb7vcjsixj5sqhpz: new version was simpler, it
 was also completely broken

issue here is that <tr> element bears a foreach, which we have to keep, so can't just insert new tds in the row (they'll get repeated), we can't remove the tr (not without grafting the old attributes), etc...

it's really kind-of a pain.

Basically, the replaceAll() is used to make the <t> just created replace the <tr> matched, the unwrapAll removes the <table> around it all, resulting in a <t> with the buttons inserted before and after it, all landed in the editable-listview-generated-row

bzr revid: xmo@openerp.com-20110909134244-mbf5sf4to09fvsyi
---
 addons/web/static/src/xml/base.xml | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 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 385d7bfd48b..8b0fda2b83f 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1211,11 +1211,21 @@
     <button type="button" class="oe_formopenpopup-form-close">Cancel</button>
 </t>
 <t t-name="ListView.row.frame" t-extend="WidgetFrame">
-    <t t-jquery="tr" t-operation="prepend">
-        <td><button type="button" class="oe-edit-row-cancel">Cancel</button></td>
-    </t>
-    <t t-jquery="tr" t-operation="append">
-        <td><button type="button" class="oe-edit-row-save">Save</button></td>
+    <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'}).text('Save')))
+            .before($(document.createElement('td')).append(
+                $(document.createElement('button')).attr({
+                    'class': 'oe-edit-row-cancel', 'type': 'button'}).text('Cancel')))
+            .unwrap();
     </t>
 </t>
 
-- 
cgit v1.2.3


From 76356580349f3f11bcbe1eaf96ca3c309a60445e Mon Sep 17 00:00:00 2001
From: "Vaibhav (OpenERP)" <vda@tinyerp.com>
Date: Mon, 12 Sep 2011 13:54:26 +0530
Subject: [FIX] Override viewmanager,show stars when called from actionmanager.

bzr revid: vda@tinyerp.com-20110912082426-snwh0cc5ac75g7xz
---
 addons/web/static/src/xml/base.xml | 10 ++++++++--
 1 file changed, 8 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 677488d9d7d..5c2b2f0000d 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -420,8 +420,6 @@
     <table class="view-manager-main-table">
     <tr>
         <td class="view-manager-main-content">
-            <a class="oe-shortcut-toggle" title="Add / Remove Shortcut..."
-               href="javascript: void(0)"> </a>
             <div class="oe_vm_switch">
                 <t t-if="views.length != 1" t-foreach="views" t-as="view">
                     <button type="button" t-att-data-view-type="view.view_type">
@@ -442,6 +440,14 @@
     </tr>
     </table>
 </t>
+
+<t t-extend="ViewManager">
+    <t t-jquery="table td:first-child" t-operation="prepend">
+    	<a t-if="action" class="oe-shortcut-toggle" title="Add / Remove Shortcut..."
+               href="javascript: void(0)"> </a>
+    </t>
+</t>
+
 <t t-name="Sidebar">
     <a class="toggle-sidebar"></a>
     <div class="sidebar-content">
-- 
cgit v1.2.3


From 61e6bd93481853f6b2373fc0295852afec78dacf Mon Sep 17 00:00:00 2001
From: "Vaibhav (OpenERP)" <vda@tinyerp.com>
Date: Mon, 12 Sep 2011 16:23:25 +0530
Subject: [FIX] Inherit template.load right template.

bzr revid: vda@tinyerp.com-20110912105325-0e7f9jmt79ztao5w
---
 addons/web/static/src/xml/base.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 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 5c2b2f0000d..5688ca6b0c7 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -441,11 +441,11 @@
     </table>
 </t>
 
-<t t-extend="ViewManager">
-    <t t-jquery="table td:first-child" t-operation="prepend">
-    	<a t-if="action" class="oe-shortcut-toggle" title="Add / Remove Shortcut..."
-               href="javascript: void(0)"> </a>
-    </t>
+<t t-extend="ViewManager" t-name="ViewManagerAction">
+	<t t-jquery=".view-manager-main-table .view-manager-main-content" t-operation="prepend">
+		<a class="oe-shortcut-toggle" title="Add / Remove Shortcut..."
+	               href="javascript: void(0)"> </a>
+   </t>
 </t>
 
 <t t-name="Sidebar">
-- 
cgit v1.2.3


From bbea51f5e7f9ca41f3966d1c9b96bd5d6c14b557 Mon Sep 17 00:00:00 2001
From: "Vaibhav (OpenERP)" <vda@tinyerp.com>
Date: Mon, 12 Sep 2011 16:26:54 +0530
Subject: [FIX] element ref.

bzr revid: vda@tinyerp.com-20110912105654-h8s5xvwbdn3nqe8a
---
 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 5688ca6b0c7..49b489df957 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -442,7 +442,7 @@
 </t>
 
 <t t-extend="ViewManager" t-name="ViewManagerAction">
-	<t t-jquery=".view-manager-main-table .view-manager-main-content" t-operation="prepend">
+	<t t-jquery=".view-manager-main-content" t-operation="prepend">
 		<a class="oe-shortcut-toggle" title="Add / Remove Shortcut..."
 	               href="javascript: void(0)"> </a>
    </t>
-- 
cgit v1.2.3


From 0f9c39acdb3baf3a84a2cc00c32a9c07fe5229c1 Mon Sep 17 00:00:00 2001
From: "Vaibhav (OpenERP)" <vda@tinyerp.com>
Date: Mon, 12 Sep 2011 18:27:38 +0530
Subject: [FIX] Indentation.cleanup space,tabs.

bzr revid: vda@tinyerp.com-20110912125738-ngubj1wpfp6t7s4u
---
 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 49b489df957..203e3163915 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -442,10 +442,10 @@
 </t>
 
 <t t-extend="ViewManager" t-name="ViewManagerAction">
-	<t t-jquery=".view-manager-main-content" t-operation="prepend">
-		<a class="oe-shortcut-toggle" title="Add / Remove Shortcut..."
-	               href="javascript: void(0)"> </a>
-   </t>
+    <t t-jquery=".view-manager-main-content" t-operation="prepend">
+    	<a class="oe-shortcut-toggle" title="Add / Remove Shortcut..."
+    	href="javascript: void(0)"> </a>
+    </t>
 </t>
 
 <t t-name="Sidebar">
-- 
cgit v1.2.3


From 7a31d4258b4152ba0e378e71fc68b3f930b782cd Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 13 Sep 2011 09:37:30 +0200
Subject: [FIX] application content moving around the content area if the
 secondary menu is closed

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

bzr revid: xmo@openerp.com-20110913073730-caukax89lhgwqpch
---
 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 c97b9d5b049..1b1745036c4 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -40,7 +40,7 @@
     <tr>
         <td valign="top" id="oe_secondary_menu" class="secondary_menu">
         </td>
-        <td valign="top">
+        <td valign="top" class="oe-application-container">
             <div id="oe_app" class="oe-application">
             </div>
         </td>
-- 
cgit v1.2.3