From 1b3701ce5914d9477f4a0ce215e06c9b6992aee8 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 7 Feb 2012 10:26:55 +0100
Subject: [IMP] Fix some remaining untranslated areas, and extract @title,@alt
 and @label attributes too

(pending an update of the qweb rendering engine to
 actually translate the newly exported attributes)

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

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

diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 8a8e39e0b7e..a504d9f09a4 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -422,7 +422,7 @@
                 <div class="oe_vm_switch">
                     <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.view_type">
+                        <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>
-- 
cgit v1.2.3


From ed9eeea3db818110aa7c01206267514890680ba9 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 7 Feb 2012 12:01:29 +0100
Subject: [imp] nivified root frame

bzr revid: nicolas.vanhoren@openerp.com-20120207110129-psfxmdiw9c2gvxtp
---
 addons/web/static/src/xml/base.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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

diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 8a8e39e0b7e..241d323dc0e 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -743,7 +743,8 @@
             </t>
         </div>
     </div>
-    <t t-raw="frame.render()"/>
+    <div class="oe_form_root_frame_placeholder">
+    </div>
 </t>
 <t t-name="One2Many.formview" t-extend="FormView">
     <t t-jquery=".oe_form_buttons" t-operation="inner">
-- 
cgit v1.2.3


From 9fb0a22b869bd52c406152a64758ac443a67afa4 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 7 Feb 2012 12:14:51 +0100
Subject: [imp] nivified notebook

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

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

diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 241d323dc0e..76e2d5f15d9 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -837,7 +837,8 @@
         </li>
     </ul>
     <t t-foreach="widget.pages" t-as="page">
-        <t t-raw="page.render()"/>
+    	<div t-att-class="page.element_class">
+    	</div>
     </t>
 </t>
 <t t-name="WidgetNotebook.tooltip">
@@ -854,9 +855,7 @@
     </t>
 </t>
 <t t-name="WidgetNotebookPage">
-    <div>
-        <t t-call="WidgetFrame"/>
-    </div>
+	<t t-call="WidgetFrame"/>
 </t>
 <t t-name="WidgetSeparator">
     <div t-if="widget.orientation !== 'vertical'" t-att-class="'separator ' + widget.orientation">
-- 
cgit v1.2.3


From 243d524978bf2a4aaab508984c87bbf9af9d1810 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 7 Feb 2012 14:01:25 +0100
Subject: [imp] polish render and render_element usage

bzr revid: nicolas.vanhoren@openerp.com-20120207130125-xexqks24jb7mguy8
---
 addons/web/static/src/xml/base.xml | 2 --
 1 file changed, 2 deletions(-)

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

diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 76e2d5f15d9..2871552e590 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -743,8 +743,6 @@
             </t>
         </div>
     </div>
-    <div class="oe_form_root_frame_placeholder">
-    </div>
 </t>
 <t t-name="One2Many.formview" t-extend="FormView">
     <t t-jquery=".oe_form_buttons" t-operation="inner">
-- 
cgit v1.2.3


From a93634d80ca6a5cc48441443c291d3ebb7625ab6 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 7 Feb 2012 15:31:16 +0100
Subject: [FIX] base.xml: exclude classnames set with @t-set from translatable
 things

This could cause problems if someone was to translate these
class names to something different, possibly breaking all
menu rendering.
The corresponding web.pot template was already re-exported,
to remove the spurious terms (and incidentally update all
source line references).

bzr revid: odo@openerp.com-20120207143116-tnyerd15j9hlpjff
---
 addons/web/static/src/xml/base.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 279c3affa5c..4194831bb78 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -390,7 +390,7 @@
     </div>
     <div t-foreach="widget.data.data.children" t-as="menu" style="display: none" class="oe_secondary_menu" t-att-data-menu-parent="menu.id">
         <t t-foreach="menu.children" t-as="menu">
-            <t t-set="classname">oe_secondary_menu_item</t>
+            <t t-set="classname" t-translation="off">oe_secondary_menu_item</t>
             <t t-set="level" t-value="0"/>
             <t t-call="Menu.secondary.children"/>
         </t>
@@ -405,7 +405,7 @@
     </a>
     <div t-attf-class="oe_secondary_submenu" t-if="menu.children.length" t-att-style="menu_first and level == 1 ? undefined : 'display: none'">
         <t t-foreach="menu.children" t-as="menu">
