From 93a112e9f2c06ff05aec3f546408a479681249e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 7 May 2013 14:22:23 +0200
Subject: [PATCH] [IMP] hr, res_users, project, mail_group: improved form view
 about aliases, following new specs.

bzr revid: tde@openerp.com-20130507122223-scy54ukfdndtj2d8
---
 addons/hr_recruitment/hr_recruitment_view.xml | 20 ++++++++--------
 addons/mail/mail_group_view.xml               | 23 +++++++++----------
 addons/mail/res_users_view.xml                |  1 +
 addons/project/project_view.xml               | 14 ++++++-----
 addons/project_issue/project_issue_view.xml   | 14 +----------
 5 files changed, 30 insertions(+), 42 deletions(-)

diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 1d7335e5664..1b4342b8cb6 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -313,19 +313,17 @@
                 </div>
             </field>
             <xpath expr="//div[@class='oe_title']//h1" position="after">
-                <div name="group_alias"
+                <group colspan="2" name="group_alias"
                         attrs="{'invisible': [('alias_domain', '=', False)]}">
-                    <span name="read_alias" class="oe_read_only" attrs="{'invisible': [('alias_name', '=', False)]}">
-                        <span class="oe_e oe_e_alias">%%</span>
-                        <field name="alias_id" class="oe_inline oe_read_only" required="0" nolabel="1"/>
-                    </span>
-                    <span name="edit_alias" class="oe_edit_only">
-                        <span class="oe_e oe_e_alias">%%</span>
-                        <field name="alias_name" class="oe_inline"/>@<field name="alias_domain" class="oe_inline" readonly="1"/>
-                    </span>
-                    <span class="oe_e oe_e_alias">V</span>
+                    <label for="alias_name" string="Email Alias"/>
+                    <div name="alias_def">
+                        <field name="alias_id" class="oe_read_only oe_inline" string="Email Alias"/>
+                        <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>
                     <field name="alias_contact" class="oe_inline"/>
-                </div>
+                </group>
             </xpath>
         </field>
     </record>
diff --git a/addons/mail/mail_group_view.xml b/addons/mail/mail_group_view.xml
index d1f22ac17db..9e3295a9b55 100644
--- a/addons/mail/mail_group_view.xml
+++ b/addons/mail/mail_group_view.xml
@@ -78,19 +78,18 @@
                                 <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)]}">
-                                <span name="read_alias" class="oe_read_only" attrs="{'invisible': [('alias_name', '=', False)]}">
-                                    <span class="oe_e oe_e_alias">%%</span>
-                                    <field name="alias_id" class="oe_inline oe_read_only" required="0" nolabel="1"/>
-                                </span>
-                                <span name="edit_alias" class="oe_edit_only">
-                                    <span class="oe_e oe_e_alias">%%</span>
-                                    <field name="alias_name" class="oe_inline"/>@<field name="alias_domain" class="oe_inline" readonly="1"/>
-                                </span>
-                                <span class="oe_e oe_e_alias">V</span>
-                                <field name="alias_contact" class="oe_inline"/>
-                            </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"/>
+                                    <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"/>
diff --git a/addons/mail/res_users_view.xml b/addons/mail/res_users_view.xml
index b6a5ac3b9cf..8cbe91c07c6 100644
--- a/addons/mail/res_users_view.xml
+++ b/addons/mail/res_users_view.xml
@@ -35,6 +35,7 @@
                             <field name="alias_name" class="oe_inline"/>@<field name="alias_domain" class="oe_inline" readonly="1"/>
                         </div>
                     </div>
+                    <field name="alias_contact"/>
                 </field>
             </data>
             </field>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 0363aa0a7c7..3d3ff6e524d 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -99,15 +99,17 @@
                         <button name="attachment_tree_view" string="Documents" type="object"/>
                     </div>
                     <group>
-                        <group colspan="2"
+                        <group colspan="2" name="group_alias"
                                 attrs="{'invisible': [('alias_domain', '=', False)]}">
-                                <field name="privacy_visibility" widget="radio"/>
-                                <field name="alias_id" class="oe_read_only" string="Email Alias"/>
-                                <label for="alias_name" string="Email Alias" class="oe_edit_only"/>
-                                <div class="oe_edit_only">
+                            <field name="privacy_visibility" widget="radio"/>
+                            <label for="alias_name" string="Email Alias"/>
+                            <div name="alias_def">
+                                <field name="alias_id" class="oe_read_only oe_inline" string="Email Alias"/>
+                                <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>
-                                <field name="alias_contact" class="oe_inline"/>
+                            </div>
+                            <field name="alias_contact" class="oe_inline"/>
                         </group>
                         <field name="user_id" string="Project Manager" 
                                 attrs="{'readonly':[('state','in',['close', 'cancelled'])]}" 
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 3e65f832c86..ed596054d0b 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -336,22 +336,10 @@
                 <field name="priority" position="before">
                     <field name="project_escalation_id"/>
                 </field>
-                <xpath expr='//span[@name="edit_alias"]' position='after'>
+                <xpath expr='//div[@name="edit_alias"]' position='after'>
                     <label for="alias_model" string="creates" style="vertical-align: middle;"/>
                     <field name="alias_model" class="oe_inline"/>
                 </xpath>
-<!--                 <xpath expr='//span[@name="edit_alias"]' position='replace'>
-                    <span class="oe_edit_only" name="edit_alias">
-                        <field name="alias_name" class="oe_inline" attrs="{'required': [('alias_id', '!=', False)]}"/>
-                        @
-                        <field class="oe_inline" name="alias_domain"/>
-                        <span class="oe_inline"
-                                attrs="{'invisible': ['|', ('use_issues', '!=', True), ('use_tasks', '!=', True)]}">
-                            <label for="alias_model" string="creates"/>
-                            <field name="alias_model" class="oe_inline"/>
-                        </span>
-                    </span>
-                </xpath> -->
             </field>
        </record>