From 74d4d1f58dfc9e1e124ff045bd8443ac7b7492cc Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Fri, 18 Apr 2014 14:15:03 +0200
Subject: [PATCH] [CHG] bundlify website

CKEDITOR_BASEPATH has to be defined, by default ckeditor will load its files
relative to "itself" (the file which executes it). After bundling, the path is
incorrect and ckeditor looks for its files (e.g. en.js) in the wrong place.

bzr revid: xmo@openerp.com-20140418121503-4nsja7enutney2vn
---
 addons/website/views/website_templates.xml    | 120 ++++++++++--------
 .../views/website_blog_templates.xml          |   2 +-
 addons/website_event/views/website_event.xml  |   2 +-
 addons/website_gengo/views/website_gengo.xml  |   2 +-
 .../views/templates.xml                       |   2 +-
 addons/website_mail/views/website_mail.xml    |  10 +-
 addons/website_sale/views/website_sale.xml    |   2 +-
 .../website_twitter/views/twitter_snippet.xml |  12 +-
 8 files changed, 85 insertions(+), 67 deletions(-)

diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml
index a9a9173099a..42aa1cc6c3c 100644
--- a/addons/website/views/website_templates.xml
+++ b/addons/website/views/website_templates.xml
@@ -10,6 +10,28 @@
     <link id="bootstrap_css" rel='stylesheet' href='/web/static/lib/bootstrap/css/bootstrap.css' t-ignore="true"/>
     <link id="website_css" rel='stylesheet' href='/website/static/src/css/website.css' t-ignore="true"/>
 </template>
+<template id="assets" name="Website assets">
+    <t t-call="website.theme"/>
+
+    <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/jquery/jquery.js"></script>
+    <script type="text/javascript">
+        // Bootstrap and jQuery UI conflicts
+        $.fn.bstooltip = $.fn.tooltip;
+        $.fn.bsbutton = $.fn.button;
+    </script>
+
+    <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="/website/static/src/js/website.js"></script>
+
+    <script t-if="not translatable" type="text/javascript" src="/website/static/src/js/website.snippets.animation.js"></script>
+    <script type="text/javascript" src="/web/static/lib/bootstrap/js/bootstrap.js"></script>
+
+</template>
 
 <template id="website.submenu" name="Submenu">
     <li t-if="not submenu.child_id" t-att-class="
@@ -63,25 +85,7 @@
             <!-- Load stylesheets before scripts to avoid blocking -->
             <link rel='stylesheet' href='/web/static/lib/fontawesome/css/font-awesome.css'/>
 
-            <t t-call="website.theme"/>
-
-            <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/jquery/jquery.js"></script>
-            <script type="text/javascript">
-                // Bootstrap and jQuery UI conflicts
-                $.fn.bstooltip = $.fn.tooltip;
-                $.fn.bsbutton = $.fn.button;
-            </script>
-
-            <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="/website/static/src/js/website.js"></script>
-            
-            <script t-if="not translatable" type="text/javascript" src="/website/static/src/js/website.snippets.animation.js"></script>
-            <script type="text/javascript" src="/web/static/lib/bootstrap/js/bootstrap.js"></script>
+            <t t-call-assets="website.assets"/>
 
             <t t-raw="head or ''" name='layout_head'/>
         </head>
@@ -250,44 +254,50 @@
             </div>
         </div>
     </xpath>
