From d5ec6fdcb5daff56791131c587ac03613e0c2a7b Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Thu, 14 Mar 2013 12:09:27 +0100
Subject: [FIX] auth_openid: add data-modes attribute on <li> tags to be
 compatible with auth_signup module. show()/hide() elements explicitly instead
 of setting a specific class for this job.

bzr revid: chs@openerp.com-20130314110927-rvb21ii1lbfpmmna
---
 addons/auth_openid/static/src/xml/auth_openid.xml | 31 +++++++++++++++--------
 1 file changed, 20 insertions(+), 11 deletions(-)

(limited to 'addons/auth_openid/static/src/xml/auth_openid.xml')

diff --git a/addons/auth_openid/static/src/xml/auth_openid.xml b/addons/auth_openid/static/src/xml/auth_openid.xml
index 6a40439a012..9802b8adda5 100644
--- a/addons/auth_openid/static/src/xml/auth_openid.xml
+++ b/addons/auth_openid/static/src/xml/auth_openid.xml
@@ -4,7 +4,7 @@
 
     <t t-extend="Login">
         <t t-jquery=".oe_login .oe_login_logo" t-operation="after">
-            <ul class="openid_providers oe_semantic_html_override">
+            <ul class="openid_providers oe_semantic_html_override" data-modes="default openid">
                 <li><a href="#login,password" title="Password" data-url="" id="btn_password">Password</a></li>
                 <li><a href="#google" title="Google" data-url="https://www.google.com/accounts/o8/id">Google</a></li>
                 <li><a href="#googleapps" title="Google Apps" data-url="https://www.google.com/accounts/o8/site-xrds?hd={id}">Google</a></li>
@@ -14,34 +14,43 @@
         </t>
     </t>
     <t t-extend="Login">
-        <t t-jquery=".oe_login .oe_login_pane form ul li:nth-child(4)" t-operation="after">
-            <li>
+        <t t-jquery=".oe_login .oe_login_pane form ul li:last-child()" t-operation="before">
+            <li data-modes="openid" data-provider='googleapps'>
                 Google Apps Domain
             </li>
-            <li>
+            <li data-modes="openid" data-provider='googleapps'>
                 <input type="text" name="googleapps" />
             </li>
-            <li>
+            <li data-modes="openid" data-provider='launchpad'>
                 Username
             </li>
-            <li>
+            <li data-modes="openid" data-provider='launchpad'>
                 <input type="text" name="launchpad" />
             </li>
-            <li>
+            <li data-modes="openid" data-provider='openid_url'>
                 OpenID URL
             </li>
-            <li>
+            <li data-modes="openid" data-provider='openid_url'>
                 <input type="text" name="openid_url" />
             </li>
         </t>
     </t>
 
     <t t-extend="Login">
-        <t t-jquery=".oe_login .oe_login_pane form ul li:has(input)">
+        <t t-jquery=".oe_login .oe_login_pane form ul li:has(input[name=password])">
+            this.each(function() {
+                var $i = $(this);
+                $i.add($i.prev()).attr('data-provider', 'password');
+            });
+        </t>
+        <t t-jquery=".oe_login .oe_login_pane form ul li:has(input[name=login])">
             this.each(function() {
                 var $i = $(this),
-                    dp = $i.find('input').attr('name');
-                $i.add($i.prev()).attr('class', 'auth_choice').attr('data-provider', dp);
+                    dp = $i.find('input').attr('name'),
+                    $p = $i.prev();
+                // $p may not be the correct label when auth_signup is installed.
+                while(($p.attr('data-modes') || 'default') !== 'default') { $p = $p.prev(); }
+                $i.add($p).attr('data-provider', dp);
             });
         </t>
     </t>
-- 
cgit v1.2.3


From e37287988264ece0ff1e475f28d304fba7b0a3b1 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Thu, 14 Mar 2013 12:14:21 +0100
Subject: [FIX] auth_openid: use data-provider instead of title to match
 provider logo as title is translatable

