[MERGE] forward port of branch 8.0 up to 591e329

[odoo/odoo.git] / addons / website_mail / views / website_email_designer.xml

diff --git a/addons/website_mail/views/website_email_designer.xml b/addons/website_mail/views/website_email_designer.xml
index d230d68..7228574 100644 (file)
--- a/addons/website_mail/views/website_email_designer.xml
+++ b/addons/website_mail/views/website_email_designer.xml
@@ -2,6 +2,12 @@
 <openerp>
     <data>
 
+<template id="assets_editor" inherit_id="website.assets_editor" name="Email Designer">
+    <xpath expr="." position="inside">
+        <script type="text/javascript" src="/website_mail/static/src/js/website_email_designer.js"></script>
+    </xpath>
+</template>
+
 <!-- Template Choice page -->
 <template id="email_designer" name="Email Designer">
     <t t-call="website.layout">
@@ -32,7 +38,7 @@
                 </div>
             </div>
             <div id="email_designer" class="mb32" t-att-style="mode != 'email_designer' and 'display: none' or ''">
-                <a class="mt16 btn btn-primary pull-right css_editable_mode_hidden" 
+                <a class="mt16 btn btn-primary pull-right" id="save_and_continue"
                   t-attf-href="/web#return_label=Website&amp;model=#{model}&amp;id=#{res_id}&amp;view_type=form">
                     Back to the mass mailing
                 </a>