From 2541ded2c1b496c57ba47ac9f4603a6c6ebfcff1 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 24 Apr 2014 11:25:20 +0200
Subject: [PATCH] [IMP] bundlify web client

bzr revid: fme@openerp.com-20140424092520-xx7nocvacx4mcsyw
---
 addons/web/__openerp__.py                  | 59 ---------------
 addons/web/views/webclient_templates.xml   | 85 +++++++++++++++++++++-
 addons/web_api/__openerp__.py              |  4 -
 addons/web_calendar/__openerp__.py         | 10 +--
 addons/web_diagram/__openerp__.py          | 11 +--
 addons/web_gantt/__openerp__.py            |  7 +-
 addons/web_graph/__openerp__.py            | 11 +--
 addons/web_kanban/__openerp__.py           |  7 +-
 addons/web_kanban_gauge/__openerp__.py     |  7 +-
 addons/web_kanban_sparkline/__openerp__.py |  7 +-
 addons/web_tests/__openerp__.py            |  5 +-
 addons/web_tests_demo/__openerp__.py       |  4 +-
 addons/web_view_editor/__openerp__.py      |  5 +-
 13 files changed, 107 insertions(+), 115 deletions(-)

diff --git a/addons/web/__openerp__.py b/addons/web/__openerp__.py
index 5941a6aa5b0..a8bef3f009c 100644
--- a/addons/web/__openerp__.py
+++ b/addons/web/__openerp__.py
@@ -14,65 +14,6 @@ This module provides the core of the OpenERP Web Client.
     'data': [
         'views/webclient_templates.xml',
     ],
-    'js': [
-        "static/lib/es5-shim/es5-shim.min.js",
-        "static/lib/datejs/globalization/en-US.js",
-        "static/lib/datejs/core.js",
-        "static/lib/datejs/parser.js",
-        "static/lib/datejs/sugarpak.js",
-        "static/lib/datejs/extras.js",
-        "static/lib/jquery/jquery.js",
-        "static/lib/jquery.form/jquery.form.js",
-        "static/lib/jquery.validate/jquery.validate.js",
-        "static/lib/jquery.ba-bbq/jquery.ba-bbq.js",
-        "static/lib/spinjs/spin.js",
-        "static/lib/jquery.autosize/jquery.autosize.js",
-        "static/lib/jquery.blockUI/jquery.blockUI.js",
-        "static/lib/jquery.hotkeys/jquery.hotkeys.js",
-        "static/lib/jquery.placeholder/jquery.placeholder.js",
-        "static/lib/jquery.ui/js/jquery-ui-1.9.1.custom.js",
-        "static/lib/jquery.ui.timepicker/js/jquery-ui-timepicker-addon.js",
-        "static/lib/jquery.ui.notify/js/jquery.notify.js",
-        "static/lib/jquery.deferred-queue/jquery.deferred-queue.js",
-        "static/lib/jquery.scrollTo/jquery.scrollTo-min.js",
-        "static/lib/jquery.textext/jquery.textext.js",
-        "static/lib/jquery.timeago/jquery.timeago.js",
-        "static/lib/bootstrap/js/bootstrap.js",
-        "static/lib/qweb/qweb2.js",
-        "static/lib/underscore/underscore.js",
-        "static/lib/underscore.string/lib/underscore.string.js",
-        "static/lib/backbone/backbone.js",
-        "static/lib/cleditor/jquery.cleditor.js",
-        "static/lib/py.js/lib/py.js",
-        "static/lib/select2/select2.js",
-        "static/src/js/openerpframework.js",
-        "static/src/js/boot.js",
-        "static/src/js/testing.js",
-        "static/src/js/pyeval.js",
-        "static/src/js/core.js",
-        "static/src/js/formats.js",
-        "static/src/js/chrome.js",
-        "static/src/js/views.js",
-        "static/src/js/data.js",
-        "static/src/js/data_export.js",
-        "static/src/js/search.js",
-        "static/src/js/view_list.js",
-        "static/src/js/view_form.js",
-        "static/src/js/view_list_editable.js",
-        "static/src/js/view_tree.js",
-    ],
-    'css' : [
-        "static/lib/jquery.ui.bootstrap/css/custom-theme/jquery-ui-1.9.0.custom.css",
-        "static/lib/jquery.ui.timepicker/css/jquery-ui-timepicker-addon.css",
-        "static/lib/jquery.ui.notify/css/ui.notify.css",
-        "static/lib/jquery.textext/jquery.textext.css",
-        "static/lib/fontawesome/css/font-awesome.css",
-        "static/lib/bootstrap/css/bootstrap.css",
-        "static/lib/select2/select2.css",
-        "static/src/css/base.css",
-        "static/src/css/data_export.css",
-        "static/lib/cleditor/jquery.cleditor.css",
-    ],
     'qweb' : [
         "static/src/xml/*.xml",
     ],
