From e125dd5f63f73a12da362a20181a0ae31b58fb49 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 12 Mar 2012 16:34:52 +0100
Subject: [WIP] Form v2

bzr revid: fme@openerp.com-20120312153452-x6zhyeheu4579ak3
---
 addons/web/static/src/xml/base.xml | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 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 c8a2b4d920f..983cdf9a184 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -714,16 +714,19 @@
 </t>
 
 <t t-name="FormView">
-    <div class="oe_form_header">
-        <div class="oe_form_buttons" t-if="widget.options.action_buttons !== false">
-            <button type="button" class="oe_button oe_form_button_save">Save</button>
-            <button type="button" class="oe_button oe_form_button_cancel">Cancel</button>
-        </div>
-        <div class="oe_form_pager" t-if="widget.options.pager !== false">
-            <t t-call="ViewPager">
-                <span class="oe_pager_index">0</span><span class="oe_pager_separator"> / </span><span class="oe_pager_count">0</span>
-            </t>
+    <div class="oe_formview">
+        <div class="oe_form_header">
+            <div class="oe_form_buttons" t-if="widget.options.action_buttons !== false">
+                <button type="button" class="oe_button oe_form_button_save">Save</button>
+                <button type="button" class="oe_button oe_form_button_cancel">Cancel</button>
+            </div>
+            <div class="oe_form_pager" t-if="widget.options.pager !== false">
+                <t t-call="ViewPager">
+                    <span class="oe_pager_index">0</span><span class="oe_pager_separator"> / </span><span class="oe_pager_count">0</span>
+                </t>
+            </div>
         </div>
+        <div class="oe_form_content"/>
     </div>
 </t>
 <t t-name="One2Many.formview" t-extend="FormView">
-- 
cgit v1.2.3


From fe0c8fd1e4c18385dcd940788d793238d2e49740 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 13 Mar 2012 16:14:35 +0100
Subject: [imp] modified m2o to look like page view in readonly mode

bzr revid: nicolas.vanhoren@openerp.com-20120313151435-jsh91fg44i65ecol
---
 addons/web/static/src/xml/base.xml | 3 +++
 1 file changed, 3 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 c8a2b4d920f..ec3d7621e5c 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1065,6 +1065,9 @@
     </tr>
     </table>
 </t>
+<t t-name="FieldMany2One_readonly">
+   <a href="#" class="oe_form_uri"/>
+</t>
 <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>
-- 
cgit v1.2.3


From 91cf25ae07405095696cfeaeb8ff6efe3ad13883 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 13 Mar 2012 16:58:52 +0100
Subject: [WIP] broken state

bzr revid: fme@openerp.com-20120313155852-1d9fb2ky4pvlja8u
---
 addons/web/static/src/xml/base.xml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 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 983cdf9a184..5ff1ed197fc 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -857,14 +857,14 @@
     </t>
 </t>
 <t t-name="WidgetGroup">
-    <t t-if="widget.string">
-    <fieldset class="oe_group_box">
-        <legend><t t-esc="widget.string"/></legend>
-        <t t-call="WidgetFrame"/>
-    </fieldset>
+    <t t-if="widget.node_attrs.string">
+        <fieldset class="oe_group_box">
+            <legend><t t-esc="widget.node_attrs.string"/></legend>
+            <table border="1"/>
+        </fieldset>
     </t>
-    <t t-if="!widget.string">
-        <t t-call="WidgetFrame"/>
+    <t t-if="!widget.node_attrs.string">
+        <table border="1"/>
     </t>
 </t>
 <t t-name="WidgetNotebook">
@@ -1209,7 +1209,7 @@
 </t>
 <t t-name="WidgetButton">
     <button type="button" class="oe_button">
-        <img t-if="widget.node.attrs.icon" t-att-src="_s + '/web/static/src/img/icons/' + widget.node.attrs.icon + '.png'" width="16" height="16"/>
+        <img t-if="widget.node_attrs.icon" t-att-src="_s + '/web/static/src/img/icons/' + widget.node_attrs.icon + '.png'" width="16" height="16"/>
         <span t-if="widget.string"><t t-esc="widget.string"/></span>
     </button>
 </t>
-- 
cgit v1.2.3


From 9ce66ed4b5439cc9e620ee327382aac801459ff1 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 13 Mar 2012 18:46:19 +0100
Subject: [WIP] A bit further

bzr revid: fme@openerp.com-20120313174619-9kkjwa1amfrx07z2
---
 addons/web/static/src/xml/base.xml | 36 +++++++++++++++++-------------------
 1 file changed, 17 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 5ff1ed197fc..afdbdb424a6 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -898,15 +898,15 @@
 </t>
 <t t-name="WidgetSeparator">
     <div t-if="widget.orientation !== 'vertical'" t-att-class="'separator ' + widget.orientation">
-        <t t-esc="widget.string"/>
+        <t t-esc="widget.node_attrs.string"/>
     </div>
 </t>
 <t t-name="WidgetLabel">
-    <label t-att-for="widget.element_id"
-           t-attf-class="oe_label#{widget.help ? '_help' : ''} oe_align_#{widget.align}">
-        <t t-esc="widget.string"/>
-        <span t-if="widget.help">?</span>
-        <t t-if="widget.string and widget.node.tag != 'label'">:</t>
+    <label t-att-for="widget.node_attrs.for"
+           t-attf-class="oe_label#{widget.node_attrs.help ? '_help' : ''} oe_align_#{widget.align}">
+        <t t-esc="widget.node_attrs.string"/>
+        <span t-if="widget.node_attrs.help">?</span>
+        :
     </label>
 </t>
 <t t-name="WidgetLabel.tooltip">
@@ -971,13 +971,10 @@
         </li>
     </ul>
 </t>
-<t t-name="WidgetParagraph">
-    <p t-attf-class="oe_form_paragraph oe_align_#{widget.align} #{widget.multilines ? 'oe_multilines' : ''}"><t t-esc="widget.string"/></p>
-</t>
 <t t-name="FieldChar">
     <input t-att-type="widget.password ? 'password' : 'text'" size="1"
         t-att-name="widget.name"
-        t-att-id="widget.element_id"
+        t-att-id="widget.node_attrs.id"
         t-attf-class="field_#{widget.type} #{_(['integer', 'float', 'float_time']).contains(widget.type) ? 'oe-number' : ''}"
         style="width: 100%"
     /><img class="oe_field_translate oe_input_icon" t-if="widget.field.translate" t-att-src='_s + "/web/static/src/img/icons/terp-translate.png"' width="16" height="16" border="0"/>
@@ -1040,15 +1037,16 @@
     </div>
 </t>
 <t t-name="FieldSelection">
-    <select
-        t-att-name="widget.name"
-        t-att-id="widget.element_id"
-        t-attf-class="field_#{widget.type}"
-        style="width: 100%">
-            <t t-foreach="widget.values" t-as="option">
-                <option><t t-esc="option[1]"/></option>
-            </t>
-    </select>
+    <span class="oe_field_selection">
+        <select
+            t-att-name="widget.name"
+            t-att-id="widget.node_attrs.id"
+            style="width: 100%">
+                <t t-foreach="widget.values" t-as="option">
+                    <option><t t-esc="option[1]"/></option>
+                </t>
+        </select>
+    </span>
 </t>
 <t t-name="FieldMany2One">
     <table cellpadding="0" cellspacing="0" border="0" width="100%">
-- 
cgit v1.2.3


From a5be5c2438228f76804ab791463c5a02d046fa68 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 13 Mar 2012 20:34:43 +0100
Subject: [WIP] Fixed notebooks

bzr revid: fme@openerp.com-20120313193443-0gjk1wmxfe946uyz
---
 addons/web/static/src/xml/base.xml | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 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 afdbdb424a6..9f5022d4d70 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -868,17 +868,15 @@
     </t>
 </t>
 <t t-name="WidgetNotebook">
-    <ul>
-        <li t-foreach="widget.pages" t-as="page">
-            <a href="#">
-                <t t-esc="page.string"/>
-            </a>
-        </li>
-    </ul>
-    <t t-foreach="widget.pages" t-as="page">
-    	<div t-att-class="page.element_class">
-    	</div>
-    </t>
+    <div class="oe_form_notebook">
+        <ul>
+            <li t-foreach="widget.pages" t-as="page">
+                <a t-attf-href="##{page.page_id}">
+                    <t t-esc="page.node_attrs.string"/>
+                </a>
+            </li>
+        </ul>
+    </div>
 </t>
 <t t-name="WidgetNotebook.tooltip">
     <t t-foreach="widget.pages" t-as="page">
@@ -894,7 +892,7 @@
     </t>
 </t>
 <t t-name="WidgetNotebookPage">
-	<t t-call="WidgetFrame"/>
+    <div class="oe_form_notebook_page" t-att-id="widget.page_id"/>
 </t>
 <t t-name="WidgetSeparator">
     <div t-if="widget.orientation !== 'vertical'" t-att-class="'separator ' + widget.orientation">
-- 
cgit v1.2.3


From 01088067fd3f85a2f63c0f02195deab7ccf3b7e5 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 13 Mar 2012 20:47:48 +0100
Subject: [FIX] Fix colspan

bzr revid: fme@openerp.com-20120313194748-nlzfmz8t9ylz6hke
---
 addons/web/static/src/xml/base.xml | 7 +++++--
 1 file changed, 5 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 9f5022d4d70..d4c20342573 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -857,14 +857,17 @@
     </t>
 </t>
 <t t-name="WidgetGroup">
+    <t t-set="table">
+        <table border="1" cellpadding="0" cellspacing="0" width="100%"/>
+    </t>
     <t t-if="widget.node_attrs.string">
         <fieldset class="oe_group_box">
             <legend><t t-esc="widget.node_attrs.string"/></legend>
-            <table border="1"/>
+            <t t-raw="table"/>
         </fieldset>
     </t>
     <t t-if="!widget.node_attrs.string">
-        <table border="1"/>
+        <t t-raw="table"/>
     </t>
 </t>
 <t t-name="WidgetNotebook">
-- 
cgit v1.2.3


From 2b1a3653713a33a810e14e69265117c122abdeb3 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 13 Mar 2012 21:28:23 +0100
Subject: [FIX] Some fixes

bzr revid: fme@openerp.com-20120313202823-eqabbh4ymb0vxei1
---
 addons/web/static/src/xml/base.xml | 32 +++++++++++++++-----------------
 1 file changed, 15 insertions(+), 17 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 d4c20342573..f602e3da984 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -884,12 +884,12 @@
 <t t-name="WidgetNotebook.tooltip">
     <t t-foreach="widget.pages" t-as="page">
         <div class="oe_tooltip_string">
-            Notebook Page "<t t-esc="page.string"/>"
+            Notebook Page "<t t-esc="page.node_attrs.string"/>"
         </div>
         <ul class="oe_tooltip_technical">
             <li data-item="modifiers">
                 <span class="oe_tooltip_technical_title">Modifiers:</span>
-                <t t-esc="page.node.attrs.modifiers"/>
+                <t t-esc="page.node_attrs.modifiers"/>
             </li>
         </ul>
     </t>
@@ -912,7 +912,7 @@
 </t>
 <t t-name="WidgetLabel.tooltip">
     <div class="oe_tooltip_string" t-if="widget.string">
-        <t t-esc="widget.string"/> <t t-if="debug and widget.nolabel">(nolabel)</t>
+        <t t-esc="widget.node_attrs.string"/> <t t-if="debug and widget.nolabel">(nolabel)</t>
     </div>
     <p t-if="widget.help" class="oe_tooltip_help"><t t-esc="widget.help"/></p>
     <ul t-if="debug" class="oe_tooltip_technical">
@@ -928,33 +928,33 @@
             <span class="oe_tooltip_technical_title">Type:</span>
             <t t-esc="widget.field.type"/>
         </li>
-        <li t-if="widget.node.attrs.widget" data-item="widget">
+        <li t-if="widget.node_attrs.widget" data-item="widget">
             <span class="oe_tooltip_technical_title">Widget:</span>
-            <t t-esc="widget.node.attrs.widget"/>
+            <t t-esc="widget.node_attrs.widget"/>
         </li>
-        <li t-if="widget.node.attrs.size || (widget.field and widget.field.size)" data-item="size">
+        <li t-if="widget.node_attrs.size || (widget.field and widget.field.size)" data-item="size">
             <span class="oe_tooltip_technical_title">Size:</span>
-            <t t-esc="widget.node.attrs.size || widget.field.size"/>
+            <t t-esc="widget.node_attrs.size || widget.field.size"/>
         </li>
-        <li t-if="widget.node.attrs.context" data-item="context">
+        <li t-if="widget.node_attrs.context" data-item="context">
             <span class="oe_tooltip_technical_title">Context:</span>
-            <t t-esc="widget.node.attrs.context_string"/>
+            <t t-esc="widget.node_attrs.context_string"/>
         </li>
-        <li t-if="widget.node.attrs.domain" data-item="domain">
+        <li t-if="widget.node_attrs.domain" data-item="domain">
             <span class="oe_tooltip_technical_title">Domain:</span>
-            <t t-esc="widget.node.attrs.domain_string"/>
+            <t t-esc="widget.node_attrs.domain_string"/>
         </li>
-        <li t-if="widget.node.attrs.modifiers and widget.node.attrs.modifiers != '{}'" data-item="modifiers">
+        <li t-if="widget.node_attrs.modifiers and widget.node_attrs.modifiers != '{}'" data-item="modifiers">
             <span class="oe_tooltip_technical_title">Modifiers:</span>
-            <t t-esc="widget.node.attrs.modifiers"/>
+            <t t-esc="widget.node_attrs.modifiers"/>
         </li>
         <li t-if="widget.field and widget.field.change_default" data-item="change_default">
             <span class="oe_tooltip_technical_title">Change default:</span>
             Yes
         </li>
-        <li t-if="widget.node.attrs.on_change" data-item="on_change">
+        <li t-if="widget.node_attrs.on_change" data-item="on_change">
             <span class="oe_tooltip_technical_title">On change:</span>
-            <t t-esc="widget.node.attrs.on_change"/>
+            <t t-esc="widget.node_attrs.on_change"/>
         </li>
         <li t-if="widget.field and widget.field.relation" data-item="relation">
             <span class="oe_tooltip_technical_title">Relation:</span>
@@ -1022,7 +1022,6 @@
 <t t-name="FieldText">
     <textarea rows="6"
         t-att-name="widget.name"
-        t-att-id="widget.element_id"
         t-attf-class="field_#{widget.type}"
         style="width: 100%"
     ></textarea><img class="oe_field_translate oe_input_icon" t-if="widget.field.translate" t-att-src='_s + "/web/static/src/img/icons/terp-translate.png"' width="16" height="16" border="0"/>
@@ -1099,7 +1098,6 @@
 <t t-name="FieldBoolean">
     <input type="checkbox"
         t-att-name="widget.name"
-        t-att-id="widget.element_id"
         t-attf-class="field_#{widget.type}"/>
 </t>
 <t t-name="FieldProgressBar">
-- 
cgit v1.2.3


From 4b2494bb0545d34f2629b698b8f482a0b9725302 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 14 Mar 2012 18:09:49 +0100
Subject: [ADD] Added FormRenderingEngine. Save kitten.

bzr revid: fme@openerp.com-20120314170949-m1wv8eub9u0g9xwb
---
 addons/web/static/src/xml/base.xml | 122 +++++++++++++++++--------------------
 1 file changed, 56 insertions(+), 66 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 f602e3da984..5fd60b1fb18 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -832,6 +832,45 @@
         </tr>
     </table>
 </form>
+
+<t t-name="FormRenderingGroup">
+    <t t-set="table">
+        <table border="1" cellpadding="0" cellspacing="0" width="100%"/>
+    </t>
+    <t t-if="string">
+        <fieldset class="oe_group_box">
+            <legend><t t-esc="string"/></legend>
+            <t t-raw="table"/>
+        </fieldset>
+    </t>
+    <t t-if="!string">
+        <t t-raw="table"/>
+    </t>
+</t>
+<t t-name="FormRenderingNotebook">
+    <div class="oe_form_notebook">
+        <ul>
+            <li t-foreach="widget.pages" t-as="page">
+                <a t-attf-href="##{page.page_id}">
+                    <t t-esc="page.node.attrs.string"/>
+                </a>
+            </li>
+        </ul>
+    </div>
+</t>
+<t t-name="FormRenderingNotebookPage">
+    <div class="oe_form_notebook_page" t-att-id="widget.page_id"/>
+</t>
+<t t-name="FormRenderingLabel">
+    <label  t-att-for="for"
+            t-att-title="help"
+            t-attf-class="oe_label#{help ? '_help' : ''} oe_align_#{align}">
+        <t t-esc="string"/>
+        <span t-if="help">?</span>
+        :
+    </label>
+</t>
+
 <t t-name="Widget">
     Unhandled widget
     <t t-js="dict">console.warn('Unhandled widget', dict.widget);</t>
@@ -856,63 +895,14 @@
         this.attr('class', this.attr('class')+' oe_form_readonly');
     </t>
 </t>
-<t t-name="WidgetGroup">
-    <t t-set="table">
-        <table border="1" cellpadding="0" cellspacing="0" width="100%"/>
-    </t>
-    <t t-if="widget.node_attrs.string">
-        <fieldset class="oe_group_box">
-            <legend><t t-esc="widget.node_attrs.string"/></legend>
-            <t t-raw="table"/>
-        </fieldset>
-    </t>
-    <t t-if="!widget.node_attrs.string">
-        <t t-raw="table"/>
-    </t>
-</t>
-<t t-name="WidgetNotebook">
-    <div class="oe_form_notebook">
-        <ul>
-            <li t-foreach="widget.pages" t-as="page">
-                <a t-attf-href="##{page.page_id}">
-                    <t t-esc="page.node_attrs.string"/>
-                </a>
-            </li>
-        </ul>
-    </div>
-</t>
-<t t-name="WidgetNotebook.tooltip">
-    <t t-foreach="widget.pages" t-as="page">
-        <div class="oe_tooltip_string">
-            Notebook Page "<t t-esc="page.node_attrs.string"/>"
-        </div>
-        <ul class="oe_tooltip_technical">
-            <li data-item="modifiers">
-                <span class="oe_tooltip_technical_title">Modifiers:</span>
-                <t t-esc="page.node_attrs.modifiers"/>
-            </li>
-        </ul>
-    </t>
-</t>
-<t t-name="WidgetNotebookPage">
-    <div class="oe_form_notebook_page" t-att-id="widget.page_id"/>
-</t>
 <t t-name="WidgetSeparator">
     <div t-if="widget.orientation !== 'vertical'" t-att-class="'separator ' + widget.orientation">
-        <t t-esc="widget.node_attrs.string"/>
+        <t t-esc="widget.node.attrs.string"/>
     </div>
 </t>
-<t t-name="WidgetLabel">
-    <label t-att-for="widget.node_attrs.for"
-           t-attf-class="oe_label#{widget.node_attrs.help ? '_help' : ''} oe_align_#{widget.align}">
-        <t t-esc="widget.node_attrs.string"/>
-        <span t-if="widget.node_attrs.help">?</span>
-        :
-    </label>
-</t>
 <t t-name="WidgetLabel.tooltip">
     <div class="oe_tooltip_string" t-if="widget.string">
-        <t t-esc="widget.node_attrs.string"/> <t t-if="debug and widget.nolabel">(nolabel)</t>
+        <t t-esc="widget.node.attrs.string"/> <t t-if="debug and widget.nolabel">(nolabel)</t>
     </div>
     <p t-if="widget.help" class="oe_tooltip_help"><t t-esc="widget.help"/></p>
     <ul t-if="debug" class="oe_tooltip_technical">
@@ -928,33 +918,33 @@
             <span class="oe_tooltip_technical_title">Type:</span>
             <t t-esc="widget.field.type"/>
         </li>
-        <li t-if="widget.node_attrs.widget" data-item="widget">
+        <li t-if="widget.node.attrs.widget" data-item="widget">
             <span class="oe_tooltip_technical_title">Widget:</span>
-            <t t-esc="widget.node_attrs.widget"/>
+            <t t-esc="widget.node.attrs.widget"/>
         </li>
-        <li t-if="widget.node_attrs.size || (widget.field and widget.field.size)" data-item="size">
+        <li t-if="widget.node.attrs.size || (widget.field and widget.field.size)" data-item="size">
             <span class="oe_tooltip_technical_title">Size:</span>
-            <t t-esc="widget.node_attrs.size || widget.field.size"/>
+            <t t-esc="widget.node.attrs.size || widget.field.size"/>
         </li>
-        <li t-if="widget.node_attrs.context" data-item="context">
+        <li t-if="widget.node.attrs.context" data-item="context">
             <span class="oe_tooltip_technical_title">Context:</span>
-            <t t-esc="widget.node_attrs.context_string"/>
+            <t t-esc="widget.node.attrs.context_string"/>
         </li>
-        <li t-if="widget.node_attrs.domain" data-item="domain">
+        <li t-if="widget.node.attrs.domain" data-item="domain">
             <span class="oe_tooltip_technical_title">Domain:</span>
-            <t t-esc="widget.node_attrs.domain_string"/>
+            <t t-esc="widget.node.attrs.domain_string"/>
         </li>
-        <li t-if="widget.node_attrs.modifiers and widget.node_attrs.modifiers != '{}'" data-item="modifiers">
+        <li t-if="widget.node.attrs.modifiers and widget.node.attrs.modifiers != '{}'" data-item="modifiers">
             <span class="oe_tooltip_technical_title">Modifiers:</span>
-            <t t-esc="widget.node_attrs.modifiers"/>
+            <t t-esc="widget.node.attrs.modifiers"/>
         </li>
         <li t-if="widget.field and widget.field.change_default" data-item="change_default">
             <span class="oe_tooltip_technical_title">Change default:</span>
             Yes
         </li>
-        <li t-if="widget.node_attrs.on_change" data-item="on_change">
+        <li t-if="widget.node.attrs.on_change" data-item="on_change">
             <span class="oe_tooltip_technical_title">On change:</span>
-            <t t-esc="widget.node_attrs.on_change"/>
+            <t t-esc="widget.node.attrs.on_change"/>
         </li>
         <li t-if="widget.field and widget.field.relation" data-item="relation">
             <span class="oe_tooltip_technical_title">Relation:</span>
@@ -975,7 +965,7 @@
 <t t-name="FieldChar">
     <input t-att-type="widget.password ? 'password' : 'text'" size="1"
         t-att-name="widget.name"
-        t-att-id="widget.node_attrs.id"
+        t-att-id="widget.node.attrs.id"
         t-attf-class="field_#{widget.type} #{_(['integer', 'float', 'float_time']).contains(widget.type) ? 'oe-number' : ''}"
         style="width: 100%"
     /><img class="oe_field_translate oe_input_icon" t-if="widget.field.translate" t-att-src='_s + "/web/static/src/img/icons/terp-translate.png"' width="16" height="16" border="0"/>
@@ -1040,7 +1030,7 @@
     <span class="oe_field_selection">
         <select
             t-att-name="widget.name"
-            t-att-id="widget.node_attrs.id"
+            t-att-id="widget.node.attrs.id"
             style="width: 100%">
                 <t t-foreach="widget.values" t-as="option">
                     <option><t t-esc="option[1]"/></option>
@@ -1206,7 +1196,7 @@
 </t>
 <t t-name="WidgetButton">
     <button type="button" class="oe_button">
-        <img t-if="widget.node_attrs.icon" t-att-src="_s + '/web/static/src/img/icons/' + widget.node_attrs.icon + '.png'" width="16" height="16"/>
+        <img t-if="widget.node.attrs.icon" t-att-src="_s + '/web/static/src/img/icons/' + widget.node.attrs.icon + '.png'" width="16" height="16"/>
         <span t-if="widget.string"><t t-esc="widget.string"/></span>
     </button>
 </t>
-- 
cgit v1.2.3


From aac8c23bc282105d2acc5efdfcc2f3a4e0722e5a Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 15 Mar 2012 11:53:24 +0100
Subject: [ADD] Added notebook processing

bzr revid: fme@openerp.com-20120315105324-452qttsl4afmmvmj
---
 addons/web/static/src/xml/base.xml | 8 ++++----
 1 file changed, 4 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 5fd60b1fb18..94af4aa3a9a 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -850,16 +850,16 @@
 <t t-name="FormRenderingNotebook">
     <div class="oe_form_notebook">
         <ul>
-            <li t-foreach="widget.pages" t-as="page">
-                <a t-attf-href="##{page.page_id}">
-                    <t t-esc="page.node.attrs.string"/>
+            <li t-foreach="pages" t-as="page">
+                <a t-attf-href="##{page.id}">
+                    <t t-esc="page.string"/>
                 </a>
             </li>
         </ul>
     </div>
 </t>
 <t t-name="FormRenderingNotebookPage">
-    <div class="oe_form_notebook_page" t-att-id="widget.page_id"/>
+    <div class="oe_form_notebook_page" t-att-id="id"/>
 </t>
 <t t-name="FormRenderingLabel">
     <label  t-att-for="for"
-- 
cgit v1.2.3


From e59179f71fc420c823a0c67f3101266e060c310c Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 15 Mar 2012 12:52:15 +0100
Subject: [KK] Kill Kittens

bzr revid: fme@openerp.com-20120315115215-02kq4flqg95zq67r
---
 addons/web/static/src/xml/base.xml | 22 +---------------------
 1 file changed, 1 insertion(+), 21 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 94af4aa3a9a..ff0819ee92f 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -835,7 +835,7 @@
 
 <t t-name="FormRenderingGroup">
     <t t-set="table">
-        <table border="1" cellpadding="0" cellspacing="0" width="100%"/>
+        <table border="0" cellpadding="0" cellspacing="0" width="100%"/>
     </t>
     <t t-if="string">
         <fieldset class="oe_group_box">
@@ -875,26 +875,6 @@
     Unhandled widget
     <t t-js="dict">console.warn('Unhandled widget', dict.widget);</t>
 </t>
-<t t-name="WidgetFrame">
-    <table border="0" width="100%" cellpadding="0" cellspacing="0" class="oe_frame oe_forms">
-    <tr 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>
-    </tr>
-    </table>
-</t>
-<t t-name="WidgetFrame.readonly" t-extend="WidgetFrame">
-    <t t-jquery="&gt;table">
-        this.attr('class', this.attr('class')+' oe_form_readonly');
-    </t>
-</t>
 <t t-name="WidgetSeparator">
     <div t-if="widget.orientation !== 'vertical'" t-att-class="'separator ' + widget.orientation">
         <t t-esc="widget.node.attrs.string"/>
-- 
cgit v1.2.3


From 2719a64debdacb942d469533f07f1694d520a4e3 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 15 Mar 2012 15:16:22 +0100
Subject: [ADD] Add <separator>

bzr revid: fme@openerp.com-20120315141622-pby363816gv4td0k
---
 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 ff0819ee92f..de657a6af31 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -861,6 +861,11 @@
 <t t-name="FormRenderingNotebookPage">
     <div class="oe_form_notebook_page" t-att-id="id"/>
 </t>
+<t t-name="FormRenderingSeparator">
+    <div class="oe_horizontal_separator">
+        <t t-esc="string"/>
+    </div>
+</t>
 <t t-name="FormRenderingLabel">
     <label  t-att-for="for"
             t-att-title="help"
@@ -875,11 +880,6 @@
     Unhandled widget
     <t t-js="dict">console.warn('Unhandled widget', dict.widget);</t>
 </t>
-<t t-name="WidgetSeparator">
-    <div t-if="widget.orientation !== 'vertical'" t-att-class="'separator ' + widget.orientation">
-        <t t-esc="widget.node.attrs.string"/>
-    </div>
-</t>
 <t t-name="WidgetLabel.tooltip">
     <div class="oe_tooltip_string" t-if="widget.string">
         <t t-esc="widget.node.attrs.string"/> <t t-if="debug and widget.nolabel">(nolabel)</t>
