From 405beaa3c6cde0c365530c415aea9ce5ff764497 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Fri, 14 Oct 2011 10:43:10 +0200
Subject: [FIX] m2o values display in list views (mostly under onchange
 condition)

Normal m2o values are pairs of (id, name) (name_get format, basically)
but in some cases (lazyness & al), APIs (often onchange results) only
return the `id` part, which is not sufficient to display the m2o
as-is, a name_get has to be performed.

Added an intermediate step in displaying a table cell (in list view):
if we're displaying an m2o cell (~a cell for an m2o column) and the
value is a number, then dispatch a name_get and keep trucking (display
the rows without the m2o values).

When the name_get returns, it will simply refresh the row and diplay
the m2o name.

bzr revid: xmo@openerp.com-20111014084310-pv2mmmy28fwwk9sm
---
 addons/web/static/src/xml/base.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 8dbd3401b4c..3f955789b11 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -636,7 +636,7 @@
         <td t-if="!column.meta and column.invisible !== '1'" t-att-title="column.help"
             t-att-class="'oe-field-cell' + (align ? ' oe-number' : '')"
             t-att-data-field="column.id">
-            <t t-raw="render_cell(record.toForm().data, column)"/>
+            <t t-raw="render_cell(record, column)"/>
         </td>
     </t>
     <td t-if="options.deletable" class='oe-record-delete' width="1">
-- 
cgit v1.2.3


From 8b1e88a47a5c566ad0ebb2e79f67b16d242a2bd2 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 17 Oct 2011 12:03:10 +0200
Subject: [REM] Removed '& Edit' label in FormView's Save and Create buttons

bzr revid: fme@openerp.com-20111017100310-sxhudt74oi7eia10
---
 addons/web/static/src/xml/base.xml | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

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

diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 3f955789b11..a0aafead6fa 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -649,15 +649,10 @@
 <t t-name="FormView">
     <div class="oe_form_header">
         <div class="oe_form_buttons" t-if="view.options.action_buttons !== false">
-            <!--<button type="button" class="oe_form_button_save">
+            <button type="button" class="oe_form_button_save">
                 <span class="oe_form_on_update">Save</span>
                 <span class="oe_form_on_create">Create</span>
-            </button>-->
-            <button type="button" class="oe_form_button_save_edit">
-                <span class="oe_form_on_update">Save &amp; Edit</span>
-                <span class="oe_form_on_create">Create &amp; Edit</span>
             </button>
-            <!--<button type="button" class="oe_form_button_cancel">Cancel</button>-->
             <button type="button" class="oe_form_button_new">New</button>
             <button type="button" class="oe_form_button_duplicate oe_form_on_update">Duplicate</button>
             <button type="button" class="oe_form_button_toggle">Readonly/Editable</button>
-- 
cgit v1.2.3


From 1d0b38d034f2f898f191acdc84200be00db6be5b Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 17 Oct 2011 14:23:35 +0200
Subject: [FIX] No title on page trigered by an action

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

bzr revid: fme@openerp.com-20111017122335-vov2sy95sdt3dwp9
---
 addons/web/static/src/xml/base.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

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

diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index a0aafead6fa..7720ae2d38b 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -449,11 +449,11 @@
         </blockquote>
     	<a class="oe-shortcut-toggle" title="Add / Remove Shortcut..."
     	   href="javascript: void(0)"> </a>
-        <h2 class="oe_view_title" t-if="self.session.debug || self.flags.display_title !==false">
-            <t t-if="self.flags.display_title !==false" t-esc="self.action.name"/>
-            <button t-if="self.session.debug" class="oe_get_xml_view">
-                View#<span></span>
-            </button>
+        <button t-if="self.session.debug" class="oe_get_xml_view">
+            View#<span></span>
+        </button>
+        <h2 class="oe_view_title" t-if="self.flags.display_title !== false">
+            <t t-if="self.flags.display_title !== false" t-esc="self.action.name"/>
         </h2>
     </t>
     <t t-jquery=".oe-view-manager-header" t-operation="after">
-- 
cgit v1.2.3


From 27869cac8b76baea212575cf95c351a3cf5aa7d2 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Mon, 10 Oct 2011 14:34:32 +0200
Subject: [IMP] change the way the sections and items are added to the sidebar

