summaryrefslogtreecommitdiff
path: root/addons/web/controllers/main.py
diff options
context:
space:
mode:
authorniv-openerp <nicolas.vanhoren@openerp.com>2012-01-04 16:53:29 +0100
committerniv-openerp <nicolas.vanhoren@openerp.com>2012-01-04 16:53:29 +0100
commit2f1dace76a5f2e06aea250687519dbdc481e60b8 (patch)
tree009794c2c70d796a11090416c154958f530ead31 /addons/web/controllers/main.py
parent0e3809d8ccb0d51d06d1f762d0f37f49bc29c0a7 (diff)
[fix] rollback 1873 & 1871 to correct bugs related to login page & dialogs
bzr revid: nicolas.vanhoren@openerp.com-20120104155329-tfk6gt4mjhme82od
Diffstat (limited to 'addons/web/controllers/main.py')
-rw-r--r--addons/web/controllers/main.py4
1 files changed, 2 insertions, 2 deletions
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 = """<!DOCTYPE html>
});
</script>
</head>
- <body style="margin: 0;height: 100%%;"></body>
+ <body></body>
</html>
"""
@@ -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