-- 
cgit v1.2.3


From 99f956a533918719aec8ed30f4556e3a2e133ba6 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 15 Mar 2012 17:21:07 +0100
Subject: [FIX] Fix some field

bzr revid: fme@openerp.com-20120315162107-pcw7ssitur8zb7vv
---
 addons/web/static/src/xml/base.xml | 66 +++++++++++++++++++++-----------------
 1 file changed, 37 insertions(+), 29 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 154c5fbf7f7..7ee908ae43c 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -943,12 +943,14 @@
     </ul>
 </t>
 <t t-name="FieldChar">
-    <input t-att-type="widget.password ? 'password' : 'text'" size="1"
-        t-att-name="widget.name"
-        t-att-id="widget.node.attrs.id"
-        t-attf-class="field_#{widget.type} #{_(['integer', 'float', 'float_time']).contains(widget.type) ? 'oe-number' : ''}"
-        style="width: 100%"
-    /><img class="oe_field_translate oe_input_icon" t-if="widget.field.translate" t-att-src='_s + "/web/static/src/img/icons/terp-translate.png"' width="16" height="16" border="0"/>
+    <div t-attf-class="oe_form_field_#{type}">
+        <input t-att-type="widget.password ? 'password' : 'text'" size="1"
+            t-att-name="widget.name"
+            t-att-id="widget.node.attrs.id"
+            t-attf-class="field_#{widget.type} #{_(['integer', 'float', 'float_time']).contains(widget.type) ? 'oe-number' : ''}"
+            style="width: 100%"
+        /><img class="oe_field_translate oe_input_icon" t-if="widget.field.translate" t-att-src='_s + "/web/static/src/img/icons/terp-translate.png"' width="16" height="16" border="0"/>
+    </div>
 </t>
 <t t-name="FieldChar.readonly">
     <div
@@ -962,7 +964,7 @@
     </div>
 </t>
 <t t-name="FieldEmail">
-    <table cellpadding="0" cellspacing="0" border="0" width="100%">
+    <table t-attf-class="oe_form_field_#{type}" cellpadding="0" cellspacing="0" border="0" width="100%">
     <tr>
         <td width="100%">
             <t t-call="FieldChar"/>
@@ -976,7 +978,7 @@
     </table>
 </t>
 <t t-name="FieldUrl">
-    <table cellpadding="0" cellspacing="0" border="0" width="100%">
+    <table t-attf-class="oe_form_field_#{type}" cellpadding="0" cellspacing="0" border="0" width="100%">
     <tr>
         <td width="100%">
             <t t-call="FieldChar"/>
@@ -990,14 +992,16 @@
     </table>
 </t>
 <t t-name="FieldText">
-    <textarea rows="6"
-        t-att-name="widget.name"
-        t-attf-class="field_#{widget.type}"
-        style="width: 100%"
-    ></textarea><img class="oe_field_translate oe_input_icon" t-if="widget.field.translate" t-att-src='_s + "/web/static/src/img/icons/terp-translate.png"' width="16" height="16" border="0"/>
+    <div t-attf-class="oe_form_field_#{type}">
+        <textarea rows="6"
+            t-att-name="widget.name"
+            t-attf-class="field_#{widget.type}"
+            style="width: 100%"
+        ></textarea><img class="oe_field_translate oe_input_icon" t-if="widget.field.translate" t-att-src='_s + "/web/static/src/img/icons/terp-translate.png"' width="16" height="16" border="0"/>
+    </div>
 </t>
 <t t-name="web.datetimepicker">
-    <div class="oe_datepicker_root">
+    <div class="oe_datepicker_root" t-attf-class="oe_form_field_#{type}">
         <input type="text" size="1" class="oe_datepicker_container" disabled="disabled" style="display: none;"/>
         <input type="text" size="1" style="width: 100%"
             t-att-name="widget.name"
@@ -1007,7 +1011,7 @@
     </div>
 </t>
 <t t-name="FieldSelection">
-    <span class="oe_field_selection">
+    <div t-attf-class="oe_form_field_#{type}">
         <select
             t-att-name="widget.name"
             t-att-id="widget.node.attrs.id"
@@ -1016,10 +1020,10 @@
                     <option><t t-esc="option[1]"/></option>
                 </t>
         </select>
-    </span>
+    </div>
 </t>
 <t t-name="FieldMany2One">
-    <table cellpadding="0" cellspacing="0" border="0" width="100%">
+    <table t-attf-class="oe_form_field_#{type}" cellpadding="0" cellspacing="0" border="0" width="100%">
     <tr>
         <td width="100%" valign="top">
             <t t-call="FieldChar"/>
@@ -1056,10 +1060,10 @@
 <t t-name="FieldOne2Many">
 </t>
 <t t-name="FieldMany2Many">
-    <div t-att-id="widget.list_id"></div>
+    <div t-attf-class="oe_form_field_#{type}" t-att-id="widget.list_id"></div>
 </t>
 <t t-name="FieldReference">
-    <table border="0" width="100%" cellpadding="0" cellspacing="0" class="oe_frame oe_forms">
+    <table t-attf-class="oe_form_field_#{type}" 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 oe_form_view_reference_selection">
         </td>
@@ -1069,17 +1073,19 @@
     </table>
 </t>
 <t t-name="FieldBoolean">
-    <input type="checkbox"
-        t-att-name="widget.name"
-        t-attf-class="field_#{widget.type}"/>
+    <div t-attf-class="oe_form_field_#{type}">
+        <input type="checkbox"
+            t-att-name="widget.name"
+            t-attf-class="field_#{widget.type}"/>
+    </div>
 </t>
 <t t-name="FieldProgressBar">
-    <div t-opentag="true" class="oe-progressbar">
+    <div t-attf-class="oe_form_field_#{type}" t-opentag="true">
         <span></span>
     </div>
 </t>
 <t t-name="FieldBinaryImage">
-    <table cellpadding="0" cellspacing="0" border="0">
+    <table t-attf-class="oe_form_field_#{type}" cellpadding="0" cellspacing="0" border="0">
     <tr>
         <td align="center">
             <img t-att-src='_s + "/web/static/src/img/placeholder.png"' class="oe-binary-image"
@@ -1128,7 +1134,7 @@
     </table>
 </t>
 <t t-name="FieldBinaryFile">
-    <table cellpadding="0" cellspacing="0" border="0" width="100%">
+    <table t-attf-class="oe_form_field_#{type}" cellpadding="0" cellspacing="0" border="0" width="100%">
     <tr>
         <td width="100%">
             <input type="text" size="1" readonly="readonly"
@@ -1178,10 +1184,12 @@
     </table>
 </t>
 <t t-name="WidgetButton">
-    <button type="button" class="oe_button">
-        <img t-if="widget.node.attrs.icon" t-att-src="_s + '/web/static/src/img/icons/' + widget.node.attrs.icon + '.png'" width="16" height="16"/>
-        <span t-if="widget.string"><t t-esc="widget.string"/></span>
-    </button>
+    <div t-attf-class="oe_form_field_#{type}">
+        <button type="button" class="oe_button">
+            <img t-if="widget.node.attrs.icon" t-att-src="_s + '/web/static/src/img/icons/' + widget.node.attrs.icon + '.png'" width="16" height="16"/>
+            <span t-if="widget.string"><t t-esc="widget.string"/></span>
+        </button>
+    </div>
 </t>
 <t t-name="WidgetButton.tooltip" t-extend="WidgetLabel.tooltip">
     <t t-jquery="div.oe_tooltip_string" t-operation="replace">
-- 
cgit v1.2.3


From 36ba035431cecf4d7f3faf7b377079ce827d5809 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Fri, 16 Mar 2012 12:22:23 +0100
Subject: [imp] made chars readonly-able

bzr revid: nicolas.vanhoren@openerp.com-20120316112223-d4az41nm2012liz5
---
 addons/web/static/src/xml/base.xml | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 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 7ee908ae43c..8aa0241a5b5 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -943,20 +943,22 @@
     </ul>
 </t>
 <t t-name="FieldChar">
-    <div t-attf-class="oe_form_field_#{type}">
-        <input t-att-type="widget.password ? 'password' : 'text'" size="1"
-            t-att-name="widget.name"
-            t-att-id="widget.node.attrs.id"
-            t-attf-class="field_#{widget.type} #{_(['integer', 'float', 'float_time']).contains(widget.type) ? 'oe-number' : ''}"
-            style="width: 100%"
-        /><img class="oe_field_translate oe_input_icon" t-if="widget.field.translate" t-att-src='_s + "/web/static/src/img/icons/terp-translate.png"' width="16" height="16" border="0"/>
-    </div>
-</t>
-<t t-name="FieldChar.readonly">
-    <div
-        t-att-id="widget.element_id"
-        t-attf-class="field_#{widget.type} #{_(['integer', 'float', 'float_time']).contains(widget.type) ? 'oe-number' : ''}">
-    </div>
+    <t t-if="!widget.get('effective_readonly')">
+        <div t-attf-class="oe_form_field_#{type}">
+            <input t-att-type="widget.password ? 'password' : 'text'" size="1"
+                t-att-name="widget.name"
+                t-att-id="widget.node.attrs.id"
+                t-attf-class="field_#{widget.type} #{_(['integer', 'float', 'float_time']).contains(widget.type) ? 'oe-number' : ''}"
+                style="width: 100%"
+            /><img class="oe_field_translate oe_input_icon" t-if="widget.field.translate" t-att-src='_s + "/web/static/src/img/icons/terp-translate.png"' width="16" height="16" border="0"/>
+        </div>
+    </t>
+    <t t-if="widget.get('effective_readonly')">
+        <div
+            t-att-id="widget.element_id"
+            t-attf-class="field_#{widget.type} #{_(['integer', 'float', 'float_time']).contains(widget.type) ? 'oe-number' : ''}">
+        </div>
+    </t>
 </t>
 <t t-name="FieldURI.readonly">
     <div>
-- 
cgit v1.2.3


From 7cee52681f157c44863a8a41f66a18480cf0055e Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Fri, 16 Mar 2012 12:33:22 +0100
Subject: [imp] made email readonly-able

bzr revid: nicolas.vanhoren@openerp.com-20120316113322-wgg7ixwal4qwc55f
---
 addons/web/static/src/xml/base.xml | 31 +++++++++++++++++++------------
 1 file changed, 19 insertions(+), 12 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 8aa0241a5b5..4bfb18414ca 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -966,18 +966,25 @@
     </div>
 </t>
 <t t-name="FieldEmail">
-    <table t-attf-class="oe_form_field_#{type}" cellpadding="0" cellspacing="0" border="0" width="100%">
-    <tr>
-        <td width="100%">
-            <t t-call="FieldChar"/>
-        </td>
-        <td width="16">
-            <button class="oe_button oe_field_button" type="button" title="Send an e-mail with your default e-mail client">
-                <img t-att-src='_s + "/web/static/src/img/icons/terp-mail-message-new.png"'/>
-            </button>
-        </td>
-    </tr>
-    </table>
+    <t t-if="!widget.get('effective_readonly')">
+        <table t-attf-class="oe_form_field_#{type}" cellpadding="0" cellspacing="0" border="0" width="100%">
+        <tr>
+            <td width="100%">
+                <t t-call="FieldChar"/>
+            </td>
+            <td width="16">
+                <button class="oe_button oe_field_button" type="button" title="Send an e-mail with your default e-mail client">
+                    <img t-att-src='_s + "/web/static/src/img/icons/terp-mail-message-new.png"'/>
+                </button>
+            </td>
+        </tr>
+        </table>
+    </t>
+    <t t-if="widget.get('effective_readonly')">
+        <div>
+            <a href="#" class="oe_form_uri"/>
+        </div>
+    </t>
 </t>
 <t t-name="FieldUrl">
     <table t-attf-class="oe_form_field_#{type}" cellpadding="0" cellspacing="0" border="0" width="100%">
-- 
cgit v1.2.3


From 55b40f3e17ddae55dd6e0240a1cb61376141f6a9 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Fri, 16 Mar 2012 12:44:24 +0100
Subject: [imp] made url readonly-able

bzr revid: nicolas.vanhoren@openerp.com-20120316114424-veofbtwtzmz7kakj
---
 addons/web/static/src/xml/base.xml | 31 +++++++++++++++++++------------
 1 file changed, 19 insertions(+), 12 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 4bfb18414ca..05feec79168 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -987,18 +987,25 @@
     </t>
 </t>
 <t t-name="FieldUrl">
-    <table t-attf-class="oe_form_field_#{type}" cellpadding="0" cellspacing="0" border="0" width="100%">
-    <tr>
-        <td width="100%">
-            <t t-call="FieldChar"/>
-        </td>
-        <td width="16">
-            <button class="oe_button oe_field_button" type="button" title="Open this resource">
-                <img t-att-src='_s + "/web/static/src/img/icons/gtk-ok.png"'/>
-            </button>
-        </td>
-    </tr>
-    </table>
+    <t t-if="!widget.get('effective_readonly')">
+        <table t-attf-class="oe_form_field_#{type}" cellpadding="0" cellspacing="0" border="0" width="100%">
+        <tr>
+            <td width="100%">
+                <t t-call="FieldChar"/>
+            </td>
+            <td width="16">
+                <button class="oe_button oe_field_button" type="button" title="Open this resource">
+                    <img t-att-src='_s + "/web/static/src/img/icons/gtk-ok.png"'/>
+                </button>
+            </td>
+        </tr>
+        </table>
+    </t>
+    <t t-if="widget.get('effective_readonly')">
+        <div>
+            <a href="#" class="oe_form_uri"/>
+        </div>
+    </t>
 </t>
 <t t-name="FieldText">
     <div t-attf-class="oe_form_field_#{type}">
-- 
cgit v1.2.3


From 089664e3304c59e46984b373ac925b43eace62d1 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Fri, 16 Mar 2012 12:52:43 +0100
Subject: [imp] made boolean readonly-able

bzr revid: nicolas.vanhoren@openerp.com-20120316115243-7cj2mbfgp4c28q0k
---
 addons/web/static/src/xml/base.xml | 5 -----
 1 file changed, 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 05feec79168..c63394ee0dd 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -960,11 +960,6 @@
         </div>
     </t>
 </t>
-<t t-name="FieldURI.readonly">
-    <div>
-        <a href="#" class="oe_form_uri"/>
-    </div>
-</t>
 <t t-name="FieldEmail">
     <t t-if="!widget.get('effective_readonly')">
         <table t-attf-class="oe_form_field_#{type}" cellpadding="0" cellspacing="0" border="0" width="100%">
-- 
cgit v1.2.3


From 5f5abc44617537aee9e4071d005e6f08d4f2a5ea Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Fri, 16 Mar 2012 13:23:31 +0100
Subject: [imp] made selection readonly-able

bzr revid: nicolas.vanhoren@openerp.com-20120316122331-ewfto4tzutt87t2h
---
 addons/web/static/src/xml/base.xml | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 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 c63394ee0dd..31dc699e4e6 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1022,16 +1022,24 @@
     </div>
 </t>
 <t t-name="FieldSelection">
-    <div t-attf-class="oe_form_field_#{type}">
-        <select
-            t-att-name="widget.name"
-            t-att-id="widget.node.attrs.id"
-            style="width: 100%">
-                <t t-foreach="widget.values" t-as="option">
-                    <option><t t-esc="option[1]"/></option>
-                </t>
-        </select>
-    </div>
+    <t t-if="!widget.get('effective_readonly')">
+        <div t-attf-class="oe_form_field_#{type}">
+            <select
+                t-att-name="widget.name"
+                t-att-id="widget.node.attrs.id"
+                style="width: 100%">
+                    <t t-foreach="widget.values" t-as="option">
+                        <option><t t-esc="option[1]"/></option>
+                    </t>
+            </select>
+        </div>
+    </t>
+    <t t-if="widget.get('effective_readonly')">
+        <div
+            t-att-id="widget.element_id"
+            t-attf-class="field_#{widget.type} #{_(['integer', 'float', 'float_time']).contains(widget.type) ? 'oe-number' : ''}">
+        </div>
+    </t>
 </t>
 <t t-name="FieldMany2One">
     <table t-attf-class="oe_form_field_#{type}" cellpadding="0" cellspacing="0" border="0" width="100%">
-- 
cgit v1.2.3


From cade2c3f162a184a463a6ffd5c1e42e9b15a9a86 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 19 Mar 2012 11:29:04 +0100
Subject: [FIX] Fixed labels and stuff

bzr revid: fme@openerp.com-20120319102904-gcnls0j3rl25asq5
---
 addons/web/static/src/xml/base.xml | 53 ++++++++++++++++++--------------------
 1 file changed, 25 insertions(+), 28 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 31dc699e4e6..58d7b8c95c3 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -869,7 +869,7 @@
 <t t-name="FormRenderingLabel">
     <label  t-att-for="for"
             t-att-title="help"
-            t-attf-class="oe_label#{help ? '_help' : ''} oe_align_#{align}">
+            t-attf-class="oe_form_label#{help ? '_help' : ''} oe_align_#{align}">
         <t t-esc="string"/>
         <span t-if="help">?</span>
         :
@@ -944,12 +944,11 @@
 </t>
 <t t-name="FieldChar">
     <t t-if="!widget.get('effective_readonly')">
-        <div t-attf-class="oe_form_field_#{type}">
-            <input t-att-type="widget.password ? 'password' : 'text'" size="1"
+        <div t-attf-class="oe_form_field_#{widget.type}">
+            <input t-att-type="widget.password ? 'password' : 'text'"
                 t-att-name="widget.name"
-                t-att-id="widget.node.attrs.id"
+                t-att-id="widget.id_for_label"
                 t-attf-class="field_#{widget.type} #{_(['integer', 'float', 'float_time']).contains(widget.type) ? 'oe-number' : ''}"
-                style="width: 100%"
             /><img class="oe_field_translate oe_input_icon" t-if="widget.field.translate" t-att-src='_s + "/web/static/src/img/icons/terp-translate.png"' width="16" height="16" border="0"/>
         </div>
     </t>
@@ -962,9 +961,9 @@
 </t>
 <t t-name="FieldEmail">
     <t t-if="!widget.get('effective_readonly')">
-        <table t-attf-class="oe_form_field_#{type}" cellpadding="0" cellspacing="0" border="0" width="100%">
+        <table t-attf-class="oe_form_field_#{widget.type}" cellpadding="0" cellspacing="0" border="0">
         <tr>
-            <td width="100%">
+            <td>
                 <t t-call="FieldChar"/>
             </td>
             <td width="16">
@@ -983,9 +982,9 @@
 </t>
 <t t-name="FieldUrl">
     <t t-if="!widget.get('effective_readonly')">
-        <table t-attf-class="oe_form_field_#{type}" cellpadding="0" cellspacing="0" border="0" width="100%">
+        <table t-attf-class="oe_form_field_#{widget.type}" cellpadding="0" cellspacing="0" border="0">
         <tr>
-            <td width="100%">
+            <td>
                 <t t-call="FieldChar"/>
             </td>
             <td width="16">
@@ -1003,18 +1002,17 @@
     </t>
 </t>
 <t t-name="FieldText">
-    <div t-attf-class="oe_form_field_#{type}">
+    <div t-attf-class="oe_form_field_#{widget.type}">
         <textarea rows="6"
             t-att-name="widget.name"
             t-attf-class="field_#{widget.type}"
-            style="width: 100%"
         ></textarea><img class="oe_field_translate oe_input_icon" t-if="widget.field.translate" t-att-src='_s + "/web/static/src/img/icons/terp-translate.png"' width="16" height="16" border="0"/>
     </div>
 </t>
 <t t-name="web.datetimepicker">
-    <div class="oe_datepicker_root" t-attf-class="oe_form_field_#{type}">
-        <input type="text" size="1" class="oe_datepicker_container" disabled="disabled" style="display: none;"/>
-        <input type="text" size="1" style="width: 100%"
+    <div class="oe_datepicker_root" t-attf-class="oe_form_field_#{widget.type}">
+        <input type="text" class="oe_datepicker_container" disabled="disabled" style="display: none;"/>
+        <input type="text"
             t-att-name="widget.name"
             t-attf-class="oe_datepicker_master field_#{widget.type_of_date}"
         /><img class="oe_input_icon oe_datepicker_trigger" t-att-src='_s + "/web/static/src/img/ui/field_calendar.png"'
@@ -1023,11 +1021,10 @@
 </t>
 <t t-name="FieldSelection">
     <t t-if="!widget.get('effective_readonly')">
-        <div t-attf-class="oe_form_field_#{type}">
+        <div t-attf-class="oe_form_field_#{widget.type}">
             <select
                 t-att-name="widget.name"
-                t-att-id="widget.node.attrs.id"
-                style="width: 100%">
+                t-att-id="widget.id_for_label">
                     <t t-foreach="widget.values" t-as="option">
                         <option><t t-esc="option[1]"/></option>
                     </t>
@@ -1042,9 +1039,9 @@
     </t>
 </t>
 <t t-name="FieldMany2One">
-    <table t-attf-class="oe_form_field_#{type}" cellpadding="0" cellspacing="0" border="0" width="100%">
+    <table t-attf-class="oe_form_field_#{widget.type}" cellpadding="0" cellspacing="0" border="0">
     <tr>
-        <td width="100%" valign="top">
+        <td valign="top">
             <t t-call="FieldChar"/>
             <span class="oe-m2o-drop-down-button">
                 <img t-att-src='_s + "/web/static/src/img/down-arrow.png"' /></span>
@@ -1079,10 +1076,10 @@
 <t t-name="FieldOne2Many">
 </t>
 <t t-name="FieldMany2Many">
-    <div t-attf-class="oe_form_field_#{type}" t-att-id="widget.list_id"></div>
+    <div t-attf-class="oe_form_field_#{widget.type}" t-att-id="widget.list_id"></div>
 </t>
 <t t-name="FieldReference">
-    <table t-attf-class="oe_form_field_#{type}" border="0" width="100%" cellpadding="0" cellspacing="0" class="oe_frame oe_forms">
+    <table t-attf-class="oe_form_field_#{widget.type}" border="0" cellpadding="0" cellspacing="0" class="oe_frame oe_forms">
     <tr>
         <td t-attf-class="oe_form_frame_cell oe_form_selection oe_form_view_reference_selection">
         </td>
@@ -1092,19 +1089,19 @@
     </table>
 </t>
 <t t-name="FieldBoolean">
-    <div t-attf-class="oe_form_field_#{type}">
+    <div t-attf-class="oe_form_field_#{widget.type}">
         <input type="checkbox"
             t-att-name="widget.name"
             t-attf-class="field_#{widget.type}"/>
     </div>
 </t>
 <t t-name="FieldProgressBar">
-    <div t-attf-class="oe_form_field_#{type}" t-opentag="true">
+    <div t-attf-class="oe_form_field_#{widget.type}" t-opentag="true">
         <span></span>
     </div>
 </t>
 <t t-name="FieldBinaryImage">
-    <table t-attf-class="oe_form_field_#{type}" cellpadding="0" cellspacing="0" border="0">
+    <table t-attf-class="oe_form_field_#{widget.type}" cellpadding="0" cellspacing="0" border="0">
     <tr>
         <td align="center">
             <img t-att-src='_s + "/web/static/src/img/placeholder.png"' class="oe-binary-image"
@@ -1153,13 +1150,13 @@
     </table>
 </t>
 <t t-name="FieldBinaryFile">
-    <table t-attf-class="oe_form_field_#{type}" cellpadding="0" cellspacing="0" border="0" width="100%">
+    <table t-attf-class="oe_form_field_#{widget.type}" cellpadding="0" cellspacing="0" border="0">
     <tr>
-        <td width="100%">
+        <td>
             <input type="text" size="1" readonly="readonly"
                 t-att-name="widget.name"
                 t-att-id="widget.element_id + '_field'"
-                t-attf-class="field_#{widget.type}" style="width: 100%"
+                t-attf-class="field_#{widget.type}"
             />
         </td>
         <td class="oe-binary" nowrap="true">
@@ -1203,7 +1200,7 @@
     </table>
 </t>
 <t t-name="WidgetButton">
-    <div t-attf-class="oe_form_field_#{type}">
+    <div t-attf-class="oe_form_field_#{widget.type}">
         <button type="button" class="oe_button">
             <img t-if="widget.node.attrs.icon" t-att-src="_s + '/web/static/src/img/icons/' + widget.node.attrs.icon + '.png'" width="16" height="16"/>
             <span t-if="widget.string"><t t-esc="widget.string"/></span>
-- 
cgit v1.2.3


From e9ff845347f177096ca05f3387b1174a41f4e52e Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Mon, 19 Mar 2012 13:49:45 +0100
Subject: [imp] small cleaning in o2m & m2m

bzr revid: nicolas.vanhoren@openerp.com-20120319124945-3zhjen8pqhiqm78d
---
 addons/web/static/src/xml/base.xml | 5 -----
 1 file changed, 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 58d7b8c95c3..a7c8d427440 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1073,11 +1073,6 @@
         </t>
     </ul>
 </t>
-<t t-name="FieldOne2Many">
-</t>
-<t t-name="FieldMany2Many">
-    <div t-attf-class="oe_form_field_#{widget.type}" t-att-id="widget.list_id"></div>
-</t>
 <t t-name="FieldReference">
     <table t-attf-class="oe_form_field_#{widget.type}" border="0" cellpadding="0" cellspacing="0" class="oe_frame oe_forms">
     <tr>
-- 
cgit v1.2.3


From 993c99a41449e508554c4e33342ef484020d8c31 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Mon, 19 Mar 2012 14:09:52 +0100
Subject: [imp] made reference readonly-able

bzr revid: nicolas.vanhoren@openerp.com-20120319130952-k1921f9za3duezyn
---
 addons/web/static/src/xml/base.xml | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 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 a7c8d427440..5d8aa5c704b 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1057,7 +1057,7 @@
     </table>
 </t>
 <t t-name="FieldMany2One_readonly">
-   <a href="#" class="oe_form_uri"/>
+    <a href="#" class="oe_form_uri"/>
 </t>
 <t t-name="FieldMany2One.context_menu">
     <ul>
@@ -1074,14 +1074,19 @@
     </ul>
 </t>
 <t t-name="FieldReference">
-    <table t-attf-class="oe_form_field_#{widget.type}" border="0" cellpadding="0" cellspacing="0" class="oe_frame oe_forms">
-    <tr>
-        <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 oe_form_view_reference_m2o" nowrap="true" style="display: none">
-        </td>
-    </tr>
-    </table>
+    <t t-if="!widget.get('effective_readonly')">
+        <table t-attf-class="oe_form_field_#{widget.type}" border="0" cellpadding="0" cellspacing="0" class="oe_frame oe_forms">
+        <tr>
+            <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 oe_form_view_reference_m2o" nowrap="true" style="display: none">
+            </td>
+        </tr>
+        </table>
+    </t>
+    <t t-if="widget.get('effective_readonly')">
+        <a href="#" class="oe_form_uri"/>
+    </t>
 </t>
 <t t-name="FieldBoolean">
     <div t-attf-class="oe_form_field_#{widget.type}">
-- 
cgit v1.2.3


From 9df2a090a01a439bc85092a45f6d927568a332f7 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Mon, 19 Mar 2012 16:18:23 +0100
Subject: [fix] field text

bzr revid: nicolas.vanhoren@openerp.com-20120319151823-xpyjoh8moal2v3tv
---
 addons/web/static/src/xml/base.xml | 14 ++++++++------
 1 file changed, 8 insertions(+), 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 5d8aa5c704b..c8df69c2bdc 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1002,12 +1002,14 @@
     </t>
 </t>
 <t t-name="FieldText">
