odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP] Rename assets_frontend 

bzr revid: fme@openerp.com-20140429145745-t3u41tzv6qnndlla
This commit is contained in:
Fabien Meghazi 2014-04-29 16:57:45 +02:00
parent fdaa70f319
commit c92e1b6bcb
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
addons/website/views/website_templates.xml
View File

@ -11,7 +11,7 @@
<link id="website_css" rel='stylesheet' href='/website/static/src/css/website.css' t-ignore="true"/>
</template>
<template id="website.assets" name="Website assets">
<template id="website.assets_frontend" name="Website assets">
<t t-call="web.assets_common"/>
<t t-call="website.theme"/>
@ -75,7 +75,7 @@
and main_object.website_meta_keywords or website_meta_keywords"/>
<title><t t-esc="title"/></title>
<t t-call-assets="website.assets"/>
<t t-call-assets="website.assets_frontend"/>
<t t-raw="head or ''" name='layout_head'/>
</head>
@ -244,7 +244,7 @@
</div>
</div>
</xpath>
<xpath expr='//t[@t-call-assets="website.assets"]' position="after">
<xpath expr='//t[@t-call-assets="website.assets_frontend"]' position="after">
<t t-call-assets="website.assets_editor"/>
</xpath>
</template>

2
addons/website_mail/views/website_mail.xml
View File

@ -19,7 +19,7 @@
</div>
</template>
<template id="head" inherit_id="website.assets" name="Mail customization">
<template id="head" inherit_id="website.assets_frontend" 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'/>

2
addons/website_twitter/views/twitter_snippet.xml
View File

@ -22,7 +22,7 @@
</div>
</xpath>
</template>
<template id="twitter" inherit_id="website.assets" name="Twitter Snippet">
<template id="twitter" inherit_id="website.assets_frontend" 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"/>