diff options
Diffstat (limited to 'addons/website')
| -rw-r--r-- | addons/website/static/src/js/website.js | 1 | ||||
| -rw-r--r-- | addons/website/static/src/js/website.translator.js | 5 | ||||
| -rw-r--r-- | addons/website/views/website_templates.xml | 19 |
3 files changed, 15 insertions, 10 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> |