diff options
| author | niv-openerp <nicolas.vanhoren@openerp.com> | 2012-02-07 12:14:51 +0100 |
|---|---|---|
| committer | niv-openerp <nicolas.vanhoren@openerp.com> | 2012-02-07 12:14:51 +0100 |
| commit | 9fb0a22b869bd52c406152a64758ac443a67afa4 (patch) | |
| tree | f6d08280ecd3a5861dab460789b8a5446aed1433 /addons/web/static/src | |
| parent | a898146cc1cc98d638a98377e65f7c0f0b909383 (diff) | |
[imp] nivified notebook
bzr revid: nicolas.vanhoren@openerp.com-20120207111451-le08xlmqfhalkcgm
Diffstat (limited to 'addons/web/static/src')
| -rw-r--r-- | addons/web/static/src/js/view_form.js | 10 | ||||
| -rw-r--r-- | 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"> |