diff --git a/addons/web/views/webclient_templates.xml b/addons/web/views/webclient_templates.xml
index a0c6cc8463b..38b60e92f03 100644
--- a/addons/web/views/webclient_templates.xml
+++ b/addons/web/views/webclient_templates.xml
@@ -5,10 +5,93 @@
     <data>
         <template id="web.assets_common">
             <script type="text/javascript" src="/web/static/lib/es5-shim/es5-shim.min.js"></script>
+            <script type="text/javascript" src="/web/static/lib/underscore/underscore.js"></script>
+            <script type="text/javascript" src="/web/static/lib/underscore.string/lib/underscore.string.js"></script>
+            <script type="text/javascript" src="/web/static/lib/datejs/globalization/en-US.js"></script>
+            <script type="text/javascript" src="/web/static/lib/spinjs/spin.js"></script>
+
+            <!-- jQuery stuff -->
+            <script type="text/javascript" src="/web/static/lib/jquery/jquery.js"></script>
+            <script type="text/javascript" src="/web/static/lib/jquery.blockUI/jquery.blockUI.js"></script>
+            <script type="text/javascript" src="/web/static/lib/jquery.hotkeys/jquery.hotkeys.js"></script>
+            <script type="text/javascript" src="/web/static/lib/jquery.placeholder/jquery.placeholder.js"></script>
+            <script type="text/javascript" src="/web/static/lib/jquery.timeago/jquery.timeago.js"></script>
+
+            <link rel="stylesheet" href="/web/static/lib/select2/select2.css"/>
+            <script type="text/javascript" src="/web/static/lib/select2/select2.js"></script>
+
+            <!-- Obsolete ??? -->
+            <script type="text/javascript" src="/web/static/lib/jquery.ba-bbq/jquery.ba-bbq.js"></script>
+
+            <!-- Bootstrap -->
+            <link rel="stylesheet" href="/web/static/lib/fontawesome/css/font-awesome.css"/>
+            <link rel="stylesheet" href="/web/static/lib/bootstrap/css/bootstrap.css"/>
+            <script type="text/javascript" src="/web/static/lib/bootstrap/js/bootstrap.js"></script>
+        </template>
+
+        <template id="web.assets_backend">
+            <t t-call="web.assets_common"/>
+            <!-- Datejs -->
+            <script type="text/javascript" src="/web/static/lib/datejs/core.js"></script>
+            <script type="text/javascript" src="/web/static/lib/datejs/parser.js"></script>
+            <script type="text/javascript" src="/web/static/lib/datejs/sugarpak.js"></script>
+            <script type="text/javascript" src="/web/static/lib/datejs/extras.js"></script>
+
+            <!-- jQuery addons -->
+            <script type="text/javascript" src="/web/static/lib/jquery.form/jquery.form.js"></script>
+            <script type="text/javascript" src="/web/static/lib/jquery.validate/jquery.validate.js"></script>
+            <script type="text/javascript" src="/web/static/lib/jquery.autosize/jquery.autosize.js"></script>
+            <script type="text/javascript" src="/web/static/lib/jquery.scrollTo/jquery.scrollTo-min.js"></script>
+
+            <link rel="stylesheet" href="/web/static/lib/cleditor/jquery.cleditor.css"/>
+            <script type="text/javascript" src="/web/static/lib/cleditor/jquery.cleditor.js"></script>
+
+            <link rel="stylesheet" href="/web/static/lib/jquery.textext/jquery.textext.css"/>
+            <script type="text/javascript" src="/web/static/lib/jquery.textext/jquery.textext.js"></script>
+
+            <!-- jQuery ui -->
+            <link rel="stylesheet" href="/web/static/lib/jquery.ui.bootstrap/css/custom-theme/jquery-ui-1.9.0.custom.css"/>
+            <script type="text/javascript" src="/web/static/lib/jquery.ui/js/jquery-ui-1.9.1.custom.js"></script>
+
+            <link rel="stylesheet" href="/web/static/lib/jquery.ui.timepicker/css/jquery-ui-timepicker-addon.css"/>
+            <script type="text/javascript" src="/web/static/lib/jquery.ui.timepicker/js/jquery-ui-timepicker-addon.js"></script>
+
+            <link rel="stylesheet" href="/web/static/lib/jquery.ui.notify/css/ui.notify.css"/>
+            <script type="text/javascript" src="/web/static/lib/jquery.ui.notify/js/jquery.notify.js"></script>
+
+            <script type="text/javascript" src="/web/static/lib/bootstrap/js/bootstrap.js"></script>
+
+            <!-- Backbone -->
+            <script type="text/javascript" src="/web/static/lib/backbone/backbone.js"></script>
+
+            <!-- Internals -->
+            <link rel="stylesheet" href="/web/static/src/css/base.css"/>
+            <link rel="stylesheet" href="/web/static/src/css/data_export.css"/>
+            <link rel="stylesheet" href="/base/static/src/css/modules.css"/>
+
+            <script type="text/javascript" src="/web/static/lib/qweb/qweb2.js"></script>
             <script type="text/javascript" src="/web/static/src/js/openerpframework.js"></script>
