[FIX] website_mail*: fix + bundlify changes of 0c89ca: move subscription...

[FIX] website_mail*: fix + bundlify changes of 0c89ca: move subscription widget from website_mail to website_mail_group

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>

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">