bzr revid: chs@openerp.com-20111010123432-619o61elz09jm9sy
---
 addons/web/static/src/xml/base.xml | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

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

diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 0e5c97c4707..fb645296d0e 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -467,17 +467,20 @@
     </div>
 </t>
 <t t-name="Sidebar.section">
-    <h2><t t-esc="name"/></h2>
     <div t-att-id="section_id" t-att-class="classname">
-        <ul t-if="items">
+        <h2><t t-esc="name"/></h2>
+    </div>
+</t>
+
+
+<t t-name="Sidebar.section.items">
             <li t-foreach="items" t-as="item" t-att-class="item.classname">
                 <a class="oe_sidebar_action_a" t-att-id="item.element_id" t-att-title="item.title" href="#">
                     <t t-esc="item.label"/>
                 </a>
             </li>
-        </ul>
-    </div>
 </t>
+
 <t t-name="TranslateDialog">
     <ul class="oe_translate_tabs">
         <li><a t-attf-href="##{widget.element_id}_fields">Fields</a></li>
-- 
cgit v1.2.3


From 00b269d1c0a3507a01a296587e96bcb9e8e6da86 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Thu, 13 Oct 2011 12:26:53 +0200
Subject: [IMP] nivification of Notification Widget

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

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

diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 9dc2bb7152a..b676caa6df7 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -2,9 +2,10 @@
 <!-- vim:fdl=1:
 -->
 <templates id="template" xml:space="preserve">
-<t t-name="Interface">
-    <div id="oe_loading" class="loading"></div>
-    <div id="oe_notification" class="oe_notification">
+
+
+    <t t-name="Notification">
+        <div class="oe_notification">
         <div id="oe_notification_default">
             <a class="ui-notify-cross ui-notify-close" href="#">x</a>
             <h1>#{title}</h1>
@@ -16,7 +17,10 @@
             <h1>#{title}</h1>
             <p>#{text}</p>
         </div>
-    </div>
+        </div>
+    </t>
+<t t-name="Interface">
+    <div id="oe_loading" class="loading"></div>
     <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 d049a25fa5f5053014d5930da14818fd056a1cac Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Fri, 21 Oct 2011 12:21:03 +0530
Subject: [FIX] Fixed the issue of  buttons 'First', '<', '>', 'Last' would be
 nice at the bottom, too

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

bzr revid: tpa@tinyerp.com-20111021065103-slbb7n124cuyvwhm
---
 addons/web/static/src/xml/base.xml | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

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

diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 7720ae2d38b..c3f15cf281c 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -612,6 +612,23 @@
             </td>
             <td t-if="options.deletable"/>
         </tr>
+		<tr>
+			<th t-if="options.pager !== false" class="oe-list-pager" t-att-colspan="columns_count">
+				<button type="button" disabled="disabled"
+					data-pager-action="first">First</button>
+				<button type="button" disabled="disabled"
+					data-pager-action="previous"
+					>&lt;</button>
+
+				<span class="oe-pager-state">
+				</span>
+
+				<button type="button" disabled="disabled"
+					data-pager-action="next">&gt;</button>
+				<button type="button" disabled="disabled"
+					data-pager-action="last">Last</button>
+			</th>
+		</tr>
     </tfoot>
 </table>
 <t t-name="ListView.rows" t-foreach="records.length" t-as="index">
-- 
cgit v1.2.3


From 75a57eed129f7491adfa4cf1f26551b79da6cd04 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Fri, 21 Oct 2011 16:14:41 +0530
Subject: [IMP]  Fixed the issue of buttons 'First', '<', '>', 'Last' would be
 nice at the bottom, too

bzr revid: tpa@tinyerp.com-20111021104441-k2lnnciqalsjii2j
---
 addons/web/static/src/xml/base.xml | 51 ++++++++++++++------------------------
 1 file changed, 19 insertions(+), 32 deletions(-)

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

diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index c3f15cf281c..7665a72e77b 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -567,22 +567,8 @@
                                     t-if="options.selectable and options.deletable">
                                 Delete
                             </button>
+                            <t t-call="Listview.navigation.button"/>
                         </td>
