From a370d1c0598a52b4a2020289620d45a27e65a36e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 13 Nov 2012 12:36:25 +0100
Subject: [IMP] email_template: relooked a bit the mail.compose.message wizard,
 use_template by default, on bottom-right choose the template; rendre only
 when use_template and template_id set.

bzr revid: tde@openerp.com-20121113113625-fg3jp3047gnrx2wr
---
 .../wizard/mail_compose_message_view.xml           | 32 +++++++++++-----------
 1 file changed, 16 insertions(+), 16 deletions(-)

(limited to 'addons/email_template/wizard/mail_compose_message_view.xml')

diff --git a/addons/email_template/wizard/mail_compose_message_view.xml b/addons/email_template/wizard/mail_compose_message_view.xml
index 05d0e8dffa1..0a530299d4a 100644
--- a/addons/email_template/wizard/mail_compose_message_view.xml
+++ b/addons/email_template/wizard/mail_compose_message_view.xml
@@ -8,23 +8,23 @@
             <field name="inherit_id" ref="mail.email_compose_message_wizard_form"/>
             <field name="arch" type="xml">
                 <data>
-                    <xpath expr="//form/group" position="after">
-                        <group attrs="{'invisible':[('use_template','=',False)]}">
-                            <field name="use_template" invisible="1"
-                                on_change="onchange_use_template(use_template, template_id, composition_mode, model, res_id, context)"/>
-                            <field name="template_id"
-                                on_change="onchange_template_id(use_template, template_id, composition_mode, model, res_id, context)"/>
-                        </group>
+                    <xpath expr="//field[@name='content_subtype']" position="after">
+                        <field name="use_template" invisible="1"
+                            on_change="onchange_use_template(use_template, template_id, composition_mode, model, res_id, context)"/>
                     </xpath>
-                    <xpath expr="//form/footer/button" position="after">
-                        <button icon="/email_template/static/src/img/email_template.png"
-                            type="object" name="toggle_template" string=""
-                            help="Use a message template"
-                            attrs="{'invisible':[('content_subtype','!=','html')]}"/>
-                        <button icon="/email_template/static/src/img/email_template_save.png"
-                            type="object" name="save_as_template" string=""
-                            help="Save as a new template"
-                            attrs="{'invisible':[('content_subtype','!=','html')]}"/>
+                    <xpath expr="//footer" position="inside">
+                        <group class="oe_right" col="1">
+                            <div>Use template
+                                <field name="template_id" attrs="{'invisible':[('use_template','=',False)]}"
+                                    nolabel="1"
+                                    on_change="onchange_template_id(use_template, template_id, composition_mode, model, res_id, context)"/>
+                            </div>
+                            or
+                            <button icon="/email_template/static/src/img/email_template_save.png"
+                                type="object" name="save_as_template" string="Save as new template" class="oe_link"
+                                help="Save as a new template"
+                                attrs="{'invisible':[('content_subtype','!=','html')]}"/>
+                        </group>
                     </xpath>
                 </data>
             </field>
-- 
cgit v1.2.3


From 81d4467c8fb4e15129d5dd6b8242fa1a8d4e5562 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 15 Nov 2012 13:24:06 +0100
Subject: [REV] mail.compose.message using email_template: _reopen is back, as
 the spec of a wizard should be that hitting a button close it. Therefore
 _reopen is necessaru to reopen the wizard with its previous value, to
 continue working on it.

bzr revid: tde@openerp.com-20121115122406-d88ozw5iclsqdyff
---
 addons/email_template/wizard/mail_compose_message_view.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'addons/email_template/wizard/mail_compose_message_view.xml')

diff --git a/addons/email_template/wizard/mail_compose_message_view.xml b/addons/email_template/wizard/mail_compose_message_view.xml
index 0a530299d4a..5afaf9745e1 100644
--- a/addons/email_template/wizard/mail_compose_message_view.xml
+++ b/addons/email_template/wizard/mail_compose_message_view.xml
@@ -14,12 +14,11 @@
                     </xpath>
                     <xpath expr="//footer" position="inside">
                         <group class="oe_right" col="1">
-                            <div>Use template
+                            <div attrs="{'invisible':[('use_template','=',False)]}">Use template
                                 <field name="template_id" attrs="{'invisible':[('use_template','=',False)]}"
                                     nolabel="1"
                                     on_change="onchange_template_id(use_template, template_id, composition_mode, model, res_id, context)"/>
                             </div>
-                            or
                             <button icon="/email_template/static/src/img/email_template_save.png"
                                 type="object" name="save_as_template" string="Save as new template" class="oe_link"
                                 help="Save as a new template"
-- 
cgit v1.2.3