diff options
| author | Vidhin Mehta <vme@tinyerp.com> | 2013-08-23 10:36:02 +0530 |
|---|---|---|
| committer | Vidhin Mehta <vme@tinyerp.com> | 2013-08-23 10:36:02 +0530 |
| commit | 75ddd5ccbec73c4a671b6a74efaa3d41dc2ea2db (patch) | |
| tree | 50ed3620df15e8533760f5d47e754a1d39c1e856 /addons/mail/mail_group_view.xml | |
| parent | 42f27a15275effd9c43dfe99e32c395ca6b3fd8a (diff) | |
| parent | a7f4b6aaa0359d12046e81183417c24f093cd7c3 (diff) | |
[MERGE]Trunk.
bzr revid: vme@tinyerp.com-20130823050602-33bqv07e7g8dhv7x
Diffstat (limited to 'addons/mail/mail_group_view.xml')
| -rw-r--r-- | addons/mail/mail_group_view.xml | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/addons/mail/mail_group_view.xml b/addons/mail/mail_group_view.xml index 04212b2f58a..8bf61dbdb1e 100644 --- a/addons/mail/mail_group_view.xml +++ b/addons/mail/mail_group_view.xml @@ -44,7 +44,7 @@ <div class="oe_group_details"> <h4><a type="open"><field name="name"/></a></h4> <div class="oe_kanban_alias" t-if="record.alias_id.value"> - <span class="oe_e">%%</span><small><field name="alias_id"/></small> + <span class="oe_e oe_e_alias">%%</span><small><field name="alias_id"/></small> </div> <div class="oe_grey"> <field name="description"/> @@ -78,17 +78,19 @@ <label for="name" string="Group Name"/> </div> <h1><field name="name" readonly="0"/></h1> - <div name="group_alias" + <group colspan="2" name="group_alias" attrs="{'invisible': [('alias_domain', '=', False)]}"> - <label for="alias_id" string="Email Alias"/> - <field name="alias_id" class="oe_inline oe_read_only" required="0" nolabel="1"/> - <span name="edit_alias" class="oe_edit_only"> - <field name="alias_name" class="oe_inline" - attrs="{'required': [('alias_id', '!=', False)]}"/> - @ - <field name="alias_domain" class="oe_inline" readonly="1"/> - </span> - </div> + <label for="alias_id" string="%%" class="oe_e oe_e_alias" style="min-width: 20px;"/> + <div name="alias_def"> + <field name="alias_id" class="oe_read_only oe_inline" + string="Email Alias" required="0"/> + <div class="oe_edit_only oe_inline" name="edit_alias" style="display: inline;" > + <field name="alias_name" class="oe_inline"/>@<field name="alias_domain" class="oe_inline" readonly="1"/> + </div> + </div> + <label for="alias_contact" string="V" class="oe_e oe_e_alias" style="min-width: 20px;"/> + <field name="alias_contact" class="oe_inline" nolabel="1"/> + </group> </div> <field name="description" placeholder="Topics discussed in this group..."/> <div class="oe_clear"/> |