Reverting the merges due to unsuccessfull conflict resolvement.

[osqa.git] / forum_modules / openidauth / authentication.py

diff --git a/forum_modules/openidauth/authentication.py b/forum_modules/openidauth/authentication.py
index c82b99eda3d7971d16e8d65823f0a6c6c0474714..0afd4c6e189c212a54c6fcaecadb925f04c8c583 100644 (file)
--- a/forum_modules/openidauth/authentication.py
+++ b/forum_modules/openidauth/authentication.py
@@ -33,30 +33,37 @@ class AolAuthConsumer(OpenIdAbstractAuthConsumer):
         return 'http://openid.aol.com/' + uname
 
 class AolAuthContext(ConsumerTemplateContext):
         return 'http://openid.aol.com/' + uname
 
 class AolAuthContext(ConsumerTemplateContext):

-    mode = 'BIGICON'
+    mode = 'SMALLICON'

     type = 'SIMPLE_FORM'
     simple_form_context = {
         'your_what': 'AOL screen name'
     }
     type = 'SIMPLE_FORM'
     simple_form_context = {
         'your_what': 'AOL screen name'
     }

-    weight = 400
+    weight = 200

     human_name = 'AOL'
     human_name = 'AOL'

-    icon = '/media/images/openid/aol.gif'
+    icon = '/media/images/openid/aol.png'

 
 
 class MyOpenIdAuthConsumer(OpenIdAbstractAuthConsumer):
 
 
 class MyOpenIdAuthConsumer(OpenIdAbstractAuthConsumer):

+    dataype2ax_schema = {
+        #'username': ('http://schema.openid.net/namePerson/friendly', 'friendly'),
+        'email': 'http://schema.openid.net/contact/email',
+        #'web': 'http://schema.openid.net/contact/web/default',
+        #'birthdate': ('http://schema.openid.net/birthDate', 'birthDate'),
+    }
+

     def get_user_url(self, request):
         blog_name = request.POST['input_field']
         return "http://%s.myopenid.com/" % blog_name
 
 class MyOpenIdAuthContext(ConsumerTemplateContext):
     def get_user_url(self, request):
         blog_name = request.POST['input_field']
         return "http://%s.myopenid.com/" % blog_name
 
 class MyOpenIdAuthContext(ConsumerTemplateContext):

-    mode = 'SMALLICON'
+    mode = 'BIGICON'

     type = 'SIMPLE_FORM'
     simple_form_context = {
         'your_what': 'MyOpenID user name'
     }
     type = 'SIMPLE_FORM'
     simple_form_context = {
         'your_what': 'MyOpenID user name'
     }

-    weight = 200
+    weight = 400

     human_name = 'MyOpenID'
     human_name = 'MyOpenID'

-    icon = '/media/images/openid/myopenid.png'
+    icon = '/media/images/openid/myopenid_big.png'

 
 
 class FlickrAuthConsumer(OpenIdAbstractAuthConsumer):
 
 
 class FlickrAuthConsumer(OpenIdAbstractAuthConsumer):