-    <div t-attf-class="oe_form_field_#{widget.type}">
-        <textarea rows="6"
-            t-att-name="widget.name"
-            t-attf-class="field_#{widget.type}"
-        ></textarea><img class="oe_field_translate oe_input_icon" t-if="widget.field.translate" t-att-src='_s + "/web/static/src/img/icons/terp-translate.png"' width="16" height="16" border="0"/>
-    </div>
+    <t t-if="!widget.get('effective_readonly')">
+        <div t-attf-class="oe_form_field_#{widget.type}">
+            <textarea rows="6"
+                t-att-name="widget.name"
+                t-attf-class="field_#{widget.type}"
+            ></textarea><img class="oe_field_translate oe_input_icon" t-if="widget.field.translate" t-att-src='_s + "/web/static/src/img/icons/terp-translate.png"' width="16" height="16" border="0"/>
+        </div>
+    </t>
 </t>
 <t t-name="web.datetimepicker">
     <div class="oe_datepicker_root" t-attf-class="oe_form_field_#{widget.type}">
-- 
cgit v1.2.3


From e3a8b30a153a00b26b81f3e82ee3b6deec7fffd7 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Mon, 19 Mar 2012 17:13:58 +0100
Subject: [imp] refactored fields binary & image

bzr revid: nicolas.vanhoren@openerp.com-20120319161358-uw9h91fakkc1e2fu
---
 addons/web/static/src/xml/base.xml | 103 ++++++++++++++++++++-----------------
 1 file changed, 55 insertions(+), 48 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 c8df69c2bdc..37ca7e25e0a 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1152,54 +1152,61 @@
     </table>
 </t>
 <t t-name="FieldBinaryFile">
-    <table t-attf-class="oe_form_field_#{widget.type}" cellpadding="0" cellspacing="0" border="0">
-    <tr>
-        <td>
-            <input type="text" size="1" readonly="readonly"
-                t-att-name="widget.name"
-                t-att-id="widget.element_id + '_field'"
-                t-attf-class="field_#{widget.type}"
-            />
-        </td>
-        <td class="oe-binary" nowrap="true">
-            <table cellspacing="0" cellpadding="0" border="0">
-            <tr>
-                <td>
-                    <div class="oe-binary-file-set" style="width: 80px; height:22px;">
-                        <form class="oe-binary-form" t-att-target="widget.iframe"
-                            method="post" enctype="multipart/form-data" action="/web/binary/upload">
-                            <input type="hidden" name="session_id" value=""/>
-                            <input type="hidden" name="callback" t-att-value="widget.iframe"/>
-                            <button class="oe_button oe_field_button" type="button" title="Set Image">
-                                <img t-att-src='_s + "/web/static/src/img/icons/STOCK_DIRECTORY.png"'/>
-                                <span>Select</span>
-                            </button>
-                            <input type="file" class="oe-binary-file" name="ufile"/>
-                        </form>
-                    </div>
-                </td>
-                <td>
-                    <button class="oe_button oe-binary-file-save" type="button" title="Save As">
-                        <img t-att-src='_s + "/web/static/src/img/icons/gtk-save.png"'/>
-                        <span>Save As</span>
-                    </button>
-                </td>
-                <td>
-                    <button class="oe_button oe-binary-file-clear" type="button" title="Clear">
-                        <img t-att-src='_s + "/web/static/src/img/icons/STOCK_MISSING_IMAGE.png"'/>
-                        <span>Clear</span>
-                    </button>
-                </td>
-            </tr>
-            </table>
-        </td>
-        <td class="oe-binary-progress" style="display: none" nowrap="true">
-            <img t-att-src='_s + "/web/static/src/img/throbber.gif"' width="16" height="16"/>
-            <b>Uploading ...</b>
-            <iframe t-att-id="widget.iframe" t-att-name="widget.iframe" style="display: none"/>
-        </td>
-    </tr>
-    </table>
+    <t t-if="!widget.get('effective_readonly')">
+        <table t-attf-class="oe_form_field_#{widget.type}" cellpadding="0" cellspacing="0" border="0">
+        <tr>
+            <td>
+                <input type="text" size="1" readonly="readonly"
+                    t-att-name="widget.name"
+                    t-att-id="widget.element_id + '_field'"
+                    t-attf-class="field_#{widget.type}"
+                />
+            </td>
+            <td class="oe-binary" nowrap="true">
+                <table cellspacing="0" cellpadding="0" border="0">
+                <tr>
+                    <td>
+                        <div class="oe-binary-file-set" style="width: 80px; height:22px;">
+                            <form class="oe-binary-form" t-att-target="widget.iframe"
+                                method="post" enctype="multipart/form-data" action="/web/binary/upload">
+                                <input type="hidden" name="session_id" value=""/>
+                                <input type="hidden" name="callback" t-att-value="widget.iframe"/>
+                                <button class="oe_button oe_field_button" type="button" title="Set Image">
+                                    <img t-att-src='_s + "/web/static/src/img/icons/STOCK_DIRECTORY.png"'/>
+                                    <span>Select</span>
+                                </button>
+                                <input type="file" class="oe-binary-file" name="ufile"/>
+                            </form>
+                        </div>
+                    </td>
+                    <td>
+                        <button class="oe_button oe-binary-file-save" type="button" title="Save As">
+                            <img t-att-src='_s + "/web/static/src/img/icons/gtk-save.png"'/>
+                            <span>Save As</span>
+                        </button>
+                    </td>
+                    <td>
+                        <button class="oe_button oe-binary-file-clear" type="button" title="Clear">
+                            <img t-att-src='_s + "/web/static/src/img/icons/STOCK_MISSING_IMAGE.png"'/>
+                            <span>Clear</span>
+                        </button>
+                    </td>
+                </tr>
+                </table>
+            </td>
+            <td class="oe-binary-progress" style="display: none" nowrap="true">
+                <img t-att-src='_s + "/web/static/src/img/throbber.gif"' width="16" height="16"/>
+                <b>Uploading ...</b>
+                <iframe t-att-id="widget.iframe" t-att-name="widget.iframe" style="display: none"/>
+            </td>
+        </tr>
+        </table>
+    </t>
+    <t t-if="widget.get('effective_readonly')">
+        <div>
+            <a href="javascript:void(0)" class="oe_form_uri"/>
+        </div>
+    </t>
 </t>
 <t t-name="WidgetButton">
     <div t-attf-class="oe_form_field_#{widget.type}">
-- 
cgit v1.2.3


From 4edfbc37db73fff5bb66091835e9dddf42083b5d Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Mon, 19 Mar 2012 17:41:31 +0100
Subject: [imp] removed some usage of element_id

bzr revid: nicolas.vanhoren@openerp.com-20120319164131-ctu3f4kou2mpfmgn
---
 addons/web/static/src/xml/base.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 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 37ca7e25e0a..342e62c6063 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1459,20 +1459,20 @@
     </select>
 </t>
 <t t-name="SelectCreatePopup">
-    <div t-att-id="widget.element_id">
+    <div>
         <table style="width:100%">
             <tr style="width:100%">
                 <td style="width:100%">
-                    <div t-att-id="widget.element_id + '_search'" style="width:100%"></div>
+                    <div class="oe-select-create-popup-view-search" style="width:100%"></div>
                 </td>
             </tr>
             <tr style="width:100%">
                 <td style="width:100%">
-                    <div t-att-id="widget.element_id + '_view_list'" style="width:100%"></div>
+                    <div class="oe-select-create-popup-view-list" style="width:100%"></div>
                 </td>
             </tr>
         </table>
-        <div t-att-id="widget.element_id + '_view_form'" style="width:100%"></div>
+        <div class="oe-select-create-popup-view-form" style="width:100%"></div>
     </div>
 </t>
 <t t-name="SelectCreatePopup.search.buttons">
@@ -1490,8 +1490,8 @@
     <button type="button" class="oe_button oe_selectcreatepopup-form-close">Cancel</button>
 </t>
 <t t-name="FormOpenPopup">
-    <div t-att-id="widget.element_id">
-        <div t-att-id="widget.element_id + '_view_form'" style="width:100%"></div>
+    <div>
+        <div class="oe-form-open-popup-form-view" style="width:100%"></div>
     </div>
 </t>
 <t t-name="FormOpenPopup.form.buttons">
-- 
cgit v1.2.3


From 16fddf9207d4eea59dc27224fe3ee5c839d1aef0 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 19 Mar 2012 17:43:04 +0100
Subject: [BREAK THE WORLD] single search field with global multifield
 autocompletion full of awesome

bzr revid: xmo@openerp.com-20120319164304-r48l8gdteaekr3hm
---
 addons/web/static/src/xml/base.xml | 13 ++-----------
 1 file changed, 2 insertions(+), 11 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 c8a2b4d920f..aff83cf342a 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1242,17 +1242,8 @@
     </t>
 </t>
 
-<t t-name="SearchView">
-    <form class="oe_forms">
-        <t t-call="SearchView.render_lines"/>
-        <div class="oe_search-view-buttons">
-            <button class="oe_button">Search</button>
-            <button class="oe_button" type="reset">Clear</button>
-            <select class="oe_search-view-filters-management">
-            </select>
-        </div>
-    </form>
-</t>
+<div t-name="SearchView" class="oe_searchview"/>
+
 <t t-name="SearchView.managed-filters">
     <option class="oe-filters-title" value="">Filters</option>
     <optgroup label="-- Filters --">
-- 
cgit v1.2.3


From 56516cc3bcc938b5dfda52d4696b7b1d1e0a4409 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Mon, 19 Mar 2012 17:44:42 +0100
Subject: [imp] cleaned some more usage of element_id

bzr revid: nicolas.vanhoren@openerp.com-20120319164442-camp93gupoec3qlu
---
 addons/web/static/src/xml/base.xml | 10 ++--------
 1 file changed, 2 insertions(+), 8 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 342e62c6063..4d847124edd 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -953,9 +953,7 @@
         </div>
     </t>
     <t t-if="widget.get('effective_readonly')">
-        <div
-            t-att-id="widget.element_id"
-            t-attf-class="field_#{widget.type} #{_(['integer', 'float', 'float_time']).contains(widget.type) ? 'oe-number' : ''}">
+        <div t-attf-class="field_#{widget.type} #{_(['integer', 'float', 'float_time']).contains(widget.type) ? 'oe-number' : ''}">
         </div>
     </t>
 </t>
@@ -1034,9 +1032,7 @@
         </div>
     </t>
     <t t-if="widget.get('effective_readonly')">
-        <div
-            t-att-id="widget.element_id"
-            t-attf-class="field_#{widget.type} #{_(['integer', 'float', 'float_time']).contains(widget.type) ? 'oe-number' : ''}">
+        <div t-attf-class="field_#{widget.type} #{_(['integer', 'float', 'float_time']).contains(widget.type) ? 'oe-number' : ''}">
         </div>
     </t>
 </t>
@@ -1108,7 +1104,6 @@
         <td align="center">
             <img t-att-src='_s + "/web/static/src/img/placeholder.png"' class="oe-binary-image"
                 t-att-border="widget.readonly ? 0 : 1"
-                t-att-id="widget.element_id + '_field'"
                 t-att-name="widget.name"
                 t-attf-class="field_#{widget.type}"
                 t-att-width="widget.node.attrs.img_width || widget.node.attrs.width"
@@ -1158,7 +1153,6 @@
             <td>
                 <input type="text" size="1" readonly="readonly"
                     t-att-name="widget.name"
-                    t-att-id="widget.element_id + '_field'"
                     t-attf-class="field_#{widget.type}"
                 />
             </td>
-- 
cgit v1.2.3


From a399b1d8cc2709dfd0d3368d21d4a5b66715492a Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 20 Mar 2012 09:39:28 +0100
Subject: [IMP] Buttons styling

bzr revid: fme@openerp.com-20120320083928-52plnhxvoam51ag5
---
 addons/web/static/src/xml/base.xml | 10 ++++------
 1 file changed, 4 insertions(+), 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 4d847124edd..f12079765f9 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1203,12 +1203,10 @@
     </t>
 </t>
 <t t-name="WidgetButton">
-    <div t-attf-class="oe_form_field_#{widget.type}">
-        <button type="button" class="oe_button">
-            <img t-if="widget.node.attrs.icon" t-att-src="_s + '/web/static/src/img/icons/' + widget.node.attrs.icon + '.png'" width="16" height="16"/>
-            <span t-if="widget.string"><t t-esc="widget.string"/></span>
-        </button>
-    </div>
+    <button type="button" class="oe_button oe_form_button">
+        <img t-if="widget.node.attrs.icon" t-att-src="_s + '/web/static/src/img/icons/' + widget.node.attrs.icon + '.png'" width="16" height="16"/>
+        <span t-if="widget.string"><t t-esc="widget.string"/></span>
+    </button>
 </t>
 <t t-name="WidgetButton.tooltip" t-extend="WidgetLabel.tooltip">
     <t t-jquery="div.oe_tooltip_string" t-operation="replace">
-- 
cgit v1.2.3


From cf4159c7f8ea9bf42692a70d5ded529a34111949 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 20 Mar 2012 11:26:50 +0100
Subject: [imp] modified m2o to use the mixin

bzr revid: nicolas.vanhoren@openerp.com-20120320102650-virv6zsj0gf0rjpw
---
 addons/web/static/src/xml/base.xml | 42 +++++++++++++++++++++-----------------
 1 file changed, 23 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 f12079765f9..069f48fb48e 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1037,25 +1037,29 @@
     </t>
 </t>
 <t t-name="FieldMany2One">
-    <table t-attf-class="oe_form_field_#{widget.type}" cellpadding="0" cellspacing="0" border="0">
-    <tr>
-        <td valign="top">
-            <t t-call="FieldChar"/>
-            <span class="oe-m2o-drop-down-button">
-                <img t-att-src='_s + "/web/static/src/img/down-arrow.png"' /></span>
-        </td>
-        <td>
-            <button class="oe_button oe_field_button oe-m2o-cm-button" t-att-id="widget.name + '_open'">
-                <img t-att-src='_s + "/web/static/src/img/icons/STOCK_DIRECTORY_MENU.png"'/>
-            </button>
-            <div t-att-id="widget.cm_id" class="contextMenu" style="display:none">
-            </div>
-        </td>
-    </tr>
-    </table>
-</t>
-<t t-name="FieldMany2One_readonly">
-    <a href="#" class="oe_form_uri"/>
+    <t t-if="!widget.get('effective_readonly')">
+        <table t-attf-class="oe_form_field_#{widget.type}" cellpadding="0" cellspacing="0" border="0">
+        <tr>
+            <td valign="top">
+                <t t-call="FieldChar"/>
+                <span class="oe-m2o-drop-down-button">
+                    <img t-att-src='_s + "/web/static/src/img/down-arrow.png"' /></span>
+            </td>
+            <td>
+                <button class="oe_button oe_field_button oe-m2o-cm-button" t-att-id="widget.name + '_open'">
+                    <img t-att-src='_s + "/web/static/src/img/icons/STOCK_DIRECTORY_MENU.png"'/>
+                </button>
+                <div t-att-id="widget.cm_id" class="contextMenu" style="display:none">
+                </div>
+            </td>
+        </tr>
+        </table>
+        </t>
+    <t t-if="widget.get('effective_readonly')">
+        <div>
+            <a href="#" class="oe_form_uri"/>
+        </div>
+    </t>
 </t>
 <t t-name="FieldMany2One.context_menu">
     <ul>
-- 
cgit v1.2.3


From d76e8be574e4c73d3bcfc0d7802340ac253737f6 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 20 Mar 2012 12:01:15 +0100
Subject: [ADD] Debug layout.

bzr revid: fme@openerp.com-20120320110115-1v4ypw9t06s7l9rb
---
 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 069f48fb48e..3f5e067285c 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -948,7 +948,7 @@
             <input t-att-type="widget.password ? 'password' : 'text'"
                 t-att-name="widget.name"
                 t-att-id="widget.id_for_label"
-                t-attf-class="field_#{widget.type} #{_(['integer', 'float', 'float_time']).contains(widget.type) ? 'oe-number' : ''}"
+                t-attf-class="oe_field_#{widget.type} #{_(['integer', 'float', 'float_time']).contains(widget.type) ? 'oe-number' : ''}"
             /><img class="oe_field_translate oe_input_icon" t-if="widget.field.translate" t-att-src='_s + "/web/static/src/img/icons/terp-translate.png"' width="16" height="16" border="0"/>
         </div>
     </t>
-- 
cgit v1.2.3


From b4c90db21fa378b8f5112de6aa4023789bfb07cf Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 20 Mar 2012 14:46:30 +0100
Subject: [imp] small simplification of field char, email & url

bzr revid: nicolas.vanhoren@openerp.com-20120320134630-vpm67t7rlhvftl58
---
 addons/web/static/src/xml/base.xml | 6 ++----
 1 file changed, 2 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 3f5e067285c..e741c491f4b 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -946,8 +946,6 @@
     <t t-if="!widget.get('effective_readonly')">
         <div t-attf-class="oe_form_field_#{widget.type}">
             <input t-att-type="widget.password ? 'password' : 'text'"
-                t-att-name="widget.name"
-                t-att-id="widget.id_for_label"
                 t-attf-class="oe_field_#{widget.type} #{_(['integer', 'float', 'float_time']).contains(widget.type) ? 'oe-number' : ''}"
             /><img class="oe_field_translate oe_input_icon" t-if="widget.field.translate" t-att-src='_s + "/web/static/src/img/icons/terp-translate.png"' width="16" height="16" border="0"/>
         </div>
@@ -962,7 +960,7 @@
         <table t-attf-class="oe_form_field_#{widget.type}" cellpadding="0" cellspacing="0" border="0">
         <tr>
             <td>
-                <t t-call="FieldChar"/>
+                <input/>
             </td>
             <td width="16">
                 <button class="oe_button oe_field_button" type="button" title="Send an e-mail with your default e-mail client">
@@ -983,7 +981,7 @@
         <table t-attf-class="oe_form_field_#{widget.type}" cellpadding="0" cellspacing="0" border="0">
         <tr>
             <td>
-                <t t-call="FieldChar"/>
+                <input/>
             </td>
             <td width="16">
                 <button class="oe_button oe_field_button" type="button" title="Open this resource">
-- 
cgit v1.2.3


From e2c7d8094a4880860901155c1c45a2dabdf17f24 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 20 Mar 2012 15:10:58 +0100
Subject: [revert] put back id_for_label

bzr revid: nicolas.vanhoren@openerp.com-20120320141058-u6c49whligxcc5i1
---
 addons/web/static/src/xml/base.xml | 5 +++--
 1 file changed, 3 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 e741c491f4b..3b6afc1b69d 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -946,6 +946,7 @@
     <t t-if="!widget.get('effective_readonly')">
         <div t-attf-class="oe_form_field_#{widget.type}">
             <input t-att-type="widget.password ? 'password' : 'text'"
+                t-att-id="widget.id_for_label"
                 t-attf-class="oe_field_#{widget.type} #{_(['integer', 'float', 'float_time']).contains(widget.type) ? 'oe-number' : ''}"
             /><img class="oe_field_translate oe_input_icon" t-if="widget.field.translate" t-att-src='_s + "/web/static/src/img/icons/terp-translate.png"' width="16" height="16" border="0"/>
         </div>
@@ -960,7 +961,7 @@
         <table t-attf-class="oe_form_field_#{widget.type}" cellpadding="0" cellspacing="0" border="0">
         <tr>
             <td>
-                <input/>
+                <input t-att-id="widget.id_for_label"/>
             </td>
             <td width="16">
                 <button class="oe_button oe_field_button" type="button" title="Send an e-mail with your default e-mail client">
@@ -981,7 +982,7 @@
         <table t-attf-class="oe_form_field_#{widget.type}" cellpadding="0" cellspacing="0" border="0">
         <tr>
             <td>
-                <input/>
+                <input t-att-id="widget.id_for_label"/>
             </td>
             <td width="16">
                 <button class="oe_button oe_field_button" type="button" title="Open this resource">
-- 
cgit v1.2.3


From 308855f3465fedb6173c33e3e665241d18a53e96 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 21 Mar 2012 11:53:36 +0100
Subject: [IMP] Support for legacy mode

bzr revid: fme@openerp.com-20120321105336-ihibsp7qgqa1kstv
---
 addons/web/static/src/xml/base.xml | 12 ++++++++++--
 1 file changed, 10 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 3b6afc1b69d..d8598d8ec2d 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -726,7 +726,7 @@
                 </t>
             </div>
         </div>
-        <div class="oe_form_content"/>
+        <div class="oe_form_container"/>
     </div>
 </t>
 <t t-name="One2Many.formview" t-extend="FormView">
@@ -833,6 +833,12 @@
     </table>
 </form>
 
+<t t-name="FormRenderingRoot">
+    <div class="oe_form">
+        <h3 style="display: none"><!-- TODO: check how 'string' should be used in new layout --><t t-esc="string"/></h3>
+        <group t-if="legacy_mode" col="4"/>
+    </div>
+</t>
 <t t-name="FormRenderingGroup">
     <t t-set="table">
         <table border="0" cellpadding="0" cellspacing="0" width="100%"/>
@@ -859,7 +865,9 @@
     </div>
 </t>
 <t t-name="FormRenderingNotebookPage">
-    <div class="oe_form_notebook_page" t-att-id="id"/>
+    <div class="oe_form_notebook_page" t-att-id="id">
+        <group t-if="legacy_mode" col="4"/>
+    </div>
 </t>
 <t t-name="FormRenderingSeparator">
     <div class="oe_horizontal_separator">
-- 
cgit v1.2.3


From 1977f84ff28a6e38ee5ec4c2a61832a4e6258239 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 21 Mar 2012 16:57:22 +0100
Subject: [FIX] RenderingEngine: Fixed process_form, removed process_html

bzr revid: fme@openerp.com-20120321155722-a3flfksq8gjonxf4
---
 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 d8598d8ec2d..ea3e198e9ef 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -726,6 +726,7 @@
                 </t>
             </div>
         </div>
+        <div style="clear: both;"/>
         <div class="oe_form_container"/>
     </div>
 </t>
@@ -833,9 +834,8 @@
     </table>
 </form>
 
-<t t-name="FormRenderingRoot">
+<t t-name="FormRenderingForm">
     <div class="oe_form">
-        <h3 style="display: none"><!-- TODO: check how 'string' should be used in new layout --><t t-esc="string"/></h3>
         <group t-if="legacy_mode" col="4"/>
     </div>
 </t>
-- 
cgit v1.2.3


From 500e73d56316110dd5d1b723fe436fae4beb88e1 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 22 Mar 2012 12:19:12 +0100
Subject: [IMP] Change dom of chrome

bzr revid: fme@openerp.com-20120322111912-amvslup7pvfwkbuk
---
 addons/web/static/src/xml/base.xml | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 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 ea3e198e9ef..4ac29e0d116 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -24,16 +24,19 @@
             <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>
 
-            <div class="oe_secondary_menus_container"/>
-
-            <div class="oe_footer">
-                Powered by <a href="http://www.openerp.com"><span>Open</span>ERP</a>
+        <div class="oe_main">
+            <div class="oe_leftbarbg"/>
+            <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"/>
+                <div class="oe_footer">
+                    Powered by <a href="http://www.openerp.com"><span>Open</span>ERP</a>
+                </div>
             </div>
+            <div class="oe_application"/>
         </div>
-        <div class="oe_application"/>
+
     </div>
 </t>
 <t t-name="Loading">
-- 
cgit v1.2.3


From d4ec427f0168d57777b61fec4c941ea874ffcc02 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 22 Mar 2012 21:46:34 +0100
Subject: [FIX] Fixed css

bzr revid: fme@openerp.com-20120322204634-8o3o81oton9a4fqj
---
 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 4ac29e0d116..a6704ad659b 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -958,7 +958,7 @@
         <div t-attf-class="oe_form_field_#{widget.type}">
             <input t-att-type="widget.password ? 'password' : 'text'"
                 t-att-id="widget.id_for_label"
-                t-attf-class="oe_field_#{widget.type} #{_(['integer', 'float', 'float_time']).contains(widget.type) ? 'oe-number' : ''}"
+                t-attf-class="field_#{widget.type} #{_(['integer', 'float', 'float_time']).contains(widget.type) ? 'oe-number' : ''}"
             /><img class="oe_field_translate oe_input_icon" t-if="widget.field.translate" t-att-src='_s + "/web/static/src/img/icons/terp-translate.png"' width="16" height="16" border="0"/>
         </div>
     </t>
@@ -972,7 +972,7 @@
         <table t-attf-class="oe_form_field_#{widget.type}" cellpadding="0" cellspacing="0" border="0">
         <tr>
             <td>
-                <input t-att-id="widget.id_for_label"/>
+                <input type="text" t-att-id="widget.id_for_label"/>
             </td>
             <td width="16">
                 <button class="oe_button oe_field_button" type="button" title="Send an e-mail with your default e-mail client">
@@ -993,7 +993,7 @@
         <table t-attf-class="oe_form_field_#{widget.type}" cellpadding="0" cellspacing="0" border="0">
         <tr>
             <td>
-                <input t-att-id="widget.id_for_label"/>
+                <input type="text" t-att-id="widget.id_for_label"/>
             </td>
             <td width="16">
                 <button class="oe_button oe_field_button" type="button" title="Open this resource">
@@ -1051,7 +1051,7 @@
         <table t-attf-class="oe_form_field_#{widget.type}" cellpadding="0" cellspacing="0" border="0">
         <tr>
             <td valign="top">
-                <t t-call="FieldChar"/>
+                <input type="text" t-att-id="widget.id_for_label"/>
                 <span class="oe-m2o-drop-down-button">
                     <img t-att-src='_s + "/web/static/src/img/down-arrow.png"' /></span>
             </td>
@@ -1103,6 +1103,7 @@
 <t t-name="FieldBoolean">
     <div t-attf-class="oe_form_field_#{widget.type}">
         <input type="checkbox"
+            t-att-id="widget.id_for_label"
             t-att-name="widget.name"
             t-attf-class="field_#{widget.type}"/>
     </div>
-- 
cgit v1.2.3


From 2a9cde48c863880a06770ae0cce74e8995dec4e8 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Fri, 23 Mar 2012 16:04:48 +0100
Subject: [imp] default value for "value" in the fields

bzr revid: nicolas.vanhoren@openerp.com-20120323150448-om2trotjpbee5j9o
---
 addons/web/static/src/xml/base.xml | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 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 a6704ad659b..809ed991cd9 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1116,14 +1116,8 @@
 <t t-name="FieldBinaryImage">
     <table t-attf-class="oe_form_field_#{widget.type}" cellpadding="0" cellspacing="0" border="0">
     <tr>
-        <td align="center">
-            <img t-att-src='_s + "/web/static/src/img/placeholder.png"' class="oe-binary-image"
-                t-att-border="widget.readonly ? 0 : 1"
-                t-att-name="widget.name"
-                t-attf-class="field_#{widget.type}"
-                t-att-width="widget.node.attrs.img_width || widget.node.attrs.width"
-                t-att-height="widget.node.attrs.img_height || widget.node.attrs.height"
-            />
+        <td class="oe_form_field-binary-image-placeholder" align="center">
+
         </td>
     </tr>
     <tr>
@@ -1161,6 +1155,16 @@
     </tr>
     </table>
 </t>
+<t t-name="FieldBinaryImage-img">
+    <img t-att-src='url' class="oe-binary-image"
+        t-att-border="widget.readonly ? 0 : 1"
+        t-att-name="widget.name"
+        t-attf-class="field_#{widget.type}"
+        t-att-width="widget.node.attrs.img_width || widget.node.attrs.width"
+        t-att-height="widget.node.attrs.img_height || widget.node.attrs.height"
+        t-att-style="'max-width: ' + (widget.$element.width() > 60 ? widget.$element.width() : 60) + 'px'"
+    />
+</t>
 <t t-name="FieldBinaryFile">
     <t t-if="!widget.get('effective_readonly')">
         <table t-attf-class="oe_form_field_#{widget.type}" cellpadding="0" cellspacing="0" border="0">
-- 
cgit v1.2.3


From 6d90ea0966b658d665d421dae10eb21fe943461f Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 26 Mar 2012 11:33:47 +0200
Subject: [FIX] Fixed layout debugging

