summaryrefslogtreecommitdiff
path: root/addons/website_twitter/views
diff options
context:
space:
mode:
authorXavier Morel <xmo@openerp.com>2014-04-18 14:15:03 +0200
committerXavier Morel <xmo@openerp.com>2014-04-18 14:15:03 +0200
commit74d4d1f58dfc9e1e124ff045bd8443ac7b7492cc (patch)
tree5216ceccaf744c3b639ea8079401c1cd44932d50 /addons/website_twitter/views
parent511cf0270cf63e860826b6b31abd4b3eef594170 (diff)
[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
Diffstat (limited to 'addons/website_twitter/views')
-rw-r--r--addons/website_twitter/views/twitter_snippet.xml12
1 files changed, 8 insertions, 4 deletions
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>