+            <script type="text/javascript" src="/web/static/lib/py.js/lib/py.js"></script>
+            <script type="text/javascript" src="/web/static/src/js/boot.js"></script>
+            <script type="text/javascript" src="/web/static/src/js/testing.js"></script>
+            <script type="text/javascript" src="/web/static/src/js/pyeval.js"></script>
+            <script type="text/javascript" src="/web/static/src/js/core.js"></script>
+            <script type="text/javascript" src="/web/static/src/js/formats.js"></script>
+            <script type="text/javascript" src="/web/static/src/js/chrome.js"></script>
+            <script type="text/javascript" src="/web/static/src/js/views.js"></script>
+            <script type="text/javascript" src="/web/static/src/js/data.js"></script>
+            <script type="text/javascript" src="/web/static/src/js/data_export.js"></script>
+            <script type="text/javascript" src="/web/static/src/js/search.js"></script>
+            <script type="text/javascript" src="/web/static/src/js/view_list.js"></script>
+            <script type="text/javascript" src="/web/static/src/js/view_form.js"></script>
+            <script type="text/javascript" src="/web/static/src/js/view_list_editable.js"></script>
+            <script type="text/javascript" src="/web/static/src/js/view_tree.js"></script>
+            <script type="text/javascript" src="/base/static/src/js/apps.js"></script>
+
         </template>
 
         <template id="web.assets_webclient_manifest">
+            <!-- This bundle can be used for module manifest asset declaration backward compatibility -->
             <t t-foreach="manifest_list('css')" t-as="css_file">
                 <link rel="stylesheet" t-att-href="css_file"/>
             </t>
@@ -36,7 +119,7 @@
         <template id="web.webclient_bootstrap" name="Webclient Bootstrap">
             <t t-call="web.layout">
                 <t t-set="head">
