diff --git a/Makefile b/Makefile
index 9e84e356aaf..4beb20d3eed 100644
--- a/Makefile
+++ b/Makefile
@@ -29,3 +29,6 @@ doc:
cloc:
cloc addons/*/common/*.py addons/*/controllers/*.py addons/*/static/src/*.js addons/*/static/src/js/*.js addons/*/static/src/css/*.css addons/*/static/src/xml/*.xml
+blamestat:
+ echo addons/*/common/*.py addons/*/controllers/*.py addons/*/static/src/js/*.js addons/*/static/src/css/*.css addons/*/static/src/xml/*.xml | xargs -t -n 1 bzr blame -v --long --all | awk '{print $2}' | sort | uniq -c | sort -n
+
diff --git a/addons/web/controllers/main.html b/addons/web/controllers/main.html
deleted file mode 100644
index fd0be5ba349..00000000000
--- a/addons/web/controllers/main.html
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-
- OpenERP
-
- %(css)s
- %(js)s
-
-
-
-
-
-
\ No newline at end of file
diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index 7f5b43ba671..7844897c047 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -84,9 +84,24 @@ def concat_files(file_list, reader=None, intersperse=""):
files_concat = intersperse.join(files_content)
return files_concat,files_timestamp
-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()
+html_template = """
+
+
+
+ OpenERP
+
+ %(css)s
+ %(js)s
+
+
+
+
+"""
class WebClient(openerpweb.Controller):
_cp_path = "/web/webclient"
@@ -192,6 +207,7 @@ class WebClient(openerpweb.Controller):
'js': js,
'css': css,
'modules': simplejson.dumps(self.server_wide_modules(req)),
+ 'init': 'new s.web.WebClient().start();',
}
return r
diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 06fcf518002..b8ee62c3749 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -1061,6 +1061,7 @@ 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) {