-    <xpath expr='//script[@src="/web/static/lib/bootstrap/js/bootstrap.js"]' position="before">
-        <link rel='stylesheet' href='/website/static/src/css/snippets.css'/>
-        <link rel='stylesheet' href='/website/static/src/css/editor.css'/>
-        <link rel='stylesheet' href='/website/static/lib/bootstrap-tour/bootstrap-tour.css'/>
-
-
-        <link rel="stylesheet" href="/web/static/lib/select2/select2.css"/>
-        <link rel="stylesheet" href="/website/static/lib/select2-bootstrap-css/select2-bootstrap.css"/>
-        <link rel='stylesheet' href="/web/static/lib/jquery.ui/css/smoothness/jquery-ui-1.9.1.custom.css"/>
-
-        <script type="text/javascript" src="/web/static/lib/select2/select2.js"></script>
-        <script type="text/javascript" src="/web/static/lib/ckeditor/ckeditor.js"></script>
-        <script t-if="not translatable" type="text/javascript" src="/website/static/lib/ace/ace.js"></script>
-        <script type="text/javascript" src="/website/static/lib/vkbeautify/vkbeautify.0.99.00.beta.js"></script>
-        <script type="text/javascript" src="/web/static/lib/jquery.ui/js/jquery-ui-1.9.1.custom.js"></script>
-        <script type="text/javascript" src="/website/static/lib/bootstrap-tour/bootstrap-tour.js"></script>
-        <!-- mutation observers shim backed by mutation events (8 < IE < 11, Safari < 6, FF < 14, Chrome < 17) -->
-        <script type="text/javascript" src="/website/static/lib//jquery.mjs.nestedSortable/jquery.mjs.nestedSortable.js"></script>
-        <script type="text/javascript" src="/website/static/lib/MutationObservers/test/sidetable.js"></script>
-        <script type="text/javascript" src='/website/static/lib/nearest/jquery.nearest.js'></script>
-        <script type="text/javascript" src="/website/static/lib/MutationObservers/MutationObserver.js"></script>
-
-        <script type="text/javascript" src="/website/static/lib/jquery.placeholder/jquery.placeholder.js"></script>
-
-        <script type="text/javascript" src="/website/static/src/js/website.editor.js"></script>
-        <script type="text/javascript" src="/website/static/src/js/website.editor.newpage.js" groups="base.group_website_designer"></script>
-        <script type="text/javascript" src="/website/static/src/js/website.menu.js" groups="base.group_website_designer"></script>
-        <script type="text/javascript" src="/website/static/src/js/website.mobile.js"></script>
-        <script type="text/javascript" src="/website/static/src/js/website.seo.js"></script>
-        <script type="text/javascript" id="website_tour_js" src="/website/static/src/js/website.tour.js"></script>
-        <script type="text/javascript" src="/website/static/src/js/website.tour.banner.js" groups="base.group_website_designer"></script>
-        <script t-if="not translatable" type="text/javascript" src="/website/static/src/js/website.snippets.editor.js"></script>
-        <script t-if="not translatable" type="text/javascript" src="/website/static/src/js/website.ace.js"></script>
-        <script t-if="translatable" type="text/javascript" src="/website/static/src/js/website.translator.js"></script>
-
-        <script type="text/javascript" src="/website/static/src/js/jQuery.transfo.js"></script>
+    <xpath expr='//t[@t-call-assets="website.assets"]' position="after">
+        <t t-call-assets="website.editor_assets"/>
     </xpath>
 </template>
+<template id="editor_assets" name="Editor assets">
+    <script type="text/javascript">
+        var CKEDITOR_BASEPATH = '/web/static/lib/ckeditor/';
+    </script>
+    <link rel='stylesheet' href='/website/static/src/css/snippets.css'/>
+    <link rel='stylesheet' href='/website/static/src/css/editor.css'/>
+    <link rel='stylesheet' href='/website/static/lib/bootstrap-tour/bootstrap-tour.css'/>
+
+
+    <link rel="stylesheet" href="/web/static/lib/select2/select2.css"/>
+    <link rel="stylesheet" href="/website/static/lib/select2-bootstrap-css/select2-bootstrap.css"/>
+    <link rel='stylesheet' href="/web/static/lib/jquery.ui/css/smoothness/jquery-ui-1.9.1.custom.css"/>
+
+    <script type="text/javascript" src="/web/static/lib/select2/select2.js"></script>
+    <script type="text/javascript" src="/web/static/lib/ckeditor/ckeditor.js"></script>
+    <script t-if="not translatable" type="text/javascript" src="/website/static/lib/ace/ace.js"></script>
+    <script type="text/javascript" src="/website/static/lib/vkbeautify/vkbeautify.0.99.00.beta.js"></script>
+    <script type="text/javascript" src="/web/static/lib/jquery.ui/js/jquery-ui-1.9.1.custom.js"></script>
+    <script type="text/javascript" src="/website/static/lib/bootstrap-tour/bootstrap-tour.js"></script>
+    <!-- mutation observers shim backed by mutation events (8 < IE < 11, Safari < 6, FF < 14, Chrome < 17) -->
+    <script type="text/javascript" src="/website/static/lib//jquery.mjs.nestedSortable/jquery.mjs.nestedSortable.js"></script>
+    <script type="text/javascript" src="/website/static/lib/MutationObservers/test/sidetable.js"></script>
+    <script type="text/javascript" src='/website/static/lib/nearest/jquery.nearest.js'></script>
+    <script type="text/javascript" src="/website/static/lib/MutationObservers/MutationObserver.js"></script>
+
+    <script type="text/javascript" src="/website/static/lib/jquery.placeholder/jquery.placeholder.js"></script>
+
+    <script type="text/javascript" src="/website/static/src/js/website.editor.js"></script>
+    <script type="text/javascript" src="/website/static/src/js/website.editor.newpage.js" groups="base.group_website_designer"></script>
+    <script type="text/javascript" src="/website/static/src/js/website.menu.js" groups="base.group_website_designer"></script>
+    <script type="text/javascript" src="/website/static/src/js/website.mobile.js"></script>
+    <script type="text/javascript" src="/website/static/src/js/website.seo.js"></script>
+    <script type="text/javascript" id="website_tour_js" src="/website/static/src/js/website.tour.js"></script>
+    <script type="text/javascript" src="/website/static/src/js/website.tour.banner.js" groups="base.group_website_designer"></script>
+    <script t-if="not translatable" type="text/javascript" src="/website/static/src/js/website.snippets.editor.js"></script>
+    <script t-if="not translatable" type="text/javascript" src="/website/static/src/js/website.ace.js"></script>
+    <script t-if="translatable" type="text/javascript" src="/website/static/src/js/website.translator.js"></script>
+
+    <script type="text/javascript" src="/website/static/src/js/jQuery.transfo.js"></script>
+</template>
 
 <template id="debugger" inherit_option_id="website.layout" name="Debugger &amp; Tests">
     <xpath expr='//t[@name="layout_head"]' position="after">