bzr revid: fme@openerp.com-20120326093347-dop01vdrwf7dok0b
---
 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 809ed991cd9..de76cd00af5 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1055,7 +1055,7 @@
                 <span class="oe-m2o-drop-down-button">
                     <img t-att-src='_s + "/web/static/src/img/down-arrow.png"' /></span>
             </td>
-            <td>
+            <td width="16">
                 <button class="oe_button oe_field_button oe-m2o-cm-button" t-att-id="widget.name + '_open'">
                     <img t-att-src='_s + "/web/static/src/img/icons/STOCK_DIRECTORY_MENU.png"'/>
                 </button>
-- 
cgit v1.2.3


From 0c9cae3f6a468d515125ae7feb8f01f5d66eba71 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 26 Mar 2012 14:29:50 +0200
Subject: [FIX] Fixed some styling issues

bzr revid: fme@openerp.com-20120326122950-m7s3t27dz1qmi8bc
---
 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 f0494bb9380..e1e2a62eec9 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -790,7 +790,7 @@
                     Default:
                 </label>
             </td>
-            <td class="required">
+            <td class="oe_form_required">
                 <select id="formview_default_fields">
                     <option value=""/>
                     <option t-foreach="args.fields" t-as="field"
-- 
cgit v1.2.3


From b4fed179b3a4f6fd83ac8c2db414d35b823d4467 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 26 Mar 2012 16:19:15 +0200
Subject: [FIX] Fix translation dialog

bzr revid: fme@openerp.com-20120326141915-po8ct49xk0una0o1
---
 addons/web/static/src/xml/base.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 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 e1e2a62eec9..71976062d46 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -520,20 +520,20 @@
 </t>
 
 <t t-name="TranslateDialog">
-    <table t-if="widget.view.translatable_fields" class="oe_frame oe_forms oe_translation_form" border="0" cellpadding="0" cellspacing="0" width="100%">
+    <table t-if="widget.view.translatable_fields" class="oe_form oe_translation_form" border="0" cellpadding="0" cellspacing="0" width="100%">
     <tr>
         <td class="oe_form_separator" width="1%" nowrap="nowrap">
-            <div class="separator horizontal">Field</div>
+            <div class="oe_horizontal_separator">Field</div>
         </td>
         <th t-foreach="widget.languages" align="left">
-            <div class="separator horizontal"><t t-esc="name"/></div>
+            <div class="oe_horizontal_separator"><t t-esc="name"/></div>
         </th>
     </tr>
     <tr t-foreach="widget.view.translatable_fields" t-as="field" t-att-data-field="field.name">
-        <td class="oe_form_frame_cell" width="1%" nowrap="nowrap">
-            <label class="oe_label"><t t-esc="field.string"/>:</label>
+        <td class="oe_form_group_cell" width="1%" nowrap="nowrap">
+            <label class="oe_label"><t t-esc="field.node.attrs.string"/>:</label>
         </td>
-        <td t-foreach="widget.languages" t-as="lg" class="oe_form_frame_cell">
+        <td t-foreach="widget.languages" t-as="lg" class="oe_form_group_cell">
             <input t-if="field.type == 'char'" type="text" t-attf-name="#{lg.code}-#{field.name}" value="" data-value="" class="oe_trad_field" style="width: 100%"/>
             <textarea t-if="field.type == 'text'" t-attf-name="#{lg.code}-#{field.name}" data-value="" class="oe_trad_field" style="width: 100%"></textarea>
         </td>
-- 
cgit v1.2.3


From c21f00ab815898892db68621a752882f137ecaa7 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 26 Mar 2012 16:50:17 +0200
Subject: [FIX] greatly simplify widgets-rendering routine of search view
 (basically remove all the rendering part), add basic drawer behavior

bzr revid: xmo@openerp.com-20120326145017-g1ydm1k93hipy2j5
---
 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 aff83cf342a..49eabad21de 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1299,10 +1299,11 @@
     <br t-if="attrs.string"/>
     <t t-esc="attrs.string"/>
 </button>
-<span t-name="SearchView.filters" class="filter_label_group"
-    ><t t-foreach="filters" t-as="filter"
-        ><t t-raw="filter.render(defaults)"/></t
-></span>
+<ul t-name="SearchView.filters">
+    <li t-foreach="widget.filters" t-as="filter">
+        <t t-esc="filter.attrs.string or filter.attrs.name or 'Ω'"/>
+    </li>
+</ul>
 <t t-name="SearchView.field">
     <label t-att-class="'oe_label' + (attrs.help ? '_help' : '')"
            t-att-title="attrs.help"
-- 
cgit v1.2.3


From 6df024535a133fbccd9ca1c2e02a4e0a37e4f694 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 27 Mar 2012 14:47:04 +0200
Subject: [imp] changed the way the ids are set for the labels

bzr revid: nicolas.vanhoren@openerp.com-20120327124704-iq4lyv7qr0szn02w
---
 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 71976062d46..ec199630aaa 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -878,7 +878,7 @@
     </div>
 </t>
 <t t-name="FormRenderingLabel">
-    <label  t-att-for="for"
+    <label  t-att-for="_for"
             t-att-title="help"
             t-attf-class="oe_form_label#{help ? '_help' : ''} oe_align_#{align}">
         <t t-esc="string"/>
-- 
cgit v1.2.3


From ce69d65531f163ba8bc0879e326518b100a7c723 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 27 Mar 2012 15:55:49 +0200
Subject: [ADD] Add support for @tabindex and @autofocus

bzr revid: fme@openerp.com-20120327135549-csu2y1ko2apnbk61
---
 addons/web/static/src/xml/base.xml | 45 ++++++++++++++++++++++++++++++--------
 1 file changed, 36 insertions(+), 9 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 ec199630aaa..a58ac1c5898 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -958,6 +958,8 @@
         <div t-attf-class="oe_form_field_#{widget.type}">
             <input t-att-type="widget.password ? 'password' : 'text'"
                 t-att-id="widget.id_for_label"
+                t-att-tabindex="widget.node.attrs.tabindex"
+                t-att-autofocus="widget.node.attrs.autofocus"
                 t-attf-class="field_#{widget.type} #{_(['integer', 'float', 'float_time']).contains(widget.type) ? 'oe-number' : ''}"
             /><img class="oe_field_translate oe_input_icon" t-if="widget.field.translate" t-att-src='_s + "/web/static/src/img/icons/terp-translate.png"' width="16" height="16" border="0"/>
         </div>
@@ -972,10 +974,14 @@
         <table t-attf-class="oe_form_field_#{widget.type}" cellpadding="0" cellspacing="0" border="0">
         <tr>
             <td>
-                <input type="text" t-att-id="widget.id_for_label"/>
+                <input type="text"
+                    t-att-id="widget.id_for_label"
+                    t-att-tabindex="widget.node.attrs.tabindex"
+                    t-att-autofocus="widget.node.attrs.autofocus"
+                />
             </td>
             <td width="16">
-                <button class="oe_button oe_field_button" type="button" title="Send an e-mail with your default e-mail client">
+                <button class="oe_button oe_field_button" tabindex="-1" type="button" title="Send an e-mail with your default e-mail client">
                     <img t-att-src='_s + "/web/static/src/img/icons/terp-mail-message-new.png"'/>
                 </button>
             </td>
@@ -993,10 +999,14 @@
         <table t-attf-class="oe_form_field_#{widget.type}" cellpadding="0" cellspacing="0" border="0">
         <tr>
             <td>
-                <input type="text" t-att-id="widget.id_for_label"/>
+                <input type="text"
+                    t-att-id="widget.id_for_label"
+                    t-att-tabindex="widget.node.attrs.tabindex"
+                    t-att-autofocus="widget.node.attrs.autofocus"
+                />
             </td>
             <td width="16">
-                <button class="oe_button oe_field_button" type="button" title="Open this resource">
+                <button class="oe_button oe_field_button" tabindex="-1" type="button" title="Open this resource">
                     <img t-att-src='_s + "/web/static/src/img/icons/gtk-ok.png"'/>
                 </button>
             </td>
@@ -1015,6 +1025,8 @@
             <textarea rows="6"
                 t-att-name="widget.name"
                 t-attf-class="field_#{widget.type}"
+                t-att-tabindex="widget.node.attrs.tabindex"
+                t-att-autofocus="widget.node.attrs.autofocus"
             ></textarea><img class="oe_field_translate oe_input_icon" t-if="widget.field.translate" t-att-src='_s + "/web/static/src/img/icons/terp-translate.png"' width="16" height="16" border="0"/>
         </div>
     </t>
@@ -1034,6 +1046,8 @@
         <div t-attf-class="oe_form_field_#{widget.type}">
             <select
                 t-att-name="widget.name"
+                t-att-tabindex="widget.node.attrs.tabindex"
+                t-att-autofocus="widget.node.attrs.autofocus"
                 t-att-id="widget.id_for_label">
                     <t t-foreach="widget.values" t-as="option">
                         <option><t t-esc="option[1]"/></option>
@@ -1051,7 +1065,11 @@
         <table t-attf-class="oe_form_field_#{widget.type}" cellpadding="0" cellspacing="0" border="0">
         <tr>
             <td valign="top">
-                <input type="text" t-att-id="widget.id_for_label"/>
+                <input type="text"
+                    t-att-id="widget.id_for_label"
+                    t-att-tabindex="widget.node.attrs.tabindex"
+                    t-att-autofocus="widget.node.attrs.autofocus"
+                />
                 <span class="oe-m2o-drop-down-button">
                     <img t-att-src='_s + "/web/static/src/img/down-arrow.png"' /></span>
             </td>
@@ -1101,12 +1119,14 @@
     </t>
 </t>
 <t t-name="FieldBoolean">
-    <div t-attf-class="oe_form_field_#{widget.type}">
+    <span t-attf-class="oe_form_field_#{widget.type}">
         <input type="checkbox"
             t-att-id="widget.id_for_label"
             t-att-name="widget.name"
+            t-att-tabindex="widget.node.attrs.tabindex"
+            t-att-autofocus="widget.node.attrs.autofocus"
             t-attf-class="field_#{widget.type}"/>
-    </div>
+    </span>
 </t>
 <t t-name="FieldProgressBar">
     <div t-attf-class="oe_form_field_#{widget.type}" t-opentag="true">
@@ -1134,7 +1154,10 @@
                                 <button class="oe_button" type="button" title="Set Image">
                                     <img t-att-src='_s + "/web/static/src/img/icons/STOCK_DIRECTORY.png"'/>
                                 </button>
-                                <input type="file" class="oe-binary-file" name="ufile"/>
+                                <input type="file" class="oe-binary-file" name="ufile"
+                                    t-att-tabindex="widget.node.attrs.tabindex"
+                                    t-att-autofocus="widget.node.attrs.autofocus"
+                                />
                             </form>
                         </div>
                     </td>
@@ -1172,6 +1195,8 @@
             <td>
                 <input type="text" size="1" readonly="readonly"
                     t-att-name="widget.name"
+                    t-att-tabindex="widget.node.attrs.tabindex"
+                    t-att-autofocus="widget.node.attrs.autofocus"
                     t-attf-class="field_#{widget.type}"
                 />
             </td>
@@ -1222,7 +1247,9 @@
     </t>
 </t>
 <t t-name="WidgetButton">
-    <button type="button" class="oe_button oe_form_button">
+    <button type="button" class="oe_button oe_form_button"
+        t-att-tabindex="widget.node.attrs.tabindex"
+        t-att-autofocus="widget.node.attrs.autofocus">
         <img t-if="widget.node.attrs.icon" t-att-src="_s + '/web/static/src/img/icons/' + widget.node.attrs.icon + '.png'" width="16" height="16"/>
         <span t-if="widget.string"><t t-esc="widget.string"/></span>
     </button>
-- 
cgit v1.2.3


From c94bfd8bf960f2226aa3303b063044145393d76f Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 27 Mar 2012 17:08:11 +0200
Subject: [IMP] use qweb templates for read-only facets

bzr revid: xmo@openerp.com-20120327150811-v9urpm5j6hosesoz
---
 addons/web/static/src/xml/base.xml | 9 +++++++++
 1 file changed, 9 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 49eabad21de..f866dcdde6a 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1304,6 +1304,15 @@
         <t t-esc="filter.attrs.string or filter.attrs.name or 'Ω'"/>
     </li>
 </ul>
+<t t-name="SearchView.filters.facet">
+    <div class="category oe_filter_category"><t t-esc="facet.get('category')"/></div>
+
+    <div class="search_facet_input_container">
+        <t t-esc="facet.get('value')"/>
+    </div>
+
+    <div class="search_facet_remove VS-icon VS-icon-cancel"/>
+</t>
 <t t-name="SearchView.field">
     <label t-att-class="'oe_label' + (attrs.help ? '_help' : '')"
            t-att-title="attrs.help"
-- 
cgit v1.2.3


From 078c2a4e8e10167264178a187f498197fd999f72 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 27 Mar 2012 18:25:13 +0200
Subject: [imp] editable list wip

bzr revid: nicolas.vanhoren@openerp.com-20120327162513-7d4a58skbe0inv8n
---
 addons/web/static/src/xml/base.xml | 19 -------------------
 1 file changed, 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 a58ac1c5898..1bbdea327e8 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -711,10 +711,6 @@
         <button type="button" name="delete"></button>
     </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">
     <div class="oe_formview">
@@ -1545,21 +1541,6 @@
         <td t-if="edited and !options.deletable" class="oe-listview-padding"/>
     </t>
 </t>
-<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-valign="td.table ? 'top' : undefined"
-                t-attf-class="oe_form_frame_cell #{td.classname} #{td.element_class} oe-field-cell"
-            >
-                <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">
         <t t-call="view_editor.row"/>
-- 
cgit v1.2.3


From d6d9e2602de2a7467fad2e2cbb3eb4e2208aae33 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Wed, 28 Mar 2012 00:20:41 +0200
Subject: sane table based layouting for oe_main

bzr revid: al@openerp.com-20120327222041-kum3fp8nopnnbcdp
---
 addons/web/static/src/xml/base.xml | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 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 1bbdea327e8..100689bd22c 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -24,19 +24,19 @@
             <div class="oe_user_menu_placeholder"/>
             <div class="oe_systray"/>
         </div>
-
-        <div class="oe_main">
-            <div class="oe_leftbarbg"/>
-            <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"/>
-                <div class="oe_footer">
-                    Powered by <a href="http://www.openerp.com"><span>Open</span>ERP</a>
-                </div>
-            </div>
-            <div class="oe_application"/>
-        </div>
-
+        <table class="oe_main">
+            <tr>
+                <td class="oe_leftbar" valign="top">
+                    <a href="#" class="oe_logo"><img t-att-src='_s + "/web/static/src/img/logo.png"'/></a>
+                    <div class="oe_secondary_menus_container"/>
+                    <div class="oe_footer">
+                        Powered by <a href="http://www.openerp.com"><span>Open</span>ERP</a>
+                    </div>
+                </td>
+                <td class="oe_application">
+                </td>
+            </tr>
+        </table>
     </div>
 </t>
 <t t-name="Loading">
-- 
cgit v1.2.3


From 11fc6edd1b7770a2596ab055cb77857f3a8714d7 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 28 Mar 2012 12:41:18 +0200
Subject: [FIX] oe_form class should be root of form_view. Form Page layout is
 renamed to oe_form_page

bzr revid: fme@openerp.com-20120328104118-gjzgatblytqjtrkg
---
 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 482b189e56b..dc4f9387649 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -840,7 +840,7 @@
 </form>
 
 <t t-name="FormRenderingForm">
-    <div class="oe_form">
+    <div class="oe_form_page">
         <group t-if="legacy_mode" col="4"/>
     </div>
 </t>
-- 
cgit v1.2.3


From 4f3ed6b677a4af16d16604f39f647749dc9804a8 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Wed, 28 Mar 2012 15:17:35 +0200
Subject: css part1

bzr revid: al@openerp.com-20120328131735-2c7raapt12f5jb3x
---
 addons/web/static/src/xml/base.xml | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 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 dc4f9387649..1065072cdab 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -840,7 +840,7 @@
 </form>
 
 <t t-name="FormRenderingForm">
-    <div class="oe_form_page">
+    <div class="oe_form_form">
         <group t-if="legacy_mode" col="4"/>
     </div>
 </t>
@@ -1135,6 +1135,17 @@
         <span></span>
     </div>
 </t>
+<t t-name="FieldStatus.content">
+    <ul class="oe_form_steps">
+        <t t-set="size" t-value="widget.to_show.length"/>
+        <t t-foreach="_.range(size)" t-as="i">
+            <li t-att-class="widget.to_show[i][0] === widget.selected_value ? 'oe_form_steps_active' : ''">
+                <t t-esc="widget.to_show[i][1]"/>
+                <img t-att-src='_s + "/web/static/src/img/form_steps.png"' class="oe_form_steps_arrow" t-if="i &lt; size - 1"/>
+            </li>
+        </t>
+    </ul>
+</t>
 <t t-name="FieldBinaryImage">
     <table cellpadding="0" cellspacing="0" border="0" width="100%">
     <tr>
@@ -1832,16 +1843,6 @@
         </p>
     </div>
 </t>
-<t t-name="FieldStatus.content">
-    <ul class="oe-arrow-list">
-        <t t-set="size" t-value="widget.to_show.length"/>
-        <t t-foreach="_.range(size)" t-as="i">
-            <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>
-</t>
 <t t-name="EmptyComponent">
     <div></div>
 </t>
-- 
cgit v1.2.3


From c2f7961915ae46d52a898e615e9cfb72504ee5fd Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Wed, 28 Mar 2012 16:37:20 +0200
Subject: css part2

bzr revid: al@openerp.com-20120328143720-tcgbovoukqsyerxc
---
 addons/web/static/src/xml/base.xml | 6 ++++--
 1 file changed, 4 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 1065072cdab..3a6df378dfc 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -840,8 +840,10 @@
 </form>
 
 <t t-name="FormRenderingForm">
-    <div class="oe_form_form">
-        <group t-if="legacy_mode" col="4"/>
+    <div class="oe_form_sheetbg">
+        <div class="oe_form_sheet oe_form_sheet_width">
+            <group t-if="legacy_mode" col="4"/>
+        </div>
     </div>
 </t>
 <t t-name="FormRenderingGroup">
-- 
cgit v1.2.3


From 720e7e424a649a12bf41c9dfc87c322a9a2fdb46 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 28 Mar 2012 17:37:06 +0200
Subject: [IMP] rendering of filter facets

bzr revid: xmo@openerp.com-20120328153706-qrcqvgmazuzonfvn
---
 addons/web/static/src/xml/base.xml | 5 +++--
 1 file changed, 3 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 f866dcdde6a..e900f5fbf5a 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1307,8 +1307,9 @@
 <t t-name="SearchView.filters.facet">
     <div class="category oe_filter_category"><t t-esc="facet.get('category')"/></div>
 
-    <div class="search_facet_input_container">
-        <t t-esc="facet.get('value')"/>
+    <div class="search_facet_input_container"
+            t-foreach="facet.get('json')" t-as="filter">
+        <t t-esc="filter.attrs.string || filter.attrs.name"/>
     </div>
 
     <div class="search_facet_remove VS-icon VS-icon-cancel"/>
-- 
cgit v1.2.3


From df7c5535c41f8f51de5034b055eddefed81beb56 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 29 Mar 2012 12:20:48 +0200
Subject: [imp] cleaned fields classes

bzr revid: nicolas.vanhoren@openerp.com-20120329102048-jqtdcuqm5ayuvobg
---
 addons/web/static/src/xml/base.xml | 37 ++++++++++++++++++-------------------
 1 file changed, 18 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 3a6df378dfc..91a004e43c6 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -959,23 +959,23 @@
 </t>
 <t t-name="FieldChar">
     <t t-if="!widget.get('effective_readonly')">
-        <div t-attf-class="oe_form_field_#{widget.type}">
+        <div class="oe_form_field_char">
             <input t-att-type="widget.password ? 'password' : 'text'"
                 t-att-id="widget.id_for_label"
                 t-att-tabindex="widget.node.attrs.tabindex"
                 t-att-autofocus="widget.node.attrs.autofocus"
-                t-attf-class="field_#{widget.type} #{_(['integer', 'float', 'float_time']).contains(widget.type) ? 'oe-number' : ''}"
+                t-attf-class="field_char #{widget.is_field_number ? 'oe-number' : ''}"
             /><img class="oe_field_translate oe_input_icon" t-if="widget.field.translate" t-att-src='_s + "/web/static/src/img/icons/terp-translate.png"' width="16" height="16" border="0"/>
         </div>
     </t>
     <t t-if="widget.get('effective_readonly')">
-        <div t-attf-class="field_#{widget.type} #{_(['integer', 'float', 'float_time']).contains(widget.type) ? 'oe-number' : ''}">
+        <div t-attf-class="oe_form_field_char #{widget.is_field_number ? 'oe-number' : ''}">
         </div>
     </t>
 </t>
 <t t-name="FieldEmail">
     <t t-if="!widget.get('effective_readonly')">
-        <table t-attf-class="oe_form_field_#{widget.type}" cellpadding="0" cellspacing="0" border="0">
+        <table class="oe_form_field_email" cellpadding="0" cellspacing="0" border="0">
         <tr>
             <td>
                 <input type="text"
@@ -1000,7 +1000,7 @@
 </t>
 <t t-name="FieldUrl">
     <t t-if="!widget.get('effective_readonly')">
-        <table t-attf-class="oe_form_field_#{widget.type}" cellpadding="0" cellspacing="0" border="0">
+        <table class="oe_form_field_url" cellpadding="0" cellspacing="0" border="0">
         <tr>
             <td>
                 <input type="text"
@@ -1025,10 +1025,10 @@
 </t>
 <t t-name="FieldText">
     <t t-if="!widget.get('effective_readonly')">
-        <div t-attf-class="oe_form_field_#{widget.type}">
+        <div class="oe_form_field_text">
             <textarea rows="6"
                 t-att-name="widget.name"
-                t-attf-class="field_#{widget.type}"
+                class="field_text"
                 t-att-tabindex="widget.node.attrs.tabindex"
                 t-att-autofocus="widget.node.attrs.autofocus"
             ></textarea><img class="oe_field_translate oe_input_icon" t-if="widget.field.translate" t-att-src='_s + "/web/static/src/img/icons/terp-translate.png"' width="16" height="16" border="0"/>
@@ -1036,7 +1036,7 @@
     </t>
 </t>
 <t t-name="web.datetimepicker">
-    <div class="oe_datepicker_root" t-attf-class="oe_form_field_#{widget.type}">
+    <div class="oe_datepicker_root oe_form_field_datetime">
         <input type="text" class="oe_datepicker_container" disabled="disabled" style="display: none;"/>
         <input type="text"
             t-att-name="widget.name"
@@ -1047,7 +1047,7 @@
 </t>
 <t t-name="FieldSelection">
     <t t-if="!widget.get('effective_readonly')">
-        <div t-attf-class="oe_form_field_#{widget.type}">
+        <div class="oe_form_field_selection">
             <select
                 t-att-name="widget.name"
                 t-att-tabindex="widget.node.attrs.tabindex"
@@ -1060,13 +1060,13 @@
         </div>
     </t>
     <t t-if="widget.get('effective_readonly')">
-        <div t-attf-class="field_#{widget.type} #{_(['integer', 'float', 'float_time']).contains(widget.type) ? 'oe-number' : ''}">
+        <div class="field_selection">
         </div>
     </t>
 </t>
 <t t-name="FieldMany2One">
     <t t-if="!widget.get('effective_readonly')">
-        <table t-attf-class="oe_form_field_#{widget.type}" cellpadding="0" cellspacing="0" border="0">
+        <table class="oe_form_field_many2one" cellpadding="0" cellspacing="0" border="0">
         <tr>
             <td valign="top">
                 <input type="text"
@@ -1109,7 +1109,7 @@
 </t>
 <t t-name="FieldReference">
     <t t-if="!widget.get('effective_readonly')">
-        <table t-attf-class="oe_form_field_#{widget.type}" border="0" cellpadding="0" cellspacing="0" class="oe_frame oe_forms">
+        <table class="oe_form_field_reference oe_frame oe_forms" border="0" cellpadding="0" cellspacing="0">
         <tr>
             <td t-attf-class="oe_form_frame_cell oe_form_selection oe_form_view_reference_selection">
             </td>
@@ -1123,17 +1123,17 @@
     </t>
 </t>
 <t t-name="FieldBoolean">
-    <span t-attf-class="oe_form_field_#{widget.type}">
+    <span class="oe_form_field_boolean">
         <input type="checkbox"
             t-att-id="widget.id_for_label"
             t-att-name="widget.name"
             t-att-tabindex="widget.node.attrs.tabindex"
             t-att-autofocus="widget.node.attrs.autofocus"
-            t-attf-class="field_#{widget.type}"/>
+            class="field_boolean"/>
     </span>
 </t>
 <t t-name="FieldProgressBar">
-    <div t-attf-class="oe_form_field_#{widget.type}" t-opentag="true">
+    <div class="oe_form_field_progressbar" t-opentag="true">
         <span></span>
     </div>
 </t>
@@ -1194,10 +1194,9 @@
     </table>
 </t>
 <t t-name="FieldBinaryImage-img">
-    <img t-att-src='url' class="oe-binary-image"
+    <img t-att-src='url' class="oe-binary-image field_image"
         t-att-border="widget.readonly ? 0 : 1"
         t-att-name="widget.name"
-        t-attf-class="field_#{widget.type}"
         t-att-width="widget.node.attrs.img_width || widget.node.attrs.width"
         t-att-height="widget.node.attrs.img_height || widget.node.attrs.height"
         t-att-style="'max-width: ' + (widget.$element.width() > 60 ? widget.$element.width() : 60) + 'px'"
@@ -1205,14 +1204,14 @@
 </t>
 <t t-name="FieldBinaryFile">
     <t t-if="!widget.get('effective_readonly')">
-        <table t-attf-class="oe_form_field_#{widget.type}" cellpadding="0" cellspacing="0" border="0">
+        <table class="oe_form_field_binary" cellpadding="0" cellspacing="0" border="0">
         <tr>
             <td>
                 <input type="text" size="1" readonly="readonly"
                     t-att-name="widget.name"
                     t-att-tabindex="widget.node.attrs.tabindex"
                     t-att-autofocus="widget.node.attrs.autofocus"
-                    t-attf-class="field_#{widget.type}"
+                    class="field_binary"
                 />
             </td>
             <td class="oe-binary" nowrap="true">
-- 
cgit v1.2.3


From 948c888afb15746a78887f966c654792509b2286 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 29 Mar 2012 16:31:13 +0200
Subject: [IMP] Extend table to the whole chrome

bzr revid: fme@openerp.com-20120329143113-fhpks1tol8lso09s
---
 addons/web/static/src/xml/base.xml | 12 +++++++-----
 1 file changed, 7 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 91a004e43c6..f8fafc3b07a 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -19,12 +19,14 @@
 </t>
 <t t-name="WebClient">
     <div class="oe_webclient">
-        <div class="oe_topbar">
-            <div class="oe_menu_placeholder"/>
-            <div class="oe_user_menu_placeholder"/>
-            <div class="oe_systray"/>
-        </div>
         <table class="oe_main">
+            <tr>
+                <td colspan="2" class="oe_topbar">
+                    <div class="oe_menu_placeholder"/>
+                    <div class="oe_user_menu_placeholder"/>
+                    <div class="oe_systray"/>
+                </td>
+            </tr>
             <tr>
                 <td class="oe_leftbar" valign="top">
                     <a href="#" class="oe_logo"><img t-att-src='_s + "/web/static/src/img/logo.png"'/></a>
-- 
cgit v1.2.3


From f8510eee62b6389e231f1b7fc76e62545f8061ed Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Fri, 30 Mar 2012 16:27:31 +0530
Subject: [IMP] Improved code to show need action counter

