projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: e6532d9)
[FIX] database manager
authorFabien Meghazi <fme@openerp.com>
Thu, 1 May 2014 21:04:36 +0000 (23:04 +0200)
committerFabien Meghazi <fme@openerp.com>
Thu, 1 May 2014 21:04:36 +0000 (23:04 +0200)
bzr revid: fme@openerp.com-20140501210436-osyrvlue41w63i6f

addons/web/controllers/main.py patch | blob | history

diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index 7cc240a..6dcc069 100644 (file)
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -509,9 +509,6 @@ html_template = """<!DOCTYPE html>
         <link rel="shortcut icon" href="/web/static/src/img/favicon.ico" type="image/x-icon"/>
         <link rel="stylesheet" href="/web/static/src/css/full.css" />
 
-        <link rel="stylesheet" href="/web/css/web.assets_backend"/>
-        <script type="text/javascript" src="/web/js/web.assets_backend"></script>
-
         %(css)s
         %(js)s
         <script type="text/javascript">
@@ -748,8 +745,64 @@ class Database(http.Controller):
     def manager(self, **kw):
         # TODO: migrate the webclient's database manager to server side views
         request.session.logout()
-        js = "\n        ".join('<script type="text/javascript" src="%s"></script>' % i for i in manifest_list('js', debug=request.debug))
-        css = "\n        ".join('<link rel="stylesheet" href="%s">' % i for i in manifest_list('css', debug=request.debug))
+        css = """
+            <link href="/web/static/lib/fontawesome/css/font-awesome.css" rel="stylesheet"/>
+            <link href="/web/static/lib/cleditor/jquery.cleditor.css" rel="stylesheet"/>
+            <link href="/web/static/lib/jquery.textext/jquery.textext.css" rel="stylesheet"/>
+            <link href="/web/static/lib/select2/select2.css" rel="stylesheet"/>
+            <link href="/web/static/lib/jquery.ui.bootstrap/css/custom-theme/jquery-ui-1.9.0.custom.css" rel="stylesheet"/>
+            <link href="/web/static/lib/jquery.ui.timepicker/css/jquery-ui-timepicker-addon.css" rel="stylesheet"/>
+            <link href="/web/static/lib/jquery.ui.notify/css/ui.notify.css" rel="stylesheet"/>
+            <link href="/web/static/lib/bootstrap/css/bootstrap.css" rel="stylesheet"/>
+            <link href="/web/static/src/css/base.css" rel="stylesheet"/>
+            <link href="/web/static/src/css/data_export.css" rel="stylesheet"/>
+            <link href="/base/static/src/css/modules.css" rel="stylesheet"/>"""
+        js = """
+            <script src="/web/static/lib/es5-shim/es5-shim.min.js" type="text/javascript"></script>
+            <script src="/web/static/lib/underscore/underscore.js" type="text/javascript"></script>
+            <script src="/web/static/lib/underscore.string/lib/underscore.string.js" type="text/javascript"></script>
+            <script src="/web/static/lib/datejs/globalization/en-US.js" type="text/javascript"></script>
+            <script src="/web/static/lib/spinjs/spin.js" type="text/javascript"></script>
+            <script src="/web/static/lib/jquery/jquery.js" type="text/javascript"></script>
+            <script src="/web/static/lib/jquery.blockUI/jquery.blockUI.js" type="text/javascript"></script>
+            <script src="/web/static/lib/jquery.hotkeys/jquery.hotkeys.js" type="text/javascript"></script>
+            <script src="/web/static/lib/jquery.placeholder/jquery.placeholder.js" type="text/javascript"></script>
+            <script src="/web/static/lib/jquery.timeago/jquery.timeago.js" type="text/javascript"></script>
+            <script src="/web/static/lib/jquery.form/jquery.form.js" type="text/javascript"></script>
+            <script src="/web/static/lib/jquery.ba-bbq/jquery.ba-bbq.js" type="text/javascript"></script>
+            <script src="/web/static/lib/datejs/core.js" type="text/javascript"></script>
+            <script src="/web/static/lib/datejs/parser.js" type="text/javascript"></script>
+            <script src="/web/static/lib/datejs/sugarpak.js" type="text/javascript"></script>
+            <script src="/web/static/lib/datejs/extras.js" type="text/javascript"></script>
+            <script src="/web/static/lib/jquery.validate/jquery.validate.js" type="text/javascript"></script>
+            <script src="/web/static/lib/jquery.autosize/jquery.autosize.js" type="text/javascript"></script>
+            <script src="/web/static/lib/jquery.scrollTo/jquery.scrollTo-min.js" type="text/javascript"></script>
+            <script src="/web/static/lib/cleditor/jquery.cleditor.js" type="text/javascript"></script>
+            <script src="/web/static/lib/jquery.textext/jquery.textext.js" type="text/javascript"></script>
+            <script src="/web/static/lib/select2/select2.js" type="text/javascript"></script>
+            <script src="/web/static/lib/jquery.ui/js/jquery-ui-1.9.1.custom.js" type="text/javascript"></script>
+            <script src="/web/static/lib/jquery.ui.timepicker/js/jquery-ui-timepicker-addon.js" type="text/javascript"></script>
+            <script src="/web/static/lib/jquery.ui.notify/js/jquery.notify.js" type="text/javascript"></script>
+            <script src="/web/static/lib/bootstrap/js/bootstrap.js" type="text/javascript"></script>
+            <script src="/web/static/lib/backbone/backbone.js" type="text/javascript"></script>
+            <script src="/web/static/lib/qweb/qweb2.js" type="text/javascript"></script>
+            <script src="/web/static/src/js/openerpframework.js" type="text/javascript"></script>
+            <script src="/web/static/lib/py.js/lib/py.js" type="text/javascript"></script>
+            <script src="/web/static/src/js/boot.js" type="text/javascript"></script>
+            <script src="/web/static/src/js/testing.js" type="text/javascript"></script>
+            <script src="/web/static/src/js/pyeval.js" type="text/javascript"></script>
+            <script src="/web/static/src/js/core.js" type="text/javascript"></script>
+            <script src="/web/static/src/js/formats.js" type="text/javascript"></script>
+            <script src="/web/static/src/js/chrome.js" type="text/javascript"></script>
+            <script src="/web/static/src/js/views.js" type="text/javascript"></script>
+            <script src="/web/static/src/js/data.js" type="text/javascript"></script>
+            <script src="/web/static/src/js/data_export.js" type="text/javascript"></script>
+            <script src="/web/static/src/js/search.js" type="text/javascript"></script>
+            <script src="/web/static/src/js/view_list.js" type="text/javascript"></script>
+            <script src="/web/static/src/js/view_form.js" type="text/javascript"></script>
+            <script src="/web/static/src/js/view_list_editable.js" type="text/javascript"></script>
+            <script src="/web/static/src/js/view_tree.js" type="text/javascript"></script>
+            <script src="/base/static/src/js/apps.js" type="text/javascript"></script>"""
 
         r = html_template % {
             'js': js,
Unnamed repository; edit this file 'description' to name the repository.