[FIX] remove @translatable conditions and de-activate group_website_designer specifics

Bundlification (and later merge of editor and web client) can't work with conditional
script inclusion

bzr revid: fme@openerp.com-20140425124913-9jsfhbfhoq6j6xxl

9 files changed, 31 insertions, 21 deletions

diff --git a/addons/website/static/src/js/website.js b/addons/website/static/src/js/website.js
index 31e39b3bbc4..b6f42c8b20e 100644
--- a/addons/website/static/src/js/website.js
+++ b/addons/website/static/src/js/website.js
@@ -3,6 +3,7 @@
 
     var website = {};
     openerp.website = website;
+    openerp.website.translatable = !!$('html').data('translatable');
 
     /* ----------------------------------------------------
        Helpers
diff --git a/addons/website/static/src/js/website.translator.js b/addons/website/static/src/js/website.translator.js
index e88b1e4a6b6..5f0921abb3d 100644
--- a/addons/website/static/src/js/website.translator.js
+++ b/addons/website/static/src/js/website.translator.js
@@ -1,6 +1,11 @@
 (function () {
     'use strict';
 
+    if (!openerp.website.translatable) {
+        // Temporary hack until the editor bar is moved to the web client
+        return;
+    }
+
     var website = openerp.website;
     website.add_template_file('/website/static/src/xml/website.translator.xml');
     var nodialog = 'website_translator_nodialog';
diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml
index d28641ef918..063a9d50b08 100644
--- a/addons/website/views/website_templates.xml
+++ b/addons/website/views/website_templates.xml
@@ -218,7 +218,7 @@
     </xpath>
 </template>
 
-<template id="editor_head" inherit_id="website.layout" name="Editor" groups="base.group_website_publisher">
+<template id="editor_head" inherit_id="website.layout" name="Editor" groups="base.group_website_publisher,base.group_website_designer">
     <xpath expr="//body" position="attributes">
         <attribute name="style">padding-top: 51px;</attribute>
     </xpath>
@@ -251,6 +251,7 @@
         <t t-call-assets="website.assets_editor"/>
     </xpath>
 </template>
+
 <template id="assets_editor" name="Editor assets">
     <script type="text/javascript">
         var CKEDITOR_BASEPATH = '/web/static/lib/ckeditor/';
@@ -259,14 +260,12 @@
     <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/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>
@@ -279,15 +278,15 @@
     <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.editor.newpage.js"></script> <!-- groups="base.group_website_designer" -->
+    <script type="text/javascript" src="/website/static/src/js/website.menu.js"></script> <!-- groups="base.group_website_designer" -->
     <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/website.tour.banner.js"></script> <!-- groups="base.group_website_designer" -->
+    <script type="text/javascript" src="/website/static/src/js/website.snippets.editor.js"></script>
+    <script type="text/javascript" src="/website/static/src/js/website.ace.js"></script>
+    <script 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>
diff --git a/addons/website_event/views/website_event.xml b/addons/website_event/views/website_event.xml
index 81c31e20f78..af2e034d0ba 100644
--- a/addons/website_event/views/website_event.xml
+++ b/addons/website_event/views/website_event.xml
@@ -355,7 +355,7 @@
 
 <template id="event_script" name="Country Events Snippet Script" inherit_id="website.layout">
     <xpath expr="//head" position="inside">
-        <script t-if="not translatable" type="text/javascript" src="/website_event/static/src/js/website_geolocation.js"></script>
+        <script type="text/javascript" src="/website_event/static/src/js/website_geolocation.js"></script>
     </xpath>
 </template>
 
diff --git a/addons/website_gengo/static/src/js/website_gengo.js b/addons/website_gengo/static/src/js/website_gengo.js
index a1755ed1290..4b7d9c34b4f 100644
--- a/addons/website_gengo/static/src/js/website_gengo.js
+++ b/addons/website_gengo/static/src/js/website_gengo.js
@@ -1,6 +1,11 @@
 (function () {
     'use strict';
 
+    if (!openerp.website.translatable) {
+        // Temporary hack until the editor bar is moved to the web client
+        return;
+    }
+
     var website = openerp.website;
     website.add_template_file('/website_gengo/static/src/xml/website.gengo.xml');
 
diff --git a/addons/website_gengo/views/website_gengo.xml b/addons/website_gengo/views/website_gengo.xml
index 55f3c82cc4f..e8ae43fee1c 100644
--- a/addons/website_gengo/views/website_gengo.xml
+++ b/addons/website_gengo/views/website_gengo.xml
@@ -5,7 +5,7 @@
 <template id="gengo_assets_editor" inherit_id="website.assets_editor" 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>
+        <script type="text/javascript" src="/website_gengo/static/src/js/website_gengo.js"></script>
     </xpath>
 </template>
 
diff --git a/addons/website_mail/views/website_mail.xml b/addons/website_mail/views/website_mail.xml
index 681ca95e35d..d946f962626 100644
--- a/addons/website_mail/views/website_mail.xml
+++ b/addons/website_mail/views/website_mail.xml
@@ -27,7 +27,7 @@
 </template>
 <template id="editor" inherit_id="website.assets_editor" name="Mail snippet">
     <xpath expr="/t" position="inside">
-        <script t-if="not translatable" type="text/javascript" src="/website_mail/static/src/js/website_mail.editor.js" groups="base.group_website_publisher"></script>
+        <script type="text/javascript" src="/website_mail/static/src/js/website_mail.editor.js"></script>
     </xpath>
 </template>
 
diff --git a/addons/website_report/views/layouts.xml b/addons/website_report/views/layouts.xml
index eb8683c9eb7..e46b3fdf7a0 100644
--- a/addons/website_report/views/layouts.xml
+++ b/addons/website_report/views/layouts.xml
@@ -47,7 +47,7 @@
 
         <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/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>
@@ -60,15 +60,15 @@
         <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.editor.newpage.js"></script> <!-- groups="base.group_website_designer" -->
+        <script type="text/javascript" src="/website/static/src/js/website.menu.js"></script> <!-- groups="base.group_website_designer" -->
         <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/website.tour.banner.js"></script> <!-- groups="base.group_website_designer" -->
+        <script type="text/javascript" src="/website/static/src/js/website.snippets.editor.js"></script>
+        <script type="text/javascript" src="/website/static/src/js/website.ace.js"></script>
+        <script 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>
 
diff --git a/addons/website_twitter/views/twitter_snippet.xml b/addons/website_twitter/views/twitter_snippet.xml
index d9611dc19a7..b36c1556620 100644
--- a/addons/website_twitter/views/twitter_snippet.xml
+++ b/addons/website_twitter/views/twitter_snippet.xml
@@ -30,7 +30,7 @@
     </template>
     <template id="twitter_editor" inherit_id="website.assets_editor" name="Twitter options">
         <xpath expr="/t" position="inside">
-            <script t-if="not translatable" type="text/javascript" src="/website_twitter/static/src/js/website.twitter.editor.js" groups="base.group_website_publisher"/>
+            <script type="text/javascript" src="/website_twitter/static/src/js/website.twitter.editor.js"/>
         </xpath>
     </template>
 </data>