-                        <th t-if="options.pager !== false" class="oe-list-pager">
-                            <button type="button" disabled="disabled"
-                                    data-pager-action="first">First</button>
-                            <button type="button" disabled="disabled"
-                                    data-pager-action="previous"
-                                    >&lt;</button>
-
-                            <span class="oe-pager-state">
-                            </span>
-
-                            <button type="button" disabled="disabled"
-                                    data-pager-action="next">&gt;</button>
-                            <button type="button" disabled="disabled"
-                                    data-pager-action="last">Last</button>
-                        </th>
                     </tr>
                 </table>
             </th>
@@ -612,25 +598,26 @@
             </td>
             <td t-if="options.deletable"/>
         </tr>
-		<tr>
-			<th t-if="options.pager !== false" class="oe-list-pager" t-att-colspan="columns_count">
-				<button type="button" disabled="disabled"
-					data-pager-action="first">First</button>
-				<button type="button" disabled="disabled"
-					data-pager-action="previous"
-					>&lt;</button>
-
-				<span class="oe-pager-state">
-				</span>
-
-				<button type="button" disabled="disabled"
-					data-pager-action="next">&gt;</button>
-				<button type="button" disabled="disabled"
-					data-pager-action="last">Last</button>
-			</th>
-		</tr>
+        <tr>
+            <t t-call="Listview.navigation.button"/>
+        </tr>
     </tfoot>
 </table>
+<th t-name="Listview.navigation.button" t-if="options.pager !== false" 
+        class="oe-list-pager" t-att-colspan="columns_count">
+    <button type="button" disabled="disabled"
+        data-pager-action="first">First</button>
+    <button type="button" disabled="disabled"
+	    data-pager-action="previous">&lt;</button>
+
+    <span class="oe-pager-state">
+    </span>
+
+    <button type="button" disabled="disabled"
+        data-pager-action="next">&gt;</button>
+    <button type="button" disabled="disabled"
+        data-pager-action="last">Last</button>
+</th>
 <t t-name="ListView.rows" t-foreach="records.length" t-as="index">
     <t t-call="ListView.row">
         <t t-set="record" t-value="records.at(index)"/>
-- 
cgit v1.2.3


From 940b1138aec2296a5a20095c2be3ee9a997bf1e2 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Mon, 24 Oct 2011 11:39:26 +0530
Subject: [IMP]  Fixed the issue of buttons 'First', '<', '>', 'Last' would be
 nice at the bottom, too

bzr revid: tpa@tinyerp.com-20111024060926-f47bcg8jkmx449z2
---
 addons/web/static/src/xml/base.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 7665a72e77b..4bbee042f6d 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -567,8 +567,8 @@
                                     t-if="options.selectable and options.deletable">
                                 Delete
                             </button>
-                            <t t-call="Listview.navigation.button"/>
                         </td>
+                        <t t-call="Listview.navigation.button"/>
                     </tr>
                 </table>
             </th>
-- 
cgit v1.2.3


From ce45893633ca0492dfc57a8cd180374565560357 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 24 Oct 2011 15:44:13 +0200
Subject: [FIX] Display 'don't import' placeholder when no value selected

bzr revid: xmo@openerp.com-20111024134413-kgcgemdzquwtn0ns
---
 addons/web/static/src/xml/base.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 2860174c30f..db3f082ed03 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1461,7 +1461,7 @@
     </tr>
     <tr>
         <td t-foreach="records[0]" t-as="column">
-            <input class="sel_fields"/>
+            <input class="sel_fields" placeholder="--- Don't Import ---"/>
         </td>
     </tr>
     <tr t-foreach="records" t-as="record" class="oe_import_grid-row">
-- 
cgit v1.2.3


From a8b81ed5754ef0f2495b28b517f2a5b7ed9ba749 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 24 Oct 2011 15:55:21 +0200
Subject: [ADD] dropdown arrow next to import autocompletes

bzr revid: xmo@openerp.com-20111024135521-aikh791r9j94moal
---
 addons/web/static/src/xml/base.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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

diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index db3f082ed03..7d010d5867b 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1461,7 +1461,8 @@
     </tr>
     <tr>
         <td t-foreach="records[0]" t-as="column">