bzr revid: tpa@tinyerp.com-20120330105731-ss03y3l4fi5mq3jd
---
 addons/web/static/src/xml/base.xml | 5 +++++
 1 file changed, 5 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 894f7353c1a..fdef85aae5d 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -368,6 +368,11 @@
         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"/>
+        <t t-if="menu.uses_needaction == true">
+            <div class="oe_menu_counter">
+                <t t-esc="menu.needaction_uid_ctr"/>
+            </div>
+        </t>
     </a>
 </t>
 
-- 
cgit v1.2.3


From a3a5ea21ed063492df027edb641790f8e6fa919f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 30 Mar 2012 14:59:28 +0200
Subject: [IMP] Propagated ir.ui.menu new fields name change.

bzr revid: tde@openerp.com-20120330125928-ku9oqpb0pq4ehu6m
---
 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 fdef85aae5d..80e097e4a5e 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -368,9 +368,9 @@
         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"/>
-        <t t-if="menu.uses_needaction == true">
+        <t t-if="menu.needaction_enabled">
             <div class="oe_menu_counter">
-                <t t-esc="menu.needaction_uid_ctr"/>
+                <t t-esc="menu.needaction_counter"/>
             </div>
         </t>
     </a>
-- 
cgit v1.2.3


From 93e70362e59b42936242be9c7fbc034843bd34b9 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Fri, 30 Mar 2012 17:42:27 +0200
Subject: [ADD] groundworks for advanced search

* Possible to add an advanced search domain
* Looks like shit
* The facet itself uses a hardcoded name
* Quite a few hacks

bzr revid: xmo@openerp.com-20120330154227-gw1640rbb3rs9x5m
---
 addons/web/static/src/xml/base.xml | 41 +++++++++++---------------------------
 1 file changed, 12 insertions(+), 29 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 4849df01fd5..a538ed01196 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1377,8 +1377,7 @@
     </div>
 </t>
 <t t-name="SearchView.util.expand">
-    <div t-att-class="'searchview_group ' + (expand == '0' ? 'folded' : 'expanded')"
-         t-att-id="element_id">
+    <div t-att-class="'searchview_group ' + (expand == '0' ? 'folded' : 'expanded')">
         <a t-if="label" class="searchview_group_string" href="#">
             <t t-esc="label"/>
         </a>
@@ -1396,34 +1395,18 @@
         </t>
     </t>
 </t>
-<t t-name="SearchView.extended_search">
-    <t t-call="SearchView.util.expand">
-        <t t-set="expand" t-value="false"/>
-        <t t-set="label">Advanced Filters</t>
-        <t t-set="content">
-            <div class="searchview_extended_groups_list">
-            </div>
-        </t>
-    </t>
-</t>
-<t t-name="SearchView.extended_search.group">
-    <div t-att-id="widget.element_id" class="searchview_extended_group">
-        <select class="searchview_extended_group_choice">
-            <option value="any">Any of the following conditions must match</option>
-            <option value="all">All the following conditions must match</option>
-            <option value="none">None of the following conditions must match</option>
-        </select>
-        <a class="searchview_extended_delete_group"
-                href="javascript:void(0)"><span></span></a>
-        <div class="searchview_extended_propositions_list">
-        </div>
-        <a class="searchview_extended_add_proposition" href="javascript:void(0)">
-            <span>Add condition</span></a>
-        <div class="oe_adv_filters_and"><span>and</span></div>
+<div t-name="SearchView.advanced" class="oe_searchview_advanced">
+    <h4>Advanced Search...</h4>
+    <div>
+        <ul>
+
+        </ul>
+        <button class="oe_add_condition">Add a condition</button>
+        <button class="oe_apply">Apply</button>
     </div>
-</t>
+</div>
 <t t-name="SearchView.extended_search.proposition">
-    <div t-att-id="widget.element_id">
+    <li>
         <select class="searchview_extended_prop_field">
             <t t-foreach="widget.attrs.fields" t-as="field">
                 <option t-if="typeof field.store === 'undefined' || field.store || field.fnct_search"
@@ -1437,7 +1420,7 @@
         <span class="searchview_extended_prop_value"/>
         <a class="searchview_extended_delete_prop"
                 href="javascript:void(0)"><span> </span></a>
-    </div>
+    </li>
 </t>
 <t t-name="SearchView.extended_search.proposition.char">
     <input t-att-id="widget.element_id" class="field_char"/>
-- 
cgit v1.2.3


From a5aa1bc1a7c7f5aeee290ccb5e5fdec9cd28a00c Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Sun, 1 Apr 2012 23:55:07 +0200
Subject: notebook styling

bzr revid: al@openerp.com-20120401215507-yxxvpphhm788fq8f
---
 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 f8fafc3b07a..b6386bbf938 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -863,8 +863,8 @@
     </t>
 </t>
 <t t-name="FormRenderingNotebook">
-    <div class="oe_form_notebook">
-        <ul>
+    <div>
+        <ul class="oe_form_notebook">
             <li t-foreach="pages" t-as="page">
                 <a t-attf-href="##{page.id}">
                     <t t-esc="page.string"/>
-- 
cgit v1.2.3


From 7f1eecc8d36a69716892b040c5c31cdffc0987e0 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Mon, 2 Apr 2012 01:12:12 +0200
Subject: sidebar removal part1

bzr revid: al@openerp.com-20120401231212-dln0svoqcc0pmpxy
---
 addons/web/static/src/xml/base.xml | 4 +++-
 1 file changed, 3 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 b6386bbf938..40f8448059a 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -508,7 +508,6 @@
 </t>
 
 <t t-name="Sidebar">
-    <a class="toggle-sidebar"></a>
     <div class="sidebar-content">
         <div class="sidebar-actions">
         </div>
@@ -727,6 +726,9 @@
                 <button type="button" class="oe_button oe_form_button_save">Save</button>
                 <button type="button" class="oe_button oe_form_button_cancel">Cancel</button>
             </div>
+            <div class="oe_form_sidebar">
+                Sidebar
+            </div>
             <div class="oe_form_pager" t-if="widget.options.pager !== false">
                 <t t-call="ViewPager">
                     <span class="oe_pager_index">0</span><span class="oe_pager_separator"> / </span><span class="oe_pager_count">0</span>
-- 
cgit v1.2.3


From d75c1206e535ecf3d5c6df3bc6186ad89b4775b2 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Mon, 2 Apr 2012 14:26:45 +0200
Subject: [IMP] base.xml cleanups

bzr revid: al@openerp.com-20120402122645-ao4lxxbyj5kdz3q8
---
 addons/web/static/src/xml/base.xml | 278 ++++++++++++++++++-------------------
 1 file changed, 139 insertions(+), 139 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 894f7353c1a..947cbb4016b 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -43,6 +43,113 @@
         </div>
     </div>
 </t>
+
+<t t-name="CrashManager.warning">
+    <table cellspacing="0" cellpadding="0" border="0" class="oe-dialog-warning">
+    <tr>
+        <td><img t-att-src='_s + "/web/static/src/img/warning.png"' class="oe-dialog-icon"/></td>
+        <td>
+            <p>
+                <t t-js="d">
+                    var message = d.message ? d.message : d.error.data.fault_code;
+                    d.html_error = context.engine.tools.html_escape(message)
+                        .replace(/\n/g, '<br/>');
+                </t>
+                <t t-raw="html_error"/>
+            </p>
+        </td>
+    </tr>
+    </table>
+</t>
+<t t-name="CrashManager.error">
+    <t t-if="!session.openerp_entreprise">
+        <span>Your version of OpenERP is unsupported. Support &amp; maintenance services are available here: <a href="http://www.openerp.com/support-or-publisher-warranty-contract" target="_blank">OpenERP Entreprise</a>.</span>
+    </t>
+    <t t-if="session.openerp_entreprise">
+        <div class="oe_error_send">
+            <div>
+                <div class="oe_centeralign"><b>OpenERP Enterprise Contract.</b></div>
+                <div><br/>Your report will be sent to the OpenERP Enterprise team.<br/></div><br/>
+                <div>
+                    <label>Summary:</label><br/>
+                    <input id="issuename" type="text" class="oe_fielddiv"/>
+                </div><br/><br/>
+                <div>
+                    <label>Description:</label><br/>
+                    <textarea id="explanation" rows="6"></textarea>
+                </div><br/><br/>
+                <div>
+                    <label>What you did:</label><br/>
+                    <textarea id="remark" rows="6" ></textarea>
+                </div>
+            </div>
+        </div><br/>
+    </t>
+    <div class="oe_error_detail">
+        <pre><t t-esc="error.message"/></pre>
+        <hr/>
+        <pre><t t-esc="error.data.debug"/></pre>
+    </div>
+</t>
+
+<t t-name="Login">
+  <div class="login">
+    <div class="bottom"> </div>
+    <div class="login_error_message">Invalid username or password</div>
+    <div class="pane">
+      <div id="logo"><img src='/web/static/src/img/logo2.png'/></div>
+      <form action="" method="post">
+        <div class="dbpane" >
+          Database:
+          <input name="db" t-att-value="widget.selected_db || ''"/>
+        </div>
+        <ul>
+          <li>Username</li>
+          <li><input type="text" name="login" t-att-value="widget.selected_login || ''" autofocus="autofocus"/></li>
+          <li>Password</li>
+          <li><input type="password" name="password" t-att-value="widget.selected_password || ''"/></li>
+          <li><button name="submit">Log in</button></li>
+        </ul>
+      </form>
+      <div class="footer">
+        <a href="#" id="oe-db-config">Manage Databases</a> |
+        <a href="http://www.openerp.com">Powered by <span class="openerp">OpenERP</span></a>
+      </div>
+    </div>
+  </div>
+</t>
+<t t-name="Login.dblist">
+    <select name="db">
+        <t t-foreach="db_list" t-as="db">
+            <t t-if="selected_db === db">
+                <option t-att-value="db" selected="true">
+                    <t t-esc="db"/></option>
+            </t>
+            <t t-if="selected_db !== db">
+                <option t-att-value="db"><t t-esc="db"/></option>
+            </t>
+        </t>
+    </select>
+</t>
+
+<t t-name="Database">
+    <div class="oe-database-manager">
+        <div class="database">
+            <a class="company_logo_link" href="/?">
+                <div class="company_logo"></div>
+            </a>
+            <ul class="db_options">
+                <li id="db-create">Create</li>
+                <li id="db-drop">Drop</li>
+                <li id="db-backup">Backup</li>
+                <li id="db-restore">Restore</li>
+                <li id="db-change-password">Password</li>
+                <li id="back-to-login">Back to Login</li>
+            </ul>
+        </div>
+        <div id="oe_db_options" class="oe_db_options"></div>
+    </div>
+</t>
 <t t-name="Database.CreateDB">
     <form name="create_db_form" class="oe_forms" method="POST">
         <table width="100%">
@@ -91,7 +198,7 @@
         </table>
     </form>
 </t>
-<t t-name="DropDB">
+<t t-name="Database.DropDB">
     <form name="drop_db_form" class="oe_forms" method="POST">
         <table width="100%">
             <tr>
@@ -123,7 +230,7 @@
         </table>
     </form>
 </t>
-<t t-name="BackupDB">
+<t t-name="Database.BackupDB">
     <form name="backup_db_form" class="oe_forms" method="POST" target="backup-target"
           action="/web/database/backup">
         <input type="hidden" name="token"/>
@@ -157,7 +264,7 @@
         </table>
     </form>
 </t>
-<t t-name="RestoreDB">
+<t t-name="Database.RestoreDB">
     <form name="restore_db_form" class="oe_forms" method="POST">
         <table width="100%">
             <tr>
@@ -186,7 +293,7 @@
         </table>
     </form>
 </t>
-<t t-name="Change_DB_Pwd">
+<t t-name="Database.Change_DB_Pwd">
     <form name="change_pwd_form" class="oe_forms" method="POST">
         <table width="100%">
             <tr>
@@ -218,113 +325,6 @@
     </form>
 </t>
 
-<t t-name="CrashManagerWarning">
-    <table cellspacing="0" cellpadding="0" border="0" class="oe-dialog-warning">
-    <tr>
-        <td><img t-att-src='_s + "/web/static/src/img/warning.png"' class="oe-dialog-icon"/></td>
-        <td>
-            <p>
-                <t t-js="d">
-                    var message = d.message ? d.message : d.error.data.fault_code;
-                    d.html_error = context.engine.tools.html_escape(message)
-                        .replace(/\n/g, '<br/>');
-                </t>
-                <t t-raw="html_error"/>
-            </p>
-        </td>
-    </tr>
-    </table>
-</t>
-<t t-name="CrashManagerError">
-    <t t-if="!session.openerp_entreprise">
-        <span>Your version of OpenERP is unsupported. Support &amp; maintenance services are available here: <a href="http://www.openerp.com/support-or-publisher-warranty-contract" target="_blank">OpenERP Entreprise</a>.</span>
-    </t>
-    <t t-if="session.openerp_entreprise">
-        <div class="oe_error_send">
-            <div>
-                <div class="oe_centeralign"><b>OpenERP Enterprise Contract.</b></div>
-                <div><br/>Your report will be sent to the OpenERP Enterprise team.<br/></div><br/>
-                <div>
-                    <label>Summary:</label><br/>
-                    <input id="issuename" type="text" class="oe_fielddiv"/>
-                </div><br/><br/>
-                <div>
-                    <label>Description:</label><br/>
-                    <textarea id="explanation" rows="6"></textarea>
-                </div><br/><br/>
-                <div>
-                    <label>What you did:</label><br/>
-                    <textarea id="remark" rows="6" ></textarea>
-                </div>
-            </div>
-        </div><br/>
-    </t>
-    <div class="oe_error_detail">
-        <pre><t t-esc="error.message"/></pre>
-        <hr/>
-        <pre><t t-esc="error.data.debug"/></pre>
-    </div>
-</t>
-
-<t t-name="Login_dblist">
-    <select name="db">
-        <t t-foreach="db_list" t-as="db">
-            <t t-if="selected_db === db">
-                <option t-att-value="db" selected="true">
-                    <t t-esc="db"/></option>
-            </t>
-            <t t-if="selected_db !== db">
-                <option t-att-value="db"><t t-esc="db"/></option>
-            </t>
-        </t>
-    </select>
-</t>
-
-<t t-name="Login">
-  <div class="login">
-    <div class="bottom"> </div>
-    <div class="login_error_message">Invalid username or password</div>
-    <div class="pane">
-      <div id="logo"><img src='/web/static/src/img/logo2.png'/></div>
-      <form action="" method="post">
-        <div class="dbpane" >
-          Database:
-          <input name="db" t-att-value="widget.selected_db || ''"/>
-        </div>
-        <ul>
-          <li>Username</li>
-          <li><input type="text" name="login" t-att-value="widget.selected_login || ''" autofocus="autofocus"/></li>
-          <li>Password</li>
-          <li><input type="password" name="password" t-att-value="widget.selected_password || ''"/></li>
-          <li><button name="submit">Log in</button></li>
-        </ul>
-      </form>
-      <div class="footer">
-        <a href="#" id="oe-db-config">Manage Databases</a> |
-        <a href="http://www.openerp.com">Powered by <span class="openerp">OpenERP</span></a>
-      </div>
-    </div>
-  </div>
-</t>
-<t t-name="DatabaseManager">
-    <div class="oe-database-manager">
-        <div class="database">
-            <a class="company_logo_link" href="/?">
-                <div class="company_logo"></div>
-            </a>
-            <ul class="db_options">
-                <li id="db-create">Create</li>
-                <li id="db-drop">Drop</li>
-                <li id="db-backup">Backup</li>
-                <li id="db-restore">Restore</li>
-                <li id="db-change-password">Password</li>
-                <li id="back-to-login">Back to Login</li>
-            </ul>
-        </div>
-        <div id="oe_db_options" class="oe_db_options"></div>
-    </div>
-</t>
-
 <t t-name="Menu">
     <ul class="oe_menu" t-if="widget.data">
         <li t-foreach="widget.data.data.children" t-as="menu">
@@ -502,6 +502,24 @@
     </t>
 </t>
 
+<t t-name="ViewPager">
+    <button class="oe_button oe_button_pager" type="button" data-pager-action="first">
+        <img t-att-src='_s + "/web/static/src/img/pager_first.png"'/>
+    </button>
+    <button class="oe_button oe_button_pager" type="button" data-pager-action="previous">
+        <img t-att-src='_s + "/web/static/src/img/pager_previous.png"'/>
+    </button>
+
+    <t t-raw="__content__"/>
+
+    <button class="oe_button oe_button_pager" type="button" data-pager-action="next">
+        <img t-att-src='_s + "/web/static/src/img/pager_next.png"'/>
+    </button>
+    <button class="oe_button oe_button_pager" type="button" data-pager-action="last">
+        <img t-att-src='_s + "/web/static/src/img/pager_last.png"'/>
+    </button>
+</t>
+
 <t t-name="Sidebar">
     <a class="toggle-sidebar"></a>
     <div class="sidebar-content">
@@ -585,24 +603,6 @@
     </td>
 </tr>
 
-<t t-name="ViewPager">
-    <button class="oe_button oe_button_pager" type="button" data-pager-action="first">
-        <img t-att-src='_s + "/web/static/src/img/pager_first.png"'/>
-    </button>
-    <button class="oe_button oe_button_pager" type="button" data-pager-action="previous">
-        <img t-att-src='_s + "/web/static/src/img/pager_previous.png"'/>
-    </button>
-
-    <t t-raw="__content__"/>
-
-    <button class="oe_button oe_button_pager" type="button" data-pager-action="next">
-        <img t-att-src='_s + "/web/static/src/img/pager_next.png"'/>
-    </button>
-    <button class="oe_button oe_button_pager" type="button" data-pager-action="last">
-        <img t-att-src='_s + "/web/static/src/img/pager_last.png"'/>
-    </button>
-</t>
-
 <table t-name="ListView" class="oe-listview-content">
     <t t-set="columns_count" t-value="visible_columns.length + (options.selectable ? 1 : 0) + (options.deletable ? 1 : 0) + (options.isClarkGable ? 1 : 0)"/>
     <thead class="ui-widget-header">
@@ -1210,6 +1210,16 @@
     </tr>
     </table>
 </t>
+<t t-name="FieldStatus.content">
+    <ul class="oe-arrow-list">
+        <t t-set="size" t-value="widget.to_show.length"/>
+        <t t-foreach="_.range(size)" t-as="i">
+            <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>
+</t>
 <t t-name="WidgetButton">
     <button type="button" class="oe_button">
         <img t-if="widget.node.attrs.icon" t-att-src="_s + '/web/static/src/img/icons/' + widget.node.attrs.icon + '.png'" width="16" height="16"/>
@@ -1807,16 +1817,6 @@
         </p>
     </div>
 </t>
-<t t-name="FieldStatus.content">
-    <ul class="oe-arrow-list">
-        <t t-set="size" t-value="widget.to_show.length"/>
-        <t t-foreach="_.range(size)" t-as="i">
-            <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>
-</t>
 <t t-name="EmptyComponent">
     <div></div>
 </t>
-- 
cgit v1.2.3


From 037793e811b16c8b316dc23dc87a4e832e8482e1 Mon Sep 17 00:00:00 2001
From: Minh Tran <mit@openerp.com>
Date: Mon, 2 Apr 2012 17:56:50 +0200
Subject: Styling of sidebar dropdown menu

bzr revid: mit@openerp.com-20120402155650-6wuiymgslior2vfz
---
 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 40f8448059a..f7b5960f82c 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -514,8 +514,8 @@
     </div>
 </t>
 <t t-name="Sidebar.section">
-    <div t-att-id="section_id" t-att-class="classname">
-        <h2><t t-esc="name"/></h2>
+    <div t-att-id="section_id" t-attf-class="#{classname} oe_form_dropdown_section ">
+        <button class="oe_dropdown_toggle"><t t-esc="name"/></button>
     </div>
 </t>
 <t t-name="Sidebar.section.items">
-- 
cgit v1.2.3


From 4abfb09d323e3549a753573f8f6a10be7797b03f Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 3 Apr 2012 11:56:15 +0200
Subject: [IMP] apply current advanced search when pressing [Return] while
 altering the search

Wrap a form around the search and hook search commit on form submit, make the 'apply' button into a submit button

bzr revid: xmo@openerp.com-20120403095615-r8x5ropf8odr7oxw
---
 addons/web/static/src/xml/base.xml | 8 ++++----
 1 file changed, 4 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 a538ed01196..30bf8e6ec93 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1397,13 +1397,13 @@
 </t>
 <div t-name="SearchView.advanced" class="oe_searchview_advanced">
     <h4>Advanced Search...</h4>
-    <div>
+    <form>
         <ul>
 
         </ul>
-        <button class="oe_add_condition">Add a condition</button>
-        <button class="oe_apply">Apply</button>
-    </div>
+        <button class="oe_add_condition" type="button">Add a condition</button>
+        <button class="oe_apply" type="submit">Apply</button>
+    </form>
 </div>
 <t t-name="SearchView.extended_search.proposition">
     <li>
-- 
cgit v1.2.3


From 4229755f81418a3ba34111bc1daf7eb595cdaa15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 3 Apr 2012 22:54:53 +0200
Subject: [REM] Removed references to res.log.

bzr revid: tde@openerp.com-20120403205453-5e43bfk65xkuqpum
---
 addons/web/static/src/xml/base.xml | 7 -------
 1 file changed, 7 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 80e097e4a5e..c3df9880fe9 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -457,13 +457,6 @@
     <t t-jquery="h2.oe_view_title" t-operation="after">
         <select t-if="self.session.debug" class="oe_debug_view"/>
     </t>
-    <t t-jquery=".oe-view-manager-header" t-operation="after">
-        <div class="oe-view-manager-logs oe-folded">
-            <ul></ul>
-            <a class="oe-more-logs" href="#">More…</a>
-            <a class="oe-remove-everything ui-icon ui-icon-closethick"/>
-        </div>
-    </t>
 </t>
 <t t-name="ViewManagerDebug">
     <option value="">Debug View#<t t-esc="view.fields_view.view_id"/></option>
-- 
cgit v1.2.3


From 0550a35458672df216ad4b0af08d5660c0117b22 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 5 Apr 2012 14:07:18 +0200
Subject: [imp] removed context menu in m2o

bzr revid: nicolas.vanhoren@openerp.com-20120405120718-53ffxqhh7iuyoxex
---
 addons/web/static/src/xml/base.xml | 8 +++-----
 1 file changed, 3 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 92edb58a7d7..33eed9404de 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1082,15 +1082,13 @@
                     <img t-att-src='_s + "/web/static/src/img/down-arrow.png"' /></span>
             </td>
             <td width="16">
-                <button class="oe_button oe_field_button oe-m2o-cm-button" t-att-id="widget.name + '_open'">
-                    <img t-att-src='_s + "/web/static/src/img/icons/STOCK_DIRECTORY_MENU.png"'/>
+                <button class="oe_button oe_field_button oe-m2o-cm-button">
+                    <img t-att-src='_s + "/web/static/src/img/icons/gtk-go-forward.png"'/>
                 </button>
-                <div t-att-id="widget.cm_id" class="contextMenu" style="display:none">
-                </div>
             </td>
         </tr>
         </table>
-        </t>
+    </t>
     <t t-if="widget.get('effective_readonly')">
         <div>
             <a href="#" class="oe_form_uri"/>
-- 
cgit v1.2.3


From 81cd91f56f35f3b8df48d7f0d50bc06a2eb6302b Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 5 Apr 2012 15:08:40 +0200
Subject: [imp] cleaned some useless code

bzr revid: nicolas.vanhoren@openerp.com-20120405130840-x0t3vnknltrdccrr
---
 addons/web/static/src/xml/base.xml | 14 --------------
 1 file changed, 14 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 33eed9404de..0320a44d608 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1095,20 +1095,6 @@
         </div>
     </t>
 </t>
-<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'" 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">
-                ... <t t-esc="(entry[2] || {})['name'] || ''"/>
-            </li>
-            <t t-set="i" t-value="i+1"/>
-        </t>
-    </ul>
-</t>
 <t t-name="FieldReference">
     <t t-if="!widget.get('effective_readonly')">
         <table class="oe_form_field_reference oe_frame oe_forms" border="0" cellpadding="0" cellspacing="0">
-- 
cgit v1.2.3


From dee501948e89dacc089a2cb7a5cb729f917b8953 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Fri, 6 Apr 2012 13:46:33 +0200
Subject: [IMP] quick change (to better fix when facets are re-done): make all
 facets read-only

rco review feedback for essential fixes

bzr revid: xmo@openerp.com-20120406114633-mp0ws7n3d2cokddd
---
 addons/web/static/src/xml/base.xml | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 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 30bf8e6ec93..04effdb4fe0 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1313,10 +1313,17 @@
 <t t-name="SearchView.filters.facet">
     <div class="category oe_filter_category"><t t-esc="facet.get('category')"/></div>
 
-    <div class="search_facet_input_container"
-            t-foreach="facet.get('json')" t-as="filter">
-        <t t-esc="filter.attrs.string || filter.attrs.name"/>
+    <t t-set="val" t-value="facet.get('json')"/>
+
+    <div t-if="!(val instanceof Array)" class="search_facet_input_container">
+        <t t-esc="facet.get('value')"/>
     </div>
+    <t t-if="val instanceof Array">
+        <div class="search_facet_input_container"
+                t-foreach="facet.get('json')" t-as="filter">
+            <t t-esc="filter.attrs.string || filter.attrs.name"/>
+        </div>
+    </t>
 
     <div class="search_facet_remove VS-icon VS-icon-cancel"/>
 </t>
-- 
cgit v1.2.3


From cfee631f1965f153a6b6489accac0280cf9422df Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Sun, 8 Apr 2012 16:33:01 +0200
Subject: css and xml

bzr revid: al@openerp.com-20120408143301-31iicxhama860iu1
---
 addons/web/static/src/xml/base.xml | 275 +++++++++++++++++--------------------
 1 file changed, 126 insertions(+), 149 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 eb3f3c42551..b91b883e84f 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -2,6 +2,16 @@
 <!-- vim:fdl=1:
 -->
 <templates id="template" xml:space="preserve">
+<t t-name="EmptyComponent">
+    <div></div>
+</t>
+<t t-name="Loading">
+    <div id="oe_loading">
+        <div class="loading">
+        Loading...
+        </div>
+    </div>
+</t>
 <t t-name="Notification">
     <div class="oe_notification" t-translation="off">
         <div id="oe_notification_default">
@@ -17,37 +27,6 @@
         </div>
     </div>
 </t>
-<t t-name="WebClient">
-    <div class="oe_webclient">
-        <table class="oe_main">
-            <tr>
-                <td colspan="2" class="oe_topbar">
-                    <div class="oe_menu_placeholder"/>
-                    <div class="oe_user_menu_placeholder"/>
-                    <div class="oe_systray"/>
-                </td>
-            </tr>
-            <tr>
-                <td class="oe_leftbar" valign="top">
-                    <a href="#" class="oe_logo"><img t-att-src='_s + "/web/static/src/img/logo.png"'/></a>
-                    <div class="oe_secondary_menus_container"/>
-                    <div class="oe_footer">
-                        Powered by <a href="http://www.openerp.com"><span>Open</span>ERP</a>
-                    </div>
-                </td>
-                <td class="oe_application">
-                </td>
-            </tr>
-        </table>
-    </div>
-</t>
-<t t-name="Loading">
-    <div id="oe_loading">
-        <div class="loading">
-        Loading...
-        </div>
-    </div>
-</t>
 
 <t t-name="CrashManager.warning">
     <table cellspacing="0" cellpadding="0" border="0" class="oe-dialog-warning">
@@ -330,6 +309,29 @@
     </form>
 </t>
 
