diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py index ba5f56f613f..65002d52d7a 100644 --- a/addons/web/controllers/main.py +++ b/addons/web/controllers/main.py @@ -89,7 +89,7 @@ html_template = """ }); - + """ @@ -197,7 +197,7 @@ class WebClient(openerpweb.Controller): 'js': js, 'css': css, 'modules': simplejson.dumps(self.server_wide_modules(req)), - 'init': 'new s.web.WebClient().appendTo($("body"));', + 'init': 'new s.web.WebClient().replace($("body"));', } return r diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 2fc3aafd87b..fccbb5410e2 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1,5 +1,4 @@ - -.openerp { +body.openerp { padding: 0; margin: 0; height: 100%; @@ -8,7 +7,7 @@ font-family: Ubuntu, Helvetica, sans-serif; } -.openerp, .openerp textarea, .openerp input, .openerp select, .openerp option, .openerp button, .openerp .ui-widget { +body.openerp, .openerp textarea, .openerp input, .openerp select, .openerp option, .openerp button, .openerp .ui-widget { font-family: Ubuntu, Helvetica, sans-serif; font-size:85%; } diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js index 06bfcbfcf14..7b53c4dd5ab 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -1042,7 +1042,7 @@ openerp.web.WebClient = openerp.web.Widget.extend(/** @lends openerp.web.WebClie this._current_state = null; }, render_element: function() { - this.$element = $('
'); + this.$element = $(''); this.$element.attr("id", "oe"); this.$element.addClass("openerp"); }, diff --git a/addons/web/static/src/js/core.js b/addons/web/static/src/js/core.js index c74b1df0160..944a9d659a6 100644 --- a/addons/web/static/src/js/core.js +++ b/addons/web/static/src/js/core.js @@ -502,7 +502,7 @@ openerp.web.Connection = openerp.web.CallbackEnabled.extend( /** @lends openerp. .attr('action', ajax.url + '?' + $.param(data)) .append($('').attr('value', payload_str)) .hide() - .appendTo($('.openerp')); + .appendTo($('body')); var cleanUp = function() { if ($iframe) { $iframe.unbind("load").attr("src", "javascript:false;").remove(); diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index e338bcec534..1321be93ca7 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -1544,7 +1544,7 @@ openerp.web.form.FieldText = openerp.web.form.Field.extend({ _.each('font-family,font-size,white-space'.split(','), function(style) { $div.css(style, $input.css(style)); }); - $div.appendTo($(".openerp")); + $div.appendTo($('body')); new_height = $div.height(); if (new_height < 90) { new_height = 90; @@ -3155,7 +3155,7 @@ openerp.web.form.FieldStatus = openerp.web.form.Field.extend({ var div = $("
"); div.css("display", "none"); div.css("color", color); - div.appendTo($(".openerp")); + div.appendTo($("body")); var ncolor = div.css("color"); div.remove(); var res = /^\s*rgb\s*\(\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d+)\s*\)\s*$/.exec(ncolor);