-            <input class="sel_fields" placeholder="--- Don't Import ---"/>
+            <input class="sel_fields" placeholder="--- Don't Import ---"/><span class="oe-m2o-drop-down-button">
+                    <img src="/web/static/src/img/down-arrow.png" /></span>
         </td>
     </tr>
     <tr t-foreach="records" t-as="record" class="oe_import_grid-row">
-- 
cgit v1.2.3


From b45b7ad22cce753a00fff13981502e2c807cee79 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 24 Oct 2011 16:06:58 +0200
Subject: [IMP] import: only show second step once file has been uploaded

bzr revid: xmo@openerp.com-20111024140658-8t9csv9i6gd30luj
---
 addons/web/static/src/xml/base.xml | 39 +++++++++++++++++++-------------------
 1 file changed, 20 insertions(+), 19 deletions(-)

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

diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 7d010d5867b..201ac964ac9 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1419,8 +1419,27 @@
         <label for="csvfile">CSV File:</label>
         <input type="file" id="csvfile" size="50" name="csvfile"/>
     </p>
-    <h2 class="separator horizontal">2. Check your file format</h2>
     <div id="result"></div>
+</form>
+</t>
+<t t-name="ImportView.result">
+    <h2 class="separator horizontal">2. Check your file format</h2>
+    <table class="oe_import_grid" width="100%" style="margin: 5px 0;">
+        <tr t-if="headers" class="oe_import_grid-header">
+            <td t-foreach="headers" t-as="header" class="oe_import_grid-cell">
+                <t t-esc="header"/></td>
+        </tr>
+        <tr>
+            <td t-foreach="records[0]" t-as="column">
+                <input class="sel_fields" placeholder="--- Don't Import ---"/><span class="oe-m2o-drop-down-button">
+                        <img src="/web/static/src/img/down-arrow.png" /></span>
+            </td>
+        </tr>
+        <tr t-foreach="records" t-as="record" class="oe_import_grid-row">
+            <td t-foreach="record" t-as="cell" class="oe_import_grid-cell">
+                <t t-esc="cell"/></td>
+        </tr>
+    </table>
     <fieldset>
         <legend style="cursor:pointer;">Import Options</legend>
         <table style="display:none">
@@ -1451,25 +1470,7 @@
             </tr>
         </table>
     </fieldset>
-</form>
 </t>
-<table t-name="ImportView.result"
-        class="oe_import_grid" width="100%" style="margin: 5px 0;">
-    <tr t-if="headers" class="oe_import_grid-header">
-        <td t-foreach="headers" t-as="header" class="oe_import_grid-cell">
-            <t t-esc="header"/></td>
-    </tr>
-    <tr>
-        <td t-foreach="records[0]" t-as="column">
-            <input class="sel_fields" placeholder="--- Don't Import ---"/><span class="oe-m2o-drop-down-button">
-                    <img src="/web/static/src/img/down-arrow.png" /></span>
-        </td>
-    </tr>
-    <tr t-foreach="records" t-as="record" class="oe_import_grid-row">
-        <td t-foreach="record" t-as="cell" class="oe_import_grid-cell">
-            <t t-esc="cell"/></td>
-    </tr>
-</table>
 <t t-name="ImportView.error">
     <p style="white-space:pre-line;">The import failed due to:<t t-esc="error.message"/></p>
     <t t-if="error.preview">
-- 
cgit v1.2.3


From cd59e5e6fbf07bb1783dde48ecdafa73000d33c4 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 24 Oct 2011 16:17:37 +0200
Subject: [ADD] open/close arrow next to import options

bzr revid: xmo@openerp.com-20111024141737-bk2rg08wvll1hgno
---
 addons/web/static/src/xml/base.xml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

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

diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 201ac964ac9..f2f77b83eb7 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1409,7 +1409,8 @@
     <a id="importview" href="javascript: void(0)" style="text-decoration: none;color: #3D3D3D;">Import</a>
 </t>
 <t t-name="ImportDataView">
-<form name="import_data" id="import_data" action="" method="post" enctype="multipart/form-data">
+<form name="import_data" id="import_data" action="" method="post" enctype="multipart/form-data"
+        class="oe-import">
     <input type="hidden" name="session_id" t-att-value="session.session_id"/>
     <h2 class="separator horizontal">1. Import a .CSV file</h2>
     <p>Select a .CSV file to import. If you need a sample of file to import,
