diff options
| author | Antony Lesuisse <al@openerp.com> | 2011-10-18 22:24:29 +0200 |
|---|---|---|
| committer | Antony Lesuisse <al@openerp.com> | 2011-10-18 22:24:29 +0200 |
| commit | 11b5c602ce7ed1cd52f7a0fbf5c5a65909ecc176 (patch) | |
| tree | 552504cc5d236083a805f3c0ce55711a51902dfb | |
| parent | da7e08aa1bf81af5d84e0eb30add8324b3da57c1 (diff) | |
[IMP] html_template more generic use js
bzr revid: al@openerp.com-20111018202429-7aulbfuyze4vcbck
| -rw-r--r-- | addons/web/controllers/main.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py index e1fbe0370d7..55e23aae979 100644 --- a/addons/web/controllers/main.py +++ b/addons/web/controllers/main.py @@ -47,7 +47,7 @@ html_template = """<!DOCTYPE html> <title>OpenERP</title> <link rel="shortcut icon" href="/web/static/src/img/favicon.ico" type="image/x-icon"/> %(css)s - %(javascript)s + %(js)s <script type="text/javascript"> $(function() { var s = new openerp.init(%(modules)s); @@ -118,7 +118,7 @@ class WebClient(openerpweb.Controller): css = "\n ".join('<link rel="stylesheet" href="%s">'%i for i in self.manifest_list(req, None, 'css')) r = html_template % { - 'javascript': js, + 'js': js, 'css': css, 'modules': simplejson.dumps(self.server_wide_modules(req)), 'init': 'new s.web.WebClient("oe").start();', |