diff options
| author | Fabien Meghazi <fme@openerp.com> | 2014-04-29 16:57:45 +0200 |
|---|---|---|
| committer | Fabien Meghazi <fme@openerp.com> | 2014-04-29 16:57:45 +0200 |
| commit | c92e1b6bcbedb0059a458ce8dc2d5f1a5bbfb8b6 (patch) | |
| tree | ce96749ac4c8ac13ec06f36b92b9bb5d6b8459f0 | |
| parent | fdaa70f319457414e8cc8ca092f9eaddf947a51d (diff) | |
[IMP] Rename assets_frontend
bzr revid: fme@openerp.com-20140429145745-t3u41tzv6qnndlla
| -rw-r--r-- | addons/website/views/website_templates.xml | 6 | ||||
| -rw-r--r-- | addons/website_mail/views/website_mail.xml | 2 | ||||
| -rw-r--r-- | addons/website_twitter/views/twitter_snippet.xml | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml index 575179e9439..02f6942be25 100644 --- a/addons/website/views/website_templates.xml +++ b/addons/website/views/website_templates.xml @@ -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> diff --git a/addons/website_mail/views/website_mail.xml b/addons/website_mail/views/website_mail.xml index d946f962626..5d384f5c0b0 100644 --- a/addons/website_mail/views/website_mail.xml +++ b/addons/website_mail/views/website_mail.xml @@ -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'/> diff --git a/addons/website_twitter/views/twitter_snippet.xml b/addons/website_twitter/views/twitter_snippet.xml index b36c1556620..30be5068423 100644 --- a/addons/website_twitter/views/twitter_snippet.xml +++ b/addons/website_twitter/views/twitter_snippet.xml @@ -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"/> |