[REF] web,web_editor,website(_*),report,pos,mass_mailing: assets

* Remove recursive assets inclusions (i.e. assets_editor was including
assets_common, summernote, ...)
* Better construct the assets (link, then script + type attribute)
* Better include the assets (split js / css, always use t-call-assets)
* Simplifies the number of assets
* Move bootstrap js to assets common
* assets_frontend is now created by web module to allow using it on the
connexion page but also in the web_editor, where colors have to be
bootstrap/theme ones. Note: if a module depends on website, then keep
using the inherit_id="WEBSITE.assets_frontend"

1 files changed, 48 insertions, 43 deletions

diff --git a/addons/web_editor/views/editor.xml b/addons/web_editor/views/editor.xml
index 1e84a3c010e..5755649334d 100644
--- a/addons/web_editor/views/editor.xml
+++ b/addons/web_editor/views/editor.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<openerp>
-
+<odoo>
 <template id="summernote" name="Summernote">
     <script type="text/javascript">
         (function () {
@@ -50,57 +49,64 @@
         delete odoo.__define__;
         delete odoo.website_next_define;
     </script>
-    <link rel="stylesheet" href="/web_editor/static/lib/summernote/src/less/summernote.less"/>
-    <!-- <link rel="stylesheet" href="/web_editor/static/lib/summernote/summernote.css"/> -->
+    <link rel="stylesheet" type="text/less" href="/web_editor/static/lib/summernote/src/less/summernote.less"/>
 </template>
 
-<template id="editor" name="Editor">
-    <!-- Call default mixins from WEB module -->
-    <link rel="stylesheet" href='/web/static/src/less/utils.less'/>
-
-    <!-- Web Editor style -->
-    <link rel='stylesheet' href='/web_editor/static/src/less/web_editor.variables.less'/>
-    <link rel="stylesheet" href='/web_editor/static/src/less/web_editor.interactions.less'/>
-    <link rel="stylesheet" href='/web_editor/static/src/less/web_editor.mixins.less'/>
-    <link rel="stylesheet" href='/web_editor/static/src/less/web_editor.backend.less'/>
-    <link rel="stylesheet" href='/web_editor/static/src/less/web_editor.components.less'/>
-    <link rel="stylesheet" href='/web_editor/static/src/less/web_editor.ui.less'/>
-
-    <script type="text/javascript" src='/web_editor/static/lib/nearest/jquery.nearest.js' />
-    <script type="text/javascript" src="/web_editor/static/src/js/editor.js" />
-    <script type="text/javascript" src="/web_editor/static/src/js/rte.js" />
-    <script type="text/javascript" src="/web_editor/static/src/js/rte.summernote.js" />
-    <script type="text/javascript" src="/web_editor/static/src/js/widgets.js" />
-    <script type="text/javascript" src="/web_editor/static/src/js/snippets.editor.js" />
-    <script type="text/javascript" src="/web_editor/static/src/js/snippets.options.js" />
-    <script type="text/javascript" src="/web_editor/static/src/js/tour.rte.js" />
-    <script type="text/javascript" src="/web_editor/static/src/js/transcoder.js"></script>
-    <script type="text/javascript" src="/web_editor/static/src/js/translator.js"></script>
+<template id="less_helpers" inherit_id="web.less_helpers">
+    <xpath expr="." position="inside">
+        <link rel="stylesheet" type="text/less" href="/web_editor/static/src/less/web_editor.variables.less"/>
+    </xpath>
 </template>
 
 <template id="assets_common" inherit_id="web.assets_common" name="web_editor base assets_common">
-    <xpath expr="." position="inside">
-        <link rel="stylesheet" href='/web_editor/static/src/less/web_editor.common.less'/>
-        <link rel="stylesheet" href='/web_editor/static/src/less/web_editor.less'/>
+    <xpath expr="script[last()]" position="after">
         <script type="text/javascript" src="/web_editor/static/src/js/base.js" />
         <script type="text/javascript" src="/web_editor/static/src/js/snippets.animation.js" />
     </xpath>
 </template>
 
-<template id="assets_editor" name="web_editor assets for editor">
-    <t t-call="web.assets_common"/>
-    <t t-call="web.bootstrap"/>
-    <script type="text/javascript" src="/web/static/lib/select2/select2.js"></script>
-    <t t-call="web_editor.summernote"/>
-    <t t-call="web_editor.editor"/>
+<template id="assets_backend" inherit_id="web.assets_backend" name="web_editor assets for backend">
+    <xpath expr="link[last()]" position="after">
+        <link rel="stylesheet" type="text/less" href="/web_editor/static/src/less/web_editor.common.less"/> <!-- not in common because compiled diffently with context -->
+        <link rel="stylesheet" type="text/less" href="/web_editor/static/src/less/web_editor.backend.less"/>
+    </xpath>
+    <xpath expr="script[last()]" position="after">
+        <script type="text/javascript" src="/web_editor/static/src/js/backend.js" />
+    </xpath>
 </template>
 
-<template id="assets_backend" name="web_editor assets for backend" inherit_id="web.assets_backend">
-    <xpath expr="." position="inside">
-        <t t-call="web_editor.summernote"/>
-        <t t-call="web_editor.editor"/>
-        <link rel="stylesheet" href="/web_editor/static/src/less/web_editor.backend.less"/>
-        <script type="text/javascript" src="/web_editor/static/src/js/backend.js" />
+<template id="assets_frontend" inherit_id="web.assets_frontend">
+    <xpath expr="//link[last()]" position="after">
+        <link rel="stylesheet" type="text/less" href="/web_editor/static/src/less/web_editor.common.less"/> <!-- not in common because compiled diffently with context -->
+    </xpath>
+</template>
+
+<template id="assets_editor" name="Full web_editor assets">
+    <t t-call="web.less_helpers"/>
+    
+    <link rel="stylesheet" type="text/less" href="/web_editor/static/src/less/web_editor.ui.less"/>
+    <link rel="stylesheet" type="text/less" href="/web_editor/static/src/less/web_editor.ui.components.less"/>
+
+    <script type="text/javascript" src="/web_editor/static/lib/nearest/jquery.nearest.js"/>
+    <script type="text/javascript" src="/web_editor/static/src/js/editor.js"/>
+    <script type="text/javascript" src="/web_editor/static/src/js/rte.js"/>
+    <script type="text/javascript" src="/web_editor/static/src/js/rte.summernote.js"/>
+    <script type="text/javascript" src="/web_editor/static/src/js/widgets.js"/>
+    <script type="text/javascript" src="/web_editor/static/src/js/snippets.editor.js"/>
+    <script type="text/javascript" src="/web_editor/static/src/js/snippets.options.js"/>
+    <script type="text/javascript" src="/web_editor/static/src/js/tour.rte.js"/>
+    <script type="text/javascript" src="/web_editor/static/src/js/transcoder.js"></script>
+    <script type="text/javascript" src="/web_editor/static/src/js/translator.js"></script>
+</template>
+
+<template id="webclient_bootstrap" inherit_id="web.webclient_bootstrap">
+    <xpath expr="//t[@t-call-assets='web.assets_backend'][@t-js='false']" position="after">
+        <t t-call-assets="web_editor.summernote" t-js="false"/>
+        <t t-call-assets="web_editor.assets_editor" t-js="false"/>
+    </xpath>
+    <xpath expr="//t[@t-call-assets='web.assets_backend'][@t-css='false']" position="after">
+        <t t-call-assets="web_editor.summernote" t-css="false"/>
+        <t t-call-assets="web_editor.assets_editor" t-css="false"/>
     </xpath>
 </template>
 
@@ -134,5 +140,4 @@
         </div>
     </div>
 </template>
-
-</openerp>
+</odoo>