From 3644361b1f3f429e15efde6e80e1cb26456cdad8 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Thu, 23 Feb 2012 14:11:40 +0100 Subject: [PATCH] [IMP] Webclient not OldWidget anymore. Renamed template to 'WebClient' Made a seperate revision because of edi addon dependency bzr revid: fme@openerp.com-20120223131140-2p7uycfs2el6ibei --- addons/web/static/src/js/chrome.js | 12 ++++-------- addons/web/static/src/xml/base.xml | 2 +- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js index 15d0d0fc633..63587ad59fa 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -1065,12 +1065,10 @@ openerp.web.Menu = openerp.web.OldWidget.extend(/** @lends openerp.web.Menu# */ } }); -openerp.web.WebClient = openerp.web.OldWidget.extend(/** @lends openerp.web.WebClient */{ +openerp.web.WebClient = openerp.web.Widget.extend(/** @lends openerp.web.WebClient */{ /** * @constructs openerp.web.WebClient - * @extends openerp.web.OldWidget - * - * @param element_id + * @extends openerp.web.Widget */ init: function(parent) { var self = this; @@ -1079,11 +1077,9 @@ openerp.web.WebClient = openerp.web.OldWidget.extend(/** @lends openerp.web.WebC this._current_state = null; }, - render_element: function() { - this.$element.addClass("openerp openerp2"); - }, start: function() { var self = this; + this.$element.addClass("openerp openerp2"); if (jQuery.param != undefined && jQuery.deparam(jQuery.param.querystring()).kitten != undefined) { this.$element.addClass("kitten-mode-activated"); this.$element.delegate('img.oe-record-edit-link-img', 'hover', function(e) { @@ -1123,7 +1119,7 @@ openerp.web.WebClient = openerp.web.OldWidget.extend(/** @lends openerp.web.WebC var self = this; this.destroy_content(); this.show_common(); - self.$table = $(QWeb.render("Interface", {})); + self.$table = $(QWeb.render("WebClient", {})); self.$element.append(self.$table); self.header = new openerp.web.Header(self); self.header.on_logout.add(this.proxy('on_logout')); diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 98d99f74ef6..3d791fbbbd1 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -17,7 +17,7 @@ - +