[IMP] Improve view in email_template.

bzr revid: ysa@tinyerp.com-20110208051334-bc6k96r4cyc7hx1k

3 files changed, 50 insertions, 61 deletions

diff --git a/addons/email_template/email_template_view.xml b/addons/email_template/email_template_view.xml
index bd8fc616515..236db1dcaff 100644
--- a/addons/email_template/email_template_view.xml
+++ b/addons/email_template/email_template_view.xml
@@ -8,10 +8,10 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Email Templates">
-                    <field name="name" />
+                    <field name="name"/>
                     <field name="object_name" required="1"
-                        on_change="change_model(object_name)" />
-                    <field name="model_int_name" invisible="1" />
+                        on_change="change_model(object_name)"/>
+                    <field name="model_int_name" invisible="1"/>
                     <notebook colspan="4">
                         <page string="Mail Details">
                             <group col="2" colspan="2">
@@ -29,35 +29,34 @@
                                 <field name="track_campaign_item" colspan="4"/>
                             </group>
                             <group col="2" colspan="2">
-                                <separator colspan="2" string="Email Content  " />
-                                <field name="def_subject" colspan="4" required="1" />
+                                <separator colspan="2" string="Email Content"/>
+                                <field name="def_subject" colspan="4" required="1"/>
                                 <notebook>
                                     <page string="Body (Text)">
-                                        <field name="def_body_text" colspan="4" nolabel="1" />
+                                        <field name="def_body_text" colspan="4" nolabel="1"/>
                                     </page>
                                     <page string="Body (Raw HTML)">
-                                        <field name="def_body_html" colspan="4" nolabel="1" />
-                                        <label string="Note: This is Raw HTML." colspan="4" />
+                                        <field name="def_body_html" colspan="4" nolabel="1"/>
+                                        <label string="Note: This is Raw HTML." colspan="4"/>
                                     </page>
                                 </notebook>
                             </group>
                             <group col="4" colspan="2">
                                 <notebook>
                                     <page string="Insert Simple Field">
-
                                         <field name="model_object_field"
                                             domain="[('model_id','=',object_name),('ttype','!=','one2many'),('ttype','!=','many2many')]"
                                             on_change="onchange_sub_model_object_value_field(model_object_field)"
-                                            colspan="4" />
-                                        <field name="sub_object" readonly="1" colspan="4" />
+                                            colspan="4"/>
+                                        <field name="sub_object" readonly="1" colspan="4"/>
                                         <field name="sub_model_object_field"
                                             domain="[('model_id','=',sub_object),('ttype','!=','one2many'),('ttype','!=','many2many')]"
                                             colspan="4"
                                             attrs="{'readonly':[('sub_object','=',False)],'required':[('sub_object','!=',False)]}"
-                                            on_change="onchange_sub_model_object_value_field(model_object_field,sub_model_object_field)" />
+                                            on_change="onchange_sub_model_object_value_field(model_object_field,sub_model_object_field)"/>
                                         <field name="null_value" colspan="4"
                                             on_change="onchange_sub_model_object_value_field(model_object_field,sub_model_object_field,null_value)" />
-                                        <field name="copyvalue" colspan="4" />
+                                        <field name="copyvalue" colspan="4"/>
                                     </page>
                                 </notebook>
                                 <button name="%(wizard_email_template_preview)d" string="Preview Template"
@@ -87,7 +86,7 @@
                                     </page>
                                     <page string="Report">
                                         <field name="report_template" colspan="4"
-                                            domain="[('model','=',model_int_name)]" />
+                                            domain="[('model','=',model_int_name)]"/>
                                         <field name="file_name" colspan="4" />
                                     </page>
                                 </notebook>
@@ -126,13 +125,13 @@
            <field name="arch" type="xml">
                <search string="Templates">
                     <group col="13" colspan="4">
-                        <field name="name" select="1"/>
-                        <field name="object_name" select="1"/>
-                        <field name="def_to" select="1"/>
+                        <field name="name"/>
+                        <field name="object_name"/>
+                        <field name="def_to"/>
                         <separator orientation="vertical"/>
-                        <field name="lang" select="1"/>
-                        <field name="def_subject" select="1"/>
-                        <field name="file_name" select="1"/>
+                        <field name="lang"/>
+                        <field name="def_subject"/>
+                        <field name="file_name"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group by..." colspan="4" col="10">
@@ -156,7 +155,7 @@
         <menuitem name="Email Templates" id="menu_email_template_all_tools"
             parent="email.menu_config_email" action="action_email_template_tree_all" />
 
-	<!-- Inherit email.message view -->
+		<!-- Inherit email.message view -->
 
         <record model="ir.ui.view" id="view_email_message_template_form">
             <field name="name">email.message.template.form</field>
@@ -171,9 +170,4 @@
         </record>
 
     </data>
-</openerp>
-
-
-
-
-
+</openerp>
\ No newline at end of file
diff --git a/addons/email_template/wizard/email_template_preview_view.xml b/addons/email_template/wizard/email_template_preview_view.xml
index 55a441d7484..42b8fdb1000 100644
--- a/addons/email_template/wizard/email_template_preview_view.xml
+++ b/addons/email_template/wizard/email_template_preview_view.xml
@@ -9,14 +9,14 @@
             <field name="arch" type="xml">
                 <form string="Email Preview">
                     <group col="4" colspan="4">
