summaryrefslogtreecommitdiff
path: root/addons/website_mail/views
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2014-12-02 16:18:08 +0100
committerChristophe Simonis <chs@odoo.com>2014-12-02 16:18:08 +0100
commit1d3f8eba879f02da7fc0bb46c9801029eccbc8c8 (patch)
tree10ef917de1be8ef9755cba4f3c9ac951af176b18 /addons/website_mail/views
parent7878b2fd0cb42827b71bd00a1fd8199e73269fe4 (diff)
parent591e329bb0efe4997677a0bee2e6f3b558e35df8 (diff)
[MERGE] forward port of branch 8.0 up to 591e329
Diffstat (limited to 'addons/website_mail/views')
-rw-r--r--addons/website_mail/views/website_email_designer.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/addons/website_mail/views/website_email_designer.xml b/addons/website_mail/views/website_email_designer.xml
index 0499e619306..72285741f19 100644
--- 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