diff options
| author | Thibault Delavallée <tde@openerp.com> | 2013-06-25 10:46:30 +0200 |
|---|---|---|
| committer | Thibault Delavallée <tde@openerp.com> | 2013-06-25 10:46:30 +0200 |
| commit | d0aea936ac5b7398104f67ffcc3dc9a153c6c4a9 (patch) | |
| tree | ab1e4d9c20d4ed8722ebb48c20f4e86bc71cb3b0 | |
| parent | 27ae6e25a2a179b1514695c521638f83a2cbc73e (diff) | |
[CLEAN] Misc cleaning before merging, mainly in views
bzr revid: tde@openerp.com-20130625084630-oqlertvzxl8a8w7f
| -rw-r--r-- | addons/mail/mail_alias_view.xml | 12 | ||||
| -rw-r--r-- | addons/mail/mail_group_view.xml | 4 | ||||
| -rw-r--r-- | addons/mail/res_users_view.xml | 48 |
3 files changed, 28 insertions, 36 deletions
diff --git a/addons/mail/mail_alias_view.xml b/addons/mail/mail_alias_view.xml index 1313cf303a3..248bf7e8f3a 100644 --- a/addons/mail/mail_alias_view.xml +++ b/addons/mail/mail_alias_view.xml @@ -10,6 +10,14 @@ <form string="Alias" version="7.0"> <sheet> <h2><field name="alias_name" class="oe_inline"/>@<field name="alias_domain" class="oe_inline"/></h2> + <div class="oe_right oe_button_box"> + <button name="open_document" string="Open Document" + type="object" class="oe_link" + attrs="{'invisible': ['|', ('alias_model_id', '=', False), ('alias_force_thread_id', '=', 0)]}"/> + <button name="open_parent_document" string="Open Parent Document" + type="object" class="oe_link" + attrs="{'invisible': ['|', ('alias_parent_model_id', '=', False), ('alias_parent_thread_id', '=', 0)]}"/> + </div> <group> <field name="alias_model_id"/> <field name="alias_force_thread_id"/> @@ -19,10 +27,6 @@ <field name="alias_parent_model_id"/> <field name="alias_parent_thread_id"/> </group> - <button name="open_document" string="Open Document" type="object" - attrs="{'invisible': ['|', ('alias_model_id', '=', False), ('alias_force_thread_id', '=', False)]}"/> - <button name="open_parent_document" string="Open Parent Document" type="object" - attrs="{'invisible': ['|', ('alias_parent_model_id', '=', False), ('alias_parent_thread_id', '=', False)]}"/> </sheet> </form> </field> diff --git a/addons/mail/mail_group_view.xml b/addons/mail/mail_group_view.xml index c94fb9be727..8bf61dbdb1e 100644 --- a/addons/mail/mail_group_view.xml +++ b/addons/mail/mail_group_view.xml @@ -82,8 +82,8 @@ attrs="{'invisible': [('alias_domain', '=', False)]}"> <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"/> + <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> diff --git a/addons/mail/res_users_view.xml b/addons/mail/res_users_view.xml index da16aa080c0..2bf54b4bafd 100644 --- a/addons/mail/res_users_view.xml +++ b/addons/mail/res_users_view.xml @@ -22,37 +22,25 @@ <field name="model">res.users</field> <field name="inherit_id" ref="base.view_users_form"/> <field name="arch" type="xml"> - <data> - <field name="signature" position="before"> - <field name="notification_email_send"/> - </field> - <field name="email" position="after"> - <!-- <label for="alias_id" string="Alias" --> - <!-- attrs="{'invisible': [('alias_domain', '=', False)]}"/> --> - <div name="group_alias" - attrs="{'invisible': [('alias_domain', '=', False)]}"> - <!-- <field name="alias_id" class="oe_inline oe_read_only" required="0" nolabel="1"/> --> - <div name="edit_alias" class="oe_edit_only"> - <!-- <field name="alias_name" class="oe_inline"/>@<field name="alias_domain" class="oe_inline" readonly="1"/> --> + <data> + <field name="signature" position="before"> + <field name="notification_email_send"/> + </field> + <field name="signature" position="before"> + <label for="alias_id" string="Messaging Alias" class="oe_read_only" + attrs="{'invisible': [('alias_domain', '=', False)]}"/> + <field name="alias_id" class="oe_read_only" required="0" nolabel="1" + attrs="{'invisible': [('alias_domain', '=', False)]}"/> + <label for="alias_name" string="Messaging Alias" class="oe_edit_only" + attrs="{'invisible': [('alias_domain', '=', False)]}"/> + <div class="oe_edit_only" attrs="{'invisible': [('alias_domain', '=', False)]}"> + <field name="alias_name" class="oe_inline"/>@<field name="alias_domain" class="oe_inline" readonly="1"/> </div> - <!-- <field name="alias_contact" string="Accept Emails From"/> --> - </div> - </field> - <field name="signature" position="before"> - <label for="alias_id" string="Messaging Alias" class="oe_read_only" - attrs="{'invisible': [('alias_domain', '=', False)]}"/> - <field name="alias_id" class="oe_read_only" required="0" nolabel="1" - attrs="{'invisible': [('alias_domain', '=', False)]}"/> - <label for="alias_name" string="Messaging Alias" class="oe_edit_only" - attrs="{'invisible': [('alias_domain', '=', False)]}"/> - <div class="oe_edit_only" attrs="{'invisible': [('alias_domain', '=', False)]}"> - <field name="alias_name" class="oe_inline"/>@<field name="alias_domain" class="oe_inline" readonly="1"/> - </div> - <field name="alias_contact" string="Alias Accepts Emails From" - attrs="{'invisible': [('alias_domain', '=', False)]}"/> - <field name="display_groups_suggestions" groups="base.group_no_one"/> - </field> - </data> + <field name="alias_contact" string="Alias Accepts Emails From" + attrs="{'invisible': [('alias_domain', '=', False)]}"/> + <field name="display_groups_suggestions" groups="base.group_no_one"/> + </field> + </data> </field> </record> |