-                        <field name="rel_model" />
+                        <field name="rel_model"/>
                         <field name="rel_model_ref" on_change="on_change_ref(rel_model_ref, context)"/>
                     </group>
                     <group col="8" colspan="4">
-                        <field name="to" />
-                        <field name="cc" />
-                        <field name="bcc" />
-                        <field name="reply_to" />
+                        <field name="to"/>
+                        <field name="cc"/>
+                        <field name="bcc"/>
+                        <field name="reply_to"/>
                         <field name="message_id" attrs="{'invisible':[('message_id','=',False)]}" groups="base.group_extended"/>
                         <field name="subject" colspan="8"/>
                     </group>
@@ -46,5 +46,4 @@
         </record>
 
 	</data>
-</openerp>
-
+</openerp>
\ No newline at end of file
diff --git a/addons/email_template/wizard/email_template_send_wizard_view.xml b/addons/email_template/wizard/email_template_send_wizard_view.xml
index a5ad037aee6..c92f0c2460d 100644
--- a/addons/email_template/wizard/email_template_send_wizard_view.xml
+++ b/addons/email_template/wizard/email_template_send_wizard_view.xml
@@ -9,55 +9,51 @@
 			<field name="arch" type="xml">
 				<form string="Send mail Wizard">
 					<group col="4" colspan="4">
-						<field name="rel_model" colspan="2" />
-						<field name="from" required="1" colspan="2" />
+						<field name="rel_model" colspan="2"/>
+						<field name="from" required="1" colspan="2"/>
 					</group>
 					<group col="4" colspan="4">
 						<group col="6" colspan="4">
-							<field name="to" select="1" colspan="4" />
-							<newline />
-							<field name="cc" select="2" colspan="4" />
-							<newline />
-							<field name="bcc" select="2" colspan="4" />
-							<newline />
-							<field name="subject" select="2" colspan="4" attrs="{'required':[('state','=','single')]}" />
-							<newline />
-							<field name="report" colspan="4" />
+							<field name="to" colspan="4"/>
+							<field name="cc" colspan="4"/>
+							<field name="bcc" colspan="4"/>
+							<field name="subject" colspan="4" attrs="{'required':[('state','=','single')]}"/>
+							<field name="report" colspan="4"/>
 						</group>
-						<separator string="" colspan="4" />
+						<separator string="" colspan="4"/>
 						<notebook colspan="4">
 							<page string="Body (Plain Text)">
-								<field name="body_text" select="2" colspan="4" nolabel="1" />
+								<field name="body_text" select="2" colspan="4" nolabel="1"/>
 							</page>
 							<page string="Body (HTML)">
-								<field name="body_html" select="2" colspan="4" nolabel="1" />
+								<field name="body_html" select="2" colspan="4" nolabel="1"/>
 							</page>
 							<page string="Attachments">
 								<label string="Add here all attachments of the current document you want to include in the Email." colspan="4"/>
 								<field name="attachment_ids" colspan="4" nolabel="1"/>
 							</page>
 						</notebook>
-						<field name="signature" colspan="4" />
+						<field name="signature" colspan="4"/>
 					</group>
 					<group col="4" colspan="4" attrs="{'invisible':[('state','!=','single')]}">
-						<button icon="gtk-apply" name="sav_to_drafts" string="Save in Drafts" type="object" />
-						<button icon="gtk-ok" name="send_mail" string="Send now" type="object" />
-						<button icon="gtk-cancel" special="cancel" string="Discard Mail" />
+						<button icon="gtk-apply" name="sav_to_drafts" string="Save in Drafts" type="object"/>
+						<button icon="gtk-ok" name="send_mail" string="Send now" type="object"/>
+						<button icon="gtk-cancel" special="cancel" string="Discard Mail"/>
 					</group>
 					<group col="4" colspan="4" attrs="{'invisible':[('state','=','single')]}">
 					    <label string="Tip: Multiple emails are sent in the same language (the first one is proposed). We suggest you send emails in groups according to language." colspan="4"/>
-						<field name="requested" />
-						<field name="generated" />
-						<button icon="gtk-ok" name="get_generated" string="Send all mails" type="object" states="multi" colspan="2" />
-						<button icon="gtk-cancel" special="cancel" string="Discard Mail" colspan="2" states="multi" />
+						<field name="requested"/>
+						<field name="generated"/>
+						<button icon="gtk-ok" name="get_generated" string="Send all mails" type="object" states="multi" colspan="2"/>
+						<button icon="gtk-cancel" special="cancel" string="Discard Mail" colspan="2" states="multi"/>
 					</group>
-					<button icon="gtk-ok" special="cancel" string="Close" colspan="4" states="done" />
-					<field name="state" />
-					<newline />
+					<button icon="gtk-ok" special="cancel" string="Close" colspan="4" states="done"/>
+					<field name="state"/>
+					<newline/>
 					<label string="After clicking send all mails, mails will be sent to outbox and cleared in next Send/Recieve" colspan="4"/>
 				</form>
 			</field>
 		</record>
-	</data>
-</openerp>
 
+	</data>
+</openerp>
\ No newline at end of file