-            <t t-set="classname">oe_secondary_submenu_item</t>
+            <t t-set="classname" t-translation="off">oe_secondary_submenu_item</t>
             <t t-call="Menu.secondary.children"/>
         </t>
     </div>
-- 
cgit v1.2.3


From 7d05f195d9de3ec158629931f646e9d86de7992f Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Tue, 7 Feb 2012 15:06:28 +0100
Subject: [FIX] handle multilines in <label> tags of form views

bzr revid: chs@openerp.com-20120207140628-4yxgxv849cjg5fl9
---
 addons/web/static/src/xml/base.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 279c3affa5c..eec5ef77bd3 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -927,7 +927,7 @@
     </ul>
 </t>
 <t t-name="WidgetParagraph">
-    <p t-attf-class="oe_form_paragraph oe_align_#{widget.align}"><t t-esc="widget.string"/></p>
+    <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"
-- 
cgit v1.2.3


From df0b4f8c3546755f0df3590f3edfd87fa75889de Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 7 Feb 2012 19:22:55 +0100
Subject: [IMP] i18n extractor now ignores comments and PIs + additional
 spurious translations removed

PO templates updated accordingly

bzr revid: odo@openerp.com-20120207182255-23s4yp4hrteierht
---
 addons/web/static/src/xml/base.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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

diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 4194831bb78..6b068679310 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -3,7 +3,7 @@
 -->
 <templates id="template" xml:space="preserve">
 <t t-name="Notification">
-    <div class="oe_notification">
+    <div class="oe_notification" t-translation="off">
         <div id="oe_notification_default">
             <a class="ui-notify-cross ui-notify-close" href="#">x</a>
             <h1>#{title}</h1>
@@ -385,8 +385,8 @@
 </t>
 <t t-name="Menu.secondary">
     <div t-attf-class="oe_toggle_secondary_menu">
-        <span class="oe_menu_fold" title="Fold menu">&amp;laquo;</span>
-        <span class="oe_menu_unfold" title="Unfold menu">&amp;raquo;</span>
+        <span class="oe_menu_fold" title="Fold menu"><t t-raw="'&amp;laquo;'"/></span>
+        <span class="oe_menu_unfold" title="Unfold menu"><t t-raw="'&amp;raquo;'"/></span>
     </div>
     <div t-foreach="widget.data.data.children" t-as="menu" style="display: none" class="oe_secondary_menu" t-att-data-menu-parent="menu.id">
         <t t-foreach="menu.children" t-as="menu">
@@ -1608,7 +1608,7 @@
             <tr class="oe_export_row">
                 <t t-foreach="(field.id).split('/')" t-as="level" >
                     <t t-if="(field.id).split('/')[0] != level">
-                        <td width="18">&amp;nbsp;</td>
+                        <td width="18" t-translation="off">&amp;nbsp;</td>
                     </t>
                 </t>
                 <td valign="top" align="left" style="cursor: pointer;" width="18">
-- 
cgit v1.2.3


From 44263a42b2b9183ceeb4beba25adc79d5cd6abf9 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Wed, 8 Feb 2012 12:11:10 +0100
Subject: [fix] revert form refactoring branch

bzr revid: nicolas.vanhoren@openerp.com-20120208111110-p2nj0tehupxa0gmz
---
 addons/web/static/src/xml/base.xml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

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

diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 6b068679310..69c491c73a5 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -743,6 +743,7 @@
             </t>
         </div>
     </div>
+    <t t-raw="frame.render()"/>
 </t>
 <t t-name="One2Many.formview" t-extend="FormView">
     <t t-jquery=".oe_form_buttons" t-operation="inner">
@@ -835,8 +836,7 @@
         </li>
     </ul>
     <t t-foreach="widget.pages" t-as="page">
-    	<div t-att-class="page.element_class">
-    	</div>
+        <t t-raw="page.render()"/>
     </t>
 </t>
 <t t-name="WidgetNotebook.tooltip">
@@ -853,7 +853,9 @@
     </t>
 </t>
 <t t-name="WidgetNotebookPage">
-	<t t-call="WidgetFrame"/>
+    <div>
+        <t t-call="WidgetFrame"/>
+    </div>
 </t>
 <t t-name="WidgetSeparator">
     <div t-if="widget.orientation !== 'vertical'" t-att-class="'separator ' + widget.orientation">
-- 
cgit v1.2.3