bzr revid: chs@openerp.com-20130314111421-sf5jrig5vw3i1dlg
---
 addons/auth_openid/static/src/xml/auth_openid.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'addons/auth_openid/static/src/xml/auth_openid.xml')

diff --git a/addons/auth_openid/static/src/xml/auth_openid.xml b/addons/auth_openid/static/src/xml/auth_openid.xml
index 9802b8adda5..4a170c90e1e 100644
--- a/addons/auth_openid/static/src/xml/auth_openid.xml
+++ b/addons/auth_openid/static/src/xml/auth_openid.xml
@@ -5,11 +5,11 @@
     <t t-extend="Login">
         <t t-jquery=".oe_login .oe_login_logo" t-operation="after">
             <ul class="openid_providers oe_semantic_html_override" data-modes="default openid">
-                <li><a href="#login,password" title="Password" data-url="" id="btn_password">Password</a></li>
-                <li><a href="#google" title="Google" data-url="https://www.google.com/accounts/o8/id">Google</a></li>
-                <li><a href="#googleapps" title="Google Apps" data-url="https://www.google.com/accounts/o8/site-xrds?hd={id}">Google</a></li>
-                <li><a href="#launchpad" title="Launchpad" data-url="https://launchpad.net/~{id}">Launchpad</a></li>
-                <li><a href="#openid_url" title="OpenID" data-url="{id}">OpenID</a></li>
+                <li><a href="#login,password" data-provider='Password' title="Password" data-url="" id="btn_password">Password</a></li>
+                <li><a href="#google" data-provider='Google' title="Google" data-url="https://www.google.com/accounts/o8/id">Google</a></li>
+                <li><a href="#googleapps" data-provider='Google Apps' title="Google Apps" data-url="https://www.google.com/accounts/o8/site-xrds?hd={id}">Google</a></li>
+                <li><a href="#launchpad" data-provider='Launchpad' title="Launchpad" data-url="https://launchpad.net/~{id}">Launchpad</a></li>
+                <li><a href="#openid_url" data-provider='OpenID' title="OpenID" data-url="{id}">OpenID</a></li>
             </ul>
         </t>
     </t>
-- 
cgit v1.2.3


From 3417f2a250e6292184e5dcf039be866c72e343f3 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Thu, 14 Mar 2013 13:04:49 +0100
Subject: [FIX] auth_openid: better design

bzr revid: chs@openerp.com-20130314120449-p2oef4oymc9nuwof
---
 addons/auth_openid/static/src/xml/auth_openid.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'addons/auth_openid/static/src/xml/auth_openid.xml')

diff --git a/addons/auth_openid/static/src/xml/auth_openid.xml b/addons/auth_openid/static/src/xml/auth_openid.xml
index 4a170c90e1e..75fd2a8fe45 100644
--- a/addons/auth_openid/static/src/xml/auth_openid.xml
+++ b/addons/auth_openid/static/src/xml/auth_openid.xml
@@ -4,13 +4,13 @@
 
     <t t-extend="Login">
         <t t-jquery=".oe_login .oe_login_logo" t-operation="after">
-            <ul class="openid_providers oe_semantic_html_override" data-modes="default openid">
+            <div class="openid_providers" data-modes="default openid"><ul>
                 <li><a href="#login,password" data-provider='Password' title="Password" data-url="" id="btn_password">Password</a></li>
                 <li><a href="#google" data-provider='Google' title="Google" data-url="https://www.google.com/accounts/o8/id">Google</a></li>
                 <li><a href="#googleapps" data-provider='Google Apps' title="Google Apps" data-url="https://www.google.com/accounts/o8/site-xrds?hd={id}">Google</a></li>
                 <li><a href="#launchpad" data-provider='Launchpad' title="Launchpad" data-url="https://launchpad.net/~{id}">Launchpad</a></li>
                 <li><a href="#openid_url" data-provider='OpenID' title="OpenID" data-url="{id}">OpenID</a></li>
-            </ul>
+            </ul></div>
         </t>
     </t>
     <t t-extend="Login">
-- 
cgit v1.2.3