[imp] modified web client to be a div instead of a body

bzr revid: nicolas.vanhoren@openerp.com-20120104113555-yiudv22gxr4s3k6k

diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index 65002d5..c83d016 100644 (file)
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -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().replace($("body"));',
+            'init': 'new s.web.WebClient().appendTo($("body"));',
         }
         return r
 

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 9fa0099..0606027 100644 (file)
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1,4 +1,10 @@
-body.openerp {
+
+body {
+    margin: 0;
+    height: 100%;
+}
+
+.openerp {
     padding: 0;
     margin: 0;
     height: 100%;
@@ -7,7 +13,7 @@ body.openerp {
     font-family: Ubuntu, Helvetica, sans-serif;
 }
 
-body.openerp, .openerp textarea, .openerp input, .openerp select, .openerp option, .openerp button, .openerp .ui-widget {
+.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 d8b4e0f..9c3f7e0 100644 (file)
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -1064,7 +1064,7 @@ openerp.web.WebClient = openerp.web.Widget.extend(/** @lends openerp.web.WebClie
         this._current_state = null;
     },
     render_element: function() {
-        this.$element = $('<body/>');
+        this.$element = $('<div/>');
         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 944a9d6..c74b1df 100644 (file)
--- 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($('<input type="hidden" name="r" />').attr('value', payload_str))
                         .hide()
-                        .appendTo($('body'));
+                        .appendTo($('.openerp'));
             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 1321be9..e338bce 100644 (file)
--- 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($('body'));
+        $div.appendTo($(".openerp"));
         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></div>");
         div.css("display", "none");
         div.css("color", color);
-        div.appendTo($("body"));
+        div.appendTo($(".openerp"));
         var ncolor = div.css("color");
         div.remove();
         var res = /^\s*rgb\s*\(\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d+)\s*\)\s*$/.exec(ncolor);