[IMP] mail: remove cancel button and improved view of wizard.

bzr revid: tpa@tinyerp.com-20120615111732-pzquodtezhyfpakp

diff --git a/addons/email_template/wizard/email_compose_message_view.xml b/addons/email_template/wizard/email_compose_message_view.xml
index cf233b2..efe0074 100644 (file)
--- a/addons/email_template/wizard/email_compose_message_view.xml
+++ b/addons/email_template/wizard/email_compose_message_view.xml
@@ -9,18 +9,17 @@
             <field name="inherit_id" ref="mail.email_compose_message_wizard_form"/>
             <field name="arch" type="xml">
                 <data>
-                    <xpath expr="//label[@name='placeholder']" position="before">
+                    <xpath expr="//form/header/button" position="before">
+                                               <field name="use_template" invisible="1"/>
+                                               <button icon="gtk-paste" type="object" name="template_toggle"
+                                                       string="" help="Use a message template" />
+                                               <button icon="gtk-save" type="object" name="save_as_template"
+                                                       string="" help="Save as a new template"/>
+                    </xpath>
+                    <xpath expr="//form/notebook" position="after">
                         <group attrs="{'invisible':[('use_template','=',False)]}" colspan="4" col="4">
                             <field name="template_id" colspan="3"
                                    on_change="on_change_template(use_template, template_id, email_from, email_to, context)"/>
-                            <label string="" name="flexspace" colspan="1"/>
-                        </group>
-                        <group colspan="1" col="6">
-                            <field name="use_template" invisible="1"/>
-                            <button icon="gtk-paste" type="object" name="template_toggle"
-                                    string="" help="Use a message template" colspan="1"/>
-                            <button icon="gtk-save" type="object" name="save_as_template"
-                                    string="" help="Save as a new template" colspan="1"/>
                         </group>
                     </xpath>
                 </data>

diff --git a/addons/mail/wizard/mail_compose_message_view.xml b/addons/mail/wizard/mail_compose_message_view.xml
index d559d67..da782ae 100644 (file)
--- a/addons/mail/wizard/mail_compose_message_view.xml
+++ b/addons/mail/wizard/mail_compose_message_view.xml
@@ -6,7 +6,10 @@
             <field name="model">mail.compose.message</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Compose Email">
+                <form string="Compose Email" version="7.0">
+                    <header>
+                        <button icon="gtk-ok" name="send_mail" string="Send" type="object" class="oe_form_button_active_flow"/>
+                    </header>
                     <group col="6" colspan="4">
                         <field name="model" invisible="1"/>
                         <field name="res_id" invisible="1"/>
@@ -28,11 +31,6 @@
                             <field name="attachment_ids" colspan="4" nolabel="1"/>
                         </page>
                     </notebook>
-                    <group col="4" colspan="4">
-                        <label string="" name="placeholder" colspan="1"/>
-                        <button icon="gtk-close" special="cancel" string="Cancel"/>
-                        <button icon="gtk-ok" name="send_mail" string="Send" type="object"/>
-                    </group>
                 </form>
             </field>
         </record>