-                    <t t-call-assets="web.assets_webclient_manifest"/>
+                    <t t-call-assets="web.assets_backend"/>
                     <script type="text/javascript">
                         $(function() {
                             var s = new openerp.init(<t t-raw="modules"/>);
diff --git a/addons/web_api/__openerp__.py b/addons/web_api/__openerp__.py
index a294719aaa6..4eb15fcefa9 100644
--- a/addons/web_api/__openerp__.py
+++ b/addons/web_api/__openerp__.py
@@ -10,8 +10,4 @@ Openerp Web API.
     'depends': ['web'],
     'installable': True,
     'auto_install': False,
-    'js' : [
-    ],
-    'css' : [
-    ],
 }
diff --git a/addons/web_calendar/__openerp__.py b/addons/web_calendar/__openerp__.py
index 0c27b7359c3..a249df073d4 100644
--- a/addons/web_calendar/__openerp__.py
+++ b/addons/web_calendar/__openerp__.py
@@ -9,14 +9,8 @@ OpenERP Web Calendar view.
     'author': 'OpenERP SA, Valentino Lab (Kalysto)',
     'version': '2.0',
     'depends': ['web'],
-    'data' : [],
-    'js': [
-        'static/lib/fullcalendar/js/fullcalendar.js',
-        'static/src/js/*.js'
-    ],
-    'css': [
-        'static/lib/fullcalendar/css/*.css',
-        'static/src/css/*.css'
+    'data' : [
+        'views/web_calendar.xml',
     ],
     'qweb': [
         'static/src/xml/*.xml',
diff --git a/addons/web_diagram/__openerp__.py b/addons/web_diagram/__openerp__.py
index 71156411fe3..f7a20b40935 100644
--- a/addons/web_diagram/__openerp__.py
+++ b/addons/web_diagram/__openerp__.py
@@ -8,15 +8,8 @@ Openerp Web Diagram view.
 """,
     'version': '2.0',
     'depends': ['web'],
-    'js': [
-        'static/lib/js/raphael.js',
-        'static/lib/js/jquery.mousewheel.js',
-        'static/src/js/vec2.js',
-        'static/src/js/graph.js',
-        'static/src/js/diagram.js',
-    ],
-    'css': [
-        'static/src/css/base_diagram.css',
+    'data' : [
+        'views/web_diagram.xml',
     ],
     'qweb': [
         'static/src/xml/*.xml',
diff --git a/addons/web_gantt/__openerp__.py b/addons/web_gantt/__openerp__.py
index 3fef67a55f6..af0e59ccb28 100644
--- a/addons/web_gantt/__openerp__.py
+++ b/addons/web_gantt/__openerp__.py
@@ -8,12 +8,9 @@ OpenERP Web Gantt chart view.
 """,
     'version': '2.0',
     'depends': ['web'],
-    'js': [
-        'static/lib/dhtmlxGantt/sources/dhtmlxcommon.js',
-        'static/lib/dhtmlxGantt/sources/dhtmlxgantt.js',
-        'static/src/js/gantt.js'
+    'data' : [
+        'views/web_gantt.xml',
     ],
-    'css': ['static/src/css/gantt.css', 'static/lib/dhtmlxGantt/codebase/dhtmlxgantt.css'],
     'qweb': [
         'static/src/xml/*.xml',
     ],
diff --git a/addons/web_graph/__openerp__.py b/addons/web_graph/__openerp__.py
index 790dbe85c44..85c1283dfad 100644
--- a/addons/web_graph/__openerp__.py
+++ b/addons/web_graph/__openerp__.py
@@ -14,15 +14,8 @@ Graph Views for Web Client.
 """,
     'version': '3.0',
     'depends': ['web'],
-    'js': [
-        'static/lib/nvd3/d3.v3.js',
-        'static/lib/nvd3/nv.d3.js',
-        'static/src/js/graph_view.js',
-        'static/src/js/pivot_table.js',
-        'static/src/js/graph_widget.js',
-    ],
-    'css': [
-        'static/src/css/*.css',
+    'data' : [
+        'views/web_graph.xml',
     ],
     'qweb' : [
         'static/src/xml/*.xml',
diff --git a/addons/web_kanban/__openerp__.py b/addons/web_kanban/__openerp__.py
index 233a35a04d2..4fb03b80344 100644
--- a/addons/web_kanban/__openerp__.py
+++ b/addons/web_kanban/__openerp__.py
@@ -8,11 +8,8 @@ OpenERP Web kanban view.
 """,
     'version': '2.0',
     'depends': ['web'],
-    'js': [
-        'static/src/js/kanban.js'
-    ],
-    'css': [
-        'static/src/css/kanban.css'
+    'data' : [
+        'views/web_kanban.xml',
     ],
     'qweb' : [
         'static/src/xml/*.xml',
diff --git a/addons/web_kanban_gauge/__openerp__.py b/addons/web_kanban_gauge/__openerp__.py
index 7eb2ba81dad..592f66b77b3 100644
--- a/addons/web_kanban_gauge/__openerp__.py
+++ b/addons/web_kanban_gauge/__openerp__.py
@@ -6,11 +6,8 @@ This widget allows to display gauges using justgage library.
 """,
     'version': '1.0',
     'depends': ['web_kanban'],
-    'js': [
-        'static/lib/justgage/justgage.js',
-        'static/src/js/kanban_gauge.js'
-    ],
-    'css': [
+    'data' : [
+        'views/web_kanban_gauge.xml',
     ],
     'qweb': [
     ],
diff --git a/addons/web_kanban_sparkline/__openerp__.py b/addons/web_kanban_sparkline/__openerp__.py
index 3fb4e13b4f7..eca0e283716 100644
--- a/addons/web_kanban_sparkline/__openerp__.py
+++ b/addons/web_kanban_sparkline/__openerp__.py
@@ -6,11 +6,8 @@ This widget allows to display sparklines using jquery.sparkline library.
 """,
     'version': '1.0',
     'depends': ['web_kanban'],
-    'js': [
-        "static/lib/jquery.sparkline/jquery.sparkline.js",
-        'static/src/js/kanban_sparkline.js'
-    ],
-    'css': [
+    'data' : [
+        'views/web_kanban_sparkline.xml',
     ],
     'qweb': [
     ],
diff --git a/addons/web_tests/__openerp__.py b/addons/web_tests/__openerp__.py
index b34f96f78b2..5436ba8ce81 100644
--- a/addons/web_tests/__openerp__.py
+++ b/addons/web_tests/__openerp__.py
@@ -8,7 +8,8 @@ OpenERP Web test suite.
 """,
     'version': '2.0',
     'depends': [],
-    'js': ['static/src/js/*.js'],
-    'css': ['static/src/css/*.css'],
+    'data' : [
+        'views/web_tests.xml',
+    ],
     'auto_install': True,
 }
diff --git a/addons/web_tests_demo/__openerp__.py b/addons/web_tests_demo/__openerp__.py
index 64b23790b9b..cccc7e0b4da 100644
--- a/addons/web_tests_demo/__openerp__.py
+++ b/addons/web_tests_demo/__openerp__.py
@@ -8,7 +8,9 @@ OpenERP Web demo of a test suite
 Test suite example, same code as that used in the testing documentation.
     """,
     'depends': ['web'],
-    'js': ['static/src/js/demo.js'],
+    'data' : [
+        'views/web_tests_demo.xml',
+    ],
     'test': ['static/test/demo.js'],
     'qweb': ['static/src/xml/demo.xml'],
 }
diff --git a/addons/web_view_editor/__openerp__.py b/addons/web_view_editor/__openerp__.py
index 2ead0bb21fd..61a6a3b7373 100644
--- a/addons/web_view_editor/__openerp__.py
+++ b/addons/web_view_editor/__openerp__.py
@@ -8,8 +8,9 @@ OpenERP Web to edit views.
         """,
     'version': '2.0',
     'depends':['web'],
-    'js': ['static/src/js/view_editor.js'],
-    'css': ['static/src/css/view_editor.css'],
+    'data' : [
+        'views/web_view_editor.xml',
+    ],
     'qweb': ['static/src/xml/view_editor.xml'],
     'auto_install': True,
 }