diff options
| author | Randhir Mayatra (OpenERP) <rma@tinyerp.com> | 2012-11-19 16:38:24 +0530 |
|---|---|---|
| committer | Randhir Mayatra (OpenERP) <rma@tinyerp.com> | 2012-11-19 16:38:24 +0530 |
| commit | d23c5c8dca985dd0fde280c9237dee85b7bb4d7a (patch) | |
| tree | cf03bc2a74a1d9e93b5ef571fb78070c09c9857b /addons/email_template/wizard/mail_compose_message_view.xml | |
| parent | f4ab81afb8285a8157258232c5fb2a6745ae7f72 (diff) | |
| parent | 66afff1b52b7ab6ab8c340e18960fb6367cfb714 (diff) | |
[MERGE]merge with trunk
bzr revid: rma@tinyerp.com-20121119110824-rj4y32rfbszqln7g
Diffstat (limited to 'addons/email_template/wizard/mail_compose_message_view.xml')
| -rw-r--r-- | addons/email_template/wizard/mail_compose_message_view.xml | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/addons/email_template/wizard/mail_compose_message_view.xml b/addons/email_template/wizard/mail_compose_message_view.xml index 05d0e8dffa1..5afaf9745e1 100644 --- a/addons/email_template/wizard/mail_compose_message_view.xml +++ b/addons/email_template/wizard/mail_compose_message_view.xml @@ -8,23 +8,22 @@ <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 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> + <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> |