@@ -1440,9 +1441,9 @@
                 <t t-esc="cell"/></td>
         </tr>
     </table>
-    <fieldset>
-        <legend style="cursor:pointer;">Import Options</legend>
-        <table style="display:none">
+    <fieldset class="oe-closed">
+        <legend>Import Options</legend>
+        <table>
             <tr>
                 <td colspan="4">
                     <label for="file_has_headers">Does your file have titles?</label>
-- 
cgit v1.2.3


From 06344150ebf2860247929c76f3fc6d9b43ca27b9 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 24 Oct 2011 16:27:44 +0200
Subject: [FIX] automatically open options box if the file fails to parse
 entirely

bzr revid: xmo@openerp.com-20111024142744-zeal912gqf9bvrrp
---
 addons/web/static/src/xml/base.xml | 46 +++++++++++++++++++-------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

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

diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index f2f77b83eb7..1054a76dcf6 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1410,7 +1410,7 @@
 </t>
 <t t-name="ImportDataView">
 <form name="import_data" id="import_data" action="" method="post" enctype="multipart/form-data"
-        class="oe-import">
+        class="oe-import oe-import-no-result">
     <input type="hidden" name="session_id" t-att-value="session.session_id"/>
     <h2 class="separator horizontal">1. Import a .CSV file</h2>
     <p>Select a .CSV file to import. If you need a sample of file to import,
@@ -1420,28 +1420,9 @@
         <label for="csvfile">CSV File:</label>
         <input type="file" id="csvfile" size="50" name="csvfile"/>
     </p>
-    <div id="result"></div>
-</form>
-</t>
-<t t-name="ImportView.result">
-    <h2 class="separator horizontal">2. Check your file format</h2>
-    <table class="oe_import_grid" width="100%" style="margin: 5px 0;">
-        <tr t-if="headers" class="oe_import_grid-header">
-            <td t-foreach="headers" t-as="header" class="oe_import_grid-cell">
-                <t t-esc="header"/></td>
-        </tr>
-        <tr>
-            <td t-foreach="records[0]" t-as="column">
-                <input class="sel_fields" placeholder="--- Don't Import ---"/><span class="oe-m2o-drop-down-button">
-                        <img src="/web/static/src/img/down-arrow.png" /></span>
-            </td>
-        </tr>
-        <tr t-foreach="records" t-as="record" class="oe_import_grid-row">
-            <td t-foreach="record" t-as="cell" class="oe_import_grid-cell">
-                <t t-esc="cell"/></td>
-        </tr>
-    </table>
-    <fieldset class="oe-closed">
+    <h2 class="separator horizontal oe-import-result">2. Check your file format</h2>
+    <div id="result" class="oe-import-result"></div>
+    <fieldset class="oe-closed oe-import-result">
         <legend>Import Options</legend>
         <table>
             <tr>
@@ -1471,6 +1452,25 @@
             </tr>
         </table>
     </fieldset>
+</form>
+</t>
+<t t-name="ImportView.result">
+    <table class="oe_import_grid" width="100%" style="margin: 5px 0;">
+        <tr t-if="headers" class="oe_import_grid-header">
+            <td t-foreach="headers" t-as="header" class="oe_import_grid-cell">
+                <t t-esc="header"/></td>
+        </tr>
+        <tr>
+            <td t-foreach="records[0]" t-as="column">
+                <input class="sel_fields" placeholder="--- Don't Import ---"/><span class="oe-m2o-drop-down-button">
+                        <img src="/web/static/src/img/down-arrow.png" /></span>
+            </td>
+        </tr>
+        <tr t-foreach="records" t-as="record" class="oe_import_grid-row">
+            <td t-foreach="record" t-as="cell" class="oe_import_grid-cell">
+                <t t-esc="cell"/></td>
+        </tr>
+    </table>
 </t>
 <t t-name="ImportView.error">
     <p style="white-space:pre-line;">The import failed due to:<t t-esc="error.message"/></p>
-- 
cgit v1.2.3


