From 761204d6b61be23b0e69d810f7d70e740f558613 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Thu, 16 Aug 2012 14:24:21 +0200
Subject: [PATCH] add config for auth

bzr revid: al@openerp.com-20120816122421-tt79y5bdfdg1fth8
---
 addons/auth_signup/res_config.xml     | 15 +++++----------
 addons/base_setup/res_config_view.xml |  5 +++--
 addons/mail/res_config_view.xml       |  2 +-
 3 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/addons/auth_signup/res_config.xml b/addons/auth_signup/res_config.xml
index 3bea8dc2aed..43b0c09ea1d 100644
--- a/addons/auth_signup/res_config.xml
+++ b/addons/auth_signup/res_config.xml
@@ -7,16 +7,11 @@
             <field name="model">base.config.settings</field>
             <field name="inherit_id" ref="base_setup.view_general_configuration"/>
             <field name="arch" type="xml">
-                <xpath expr="//group[last()]" position="after">
-                    <group>
-                        <label for="id" string="External Users"/>
-                        <div>
-                            <div>
-                                <label for="auth_signup_template_user_id"/>
-                                <field name="auth_signup_template_user_id" class="oe_inline"/>
-                            </div>
-                        </div>
-                    </group>
+                <xpath expr="//field[@name='module_auth_signup']/.." position="after">
+                    <div attrs="{'invisible':[('module_auth_signup','=',False)]}">
+                        <label for="auth_signup_template_user_id"/>
+                        <field name="auth_signup_template_user_id" class="oe_inline"/>
+                    </div>
                 </xpath>
             </field>
         </record>
diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml
index fd1bd104a3c..5e49f6d4c5f 100644
--- a/addons/base_setup/res_config_view.xml
+++ b/addons/base_setup/res_config_view.xml
@@ -27,9 +27,9 @@
                             </div>
                         </div>
                     </group>
-                    <group>
+                    <group name="email">
                         <label for="id" string="Email"/>
-                        <div>
+                        <div name="email">
                             <div>
                                 <button type="action"
                                     name="%(base.action_ir_mail_server_list)d"
@@ -57,6 +57,7 @@
                                 <field name="module_auth_signup" class="oe_inline"/>
                                 <label for="module_auth_signup"/>
                             </div>
+                            ->
                             <div>
                                 <field name="module_auth_oauth" class="oe_inline"/>
                                 <label for="module_auth_oauth"/>
diff --git a/addons/mail/res_config_view.xml b/addons/mail/res_config_view.xml
index c4bc23c9357..99c19c894b1 100644
--- a/addons/mail/res_config_view.xml
+++ b/addons/mail/res_config_view.xml
@@ -6,7 +6,7 @@
             <field name="model">base.config.settings</field>
             <field name="inherit_id" ref="base_setup.view_general_configuration"/>
             <field name="arch" type="xml">
-                <xpath expr="/form/group[last()]/div[last()]/div[last()]" position='after' version="7.0">
+                <xpath expr="//div[@name='email']" position='inside' version="7.0">
                     <div>
                         <label for="alias_domain" class="oe_inline"/><field name="alias_domain" placeholder="mycompany.my.openerp.com" class="oe_inline"/>
                     </div>