diff --git a/addons/website_blog/views/website_blog_templates.xml b/addons/website_blog/views/website_blog_templates.xml
index fa6c6af53c6..44e0c2aca78 100644
--- a/addons/website_blog/views/website_blog_templates.xml
+++ b/addons/website_blog/views/website_blog_templates.xml
@@ -2,7 +2,7 @@
 <openerp>
 <data>
 
-<template id="editor_head" inherit_id="website.editor_head" name="Blog Editor" groups="base.group_document_user">
+<template id="editor_assets" inherit_id="website.editor_assets" name="Blog Editor" groups="base.group_document_user">
     <xpath expr="//script[@id='website_tour_js']" position="after">
         <script type="text/javascript" src="/website_blog/static/src/js/website_blog.editor.js"></script>
         <script type="text/javascript" src="/website_blog/static/src/js/website.tour.blog.js"></script>
diff --git a/addons/website_event/views/website_event.xml b/addons/website_event/views/website_event.xml
index 1b3ce09fca6..d9020ec0d5e 100644
--- a/addons/website_event/views/website_event.xml
+++ b/addons/website_event/views/website_event.xml
@@ -2,7 +2,7 @@
 <openerp>
 <data>
 
-<template id="editor_head" inherit_id="website.editor_head" name="Event Editor" groups="event.group_event_manager">
+<template id="editor_head" inherit_id="website.editor_assets" name="Event Editor" groups="event.group_event_manager">
     <xpath expr="//script[@id='website_tour_js']" position="after">
         <script type="text/javascript" src="/website_event/static/src/js/website_event.editor.js"></script>
         <script type="text/javascript" src="/website_event/static/src/js/website.tour.event.js"></script>
diff --git a/addons/website_gengo/views/website_gengo.xml b/addons/website_gengo/views/website_gengo.xml
index 6da78ab9464..78f64a9d47e 100644
--- a/addons/website_gengo/views/website_gengo.xml
+++ b/addons/website_gengo/views/website_gengo.xml
@@ -2,7 +2,7 @@
 <openerp>
 <data>
 
-<template id="gengo_editor_head" inherit_id="website.editor_head" name="Editor Head" groups="base.group_website_publisher">
+<template id="gengo_editor_assets" inherit_id="website.editor_assets" name="Editor Head" groups="base.group_website_publisher">
     <xpath expr='//script[@src="/website/static/src/js/website.translator.js"]' position="after">
         <link rel="stylesheet" href="/website_gengo/static/src/css/website_gengo.css"></link>
         <script t-if="translatable" type="text/javascript" src="/website_gengo/static/src/js/website_gengo.js"></script>