From a617e3bacc5ea44b4aa3ec9840e3eb8a4009047f Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Mon, 24 Oct 2011 17:10:39 +0200
Subject: [fix] small problem with the context menu of m2o when there is not
 item selected

bzr revid: nicolas.vanhoren@openerp.com-20111024151039-k9jlntcj3n56h13d
---
 addons/web/static/src/xml/base.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 1054a76dcf6..349dccec867 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -859,9 +859,9 @@
 </t>
 <t t-name="FieldMany2One.context_menu">
     <ul>
-        <li t-att-id="widget.cm_id + '_open'" style="color:grey">Open...</li>
+        <li t-att-id="widget.cm_id + '_open'" style="color:grey" class="oe_m2o_menu_item_mandatory">Open...</li>
         <li t-att-id="widget.cm_id + '_create'">Create...</li>
-        <li t-att-id="widget.cm_id + '_search'" class="oe_m2o_menu_item_mandatory">Search...</li>
+        <li t-att-id="widget.cm_id + '_search'">Search...</li>
         <t t-set="i" t-value="0"/>
         <t t-foreach="widget.related_entries" t-as="entry">
             <li t-att-id="widget.cm_id + '_related_' + i" style="color:grey" class="oe_m2o_menu_item_mandatory">
-- 
cgit v1.2.3


From 84a383d5aa7c3ef6a2fc38fb06953b447d831651 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 24 Oct 2011 17:11:58 +0200
Subject: [IMP] make notebooks in page view identical to those of normal form
 view

as requested by fp

bzr revid: xmo@openerp.com-20111024151158-7hqox4k6xrjujxnb
---
 addons/web/static/src/xml/base.xml | 6 ------
 1 file changed, 6 deletions(-)

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

diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 349dccec867..95ad99726f8 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -744,12 +744,6 @@
         <t t-call="WidgetFrame"/>
     </div>
 </t>
-<t t-name="WidgetNotebook.readonly">
-    <t t-foreach="widget.pages" t-as="page">
-        <h3><t t-esc="page.string"/></h3>
-        <t t-raw="page.render()"/>
-    </t>
-</t>
 <t t-name="WidgetSeparator">
     <div t-if="widget.orientation !== 'vertical'" t-att-class="'separator ' + widget.orientation">
         <t t-esc="widget.string"/>
-- 
cgit v1.2.3


From 6cb7f2b6f9cad1bd02dda34ad283342e1565995e Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Mon, 24 Oct 2011 17:20:56 +0200
Subject: [imp] m2o now supports readonly mode

bzr revid: nicolas.vanhoren@openerp.com-20111024152056-2nfx7zk4kc9py17k
---
 addons/web/static/src/xml/base.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 95ad99726f8..c0007275ffa 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -854,8 +854,8 @@
 <t t-name="FieldMany2One.context_menu">
     <ul>
         <li t-att-id="widget.cm_id + '_open'" style="color:grey" class="oe_m2o_menu_item_mandatory">Open...</li>
-        <li t-att-id="widget.cm_id + '_create'">Create...</li>
-        <li t-att-id="widget.cm_id + '_search'">Search...</li>
+        <li t-att-id="widget.cm_id + '_create'" class="oe_m2o_menu_item_noreadonly">Create...</li>
+        <li t-att-id="widget.cm_id + '_search'" class="oe_m2o_menu_item_noreadonly">Search...</li>
         <t t-set="i" t-value="0"/>
         <t t-foreach="widget.related_entries" t-as="entry">
             <li t-att-id="widget.cm_id + '_related_' + i" style="color:grey" class="oe_m2o_menu_item_mandatory">
-- 
cgit v1.2.3


From 55ad46220db83d2f5d6dd86d243d0d9843b74511 Mon Sep 17 00:00:00 2001
From: "Yogesh (OpenERP)" <ysa@tinyerp.com>
Date: Tue, 25 Oct 2011 14:19:51 +0530
Subject: [IMP] improve css and view.

bzr revid: ysa@tinyerp.com-20111025084951-0ty7vt1kfw0nrykr
---
 addons/web/static/src/xml/base.xml | 50 +++++++++++++++++++-------------------
 1 file changed, 25 insertions(+), 25 deletions(-)

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

diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 27a99f61c05..323854fa7a3 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1279,17 +1279,17 @@
     </t>
 </t>
 <t t-name="view_editor">
-    <table align="left" width= "100%" >
+    <table class="oe_view_editor">
         <t t-call="view_editor.row"/>
     </table>
 </t>
-<tr t-name="view_editor.row" t-att-id="'viewedit-' + rec.id"  t-att-level="rec.level" t-foreach="data" t-as="rec">
-    <td class="view_editor"  width="85%">
-        <table>
+<tr t-name="view_editor.row"  class="oe_view_editor_row" t-att-id="'viewedit-' + rec.id"  t-att-level="rec.level" t-foreach="data" t-as="rec">
+    <td class="oe_view_editor_colum"  width="85%">
+        <table class="oe_view_editor_tree_grid">
             <tr>
                 <td width="16px" t-att-style="'background-position: ' + 20*rec.level + 'px; padding-left: ' + 20*rec.level + 'px'">
-                    <img t-if="rec.child_id.length" t-att-id="'parentimg-' + rec.id"  
-                src="/web/static/src/img/collapse.gif" width="16" height="16" border="0"/>
+                    <img t-if="rec.child_id.length" t-att-id="'parentimg-' + rec.id"
+                        src="/web/static/src/img/collapse.gif" width="16" height="16" border="0"/>
                 </td>
                 <td style="cursor: pointer;">
                     <a style="text-decoration:none" href="javascript:void(0);"> <t t-esc="rec.name"/> </a>
@@ -1297,36 +1297,36 @@
             </tr>
         </table>
     </td>
-    <td align="left" class="view_editor"  width="15%">
-        <table  cellspacing="0" cellpadding ="0" width="100%">
+    <td align="left" class="oe_view_editor_colum"  width="15%">
+        <table  width="100%">
             <tr>
-                <td width="20%"> 
-                    <img t-if="rec.att_list.length"  
+                <td width="20%">
+                    <img t-if="rec.att_list.length"
                         id="side-add" src="/web/static/src/img/icons/gtk-add.png" style="cursor: pointer;"/>
                 </td>
-                <td width="20%"> 
-                    <img  id="side-remove" src="/web/static/src/img/icons/gtk-remove.png" style="cursor: pointer;"/> 
+                <td width="20%">
+                    <img  id="side-remove" src="/web/static/src/img/icons/gtk-remove.png" style="cursor: pointer;"/>
                 </td>
-                <td width="20%"> 
-                    <img t-if="rec.att_list.length"  
-                        id="side-edit" src="/web/static/src/img/icons/gtk-edit.png" style="cursor: pointer;"/> 
+                <td width="20%">
+                    <img t-if="rec.att_list.length"
+                        id="side-edit" src="/web/static/src/img/icons/gtk-edit.png" style="cursor: pointer;"/>
                 </td>
-                <td width="20%"> 
-                    <img t-if="rec.att_list.length" 
-                        id="side-up" src="/web/static/src/img/icons/gtk-go-up.png" style="cursor: pointer;"/> 
+                <td width="20%">
+                    <img t-if="rec.att_list.length"
+                        id="side-up" src="/web/static/src/img/icons/gtk-go-up.png" style="cursor: pointer;"/>
                 </td>
-                <td width="20%"> 
+                <td width="20%">
                     <img t-if="rec.att_list.length"
-                        id="side-down" src="/web/static/src/img/icons/gtk-go-down.png" style="cursor: pointer;"/> 
+                        id="side-down" src="/web/static/src/img/icons/gtk-go-down.png" style="cursor: pointer;"/>
                 </td>
             </tr>
         </table>
     </td>
-        <t t-if="rec.child_id.length">
-            <t t-set="data" t-value="rec.child_id"/>
-            <t t-call="view_editor.row"/>
-        </t>
-    </tr>
+    <t t-if="rec.child_id.length">
+        <t t-set="data" t-value="rec.child_id"/>
+        <t t-call="view_editor.row"/>
+    </t>
+</tr>
 
 <t t-name="ExportView">
     <a id="exportview" href="javascript: void(0)" style="text-decoration: none;color: #3D3D3D;">Export</a>
-- 
cgit v1.2.3