diff options
| author | Olivier Dony <odo@openerp.com> | 2014-05-29 01:59:47 +0200 |
|---|---|---|
| committer | Olivier Dony <odo@openerp.com> | 2014-05-29 01:59:47 +0200 |
| commit | 248107d11aa695cc4945fa2decb792562e0de7e2 (patch) | |
| tree | 34a789872393dcf2c432f75a6fb07d3c55897850 | |
| parent | 7dd10060df8ef3ec64c0ca264f1d096e027c1846 (diff) | |
[FIX] website_mail*: fix + bundlify changes of 0c89ca: move subscription widget from website_mail to website_mail_group
| -rw-r--r-- | addons/website_mail/views/website_mail.xml | 5 | ||||
| -rw-r--r-- | addons/website_mail_group/views/website_mail_group.xml | 11 |
2 files changed, 8 insertions, 8 deletions
diff --git a/addons/website_mail/views/website_mail.xml b/addons/website_mail/views/website_mail.xml index 9cf5f998c83..2b2bbea7e5f 100644 --- a/addons/website_mail/views/website_mail.xml +++ b/addons/website_mail/views/website_mail.xml @@ -24,11 +24,6 @@ <link rel='stylesheet' href='/website_mail/static/src/css/website_mail.css'/> </xpath> </template> -<template id="editor" inherit_id="website.assets_editor" name="Mail snippet"> - <xpath expr="/t" position="inside"> - <script type="text/javascript" src="/website_mail_group/static/src/js/website_mail_group.editor.js"></script> - </xpath> -</template> </data> </openerp> diff --git a/addons/website_mail_group/views/website_mail_group.xml b/addons/website_mail_group/views/website_mail_group.xml index 1c0ee08edd4..d52c34513b8 100644 --- a/addons/website_mail_group/views/website_mail_group.xml +++ b/addons/website_mail_group/views/website_mail_group.xml @@ -8,13 +8,18 @@ </xpath> </template> -<template id="head" inherit_id="website.layout" name="Mail Group Customization"> - <xpath expr="//head" position="inside"> - <script type="text/javascript" src="/website_mail_group/static/src/js/website_mail_group.editor.js" groups="base.group_website_publisher"></script> +<template id="head" inherit_id="website.assets_frontend" name="Mail Group Snippet"> + <xpath expr="/t" position="inside"> <script type="text/javascript" src="/website_mail_group/static/src/js/website_mail_group.snippet.js"></script> </xpath> </template> +<template id="editor" inherit_id="website.assets_editor" name="Mail Group Editor"> + <xpath expr="/t" position="inside"> + <script type="text/javascript" src="/website_mail_group/static/src/js/website_mail_group.editor.js" groups="base.group_website_publisher"></script> + </xpath> +</template> + <template id="mail_groups" name="Mailing Lists"> <t t-call="website.layout"> <div id="wrap" class="oe_structure oe_empty"> |