diff --git a/addons/website_hr_recruitment/views/templates.xml b/addons/website_hr_recruitment/views/templates.xml
index 3246eb19931..3ab75e2f2c0 100644
--- a/addons/website_hr_recruitment/views/templates.xml
+++ b/addons/website_hr_recruitment/views/templates.xml
@@ -2,7 +2,7 @@
 <openerp>
 <data>
 
-<template id="editor_head" inherit_id="website.editor_head" name="Jobs Editor" groups="base.group_hr_manager">
+<template id="editor_assets" inherit_id="website.editor_assets" name="Jobs Editor" groups="base.group_hr_manager">
     <xpath expr="//script[@id='website_tour_js']" position="after">
         <script type="text/javascript" src="/website_hr_recruitment/static/src/js/website_hr_recruitment.editor.js"></script>
     </xpath>
diff --git a/addons/website_mail/views/website_mail.xml b/addons/website_mail/views/website_mail.xml
index 2882125de67..4a694492ce5 100644
--- a/addons/website_mail/views/website_mail.xml
+++ b/addons/website_mail/views/website_mail.xml
@@ -19,13 +19,17 @@
     </div>
 </template>
 
-<template id="head" inherit_id="website.layout" name="Mail customization">
-    <xpath expr="//head" position="inside">
-        <script type="text/javascript" src="/website_mail/static/src/js/website_mail.editor.js" groups="base.group_website_publisher"></script>
+<template id="head" inherit_id="website.assets" name="Mail customization">
+    <xpath expr="/t" position="inside">
         <script type="text/javascript" src="/website_mail/static/src/js/website_mail.js"></script>
         <link rel='stylesheet' href='/website_mail/static/src/css/website_mail.css'/>
     </xpath>
 </template>
+<template id="editor" inherit_id="website.editor_assets" name="Mail snippet">
+    <xpath expr="/t" position="inside">
+        <script type="text/javascript" src="/website_mail/static/src/js/website_mail.editor.js" groups="base.group_website_publisher"></script>
+    </xpath>
+</template>
 
 </data>
 </openerp>
diff --git a/addons/website_sale/views/website_sale.xml b/addons/website_sale/views/website_sale.xml
index 542147a0b2e..7c1a7d5c702 100644
--- a/addons/website_sale/views/website_sale.xml
+++ b/addons/website_sale/views/website_sale.xml
@@ -10,7 +10,7 @@
     </xpath>
 </template>
 
-<template id="editor_head" inherit_id="website.editor_head" name="Shop Editor" groups="base.group_sale_manager">
+<template id="editor_assets" inherit_id="website.editor_assets" name="Shop Editor" groups="base.group_sale_manager">
   <xpath expr="//script[@id='website_tour_js']" position="after">
       <script type="text/javascript" src="/website_sale/static/src/js/website_sale.editor.js"></script>
       <script type="text/javascript" src="/website_sale/static/src/js/website.tour.shop.js"></script>
diff --git a/addons/website_twitter/views/twitter_snippet.xml b/addons/website_twitter/views/twitter_snippet.xml
index bc039d71c61..1ad4fecbc9c 100644
--- a/addons/website_twitter/views/twitter_snippet.xml
+++ b/addons/website_twitter/views/twitter_snippet.xml
@@ -22,11 +22,15 @@
             </div>
         </xpath>
     </template>
-    <template id="twitter" inherit_id="website.layout" name="Twitter Snippet">
-        <xpath expr="//head" position="inside">
+    <template id="twitter" inherit_id="website.assets" name="Twitter Snippet">
+        <xpath expr="/t" position="inside">
             <link rel="stylesheet" href="/website_twitter/static/src/css/website.twitter.css"  type="text/css"/>
-            <script type="text/javascript" src="/website_twitter/static/src/js/website.twitter.animation.js"></script>
-            <script type="text/javascript" src="/website_twitter/static/src/js/website.twitter.editor.js" groups="base.group_website_publisher"></script>
+            <script type="text/javascript" src="/website_twitter/static/src/js/website.twitter.animation.js"/>
+        </xpath>
+    </template>
+    <template id="twitter_editor" inherit_id="website.editor_assets" name="Twitter options">
+        <xpath expr="/t" position="inside">
+            <script type="text/javascript" src="/website_twitter/static/src/js/website.twitter.editor.js" groups="base.group_website_publisher"/>
         </xpath>
     </template>
 </data>