+<t t-name="WebClient">
+    <table class="oe_webclient">
+        <tr>
+            <td colspan="2" class="oe_topbar">
+                <div class="oe_menu_placeholder"/>
+                <div class="oe_user_menu_placeholder"/>
+                <div class="oe_systray"/>
+            </td>
+        </tr>
+        <tr>
+            <td class="oe_leftbar" valign="top">
+                <a href="#" class="oe_logo"><img t-att-src='_s + "/web/static/src/img/logo.png"'/></a>
+                <div class="oe_secondary_menus_container"/>
+                <div class="oe_footer">
+                    Powered by <a href="http://www.openerp.com"><span>Open</span>ERP</a>
+                </div>
+            </td>
+            <td class="oe_application">
+            </td>
+        </tr>
+    </table>
+</t>
+
 <t t-name="Menu">
     <ul class="oe_menu" t-if="widget.data">
         <li t-foreach="widget.data.data.children" t-as="menu">
@@ -406,55 +408,75 @@
         </a>
     </li>
 </t>
+<t t-name="About-Page">
+    <div>
+        <a class="oe_activate_debug_mode" href="?debug" style="float:right; font-size: 80%;">Activate the developper mode</a>
+        <h1 style="margin:0;">OpenERP</h1>
+        <h3 style="margin:15px 0;padding:0;">Version <t t-esc="version_info.version"/></h3>
+        <p>
+            Copyright © 2004-TODAY OpenERP SA. All Rights Reserved.<br />
+            OpenERP is a trademark of the <a target="_blank" href="http://openerp.com/" style="text-decoration: underline;">OpenERP SA Company</a>.
+        </p>
+        <p>
+            Licenced under the terms of <a target="_blank" href="http://www.gnu.org/licenses/agpl.html" style="text-decoration: underline;">GNU Affero General Public License</a>
+        </p>
+        <p>
+            For more information visit <a target="_blank" href="http://openerp.com/" style="text-decoration: underline;">OpenERP.com</a>
+        </p>
+    </div>
+</t>
+<t t-name="Change_Pwd">
+    <form name="change_password_form" class="oe_forms" method="POST">
+        <table align="center">
+            <tr>
+                <td><label for="old_pwd">Old Password:</label></td>
+                <td><input type="password" name="old_pwd"
+                           minlength="1" autofocus="autofocus"/></td>
+            </tr>
+            <tr>
+            <td><label for="new_password">New Password:</label></td>
+            <td><input type="password" name="new_password"
+                       minlength="1" autofocus="autofocus"/></td>
+            </tr>
+            <tr>
+                <td><label for="confirm_pwd">Confirm Password:</label></td>
+                <td><input type="password" name="confirm_pwd"
+                             minlength="1"/></td>
+            </tr>
+            <tr>
+                <td colspan="2" align="right"><button class="oe_button">Change Password</button></td>
+            </tr>
+        </table>
+    </form>
+</t>
 
 <t t-name="ViewManager">
-    <table class="view-manager-main-table" cellpadding="0" cellspacing="0">
-    <tbody>
-    <tr>
-        <td class="view-manager-main-content">
-            <div class="oe-view-manager-header">
+    <div class="oe_view_manager">
+        <div class="oe_view_manager_header">
+            <div class="oe_view_manager_row">
                 <h2 class="oe_view_title" t-if="self.flags.display_title !== false">
                     <span class="oe_view_title_text"><t t-esc="self.display_title()"/></span>
                 </h2>
-                <div class="oe_vm_switch">
+                <div t-attf-id="#{prefix}_search" t-opentag="true"/>
+            </div>
+            <div class="oe_view_manager_row">
+                <div class="oe_view_manager_switch oe_button_group">
                     <t t-if="views.length != 1" t-foreach="views" t-as="view">
-
                         <button type="button" t-attf-class="oe_vm_switch_#{view.view_type}" t-att-data-view-type="view.view_type" t-att-title="view.label || view.view_type">
                             <span><t t-esc="view.label || view.view_type"/></span>
                         </button>
                     </t>
                 </div>
             </div>
-            <div t-attf-id="#{prefix}_search" t-opentag="true"/>
+        </div>
+        <div class="oe_view_manager_body">
             <t t-foreach="views" t-as="view">
                 <div t-attf-id="#{prefix}_view_#{view.view_type}"/>
             </t>
-        </td>
-        <td class="view-manager-main-sidebar" height="100%">
-            <t t-foreach="views" t-as="view">
-                <div t-attf-id="#{prefix}_sidebar_#{view.view_type}" class="sidebar-main-div closed-sidebar" style="display: none"/>
-            </t>
-        </td>
-    </tr>
-    </tbody>
-    </table>
+        </div>
+    </div>
 </t>
-
-<t t-extend="ViewManager" t-name="ViewManagerAction">
-    <t t-jquery=".view-manager-main-table tbody" t-operation="prepend">
-        <tr>
-            <td class="oe_view_manager_menu_tips" colspan="2">
-                <blockquote t-if="self.action.help and !self.flags.low_profile
-                                 and !(self.action.id in self.session.hidden_menutips)">
-                    <p><t t-esc="self.action.help"/></p>
-                    <div>
-                        <button type="button" name="hide">Hide this tip</button>
-                        <button type="button" name="disable">Disable all tips</button>
-                    </div>
-                </blockquote>
-            </td>
-        </tr>
-    </t>
+<t t-name="ViewManagerAction" t-extend="ViewManager">
     <t t-jquery="h2.oe_view_title" t-operation="prepend">
         <a t-if="self.flags.display_title !== false" class="oe-shortcut-toggle" title="Add / Remove Shortcut..."
             href="javascript: void(0)"> </a>
@@ -497,14 +519,6 @@
         <span><t t-esc="format(perm.write_date, { 'type' : 'datetime' }, '/')"/></span>
     </div>
 </t>
-<t t-extend="ViewManager" t-name="One2Many.viewmanager">
-    <t t-jquery="span.oe_view_title_text" t-operation="replace"/>
-
-    <t t-jquery=".oe-view-manager-header">
-        this.attr('t-if', 'views.length != 1');
-    </t>
-</t>
-
 <t t-name="ViewPager">
     <button class="oe_button oe_button_pager" type="button" data-pager-action="first">
         <img t-att-src='_s + "/web/static/src/img/pager_first.png"'/>
@@ -542,27 +556,6 @@
     </li>
 </t>
 
-<t t-name="TranslateDialog">
-    <table t-if="widget.view.translatable_fields" class="oe_form oe_translation_form" border="0" cellpadding="0" cellspacing="0" width="100%">
-    <tr>
-        <td class="oe_form_separator" width="1%" nowrap="nowrap">
-            <div class="oe_horizontal_separator">Field</div>
-        </td>
-        <th t-foreach="widget.languages" align="left">
-            <div class="oe_horizontal_separator"><t t-esc="name"/></div>
-        </th>
-    </tr>
-    <tr t-foreach="widget.view.translatable_fields" t-as="field" t-att-data-field="field.name">
-        <td class="oe_form_group_cell" width="1%" nowrap="nowrap">
-            <label class="oe_label"><t t-esc="field.node.attrs.string"/>:</label>
-        </td>
-        <td t-foreach="widget.languages" t-as="lg" class="oe_form_group_cell">
-            <input t-if="field.type == 'char'" type="text" t-attf-name="#{lg.code}-#{field.name}" value="" data-value="" class="oe_trad_field" style="width: 100%"/>
-            <textarea t-if="field.type == 'text'" t-attf-name="#{lg.code}-#{field.name}" data-value="" class="oe_trad_field" style="width: 100%"></textarea>
-        </td>
-    </tr>
-    </table>
-</t>
 <t t-name="TreeView">
     <select t-if="toolbar" style="width: 30%">
     </select>
@@ -724,24 +717,18 @@
                 <button type="button" class="oe_button oe_form_button_save">Save</button>
                 <button type="button" class="oe_button oe_form_button_cancel">Cancel</button>
             </div>
-            <div class="oe_form_sidebar">
-                Sidebar
-            </div>
             <div class="oe_form_pager" t-if="widget.options.pager !== false">
                 <t t-call="ViewPager">
                     <span class="oe_pager_index">0</span><span class="oe_pager_separator"> / </span><span class="oe_pager_count">0</span>
                 </t>
             </div>
+            <div class="oe_form_sidebar">
+            </div>
         </div>
         <div style="clear: both;"/>
         <div class="oe_form_container"/>
     </div>
 </t>
-<t t-name="One2Many.formview" t-extend="FormView">
-    <t t-jquery=".oe_form_buttons" t-operation="inner">
-        <button type="button" class="oe_button oe_form_button_create">Add</button>
-    </t>
-</t>
 <t t-name="PageView" t-extend="FormView">
     <t t-jquery=".oe_form_buttons" t-operation="inner">
         <button type="button" class="oe_button oe_form_button_edit">Edit</button>
@@ -1296,8 +1283,43 @@
     </t>
 </t>
 
-<div t-name="SearchView" class="oe_searchview"/>
+<t t-name="TranslateDialog">
+    <table t-if="widget.view.translatable_fields" class="oe_form oe_translation_form" border="0" cellpadding="0" cellspacing="0" width="100%">
+    <tr>
+        <td class="oe_form_separator" width="1%" nowrap="nowrap">
+            <div class="oe_horizontal_separator">Field</div>
+        </td>
+        <th t-foreach="widget.languages" align="left">
+            <div class="oe_horizontal_separator"><t t-esc="name"/></div>
+        </th>
+    </tr>
+    <tr t-foreach="widget.view.translatable_fields" t-as="field" t-att-data-field="field.name">
+        <td class="oe_form_group_cell" width="1%" nowrap="nowrap">
+            <label class="oe_label"><t t-esc="field.node.attrs.string"/>:</label>
+        </td>
+        <td t-foreach="widget.languages" t-as="lg" class="oe_form_group_cell">
+            <input t-if="field.type == 'char'" type="text" t-attf-name="#{lg.code}-#{field.name}" value="" data-value="" class="oe_trad_field" style="width: 100%"/>
+            <textarea t-if="field.type == 'text'" t-attf-name="#{lg.code}-#{field.name}" data-value="" class="oe_trad_field" style="width: 100%"></textarea>
+        </td>
+    </tr>
+    </table>
+</t>
+
+<t t-name="One2Many.viewmanager" t-extend="ViewManager">
+    <t t-jquery="span.oe_view_title_text" t-operation="replace"/>
 
+    <t t-jquery=".oe-view-manager-header">
+        this.attr('t-if', 'views.length != 1');
+    </t>
+</t>
+<t t-name="One2Many.formview" t-extend="FormView">
+    <t t-jquery=".oe_form_buttons" t-operation="inner">
+        <button type="button" class="oe_button oe_form_button_create">Add</button>
+    </t>
+</t>
+
+<div t-name="SearchView" class="oe_searchview">
+</div>
 <t t-name="SearchView.managed-filters">
     <option class="oe-filters-title" value="">Filters</option>
     <optgroup label="-- Filters --">
@@ -1547,6 +1569,7 @@
         <td t-if="edited and !options.deletable" class="oe-listview-padding"/>
     </t>
 </t>
+
 <t t-name="view_editor">
     <table class="oe_view_editor">
         <t t-call="view_editor.row"/>
@@ -1610,6 +1633,7 @@
 <t t-name="vieweditor_boolean">
     <input type="checkbox" t-att-id="widget.name"/>
 </t>
+
 <t t-name="ExportView">
     <a id="exportview" href="javascript: void(0)" style="text-decoration: none;color: #3D3D3D;">Export</a>
 </t>
@@ -1661,7 +1685,6 @@
         </td>
     </tr>
 </table>
-
 <table t-name="ExportTreeView-Secondary"
        id="field-tree-structure" class="oe_export_fields_selector_export"
        cellspacing="0" cellpadding="0">
@@ -1695,7 +1718,6 @@
         </table>
     </td>
 </tr>
-
 <t t-name="ExportNewList">
     <tr>
         <th><label>Save as:</label></th>
@@ -1703,7 +1725,6 @@
         <td><button class="oe_button oe_export_button_export" id="add_export_list">Ok</button></td>
     </tr>
 </t>
-
 <t t-name="Exists.ExportList">
     <label for="saved_export_list">Saved exports:</label>
 
@@ -1715,30 +1736,6 @@
     </select>
     <button class="oe_button oe_export_button_export" id="delete_export_list" type="button">Delete</button>
 </t>
-<t t-name="Change_Pwd">
-    <form name="change_password_form" class="oe_forms" method="POST">
-        <table align="center">
-            <tr>
-                <td><label for="old_pwd">Old Password:</label></td>
-                <td><input type="password" name="old_pwd"
-                           minlength="1" autofocus="autofocus"/></td>
-            </tr>
-            <tr>
-            <td><label for="new_password">New Password:</label></td>
-            <td><input type="password" name="new_password"
-                       minlength="1" autofocus="autofocus"/></td>
-            </tr>
-            <tr>
-                <td><label for="confirm_pwd">Confirm Password:</label></td>
-                <td><input type="password" name="confirm_pwd"
-                             minlength="1"/></td>
-            </tr>
-            <tr>
-                <td colspan="2" align="right"><button class="oe_button">Change Password</button></td>
-            </tr>
-        </table>
-    </form>
-</t>
 
 <t t-name="ImportView">
     <a id="importview" href="javascript: void(0)" style="text-decoration: none;color: #3D3D3D;">Import</a>
@@ -1815,24 +1812,4 @@
     </t>
 </t>
 
-<t t-name="About-Page">
-    <div>
-        <a class="oe_activate_debug_mode" href="?debug" style="float:right; font-size: 80%;">Activate the developper mode</a>
-        <h1 style="margin:0;">OpenERP</h1>
-        <h3 style="margin:15px 0;padding:0;">Version <t t-esc="version_info.version"/></h3>
-        <p>
-            Copyright © 2004-TODAY OpenERP SA. All Rights Reserved.<br />
-            OpenERP is a trademark of the <a target="_blank" href="http://openerp.com/" style="text-decoration: underline;">OpenERP SA Company</a>.
-        </p>
-        <p>
-            Licenced under the terms of <a target="_blank" href="http://www.gnu.org/licenses/agpl.html" style="text-decoration: underline;">GNU Affero General Public License</a>
-        </p>
-        <p>
-            For more information visit <a target="_blank" href="http://openerp.com/" style="text-decoration: underline;">OpenERP.com</a>
-        </p>
-    </div>
-</t>
-<t t-name="EmptyComponent">
-    <div></div>
-</t>
 </templates>
-- 
cgit v1.2.3


From 53e6b4b4a12acdc46ab613c995f0935519632a61 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Sun, 8 Apr 2012 17:06:33 +0200
Subject: fix loading

bzr revid: al@openerp.com-20120408150633-k7g8pph11eey9at4
---
 addons/web/static/src/xml/base.xml | 4 +---
 1 file changed, 1 insertion(+), 3 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 b91b883e84f..ebdbd871ac3 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -6,10 +6,8 @@
     <div></div>
 </t>
 <t t-name="Loading">
-    <div id="oe_loading">
-        <div class="loading">
+    <div class="oe_loading">
         Loading...
-        </div>
     </div>
 </t>
 <t t-name="Notification">
-- 
cgit v1.2.3


From 07202a9761123a167279e85a599d5497801b4cbf Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Sun, 8 Apr 2012 18:52:25 +0200
Subject: chrome cleanups: remove OldWidget, improve xml and css

bzr revid: al@openerp.com-20120408165225-avsnq1t25uhvxjb1
---
 addons/web/static/src/xml/base.xml | 55 ++++++++++++++++++--------------------
 1 file changed, 26 insertions(+), 29 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 ebdbd871ac3..7fc504b5449 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -75,30 +75,30 @@
 </t>
 
 <t t-name="Login">
-  <div class="login">
-    <div class="bottom"> </div>
-    <div class="login_error_message">Invalid username or password</div>
-    <div class="pane">
-      <div id="logo"><img src='/web/static/src/img/logo2.png'/></div>
-      <form action="" method="post">
-        <div class="dbpane" >
-          Database:
-          <input name="db" t-att-value="widget.selected_db || ''"/>
+    <div class="oe_login">
+        <div class="oe_login_bottom"> </div>
+        <div class="oe_login_error_message">Invalid username or password</div>
+        <div class="oe_login_pane">
+            <div class="oe_login_logo"><img src='/web/static/src/img/logo2.png'/></div>
+            <form action="" method="post">
+                <div class="oe_login_dbpane" >
+                    Database:
+                    <input name="db" t-att-value="widget.selected_db || ''"/>
+                </div>
+                <ul>
+                    <li>Username</li>
+                    <li><input type="text" name="login" t-att-value="widget.selected_login || ''" autofocus="autofocus"/></li>
+                    <li>Password</li>
+                    <li><input type="password" name="password" t-att-value="widget.selected_password || ''"/></li>
+                    <li><button name="submit">Log in</button></li>
+                </ul>
+            </form>
+            <div class="oe_login_footer">
+                <a href="#" class="oe_login_manage_db">Manage Databases</a> |
+                <a href="http://www.openerp.com">Powered by <span>OpenERP</span></a>
+            </div>
         </div>
-        <ul>
-          <li>Username</li>
-          <li><input type="text" name="login" t-att-value="widget.selected_login || ''" autofocus="autofocus"/></li>
-          <li>Password</li>
-          <li><input type="password" name="password" t-att-value="widget.selected_password || ''"/></li>
-          <li><button name="submit">Log in</button></li>
-        </ul>
-      </form>
-      <div class="footer">
-        <a href="#" id="oe-db-config">Manage Databases</a> |
-        <a href="http://www.openerp.com">Powered by <span class="openerp">OpenERP</span></a>
-      </div>
     </div>
-  </div>
 </t>
 <t t-name="Login.dblist">
     <select name="db">
@@ -114,13 +114,10 @@
     </select>
 </t>
 
-<t t-name="Database">
-    <div class="oe-database-manager">
-        <div class="database">
-            <a class="company_logo_link" href="/?">
-                <div class="company_logo"></div>
-            </a>
-            <ul class="db_options">
+<t t-name="DatabaseManager">
+    <div class="oe_database_manager">
+        <div class="oe_database_manager_menu">
+            <ul class="oe_form_notebook">
                 <li id="db-create">Create</li>
                 <li id="db-drop">Drop</li>
                 <li id="db-backup">Backup</li>
-- 
cgit v1.2.3


From 8ea5590e2cd741b41ec64205f713ba2e62c8ef5d Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Mon, 9 Apr 2012 00:42:01 +0200
Subject: databasemanager cleanups

bzr revid: al@openerp.com-20120408224201-jpafsl49k1d01q3q
---
 addons/web/static/src/xml/base.xml | 322 ++++++++++++++++---------------------
 1 file changed, 141 insertions(+), 181 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 7fc504b5449..65364748862 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -118,191 +118,151 @@
     <div class="oe_database_manager">
         <div class="oe_database_manager_menu">
             <ul class="oe_form_notebook">
-                <li id="db-create">Create</li>
-                <li id="db-drop">Drop</li>
-                <li id="db-backup">Backup</li>
-                <li id="db-restore">Restore</li>
-                <li id="db-change-password">Password</li>
-                <li id="back-to-login">Back to Login</li>
+                <li><a href="#db_create">Create</a></li>
+                <li><a href="#db_drop">Drop</a></li>
+                <li><a href="#db_backup">Backup</a></li>
+                <li><a href="#db_restore">Restore</a></li>
+                <li><a href="#db_change_password">Password</a></li>
+                <li><a id="back_to_login" href="#">Back to Login</a></li>
             </ul>
+            <form id="db_create" name="create_db_form" class="oe_forms" method="POST">
+                <table align="center" class="db_option_table">
+                    <tr>
+                        <th colspan="2" class="option_string"> CREATE DATABASE </th>
+                    </tr>
+                    <tr>
+                        <td><label for="super_admin_pwd">Master password:</label></td>
+                        <td><input type="password" name="super_admin_pwd" class="required" value="admin"/></td>
+                    </tr>
+                    <tr>
+                        <td><label for="db_name">New database name:</label></td>
+                        <td><input type="text" name="db_name" class="required" matches="^[a-zA-Z][a-zA-Z0-9_]+$"/></td>
+                    </tr>
+                    <tr>
+                        <td><label for="demo_data">Load Demonstration data:</label></td>
+                        <td><input type="checkbox" name="demo_data"/></td>
+                    </tr>
+                    <tr>
+                        <td><label for="db_lang">Default language:</label></td>
+                        <td>
+                            <select name="db_lang" t-if="widget.lang_list">
+                                <t t-foreach="widget.lang_list" t-as="lang">
+                                    <option t-att-value="lang[0]" t-att-selected="lang[0] === 'en_US' ? 'selected' : undefined"><t t-esc="lang[1]"/></option>
+                                </t>
+                            </select>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td><label for="create_admin_pwd">Admin password:</label></td>
+                        <td><input type="password" name="create_admin_pwd" class="required"/></td>
+                    </tr>
+                    <tr>
+                        <td><label for="create_confirm_pwd">Confirm password:</label></td>
+                        <td><input type="password" name="create_confirm_pwd" class="required" equalTo="input[name=create_admin_pwd]"/></td>
+                    </tr>
+                    <tr>
+                        <td colspan="2" align="right"><button class="oe_button">Create</button></td>
+                    </tr>
+                </table>
+            </form>
+            <form id="db_drop" name="drop_db_form" class="oe_forms" method="POST">
+                <table align="center" class="db_option_table">
+                    <tr>
+                        <th colspan="2" class="option_string"> DROP DATABASE </th>
+                    </tr>
+                    <tr>
+                        <td><label for="drop_db">Database:</label></td>
+                        <td>
+                            <select t-if="widget.db_list" name="drop_db" autofocus="autofocus">
+                                <t t-foreach="widget.db_list" t-as="db">
+                                    <option t-att-value="db"><t t-esc="db"/></option>
+                                </t>
+                            </select>
+                            <input t-if="!widget.db_list" name="drop_db" class="required" type="text" autofocus="autofocus"/>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td><label for="drop_password">Master Password:</label></td>
+                        <td><input type="password" name="drop_pwd" class="required"/></td>
+                    </tr>
+                    <tr>
+                        <td colspan="2" align="right"><button class="oe_button">Drop</button></td>
+                    </tr>
+                </table>
+            </form>
+            <form id="db_backup" name="backup_db_form" class="oe_forms" method="POST" target="backup-target" action="/web/database/backup">
+                <input type="hidden" name="token"/>
+                <table align="center" class="db_option_table">
+                    <tr>
+                        <th colspan="2" class="option_string"> BACKUP DATABASE </th>
+                    </tr>
+                    <tr>
+                        <td><label for="backup_db">Database:</label></td>
+                        <td>
+                            <select t-if="widget.db_list" name="backup_db" autofocus="autofocus">
+                                <t t-foreach="widget.db_list" t-as="db">
+                                    <option t-att-value="db"><t t-esc="db"/></option>
+                                </t>
+                            </select>
+                            <input t-if="!widget.db_list" name="backup_db" class="required" type="text" autofocus="autofocus"/>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td><label for="backup_pwd">Master Password:</label></td>
+                        <td><input type="password" name="backup_pwd" class="required"/></td>
+                    </tr>
+                    <tr>
+                        <td colspan="2" align="right"><button class="oe_button">Backup</button></td>
+                    </tr>
+                </table>
+            </form>
+            <form id="db_restore" name="restore_db_form" class="oe_forms" method="POST">
+                <table align="center" class="db_option_table">
+                    <tr>
+                        <th colspan="2" class="option_string"> RESTORE DATABASE </th>
+                    </tr>
+                    <tr>
+                        <td><label for="restore_db">File:</label></td>
+                        <td><input type="file" name="db_file" class="required" autofocus="autofocus"/></td>
+                    </tr>
+                    <tr>
+                        <td><label for="restore_pwd">Master Password:</label></td>
+                        <td><input type="password" name="restore_pwd" class="required"/></td>
+                    </tr>
+                    <tr>
+                        <td><label for="new_db">New database name:</label></td>
+                        <td><input type="text" name="new_db" class="required"/></td>
+                    </tr>
+                    <tr>
+                        <td colspan="2" align="right"><button class="oe_button">Restore</button></td>
+                    </tr>
+                </table>
+            </form>
+            <form id="db_change_password" name="change_pwd_form" class="oe_forms" method="POST">
+                <table align="center" class="db_option_table">
+                    <tr>
+                        <th colspan="2" class="option_string"> CHANGE MASTER PASSWORD </th>
+                    </tr>
+                    <tr>
+                        <td><label for="old_pwd">Master password:</label></td>
+                        <td><input type="password" name="old_pwd" class="required" minlength="1" autofocus="autofocus"/></td>
+                    </tr>
+                    <tr>
+                        <td><label for="new_pwd">New master password:</label></td>
+                        <td><input type="password" name="new_pwd" class="required" minlength="1"/></td>
+                    </tr>
+                    <tr>
+                        <td><label for="confirm_pwd">Confirm new master password:</label></td>
+                        <td><input type="password" name="confirm_pwd" class="required" equalTo="input[name=new_pwd]" minlength="1"/></td>
+                    </tr>
+                    <tr>
+                        <td colspan="2" align="right"><button class="oe_button">Change Password</button></td>
+                    </tr>
+                </table>
+            </form>
         </div>
-        <div id="oe_db_options" class="oe_db_options"></div>
     </div>
 </t>
