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 @@
-
+
padding-top: 51px;
@@ -251,6 +251,7 @@
+
-
+
@@ -279,15 +278,15 @@
-
-
+
+
-
-
-
-
+
+
+
+
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 @@
-
+
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 @@
-
+
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 @@
-
+
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 @@
-
+
@@ -60,15 +60,15 @@
-
-
+
+
-
-
-
-
+
+
+
+
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 @@