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: [PATCH] [imp] nivified notebook

bzr revid: nicolas.vanhoren@openerp.com-20120207111451-le08xlmqfhalkcgm
---
 addons/web/static/src/js/view_form.js | 10 ++++++++--
 addons/web/static/src/xml/base.xml    |  7 +++----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 0e0bbaa6505..06442b169d1 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -103,8 +103,6 @@ openerp.web.FormView = openerp.web.View.extend( /** @lends openerp.web.FormView#
         this.root_frame.render_element();
         
         _.each(this.widgets, function(w) {
-        	w.$element = self.$element.find(
-				'.' + w.element_class.replace(/[^\r\n\f0-9A-Za-z_-]/g, "\\$&"));
             w.start();
         });
         this.$form_header = this.$element.find('.oe_form_header:first');
@@ -1001,6 +999,14 @@ openerp.web.form.WidgetNotebook = openerp.web.form.Widget.extend({
             }
         }
     },
+    render_element: function() {
+    	this._super();
+    	var self = this;
+	    _.each(this.pages, function(page) {
+        	page.$element = self.$element.find('.' + page.element_class.replace(/[^\r\n\f0-9A-Za-z_-]/g, "\\$&"));
+        	page.render_element();
+	    });
+    },
     start: function() {
         var self = this;
         this._super.apply(this, arguments);
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">