From 200a0fd5dd8dc03d17aaedb8ba61def2c629bd06 Mon Sep 17 00:00:00 2001
From: "vta vta@openerp.com" <>
Date: Fri, 17 Aug 2012 15:28:35 +0200
Subject: [FIX] Fixed settings view, and added some functionality to oauth
 related fields.

bzr revid: vta@openerp.com-20120817132835-l5ne76q7t8lj73yc
---
 addons/auth_oauth/res_config.xml | 52 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)
 create mode 100644 addons/auth_oauth/res_config.xml

(limited to 'addons/auth_oauth/res_config.xml')

diff --git a/addons/auth_oauth/res_config.xml b/addons/auth_oauth/res_config.xml
new file mode 100644
index 00000000000..78c5e26d983
--- /dev/null
+++ b/addons/auth_oauth/res_config.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0"?>        
+<openerp>
+    <data>
+
+        <record model="ir.ui.view" id="view_general_configuration">
+            <field name="name">base.config.settings.oauth</field>
+            <field name="model">base.config.settings</field>
+            <field name="inherit_id" ref="base_setup.view_general_configuration"/>
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='module_auth_oauth']/.." position="after">
+                    <div attrs="{'invisible':[('module_auth_oauth','=',False)]}">
+                        <div name="google">
+                            <div>
+                                <field name="auth_oauth_google_enabled" class="oe_inline"/>
+                                <label for="auth_oauth_google_enabled"/>                                
+                            </div>
+                            <div attrs="{'invisible':[('auth_oauth_google_enabled','=',False)]}">
+                                <div>
+                                    <p>To setup the signin process with Google, first you have to perform the following steps:</p>
+                                    <br/>
+                                    1. Register your application through the Google's APIs console. The result of this registration is a set of values that are known to both Google and you application: 'client_id' and 'redirect_uri'.
+                                    <br/>
+                                    2. Fill the following field with the values assigned by Google.
+                                </div>
+                                <div>
+                                    <label for="auth_oauth_google_client_id" placeholder="Your CLIENT_ID"/>                                            
+                                    <field name="auth_oauth_google_client_id" class="oe_inline"/>
+                                </div>
+                            </div>
+                        </div>
+                        <div name="facebook">
+                            <div>
+                                <field name="auth_oauth_facebook_enabled" class="oe_inline"/>
+                                <label for="auth_oauth_facebook_enabled"/>                                
+                            </div>
+                            <div attrs="{'invisible':[('auth_oauth_facebook_enabled','=',False)]}">                            
+                                <div>
+                                    <label string="Here goes the explanation"/>
+                                </div>
+                                <div>
+                                    <label for="auth_oauth_facebook_client_id" placeholder="Your CLIENT_ID"/>                                            
+                                    <field name="auth_oauth_facebook_client_id" class="oe_inline"/>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </xpath>
+            </field>
+        </record>
+
+    </data>
+</openerp>
\ No newline at end of file
-- 
cgit v1.2.3


From 01c56cbb9271f46f0620c33924443245b393c1fe Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Sat, 18 Aug 2012 15:04:11 +0200
Subject: oauth config wizard

bzr revid: al@openerp.com-20120818130411-auxfh3lc0r801kym
---
 addons/auth_oauth/res_config.xml | 42 +++++++++++++++++++---------------------
 1 file changed, 20 insertions(+), 22 deletions(-)

(limited to 'addons/auth_oauth/res_config.xml')

diff --git a/addons/auth_oauth/res_config.xml b/addons/auth_oauth/res_config.xml
index 78c5e26d983..2b06e05327a 100644
--- a/addons/auth_oauth/res_config.xml
+++ b/addons/auth_oauth/res_config.xml
@@ -1,7 +1,6 @@
-<?xml version="1.0"?>        
+<?xml version="1.0"?>
 <openerp>
     <data>
-
         <record model="ir.ui.view" id="view_general_configuration">
             <field name="name">base.config.settings.oauth</field>
             <field name="model">base.config.settings</field>
@@ -12,35 +11,34 @@
                         <div name="google">
                             <div>
                                 <field name="auth_oauth_google_enabled" class="oe_inline"/>
-                                <label for="auth_oauth_google_enabled"/>                                
+                                <label for="auth_oauth_google_enabled"/>
                             </div>
                             <div attrs="{'invisible':[('auth_oauth_google_enabled','=',False)]}">
-                                <div>
-                                    <p>To setup the signin process with Google, first you have to perform the following steps:</p>
+                                <blockquote>
+                                    To setup the signin process with Google, first you have to perform the following steps:<br/>
                                     <br/>
-                                    1. Register your application through the Google's APIs console. The result of this registration is a set of values that are known to both Google and you application: 'client_id' and 'redirect_uri'.
+                                    - Go to the <a href="https://code.google.com/apis/console/">Google APIs console</a><br/>
+                                    - Ceate a new project<br/>
+                                    - Go to Api Access<br/>
+                                    - Create an oauth client_id<br/>
+                                    - Edit settings and set both Authorized Redirect URIs and Authorized JavaScript Origins to your hostname.<br/>
                                     <br/>
-                                    2. Fill the following field with the values assigned by Google.
-                                </div>
-                                <div>
-                                    <label for="auth_oauth_google_client_id" placeholder="Your CLIENT_ID"/>                                            
-                                    <field name="auth_oauth_google_client_id" class="oe_inline"/>
-                                </div>
+                                    Now copy paste the client_id here: <field name="auth_oauth_google_client_id" class="oe_inline" placeholder="e.g. 1234-xyz.apps.googleusercontent.com"/>
+                                </blockquote>
                             </div>
                         </div>
                         <div name="facebook">
                             <div>
                                 <field name="auth_oauth_facebook_enabled" class="oe_inline"/>
-                                <label for="auth_oauth_facebook_enabled"/>                                
+                                <label for="auth_oauth_facebook_enabled"/>
                             </div>
-                            <div attrs="{'invisible':[('auth_oauth_facebook_enabled','=',False)]}">                            
-                                <div>
-                                    <label string="Here goes the explanation"/>
-                                </div>
-                                <div>
-                                    <label for="auth_oauth_facebook_client_id" placeholder="Your CLIENT_ID"/>                                            
-                                    <field name="auth_oauth_facebook_client_id" class="oe_inline"/>
-                                </div>
+                            <div attrs="{'invisible':[('auth_oauth_facebook_enabled','=',False)]}">
+                                <blockquote>
+                                    To setup the signin process with Google, first you have to perform the following steps:<br/>
+                                    <br/>
+                                    Now copy paste the client_id here: <field name="auth_oauth_facebook_client_id" class="oe_inline" placeholder="e.g. 1234-xyz.apps.googleusercontent.com"/>
+                                </blockquote>
+
                             </div>
                         </div>
                     </div>
@@ -49,4 +47,4 @@
         </record>
 
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
-- 
cgit v1.2.3