From 101084dfa07e18341724bd2fe55c3cd627839bc8 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 21 Apr 2011 12:12:12 +0200
Subject: [IMP] Improved sidebar styling

bzr revid: fme@openerp.com-20110421101212-bomgipspn3tlwahu
---
 addons/base/static/src/xml/base.xml | 39 +++++++++++++++++--------------------
 1 file changed, 18 insertions(+), 21 deletions(-)

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

diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml
index cbb90ca9e2e..163ae8d335c 100644
--- a/addons/base/static/src/xml/base.xml
+++ b/addons/base/static/src/xml/base.xml
@@ -33,10 +33,7 @@
         <td valign="top" id="oe_secondary_menu" class="secondary_menu">
         </td>
         <td valign="top" width="100%" height="100%">
-            <div id="oe_main" class="main">
-                <div id="oe_app" class="application"></div>
-                <div id="oe_sidebar"></div>
-            </div>
+            <div id="oe_app" class="oe-application"></div>
         </td>
     </tr>
     <tr>
@@ -135,23 +132,23 @@
 <t t-name="ViewManager">
     <table class="view-manager-main-table">
     <tr>
-    <td class="view-manager-main-content">
-    <!-- TODO prefix id with the element_id of the controller t-attf-id="#{prefix}_localid" -->
-    <div class="oe_vm_switch">
-        <t t-foreach="views" t-as="view">
-            <button type="button" t-att-data-view-type="view[1]">
-                <t t-esc="view[1]"/>
-            </button>
-        </t>
-    </div>
-    <div t-attf-id="#{prefix}_search"/>
-    <t t-foreach="views" t-as="view">
-        <div t-attf-id="#{prefix}_view_#{view[1]}"/>
-    </t>
-	</td>
-	<td class="view-manager-main-sidebar">
-	</td>
-	</tr>
+        <td class="view-manager-main-content">
+            <!-- TODO prefix id with the element_id of the controller t-attf-id="#{prefix}_localid" -->
+            <div class="oe_vm_switch">
+                <t t-foreach="views" t-as="view">
+                    <button type="button" t-att-data-view-type="view[1]">
+                        <t t-esc="view[1]"/>
+                    </button>
+                </t>
+            </div>
+            <div t-attf-id="#{prefix}_search" t-opentag="true"/>
+            <t t-foreach="views" t-as="view">
+                <div t-attf-id="#{prefix}_view_#{view[1]}"/>
+            </t>
+        </td>
+        <td class="view-manager-main-sidebar">
+        </td>
+    </tr>
     </table>
 </t>
 <table t-name="ListView">
-- 
cgit v1.2.3


From d087f5f37abb4d2548bec1301eb17948c2b3a34e Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 21 Apr 2011 12:24:54 +0200
Subject: [IMP] Quick & dirty support for non-scalar fields values in listviews

bzr revid: fme@openerp.com-20110421102454-cumtcqzyo0smgybo
---
 addons/base/static/src/xml/base.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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

diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml
index 163ae8d335c..1221c811039 100644
--- a/addons/base/static/src/xml/base.xml
+++ b/addons/base/static/src/xml/base.xml
@@ -214,7 +214,8 @@
                 <t t-set="is_button" t-value="column.tag === 'button'"/>
                 <!-- TODO: get correct widget from form -->
                 <t t-if="!is_button and row['data'][column.id].value">
-                    <t t-esc="row['data'][column.id].value"/>
+                    <t t-set="value" t-value="row['data'][column.id].value"/>
+                    <t t-esc="value instanceof Array ? value[1] : value"/>
                 </t>
                 <button type="button" t-att-title="column.help"
                         t-if="is_button">
-- 
cgit v1.2.3


From bf476cddf628473ff96ad7b35090d32ab9fde3dc Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 21 Apr 2011 13:59:16 +0200
Subject: [IMP] form: no colon for tag label. Removed "Reload OpenERP" button

bzr revid: fme@openerp.com-20110421115916-4bdhufvcq85dhujb
---
 addons/base/static/src/xml/base.xml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

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

diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml
index 1221c811039..b49ef2c7d6a 100644
--- a/addons/base/static/src/xml/base.xml
+++ b/addons/base/static/src/xml/base.xml
@@ -18,9 +18,6 @@
         </div>
     </div>
     <div id="oe_login" class="login"></div>
-    <div style="position: absolute; right: 2px; top: 38px;">
-        <button onclick="QWeb.add_template('base.xml'); $('body').css('background-color', '#FFFF9C'); setTimeout(function() { $('body').css('background-color', '#FFF'); }, 500);">Reload QWEB</button>
-    </div>
     <table border="0" cellpadding="0" cellspacing="0" width="100%" height="100%"
         t-att-class="'main_table' + (typeof kitten == 'undefined' ? '' : ' kitten-mode-activated')">
     <tr>
@@ -297,7 +294,7 @@
            t-att-ondblclick="'console.log(\'' + widget.element_id + '\', openerp.screen.' + widget.element_id + ')'">
         <t t-esc="widget.string"/>
         <span t-if="widget.help">?</span>
-        <t t-if="widget.string">:</t>
+        <t t-if="widget.string and widget.node.tag != 'label'">:</t>
     </label>
 </t>
 <t t-name="FieldChar">
-- 
cgit v1.2.3