-<t t-name="Database.CreateDB">
-    <form name="create_db_form" class="oe_forms" method="POST">
-        <table width="100%">
-            <tr>
-                <td class="option_string">
-                    CREATE DATABASE
-                </td>
-            </tr>
-        </table>
-        <table align="center" class="db_option_table">
-            <tr>
-                <td><label for="super_admin_pwd">Master password:</label></td>
-                <td><input type="password" name="super_admin_pwd" class="required" value="admin"/></td>
-            </tr>
-            <tr>
-                <td><label for="db_name">New database name:</label></td>
-                <td><input type="text" name="db_name"
-                           class="required" matches="^[a-zA-Z][a-zA-Z0-9_]+$"/></td>
-            </tr>
-            <tr>
-                <td><label for="demo_data">Load Demonstration data:</label></td>
-                <td><input type="checkbox" name="demo_data"/></td>
-            </tr>
-            <tr>
-                <td><label for="db_lang">Default language:</label></td>
-                <td>
-                    <select name="db_lang" t-if="lang_list">
-                        <t t-foreach="lang_list" t-as="lang">
-                            <option t-att-value="lang[0]" t-att-selected="lang[0] === 'en_US' ? 'selected' : undefined"><t t-esc="lang[1]"/></option>
-                        </t>
-                    </select>
-                </td>
-            </tr>
-            <tr>
-                <td><label for="create_admin_pwd">Admin password:</label></td>
-                <td><input type="password" name="create_admin_pwd" class="required"/></td>
-            </tr>
-            <tr>
-                <td><label for="create_confirm_pwd">Confirm password:</label></td>
-                <td><input type="password" name="create_confirm_pwd" class="required"
-                           equalTo="input[name=create_admin_pwd]"/></td>
-            </tr>
-            <tr>
-                <td colspan="2" align="right"><button class="oe_button">Create</button></td>
-            </tr>
-        </table>
-    </form>
-</t>
-<t t-name="Database.DropDB">
-    <form name="drop_db_form" class="oe_forms" method="POST">
-        <table width="100%">
-            <tr>
-                <td class="option_string">
-                    DROP DATABASE
-                </td>
-            </tr>
-        </table>
-        <table align="center" class="db_option_table">
-            <tr>
-                <td><label for="drop_db">Database:</label></td>
-                <td>
-                    <select t-if="db_list" name="drop_db" autofocus="autofocus">
-                        <t t-foreach="db_list" t-as="db">
-                            <option t-att-value="db"><t t-esc="db"/></option>
-                        </t>
-                    </select>
-                    <input t-if="!db_list" name="drop_db" class="required"
-                           type="text" autofocus="autofocus"/>
-                </td>
-            </tr>
-            <tr>
-                <td><label for="drop_password">Master Password:</label></td>
-                <td><input type="password" name="drop_pwd" class="required"/></td>
-            </tr>
-            <tr>
-                <td colspan="2" align="right"><button class="oe_button">Drop</button></td>
-            </tr>
-        </table>
-    </form>
-</t>
-<t t-name="Database.BackupDB">
-    <form name="backup_db_form" class="oe_forms" method="POST" target="backup-target"
-          action="/web/database/backup">
-        <input type="hidden" name="token"/>
-        <table width="100%">
-            <tr>
-                <td class="option_string">
-                    BACKUP DATABASE
-                </td>
-            </tr>
-        </table>
-        <table align="center" class="db_option_table">
-            <tr>
-                <td><label for="backup_db">Database:</label></td>
-                <td>
-                    <select t-if="db_list" name="backup_db" autofocus="autofocus">
-                        <t t-foreach="db_list" t-as="db">
-                            <option t-att-value="db"><t t-esc="db"/></option>
-                        </t>
-                    </select>
-                    <input t-if="!db_list" name="backup_db" class="required"
-                           type="text" autofocus="autofocus"/>
-                </td>
-            </tr>
-            <tr>
-                <td><label for="backup_pwd">Master Password:</label></td>
-                <td><input type="password" name="backup_pwd" class="required"/></td>
-            </tr>
-            <tr>
-                <td colspan="2" align="right"><button class="oe_button">Backup</button></td>
-            </tr>
-        </table>
-    </form>
-</t>
-<t t-name="Database.RestoreDB">
-    <form name="restore_db_form" class="oe_forms" method="POST">
-        <table width="100%">
-            <tr>
-                <td class="option_string">
-                    RESTORE DATABASE
-                </td>
-            </tr>
-        </table>
-        <table align="center" class="db_option_table">
-            <tr>
-                <td><label for="restore_db">File:</label></td>
-                <td><input type="file" name="db_file" class="required"
-                         autofocus="autofocus"/></td>
-            </tr>
-            <tr>
-                <td><label for="restore_pwd">Master Password:</label></td>
-                <td><input type="password" name="restore_pwd" class="required"/></td>
-            </tr>
-        <tr>
-                <td><label for="new_db">New database name:</label></td>
-                <td><input type="text" name="new_db" class="required"/></td>
-            </tr>
-        <tr>
-            <td colspan="2" align="right"><button class="oe_button">Restore</button></td>
-            </tr>
-        </table>
-    </form>
-</t>
-<t t-name="Database.Change_DB_Pwd">
-    <form name="change_pwd_form" class="oe_forms" method="POST">
-        <table width="100%">
-            <tr>
-                <td class="option_string">
-                    CHANGE MASTER PASSWORD
-                </td>
-            </tr>
-        </table>
-        <table align="center" class="db_option_table">
-            <tr>
-                <td><label for="old_pwd">Master password:</label></td>
-                <td><input type="password" name="old_pwd" class="required"
-                           minlength="1" autofocus="autofocus"/></td>
-            </tr>
-            <tr>
-            <td><label for="new_pwd">New master password:</label></td>
-       	    <td><input type="password" name="new_pwd" class="required"
-                       minlength="1"/></td>
-            </tr>
-   	    <tr>
-                <td><label for="confirm_pwd">Confirm new master password:</label></td>
-                <td><input type="password" name="confirm_pwd" class="required"
-                           equalTo="input[name=new_pwd]" minlength="1"/></td>
-            </tr>
-            <tr>
-                <td colspan="2" align="right"><button class="oe_button">Change Password</button></td>
-            </tr>
-        </table>
-    </form>
-</t>
 
 <t t-name="WebClient">
     <table class="oe_webclient">
-- 
cgit v1.2.3


From 64974e24e644c2c8e39e5ada246722fdca80f262 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Mon, 9 Apr 2012 12:37:08 +0200
Subject: viewmanager refactor part1

bzr revid: al@openerp.com-20120409103708-fu62p9wxdcjzzl5m
---
 addons/web/static/src/xml/base.xml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 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 65364748862..1ed99250d6b 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -409,14 +409,14 @@
     <div class="oe_view_manager">
         <div class="oe_view_manager_header">
             <div class="oe_view_manager_row">
-                <h2 class="oe_view_title" t-if="self.flags.display_title !== false">
-                    <span class="oe_view_title_text"><t t-esc="self.display_title()"/></span>
+                <h2 class="oe_view_title" t-if="widget.flags.display_title !== false">
+                    <span class="oe_view_title_text"><t t-esc="widget.display_title()"/></span>
                 </h2>
-                <div t-attf-id="#{prefix}_search" t-opentag="true"/>
+                <div t-attf-id="#{widget.element_id}_search" t-opentag="true"/>
             </div>
             <div class="oe_view_manager_row">
                 <div class="oe_view_manager_switch oe_button_group">
-                    <t t-if="views.length != 1" t-foreach="views" t-as="view">
+                    <t t-if="widget.views_src.length != 1" t-foreach="widget.views_src" t-as="view">
                         <button type="button" t-attf-class="oe_vm_switch_#{view.view_type}" t-att-data-view-type="view.view_type" t-att-title="view.label || view.view_type">
                             <span><t t-esc="view.label || view.view_type"/></span>
                         </button>
@@ -425,19 +425,19 @@
             </div>
         </div>
         <div class="oe_view_manager_body">
-            <t t-foreach="views" t-as="view">
-                <div t-attf-id="#{prefix}_view_#{view.view_type}"/>
+            <t t-foreach="widget.views_src" t-as="view">
+                <div t-attf-id="#{widget.element_id}_view_#{view.view_type}"/>
             </t>
         </div>
     </div>
 </t>
 <t t-name="ViewManagerAction" t-extend="ViewManager">
     <t t-jquery="h2.oe_view_title" t-operation="prepend">
-        <a t-if="self.flags.display_title !== false" class="oe-shortcut-toggle" title="Add / Remove Shortcut..."
+        <a t-if="widget.flags.display_title !== false" class="oe-shortcut-toggle" title="Add / Remove Shortcut..."
             href="javascript: void(0)"> </a>
     </t>
     <t t-jquery="h2.oe_view_title" t-operation="after">
-        <select t-if="self.session.debug" class="oe_debug_view"/>
+        <select t-if="widget.session.debug" class="oe_debug_view"/>
     </t>
 </t>
 <t t-name="ViewManagerDebug">
-- 
cgit v1.2.3


From b4157132e0559c52117b77226661e9ce79ea54ed Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Mon, 9 Apr 2012 15:14:38 +0200
Subject: sidebar refactoring attachements broken

bzr revid: al@openerp.com-20120409131438-9nmd5192z2oahjt6
---
 addons/web/static/src/xml/base.xml | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 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 1ed99250d6b..00fa6b75425 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -493,23 +493,21 @@
 </t>
 
 <t t-name="Sidebar">
-    <div class="sidebar-content">
-        <div class="sidebar-actions">
-        </div>
-    </div>
-</t>
-<t t-name="Sidebar.section">
-    <div t-att-id="section_id" t-attf-class="#{classname} oe_form_dropdown_section ">
-        <button class="oe_dropdown_toggle"><t t-esc="name"/></button>
+    <div class="oe_sidebar">
+        <t t-foreach="widget.sections" t-as="section">
+            <div class="oe_form_dropdown_section">
+                <button class="oe_dropdown_toggle"><t t-esc="section.label"/></button>
+                <ul class="oe_dropdown_menu">
+                    <li t-foreach="widget.items[section.name]" t-as="item" t-att-class="item.classname">
+                        <a class="oe_sidebar_action_a" t-att-title="item.title" href="#" t-att-data-section="section.name" t-att-data-index="item_index">
+                            <t t-raw="item.label"/>
+                        </a>
+                    </li>
+                </ul>
+            </div>
+        </t>
     </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>
-</t>
 
 <t t-name="TreeView">
     <select t-if="toolbar" style="width: 30%">
-- 
cgit v1.2.3


From bc92baa084205dbfbe1bc65b367ce11a8dcf9bf8 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 9 Apr 2012 20:43:30 +0200
Subject: [IMP] Improved styles

bzr revid: fme@openerp.com-20120409184330-g8qp5pu5sonpc4tn
---
 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 00fa6b75425..38a3b4199b9 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1097,7 +1097,7 @@
                 <table cellspacing="0" cellpadding="0" border="0">
                 <tr>
                     <td>
-                        <div class="oe-binary-file-set" style="width: 40px; height:22px;">
+                        <div class="oe-binary-file-set">
                             <form class="oe-binary-form" t-att-target="widget.iframe"
                                 method="post" enctype="multipart/form-data" action="/web/binary/upload">
                                 <input type="hidden" name="session_id" value=""/>
-- 
cgit v1.2.3


From d4b103fb4d656f8480299fb673ebbdd3b95e9aed Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Mon, 9 Apr 2012 20:44:45 +0200
Subject: viewmanager refactor part1

bzr revid: al@openerp.com-20120409184445-nri84zeylu6ur21d
---
 addons/web/static/src/xml/base.xml | 31 +++++++++++++++++++++++++++----
 1 file changed, 27 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 38a3b4199b9..6cb3412f257 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -415,6 +415,8 @@
                 <div t-attf-id="#{widget.element_id}_search" t-opentag="true"/>
             </div>
             <div class="oe_view_manager_row">
+                <div class="oe_view_manager_buttons"/>
+                <div class="oe_view_manager_sidebar"/>
                 <div class="oe_view_manager_switch oe_button_group">
                     <t t-if="widget.views_src.length != 1" t-foreach="widget.views_src" t-as="view">
                         <button type="button" t-attf-class="oe_vm_switch_#{view.view_type}" t-att-data-view-type="view.view_type" t-att-title="view.label || view.view_type">
@@ -422,6 +424,7 @@
                         </button>
                     </t>
                 </div>
+                <div class="oe_view_manager_pager"/>
             </div>
         </div>
         <div class="oe_view_manager_body">
@@ -682,14 +685,34 @@
         <div class="oe_form_container"/>
     </div>
 </t>
-<t t-name="PageView" t-extend="FormView">
-    <t t-jquery=".oe_form_buttons" t-operation="inner">
-        <button type="button" class="oe_button oe_form_button_edit">Edit</button>
+<t t-name="FormView">
+    <div class="oe_formview">
+        <div class="oe_form_buttons"/>
+        <div class="oe_form_sidebar"/>
+        <div class="oe_form_pager"/>
+        <div class="oe_form_container"/>
+    </div>
+</t>
+<t t-name="FormView.buttons">
+    <div class="oe_form_buttons" t-if="widget.options.action_buttons !== false">
+        view:<button type="button" class="oe_button oe_form_button_edit">Edit</button>
         <button type="button" class="oe_button oe_form_button_create">Create</button>
         <button type="button" class="oe_button oe_form_button_duplicate">Duplicate</button>
         <button type="button" class="oe_button oe_form_button_delete">Delete</button>
-    </t>
+        edit:<button type="button" class="oe_button oe_form_button_save">Save</button>
+        <button type="button" class="oe_button oe_form_button_cancel">Cancel</button>
+    </div>
+</t>
+<t t-name="FormView.pager">
+    <div class="oe_form_pager" t-if="widget.options.pager !== false">
+        <t t-call="ViewPager">
+            <span class="oe_pager_index">0</span><span class="oe_pager_separator"> / </span><span class="oe_pager_count">0</span>
+        </t>
+    </div>
 </t>
+<t t-name="PageView" t-extend="FormView">
+</t>
+
 <t t-name="FormView.sidebar.attachments">
     <div class="oe-sidebar-attachments-toolbar">
         <div class="oe-binary-file-set" style="float: right">
-- 
cgit v1.2.3


From 789fb206fba5f5706fd481fbf5d61cac12ee13d0 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Mon, 9 Apr 2012 20:49:13 +0200
Subject: viewmanager refactor part2

bzr revid: al@openerp.com-20120409184913-ndgelv1lyfw4e6ix
---
 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 6cb3412f257..72a2ce9ecba 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -416,7 +416,6 @@
             </div>
             <div class="oe_view_manager_row">
                 <div class="oe_view_manager_buttons"/>
-                <div class="oe_view_manager_sidebar"/>
                 <div class="oe_view_manager_switch oe_button_group">
                     <t t-if="widget.views_src.length != 1" t-foreach="widget.views_src" t-as="view">
                         <button type="button" t-attf-class="oe_vm_switch_#{view.view_type}" t-att-data-view-type="view.view_type" t-att-title="view.label || view.view_type">
@@ -425,6 +424,7 @@
                     </t>
                 </div>
                 <div class="oe_view_manager_pager"/>
+                <div class="oe_view_manager_sidebar"/>
             </div>
         </div>
         <div class="oe_view_manager_body">
-- 
cgit v1.2.3


From 518d4ccfb657e45a412e53a4d344b2b301409878 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Mon, 9 Apr 2012 21:35:09 +0200
Subject: listview refactor part1

bzr revid: al@openerp.com-20120409193509-l6kps8m5k78wn1nn
---
 addons/web/static/src/xml/base.xml | 80 ++++++++++++++++++--------------------
 1 file changed, 38 insertions(+), 42 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 72a2ce9ecba..0218c91351a 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -559,21 +559,9 @@
     <thead class="ui-widget-header">
         <tr t-if="options.action_buttons !== false or options.pager !== false">
             <th t-att-colspan="columns_count">
-                <table>
-                    <tr>
-                        <td t-if="!no_leaf and options.action_buttons !== false" class="oe-actions">
-                            <button type="button" class="oe_button oe-list-add"
-                                    t-if="options.addable">
-                                <t t-esc="options.addable"/>
-                            </button>
-                            <button type="button" class="oe_button oe-list-delete"
-                                    t-if="options.selectable and options.deletable">
-                                Delete
-                            </button>
-                        </td>
-                        <t t-call="Listview.navigation.button"/>
-                    </tr>
-                </table>
+                <div class="oe_list_buttons"/>
+                <div class="oe_list_sidebar"/>
+                <div class="oe_list_pager"/>
             </th>
         </tr>
         <tr t-if="options.header" class="oe-listview-header-columns">
@@ -583,13 +571,13 @@
                 </th>
             </t>
             <th t-if="options.selectable" width="1"  >
-                <input type="checkbox" class="all-record-selector"/> </th>
-            <th t-if="options.isClarkGable" width="1"> </th>
+                <input type="checkbox" class="all-record-selector"/>
+            </th>
+            <th t-if="options.isClarkGable" width="1"></th>
             <t t-foreach="columns" t-as="column">
                 <th t-if="!column.meta and column.invisible !== '1'" t-att-data-id="column.id"
                     t-att-class="((options.sortable and column.tag !== 'button') ? 'oe-sortable' : null)">
-                    <t t-if="column.tag !== 'button'"
-                        ><t t-esc="column.string"/></t>
+                    <t t-if="column.tag !== 'button'"><t t-esc="column.string"/></t>
                 </th>
             </t>
             <th t-if="options.deletable" width="1"/>
@@ -604,32 +592,26 @@
             </td>
             <td t-if="options.deletable"/>
         </tr>
-        <tr>
-            <t t-call="Listview.navigation.button"/>
-        </tr>
     </tfoot>
 </table>
-<t t-extend="ListView" t-name="One2Many.listview">
-    <t t-jquery="thead.ui-widget-header > tr:first">
-        this.removeAttr('t-if');
-    </t>
-
-    <t t-jquery="tfoot &gt; tr:last-child" t-operation="replace"/>
-
-    <t t-jquery="td.oe-actions">
-        this.removeAttr('t-if');
-    </t>
-    <t t-jquery="td.oe-actions" t-operation="prepend">
-        <h3 class="oe_view_title"><t t-esc="fields_view.arch.attrs.string"/></h3>
-    </t>
+<t t-name="ListView.buttons">
+    <div t-if="!no_leaf and options.action_buttons !== false" class="oe_list_buttons">
+        <button type="button" class="oe_button oe-list-add" t-if="options.addable">
+            <t t-esc="options.addable"/>
+        </button>
+        <button type="button" class="oe_button oe-list-delete" t-if="options.selectable and options.deletable">
+            Delete
+        </button>
+    </div>
+</t>
+<t t-name="Listview.pager">
+    <div t-if="!no_leaf and options.pager !== false" class="oe-list-pager" t-att-colspan="columns_count">
+        <t t-call="ViewPager">
+            <span class="oe-pager-state">
+            </span>
+        </t>
+    </div>
 </t>
-<th t-name="Listview.navigation.button" t-if="!no_leaf and options.pager !== false"
-        class="oe-list-pager" t-att-colspan="columns_count">
-    <t t-call="ViewPager">
-        <span class="oe-pager-state">
-        </span>
-    </t>
-</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)"/>
@@ -1293,6 +1275,20 @@
         <button type="button" class="oe_button oe_form_button_create">Add</button>
     </t>
 </t>
+<t t-name="One2Many.listview" t-extend="ListView">
+    <t t-jquery="thead.ui-widget-header > tr:first">
+        this.removeAttr('t-if');
+    </t>
+
+    <t t-jquery="tfoot &gt; tr:last-child" t-operation="replace"/>
+
+    <t t-jquery="td.oe-actions">
+        this.removeAttr('t-if');
+    </t>
+    <t t-jquery="td.oe-actions" t-operation="prepend">
+        <h3 class="oe_view_title"><t t-esc="fields_view.arch.attrs.string"/></h3>
+    </t>
+</t>
 
 <div t-name="SearchView" class="oe_searchview">
 </div>
-- 
cgit v1.2.3


From 4e40395d3c830044bf993c363ae1fbdba4101276 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Mon, 9 Apr 2012 22:03:34 +0200
Subject: listview css

bzr revid: al@openerp.com-20120409200334-24j00uopwpofpbq3
---
 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 0218c91351a..2050aad45fa 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -556,7 +556,7 @@
 
 <table t-name="ListView" class="oe-listview-content">
     <t t-set="columns_count" t-value="visible_columns.length + (options.selectable ? 1 : 0) + (options.deletable ? 1 : 0) + (options.isClarkGable ? 1 : 0)"/>
-    <thead class="ui-widget-header">
+    <thead>
         <tr t-if="options.action_buttons !== false or options.pager !== false">
             <th t-att-colspan="columns_count">
                 <div class="oe_list_buttons"/>
@@ -583,7 +583,7 @@
             <th t-if="options.deletable" width="1"/>
         </tr>
     </thead>
-    <tfoot class="ui-widget-header">
+    <tfoot>
         <tr>
             <td t-if="options.selectable"/>
             <td t-if="options.isClarkGable"/>
-- 
cgit v1.2.3


From 16ea7ae148c87ff1e70dff2fd95baa52b9418830 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Mon, 9 Apr 2012 22:16:47 +0200
Subject: listview refactor part2

bzr revid: al@openerp.com-20120409201647-97r7h4nd3lid42si
---
 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 2050aad45fa..3c1cfbfb7d2 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -595,17 +595,17 @@
     </tfoot>
 </table>
 <t t-name="ListView.buttons">
-    <div t-if="!no_leaf and options.action_buttons !== false" class="oe_list_buttons">
-        <button type="button" class="oe_button oe-list-add" t-if="options.addable">
-            <t t-esc="options.addable"/>
+    <div t-if="!widget.no_leaf and widget.options.action_buttons !== false" class="oe_list_buttons">
+        <button type="button" class="oe_button oe_list_add" t-if="widget.options.addable">
+            <t t-esc="widget.options.addable"/>
         </button>
-        <button type="button" class="oe_button oe-list-delete" t-if="options.selectable and options.deletable">
+        <button type="button" class="oe_button oe_list_delete" t-if="widget.options.selectable and widget.options.deletable">
             Delete
         </button>
     </div>
 </t>
 <t t-name="Listview.pager">
-    <div t-if="!no_leaf and options.pager !== false" class="oe-list-pager" t-att-colspan="columns_count">
+    <div t-if="!widget.no_leaf and widget.options.pager !== false" class="oe_list_pager" t-att-colspan="widget.columns_count">
         <t t-call="ViewPager">
             <span class="oe-pager-state">
             </span>
-- 
cgit v1.2.3


From b40479a59ea16ca3288a7bafed25aa54e025598e Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Mon, 9 Apr 2012 23:30:43 +0200
Subject: form do_mode_switch

bzr revid: al@openerp.com-20120409213043-85a3zd2xoocd4uij
---
 addons/web/static/src/xml/base.xml | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 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 3c1cfbfb7d2..aef90bf39b4 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -677,12 +677,16 @@
 </t>
 <t t-name="FormView.buttons">
     <div class="oe_form_buttons" t-if="widget.options.action_buttons !== false">
-        view:<button type="button" class="oe_button oe_form_button_edit">Edit</button>
-        <button type="button" class="oe_button oe_form_button_create">Create</button>
-        <button type="button" class="oe_button oe_form_button_duplicate">Duplicate</button>
-        <button type="button" class="oe_button oe_form_button_delete">Delete</button>
-        edit:<button type="button" class="oe_button oe_form_button_save">Save</button>
-        <button type="button" class="oe_button oe_form_button_cancel">Cancel</button>
+        <span class="oe_form_buttons_view">
+            <button type="button" class="oe_button oe_form_button_edit">Edit</button>
+            <button type="button" class="oe_button oe_form_button_create">Create</button>
+            <button type="button" class="oe_button oe_form_button_duplicate">Duplicate</button>
+            <button type="button" class="oe_button oe_form_button_delete">Delete</button>
+        </span>
+        <span class="oe_form_buttons_edit">
+            <button type="button" class="oe_button oe_form_button_save">Save</button>
+            <button type="button" class="oe_button oe_form_button_cancel">Cancel</button>
+        </span>
     </div>
 </t>
 <t t-name="FormView.pager">
@@ -692,9 +696,6 @@
         </t>
     </div>
 </t>
-<t t-name="PageView" t-extend="FormView">
-</t>
-
 <t t-name="FormView.sidebar.attachments">
     <div class="oe-sidebar-attachments-toolbar">
         <div class="oe-binary-file-set" style="float: right">
-- 
cgit v1.2.3


From d7d69a26c9de37c39afdf0a3f8680ff310aa2f0c Mon Sep 17 00:00:00 2001
From: Minh Tran <mit@openerp.com>
Date: Tue, 10 Apr 2012 00:10:56 +0200
Subject: restyling of view switcher

bzr revid: mit@openerp.com-20120409221056-xjuo8dmagjxp3mk5
---
 addons/web/static/src/xml/base.xml | 9 ++++-----
 1 file changed, 4 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 aef90bf39b4..818b6f736d8 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -416,13 +416,12 @@
             </div>
             <div class="oe_view_manager_row">
                 <div class="oe_view_manager_buttons"/>
-                <div class="oe_view_manager_switch oe_button_group">
+                <ul class="oe_view_manager_switch oe_button_group oe_right">
                     <t t-if="widget.views_src.length != 1" t-foreach="widget.views_src" t-as="view">
-                        <button type="button" t-attf-class="oe_vm_switch_#{view.view_type}" t-att-data-view-type="view.view_type" t-att-title="view.label || view.view_type">
-                            <span><t t-esc="view.label || view.view_type"/></span>
-                        </button>
+                      <li><a t-attf-class="oe_vm_switch_#{view.view_type} oe_i" t-att-data-view-type="view.view_type" t-att-title="view.label || view.view_type">
+                        </a></li>
                     </t>
-                </div>
+                </ul>
                 <div class="oe_view_manager_pager"/>
                 <div class="oe_view_manager_sidebar"/>
             </div>
-- 
cgit v1.2.3


From 5b686e0eed0a713cc6293f67ecf694c4311370bb Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Tue, 10 Apr 2012 01:44:40 +0200
Subject: view manager no more oldwidgets

bzr revid: al@openerp.com-20120409234440-vcg6whivq7x42sd8
---
 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 818b6f736d8..4234379b296 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -412,7 +412,7 @@
                 <h2 class="oe_view_title" t-if="widget.flags.display_title !== false">
                     <span class="oe_view_title_text"><t t-esc="widget.display_title()"/></span>
                 </h2>
-                <div t-attf-id="#{widget.element_id}_search" t-opentag="true"/>
+                <div class="oe_view_manager_view_search" t-opentag="true"/>
             </div>
             <div class="oe_view_manager_row">
                 <div class="oe_view_manager_buttons"/>
@@ -428,7 +428,7 @@
         </div>
         <div class="oe_view_manager_body">
             <t t-foreach="widget.views_src" t-as="view">
-                <div t-attf-id="#{widget.element_id}_view_#{view.view_type}"/>
+                <div t-attf-class="oe_view_manager_view_#{view.view_type}"/>
             </t>
         </div>
     </div>
-- 
cgit v1.2.3


From c06f170f8340fa8769e3164c7dc34e0e957e5b62 Mon Sep 17 00:00:00 2001
From: Minh Tran <mit@openerp.com>
Date: Tue, 10 Apr 2012 02:29:09 +0200
Subject: Styling of pager

bzr revid: mit@openerp.com-20120410002909-o5cwm5stb086u2my
---
 addons/web/static/src/xml/base.xml | 36 ++++++++++++++++++++----------------
 1 file changed, 20 insertions(+), 16 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 4234379b296..c63d370e249 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -416,13 +416,24 @@
             </div>
             <div class="oe_view_manager_row">
                 <div class="oe_view_manager_buttons"/>
+
                 <ul class="oe_view_manager_switch oe_button_group oe_right">
                     <t t-if="widget.views_src.length != 1" t-foreach="widget.views_src" t-as="view">
                       <li><a t-attf-class="oe_vm_switch_#{view.view_type} oe_i" t-att-data-view-type="view.view_type" t-att-title="view.label || view.view_type">
                         </a></li>
                     </t>
                 </ul>
-                <div class="oe_view_manager_pager"/>
+
+                <ul class="oe_button_group pagination oe_right">
+                  <li>
+                    <a class="oe_i oe_previous" type="button" data-pager-action="previous"> </a>
+                  </li>
+                  <li>
+                    <a class="oe_i oe_next" type="button" data-pager-action="next"> </a>
+                  </li>
+                </ul>
+
+                <ul class="oe_view_manager_pager"/>
                 <div class="oe_view_manager_sidebar"/>
             </div>
         </div>
@@ -477,21 +488,14 @@
     </div>
 </t>
 <t t-name="ViewPager">
-    <button class="oe_button oe_button_pager" type="button" data-pager-action="first">
-        <img t-att-src='_s + "/web/static/src/img/pager_first.png"'/>
-    </button>
-    <button class="oe_button oe_button_pager" type="button" data-pager-action="previous">
-        <img t-att-src='_s + "/web/static/src/img/pager_previous.png"'/>
-    </button>
-
-    <t t-raw="__content__"/>
-
-    <button class="oe_button oe_button_pager" type="button" data-pager-action="next">
-        <img t-att-src='_s + "/web/static/src/img/pager_next.png"'/>
-    </button>
-    <button class="oe_button oe_button_pager" type="button" data-pager-action="last">
-        <img t-att-src='_s + "/web/static/src/img/pager_last.png"'/>
-    </button>
+  
+    <li> <t t-raw="__content__"/> </li>
+    <!--<button class="oe_button oe_button_pager" type="button" data-pager-action="first">-->
+        <!--<img t-att-src='_s + "/web/static/src/img/pager_first.png"'/>-->
+    <!--</button>-->
+    <!--<button class="oe_button oe_button_pager" type="button" data-pager-action="last">-->
+        <!--<img t-att-src='_s + "/web/static/src/img/pager_last.png"'/>-->
+    <!--</button>-->
 </t>
 
 <t t-name="Sidebar">
-- 
cgit v1.2.3


From b6f8c0f01162524e1c87333cddea86140825f4d0 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Tue, 10 Apr 2012 10:47:52 +0200
Subject: revert mit pager

