projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 5e293f0)
[FIX] revert html_template is used by other modules. commit 2012 revid:nicolas.vanhor...
authorAntony Lesuisse <al@openerp.com>
Sun, 22 Jan 2012 23:32:02 +0000 (00:32 +0100)
committerAntony Lesuisse <al@openerp.com>
Sun, 22 Jan 2012 23:32:02 +0000 (00:32 +0100)
bzr revid: al@openerp.com-20120122233202-moq81q35qddjtlw8

Makefile patch | blob | history
addons/web/controllers/main.html [deleted file] patch | blob | history
addons/web/controllers/main.py patch | blob | history
addons/web/static/src/js/chrome.js patch | blob | history

diff --git a/Makefile b/Makefile
index 9e84e35..4beb20d 100644 (file)
--- 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 (file)
index fd0be5b..0000000
--- a/addons/web/controllers/main.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<!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>
\ No newline at end of file
diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index 7f5b43b..7844897 100644 (file)
--- 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 = """<!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>
+"""
 
 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 06fcf51..b8ee62c 100644 (file)
--- 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) {
Unnamed repository; edit this file 'description' to name the repository.