[imp] cleared main html

bzr revid: nicolas.vanhoren@openerp.com-20120118161735-2yuxisndfq92ctoi
This commit is contained in:
niv-openerp 2012-01-18 17:17:35 +01:00
parent 5182408541
commit 3e7c98f5e5
3 changed files with 24 additions and 20 deletions

View File

@ -0,0 +1,21 @@
<!DOCTYPE html>
<html style="height: 100%%">
<head>
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>OpenERP</title>
<link rel="shortcut icon" href="/web/static/src/img/favicon.ico" type="image/x-icon"/>
%(css)s
%(js)s
<script type="text/javascript">
$(function() {
var s = new openerp.init(%(modules)s);
var webclient = new s.web.WebClient();
webclient.$element = $(document.body);
webclient.start();
});
</script>
</head>
<body class="openerp" id="oe">
<!-- should add a loading message? -->
</body>
</html>

View File

@ -84,24 +84,9 @@ def concat_files(file_list, reader=None, intersperse=""):
files_concat = intersperse.join(files_content)
return files_concat,files_timestamp
html_template = """<!DOCTYPE html>
<html style="height: 100%%">
<head>
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>OpenERP</title>
<link rel="shortcut icon" href="/web/static/src/img/favicon.ico" type="image/x-icon"/>
%(css)s
%(js)s
<script type="text/javascript">
$(function() {
var s = new openerp.init(%(modules)s);
%(init)s
});
</script>
</head>
<body class="openerp" id="oe"></body>
</html>
"""
html_template = None
with open(os.path.join(os.path.dirname(os.path.abspath(__file__)), "main.html")) as html_file:
html_template = html_file.read()
class WebClient(openerpweb.Controller):
_cp_path = "/web/webclient"
@ -207,7 +192,6 @@ class WebClient(openerpweb.Controller):
'js': js,
'css': css,
'modules': simplejson.dumps(self.server_wide_modules(req)),
'init': 'new s.web.WebClient().start();',
}
return r

View File

@ -1064,7 +1064,6 @@ openerp.web.WebClient = openerp.web.Widget.extend(/** @lends openerp.web.WebClie
},
start: function() {
var self = this;
this.$element = $(document.body);
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) {