--- a/web/ldtplatform/urls.py	Wed Mar 23 17:34:36 2011 +0100
+++ b/web/ldtplatform/urls.py	Fri Apr 08 16:33:01 2011 +0200
@@ -1,7 +1,8 @@
-from django.conf.urls.defaults import patterns, include, handler500, handler404
+from django.conf.urls.defaults import patterns, include, handler500, handler404, url
 from django.contrib import admin
 from ldt.text import VERSION_STR
 from django.conf import settings
+from django.contrib.auth import views as auth_views
 
 
 # Uncomment the next two lines to enable the admin:
@@ -25,9 +26,13 @@
 
     (r'^auth_accounts/', include('registration.backends.simple.urls')),
 
-    (r'^accounts/', include('socialauth.urls')),
+    #(r'^accounts/', include('socialauth.urls')),
+    (r'^accounts/', include('social_auth.urls')),
+    url(r'^accounts/login/$',auth_views.login,{'template_name': 'registration/login.html'},name='auth_login'),
     (r'^oauth/', include('oauth_provider.urls')),
-    (r'^$', 'socialauth.views.signin_complete'),
+    
+    #(r'^$', 'socialauth.views.signin_complete'),
+    #(r'^$', 'social_auth.views.complete'),
     
     (r'^/?$', 'django.views.generic.simple.redirect_to', {'url': 'ldt'}),
     #(r'^static/(?P<path>.*)$', 'django.views.static.serve', {'document_root': settings.MEDIA_ROOT}),