[MERGE] from master

[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 0499e61..7228574 100644 (file)
--- a/addons/website_mail/views/website_email_designer.xml
+++ b/addons/website_mail/views/website_email_designer.xml
@@ -13,7 +13,7 @@
     <t t-call="website.layout">
         <div id="wrap" class="container" t-ignore="True">
             <div id="email_template" class="mb32" t-att-style="mode != 'email_template' and 'display: none' or ''">
-                <a class="mt16 btn btn-default pull-right" 
+                <a class="mt16 btn btn-default pull-right css_editable_mode_hidden" 
                   t-attf-href="/web#return_label=Website&amp;model=#{model}&amp;id=#{res_id}&amp;view_type=form">
                     Back
                 </a>
@@ -40,7 +40,7 @@
             <div id="email_designer" class="mb32" t-att-style="mode != 'email_designer' and 'display: none' or ''">
                 <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">
-                    Save and Continue
+                    Back to the mass mailing
                 </a>
                 <h1 class="page-header mt16">
                     Design Your Email