bzr revid: al@openerp.com-20120410084752-c5uvflwgi93pshvo
---
 addons/web/static/src/xml/base.xml | 36 ++++++++++++++++--------------------
 1 file changed, 16 insertions(+), 20 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 c63d370e249..4234379b296 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -416,24 +416,13 @@
             </div>
             <div class="oe_view_manager_row">
                 <div class="oe_view_manager_buttons"/>
-
                 <ul class="oe_view_manager_switch oe_button_group oe_right">
                     <t t-if="widget.views_src.length != 1" t-foreach="widget.views_src" t-as="view">
                       <li><a t-attf-class="oe_vm_switch_#{view.view_type} oe_i" t-att-data-view-type="view.view_type" t-att-title="view.label || view.view_type">
                         </a></li>
                     </t>
                 </ul>
-
-                <ul class="oe_button_group pagination oe_right">
-                  <li>
-                    <a class="oe_i oe_previous" type="button" data-pager-action="previous"> </a>
-                  </li>
-                  <li>
-                    <a class="oe_i oe_next" type="button" data-pager-action="next"> </a>
-                  </li>
-                </ul>
-
-                <ul class="oe_view_manager_pager"/>
+                <div class="oe_view_manager_pager"/>
                 <div class="oe_view_manager_sidebar"/>
             </div>
         </div>
@@ -488,14 +477,21 @@
     </div>
 </t>
 <t t-name="ViewPager">
-  
-    <li> <t t-raw="__content__"/> </li>
-    <!--<button class="oe_button oe_button_pager" type="button" data-pager-action="first">-->
-        <!--<img t-att-src='_s + "/web/static/src/img/pager_first.png"'/>-->
-    <!--</button>-->
-    <!--<button class="oe_button oe_button_pager" type="button" data-pager-action="last">-->
-        <!--<img t-att-src='_s + "/web/static/src/img/pager_last.png"'/>-->
-    <!--</button>-->
+    <button class="oe_button oe_button_pager" type="button" data-pager-action="first">
+        <img t-att-src='_s + "/web/static/src/img/pager_first.png"'/>
+    </button>
+    <button class="oe_button oe_button_pager" type="button" data-pager-action="previous">
+        <img t-att-src='_s + "/web/static/src/img/pager_previous.png"'/>
+    </button>
+
+    <t t-raw="__content__"/>
+
+    <button class="oe_button oe_button_pager" type="button" data-pager-action="next">
+        <img t-att-src='_s + "/web/static/src/img/pager_next.png"'/>
+    </button>
+    <button class="oe_button oe_button_pager" type="button" data-pager-action="last">
+        <img t-att-src='_s + "/web/static/src/img/pager_last.png"'/>
+    </button>
 </t>
 
 <t t-name="Sidebar">
-- 
cgit v1.2.3


From 79c988967ba8ff87a31da8d74245c4884332b403 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Tue, 10 Apr 2012 11:44:17 +0200
Subject: fix pager view_form

bzr revid: al@openerp.com-20120410094417-tza93i2kkko6dcy9
---
 addons/web/static/src/xml/base.xml | 36 +++++++++++++++++++++---------------
 1 file changed, 21 insertions(+), 15 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 4234379b296..27118a194e6 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -477,21 +477,27 @@
     </div>
 </t>
 <t t-name="ViewPager">
-    <button class="oe_button oe_button_pager" type="button" data-pager-action="first">
-        <img t-att-src='_s + "/web/static/src/img/pager_first.png"'/>
-    </button>
-    <button class="oe_button oe_button_pager" type="button" data-pager-action="previous">
-        <img t-att-src='_s + "/web/static/src/img/pager_previous.png"'/>
-    </button>
-
-    <t t-raw="__content__"/>
-
-    <button class="oe_button oe_button_pager" type="button" data-pager-action="next">
-        <img t-att-src='_s + "/web/static/src/img/pager_next.png"'/>
-    </button>
-    <button class="oe_button oe_button_pager" type="button" data-pager-action="last">
-        <img t-att-src='_s + "/web/static/src/img/pager_last.png"'/>
-    </button>
+    <span class="oe_pager_value">
+        <t t-raw="__content__"/>
+    </span>
+    <ul class="oe_pager_group">
+        <!--
+        <button class="oe_button oe_button_pager" type="button" data-pager-action="first">
+            <img t-att-src='_s + "/web/static/src/img/pager_first.png"'/>
+        </button>
+        -->
+        <li>
+            <a class="oe_i" type="button" data-pager-action="previous">(</a>
+        </li>
+        <li>
+            <a class="oe_i" type="button" data-pager-action="next">)</a>
+        </li>
+        <!--
+        <button class="oe_button oe_button_pager" type="button" data-pager-action="last">
+            <img t-att-src='_s + "/web/static/src/img/pager_last.png"'/>
+        </button>
+        -->
+    </ul>
 </t>
 
 <t t-name="Sidebar">
-- 
cgit v1.2.3


From 0da2dd7d5fbbe7d67d04a96317e4dcde7db972f3 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Tue, 10 Apr 2012 12:08:16 +0200
Subject: pager css fix

bzr revid: al@openerp.com-20120410100816-c8qcogm0e429953j
---
 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 27118a194e6..5077adf6b63 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -477,9 +477,9 @@
     </div>
 </t>
 <t t-name="ViewPager">
-    <span class="oe_pager_value">
+    <div class="oe_pager_value">
         <t t-raw="__content__"/>
-    </span>
+    </div>
     <ul class="oe_pager_group">
         <!--
         <button class="oe_button oe_button_pager" type="button" data-pager-action="first">
-- 
cgit v1.2.3


From e0c57cbadf325b3eb96b58306d6098c48fc3060b Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 10 Apr 2012 12:29:51 +0200
Subject: [ADD] Added support for @layout attribute in form views. Support for
 <sheet/> tag

bzr revid: fme@openerp.com-20120410102951-vnzvqms09uytaydx
---
 addons/web/static/src/xml/base.xml | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 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 5077adf6b63..2806d57ce1d 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -792,16 +792,19 @@
     </table>
 </form>
 
+<t t-name="FormRenderingForm.manual">
+    <div class="oe_form_manual_layout"/>
+</t>
 <t t-name="FormRenderingForm">
     <div class="oe_form_sheetbg">
-        <div class="oe_form_sheet oe_form_sheet_width">
-            <group t-if="legacy_mode" col="4"/>
+        <div t-attf-class="oe_form_sheet oe_form_sheet_width #{classnames}">
+            <group col="4"/>
         </div>
     </div>
 </t>
 <t t-name="FormRenderingGroup">
     <t t-set="table">
-        <table border="0" cellpadding="0" cellspacing="0" width="100%"/>
+        <table border="0" cellpadding="0" cellspacing="0" width="100%" t-att-class="classnames"/>
     </t>
     <t t-if="string">
         <fieldset class="oe_group_box">
@@ -815,7 +818,7 @@
 </t>
 <t t-name="FormRenderingNotebook">
     <div>
-        <ul class="oe_form_notebook">
+        <ul t-attf-class="oe_form_notebook #{classnames}">
             <li t-foreach="pages" t-as="page">
                 <a t-attf-href="##{page.id}">
                     <t t-esc="page.string"/>
@@ -825,19 +828,19 @@
     </div>
 </t>
 <t t-name="FormRenderingNotebookPage">
-    <div class="oe_form_notebook_page" t-att-id="id">
-        <group t-if="legacy_mode" col="4"/>
+    <div t-attf-class="oe_form_notebook_page #{classnames}" t-att-id="id">
+        <group t-if="layout === 'auto'" col="4"/>
     </div>
 </t>
 <t t-name="FormRenderingSeparator">
-    <div class="oe_horizontal_separator">
+    <div t-attf-class="oe_horizontal_separator #{classnames}">
         <t t-esc="string"/>
     </div>
 </t>
 <t t-name="FormRenderingLabel">
     <label  t-att-for="_for"
             t-att-title="help"
-            t-attf-class="oe_form_label#{help ? '_help' : ''} oe_align_#{align}">
+            t-attf-class="#{classnames} oe_form_label#{help ? '_help' : ''} oe_align_#{align}">
         <t t-esc="string"/>
         <span t-if="help">?</span>
         :
-- 
cgit v1.2.3


From 75a0603ccc155a7db6281e15ce5da0b8f989b5a3 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 10 Apr 2012 13:28:34 +0200
Subject: [IMP] Moved form layout outline feature into debug select box

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

(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 2806d57ce1d..1153a65852f 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -445,6 +445,7 @@
 <t t-name="ViewManagerDebug">
     <option value="">Debug View#<t t-esc="view.fields_view.view_id"/></option>
     <option t-if="_.indexOf(['form', 'page'], view_manager.active_view) gt -1" value="perm_read" data-views="form,page">View Log (perm_read)</option>
+    <option t-if="view_manager.active_view === 'form'" value="toggle_layout_outline">Toggle Form Layout Outline</option>
     <option value="fields">View Fields</option>
     <option value="fvg">Fields View Get</option>
     <t t-if="view_manager.session.uid === 1">
-- 
cgit v1.2.3


From 95db288939a02c28076a9d9879336038b96056b4 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 10 Apr 2012 13:26:56 +0200
Subject: [FIX] list view pager

bzr revid: xmo@openerp.com-20120410112656-nced0rr1j4zf9lvy
---
 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 1153a65852f..8131ddb4195 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -610,7 +610,7 @@
         </button>
     </div>
 </t>
-<t t-name="Listview.pager">
+<t t-name="ListView.pager">
     <div t-if="!widget.no_leaf and widget.options.pager !== false" class="oe_list_pager" t-att-colspan="widget.columns_count">
         <t t-call="ViewPager">
             <span class="oe-pager-state">
-- 
cgit v1.2.3


From d9e194be044e98029905d9c1c0d4129f0b5be375 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 10 Apr 2012 15:55:37 +0200
Subject: [FIX] Fixed dashboards

bzr revid: fme@openerp.com-20120410135537-54gonhjz3gfw9a4r
---
 addons/web/static/src/xml/base.xml | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 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 8131ddb4195..1a92dfd8b5a 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -600,19 +600,19 @@
         </tr>
     </tfoot>
 </table>
-<t t-name="ListView.buttons">
-    <div t-if="!widget.no_leaf and widget.options.action_buttons !== false" class="oe_list_buttons">
+<div t-name="ListView.buttons" class="oe_list_buttons">
+    <t t-if="!widget.no_leaf and widget.options.action_buttons !== false">
         <button type="button" class="oe_button oe_list_add" t-if="widget.options.addable">
             <t t-esc="widget.options.addable"/>
         </button>
         <button type="button" class="oe_button oe_list_delete" t-if="widget.options.selectable and widget.options.deletable">
             Delete
         </button>
-    </div>
-</t>
+    </t>
+</div>
 <t t-name="ListView.pager">
-    <div t-if="!widget.no_leaf and widget.options.pager !== false" class="oe_list_pager" t-att-colspan="widget.columns_count">
-        <t t-call="ViewPager">
+    <div class="oe_list_pager" t-att-colspan="widget.columns_count">
+        <t t-if="!widget.no_leaf and widget.options.pager !== false" t-call="ViewPager">
             <span class="oe-pager-state">
             </span>
         </t>
@@ -681,8 +681,8 @@
         <div class="oe_form_container"/>
     </div>
 </t>
-<t t-name="FormView.buttons">
-    <div class="oe_form_buttons" t-if="widget.options.action_buttons !== false">
+<div t-name="FormView.buttons" class="oe_form_buttons">
+    <t t-if="widget.options.action_buttons !== false">
         <span class="oe_form_buttons_view">
             <button type="button" class="oe_button oe_form_button_edit">Edit</button>
             <button type="button" class="oe_button oe_form_button_create">Create</button>
@@ -693,11 +693,11 @@
             <button type="button" class="oe_button oe_form_button_save">Save</button>
             <button type="button" class="oe_button oe_form_button_cancel">Cancel</button>
         </span>
-    </div>
-</t>
+    </t>
+</div>
 <t t-name="FormView.pager">
-    <div class="oe_form_pager" t-if="widget.options.pager !== false">
-        <t t-call="ViewPager">
+    <div class="oe_form_pager">
+        <t t-if="widget.options.pager !== false" t-call="ViewPager">
             <span class="oe_pager_index">0</span><span class="oe_pager_separator"> / </span><span class="oe_pager_count">0</span>
         </t>
     </div>
-- 
cgit v1.2.3


From f61cd197b61b9ed19efcd0396b9524a3975bffc6 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 10 Apr 2012 16:20:51 +0200
Subject: [IMP] Moved kanban buttons in header

bzr revid: fme@openerp.com-20120410142051-lmhd2t0kcmqyf3sv
---
 addons/web/static/src/xml/base.xml | 19 -------------------
 1 file changed, 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 1a92dfd8b5a..8cb8f7036b7 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -654,25 +654,6 @@
     </td>
 </tr>
 
-<t t-name="FormView">
-    <div class="oe_formview">
-        <div class="oe_form_header">
-            <div class="oe_form_buttons" t-if="widget.options.action_buttons !== false">
-                <button type="button" class="oe_button oe_form_button_save">Save</button>
-                <button type="button" class="oe_button oe_form_button_cancel">Cancel</button>
-            </div>
-            <div class="oe_form_pager" t-if="widget.options.pager !== false">
-                <t t-call="ViewPager">
-                    <span class="oe_pager_index">0</span><span class="oe_pager_separator"> / </span><span class="oe_pager_count">0</span>
-                </t>
-            </div>
-            <div class="oe_form_sidebar">
-            </div>
-        </div>
-        <div style="clear: both;"/>
-        <div class="oe_form_container"/>
-    </div>
-</t>
 <t t-name="FormView">
     <div class="oe_formview">
         <div class="oe_form_buttons"/>
-- 
cgit v1.2.3


From 4d9b3be656329c62f0024c0e78dabf509b55ddd2 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 10 Apr 2012 16:29:01 +0200
Subject: [fix] al forgot view page

bzr revid: nicolas.vanhoren@openerp.com-20120410142901-9x3f0if342z922bu
---
 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 8cb8f7036b7..1f2ea1a2d4b 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -444,7 +444,7 @@
 </t>
 <t t-name="ViewManagerDebug">
     <option value="">Debug View#<t t-esc="view.fields_view.view_id"/></option>
-    <option t-if="_.indexOf(['form', 'page'], view_manager.active_view) gt -1" value="perm_read" data-views="form,page">View Log (perm_read)</option>
+    <option t-if="view_manager.active_view === 'form'" value="perm_read" data-views="form,page">View Log (perm_read)</option>
     <option t-if="view_manager.active_view === 'form'" value="toggle_layout_outline">Toggle Form Layout Outline</option>
     <option value="fields">View Fields</option>
     <option value="fvg">Fields View Get</option>
-- 
cgit v1.2.3


From dc12810ba97a3f651344e3d0299e0f73506300f8 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Tue, 10 Apr 2012 17:41:56 +0200
Subject: list view delete button

bzr revid: al@openerp.com-20120410154156-adbw5slg9v65jrgo
---
 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 1f2ea1a2d4b..f92862fbf70 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -650,7 +650,7 @@
         </td>
     </t>
     <td t-if="options.deletable" class='oe-record-delete' width="1">
-        <button type="button" name="delete"></button>
+        <button type="button" name="delete" class="oe_i">d</button>
     </td>
 </tr>
 
-- 
cgit v1.2.3


From 53510b98e7d9849329fe1666e42c3d96703a7e90 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Tue, 10 Apr 2012 23:26:45 +0200
Subject: tables vs float, viewmanager uses tables, tables have won a battle
 but not yet the war

bzr revid: al@openerp.com-20120410212645-x2uumkezv9w031ei
---
 addons/web/static/src/xml/base.xml | 45 ++++++++++++++++++++++----------------
 1 file changed, 26 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 f92862fbf70..fdf5a5a7b5f 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -407,25 +407,32 @@
 
 <t t-name="ViewManager">
     <div class="oe_view_manager">
-        <div class="oe_view_manager_header">
-            <div class="oe_view_manager_row">
-                <h2 class="oe_view_title" t-if="widget.flags.display_title !== false">
-                    <span class="oe_view_title_text"><t t-esc="widget.display_title()"/></span>
-                </h2>
-                <div class="oe_view_manager_view_search" t-opentag="true"/>
-            </div>
-            <div class="oe_view_manager_row">
-                <div class="oe_view_manager_buttons"/>
-                <ul class="oe_view_manager_switch oe_button_group oe_right">
-                    <t t-if="widget.views_src.length != 1" t-foreach="widget.views_src" t-as="view">
-                      <li><a t-attf-class="oe_vm_switch_#{view.view_type} oe_i" t-att-data-view-type="view.view_type" t-att-title="view.label || view.view_type">
-                        </a></li>
-                    </t>
-                </ul>
-                <div class="oe_view_manager_pager"/>
-                <div class="oe_view_manager_sidebar"/>
-            </div>
-        </div>
+        <table class="oe_view_manager_header2">
+            <col width="33%"/>
+            <col width="33%"/>
+            <col width="34%"/>
+            <tr>
+                <td colspan="2">
+                    <h2 class="oe_view_title" t-if="widget.flags.display_title !== false">
+                        <span class="oe_view_title_text"><t t-esc="widget.display_title()"/></span>
+                    </h2>
+                </td>
+                <td> <div class="oe_view_manager_view_search" t-opentag="true"/> </td>
+            </tr>
+            <tr>
+                <td> <div class="oe_view_manager_buttons"/> </td>
+                <td> <div class="oe_view_manager_sidebar"/> </td>
+                <td>
+                    <ul class="oe_view_manager_switch oe_button_group oe_right">
+                        <t t-if="widget.views_src.length != 1" t-foreach="widget.views_src" t-as="view">
+                          <li><a t-attf-class="oe_vm_switch_#{view.view_type} oe_i" t-att-data-view-type="view.view_type" t-att-title="view.label || view.view_type">
+                            </a></li>
+                        </t>
+                    </ul>
+                    <div class="oe_view_manager_pager oe_right"/>
+                </td>
+            </tr>
+        </table>
         <div class="oe_view_manager_body">
             <t t-foreach="widget.views_src" t-as="view">
                 <div t-attf-class="oe_view_manager_view_#{view.view_type}"/>
-- 
cgit v1.2.3


From c9cd4657afdf77c5c2ced45dee8491a301702f2a Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Tue, 17 Apr 2012 03:19:33 +0200
Subject: [FIX] restore attachement, part1 read-only

bzr revid: al@openerp.com-20120417011933-wwkynkzpxex0lbbh
---
 addons/web/static/src/xml/base.xml | 70 +++++++++++++++++++-------------------
 1 file changed, 35 insertions(+), 35 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 fdf5a5a7b5f..0df4ca71777 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -515,7 +515,7 @@
                 <button class="oe_dropdown_toggle"><t t-esc="section.label"/></button>
                 <ul class="oe_dropdown_menu">
                     <li t-foreach="widget.items[section.name]" t-as="item" t-att-class="item.classname">
-                        <a class="oe_sidebar_action_a" t-att-title="item.title" href="#" t-att-data-section="section.name" t-att-data-index="item_index">
+                        <a class="oe_sidebar_action_a" t-att-title="item.title" t-att-data-section="section.name" t-att-data-index="item_index" t-att-href="item.url" target="_blank">
                             <t t-raw="item.label"/>
                         </a>
                     </li>
@@ -524,6 +524,40 @@
         </t>
     </div>
 </t>
+<t t-name="Sidebar.attachments">
+    <div class="oe-sidebar-attachments-toolbar">
+        <div class="oe-binary-file-set" style="float: right">
+            <form class="oe-binary-form" t-attf-target="#{element_id}_iframe"
+                method="post" enctype="multipart/form-data" action="/web/binary/upload_attachment">
+                <input type="hidden" name="session_id" t-att-value="session.session_id"/>
+                <input type="hidden" name="callback" t-attf-value="#{element_id}_iframe"/>
+                <input type="hidden" name="model" t-att-value="view.dataset.model"/>
+                <input type="hidden" name="id" t-att-value="view.datarecord.id"/>
+                <button class="oe_button" type="button">
+                    <img t-att-src='_s + "/web/static/src/img/throbber.gif"' width="16" height="16" style="display: none"/>
+                    <span>Add</span>
+                </button>
+                <input type="file" class="oe-binary-file" name="ufile" title="Add attachment"
+                    t-att-onclick="view.datarecord.id ? null : 'alert(\'No record selected ! You can only attach to existing record.\'); return false;'"/>
+            </form>
+            <iframe t-attf-id="#{element_id}_iframe" t-attf-name="#{element_id}_iframe" style="display: none"/>
+        </div>
+    </div>
+    <br style="clear: both"/>
+    <ul class="oe-sidebar-attachments-items">
+        <li t-foreach="attachments" t-as="attachment">
+            <t t-if="attachment.type == 'binary'" t-set="attachment.url" t-value="_s + '/web/binary/saveas?session_id='
+                + session.session_id + '&amp;model=ir.attachment&amp;id=' + attachment.id
+                + '&amp;field=datas&amp;filename_field=name&amp;t=' + (new Date().getTime())"/>
+            <a class="oe-sidebar-attachments-link" t-att-href="attachment.url" target="_blank">
+                <t t-esc="attachment.name"/>
+            </a>
+            <a href="#" class="oe-sidebar-attachment-delete" t-att-data-id="attachment.id" t-attf-title="Delete the attachment #{attachment.name}">
+                <img t-att-src='_s + "/web/static/src/img/attachments-close.png"' width="15" height="15" border="0"/>
+            </a>
+        </li>
+    </ul>
+</t>
 
 <t t-name="TreeView">
     <select t-if="toolbar" style="width: 30%">
@@ -690,40 +724,6 @@
         </t>
     </div>
 </t>
-<t t-name="FormView.sidebar.attachments">
-    <div class="oe-sidebar-attachments-toolbar">
-        <div class="oe-binary-file-set" style="float: right">
-            <form class="oe-binary-form" t-attf-target="#{element_id}_iframe"
-                method="post" enctype="multipart/form-data" action="/web/binary/upload_attachment">
-                <input type="hidden" name="session_id" t-att-value="session.session_id"/>
-                <input type="hidden" name="callback" t-attf-value="#{element_id}_iframe"/>
-                <input type="hidden" name="model" t-att-value="view.dataset.model"/>
-                <input type="hidden" name="id" t-att-value="view.datarecord.id"/>
-                <button class="oe_button" type="button">
-                    <img t-att-src='_s + "/web/static/src/img/throbber.gif"' width="16" height="16" style="display: none"/>
-                    <span>Add</span>
-                </button>
-                <input type="file" class="oe-binary-file" name="ufile" title="Add attachment"
-                    t-att-onclick="view.datarecord.id ? null : 'alert(\'No record selected ! You can only attach to existing record.\'); return false;'"/>
-            </form>
-            <iframe t-attf-id="#{element_id}_iframe" t-attf-name="#{element_id}_iframe" style="display: none"/>
-        </div>
-    </div>
-    <br style="clear: both"/>
-    <ul class="oe-sidebar-attachments-items">
-        <li t-foreach="attachments" t-as="attachment">
-            <t t-if="attachment.type == 'binary'" t-set="attachment.url" t-value="_s + '/web/binary/saveas?session_id='
-                + session.session_id + '&amp;model=ir.attachment&amp;id=' + attachment.id
-                + '&amp;field=datas&amp;filename_field=name&amp;t=' + (new Date().getTime())"/>
-            <a class="oe-sidebar-attachments-link" t-att-href="attachment.url" target="_blank">
-                <t t-esc="attachment.name"/>
-            </a>
-            <a href="#" class="oe-sidebar-attachment-delete" t-att-data-id="attachment.id" t-attf-title="Delete the attachment #{attachment.name}">
-                <img t-att-src='_s + "/web/static/src/img/attachments-close.png"' width="15" height="15" border="0"/>
-            </a>
-        </li>
-    </ul>
-</t>
 <form t-name="FormView.set_default" class="oe_forms oe_frame">
     <t t-set="args" t-value="widget.dialog_options.args"/>
     <table style="width: 100%">
-- 
cgit v1.2.3


From 4ecd07837f5f28d295efd5fe13b6643f863851fc Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Tue, 17 Apr 2012 03:43:23 +0200
Subject: [FIX] restore attachement, part2 very beginning of add

bzr revid: al@openerp.com-20120417014323-vp1cn1k5en5ogmdq
---
 addons/web/static/src/xml/base.xml | 3 +++
 1 file changed, 3 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 0df4ca71777..7cbffe865e5 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -519,6 +519,9 @@
                             <t t-raw="item.label"/>
                         </a>
                     </li>
+                    <li t-if="section.name == 'files'" class="oe_sidebar_add" style="display:none;">
+                        Input type file stuff
+                    </li>
                 </ul>
             </div>
         </t>
-- 
cgit v1.2.3


From 1be2406a0534a21d1a7c6defbddf9824dcdd4b08 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 17 Apr 2012 10:30:16 +0200
Subject: [FIX] Fix missing modifiers on notebook page tab

bzr revid: fme@openerp.com-20120417083016-cvku8xv0bsajzy91
---
 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 7cbffe865e5..f365abf8856 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -811,7 +811,7 @@
 <t t-name="FormRenderingNotebook">
     <div>
         <ul t-attf-class="oe_form_notebook #{classnames}">
-            <li t-foreach="pages" t-as="page">
+            <li t-foreach="pages" t-as="page" t-att-modifiers="page.modifiers">
                 <a t-attf-href="##{page.id}">
                     <t t-esc="page.string"/>
                 </a>
-- 
cgit v1.2.3


From 93682f99dbe6e8e67e519bca83230ae7bb05a104 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Wed, 18 Apr 2012 18:10:47 +0200
Subject: [fix] problem with text fields

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

bzr revid: nicolas.vanhoren@openerp.com-20120418161047-8yzmvsiluszc0g78
---
 addons/web/static/src/xml/base.xml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 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 f365abf8856..918231cf46c 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -972,16 +972,16 @@
     </t>
 </t>
 <t t-name="FieldText">
-    <t t-if="!widget.get('effective_readonly')">
-        <div class="oe_form_field_text">
-            <textarea rows="6"
-                t-att-name="widget.name"
-                class="field_text"
-                t-att-tabindex="widget.node.attrs.tabindex"
-                t-att-autofocus="widget.node.attrs.autofocus"
-            ></textarea><img class="oe_field_translate oe_input_icon" t-if="widget.field.translate" t-att-src='_s + "/web/static/src/img/icons/terp-translate.png"' width="16" height="16" border="0"/>
-        </div>
-    </t>
+    <div class="oe_form_field_text">
+        <textarea rows="6"
+            t-att-name="widget.name"
+            class="field_text"
+            t-att-tabindex="widget.node.attrs.tabindex"
+            t-att-autofocus="widget.node.attrs.autofocus"
+        ></textarea>
+        <img class="oe_field_translate oe_input_icon" t-if="widget.field.translate"
+            t-att-src='_s + "/web/static/src/img/icons/terp-translate.png"' width="16" height="16" border="0"/>
+    </div>
 </t>
 <t t-name="web.datetimepicker">
     <div class="oe_datepicker_root oe_form_field_datetime">
-- 
cgit v1.2.3


From f5c37eabe94a04ca62d08f46c1cf3a084fa77f19 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Wed, 18 Apr 2012 23:35:41 +0200
Subject: [IMP] open in a new tab on menuitems

bzr revid: al@openerp.com-20120418213541-c88pw8hm81rht4rw
---
 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 918231cf46c..0e1edb89969 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -324,7 +324,7 @@
     </ul>
 </t>
 <t t-name="Menu.secondary.link">
-    <a href="#"
+    <a t-attf-href="#menu_id=#{menu.id}&amp;action_id=#{menu.action ? menu.action.split(',')[1] : ''}"
         t-att-class="menu.children.length ? 'oe_menu_toggler' : 'oe_menu_leaf'"
         t-att-data-menu="menu.id"
         t-att-data-action-model="menu.action ? menu.action.split(',')[0] : ''"
-- 
cgit v1.2.3