web/ldtplatform/urls.py
branchsocialauth
changeset 28 5cba2808cde0
parent 22 03d02cf0bea7
child 56 125fc6df230d
--- a/web/ldtplatform/urls.py	Fri Feb 11 11:56:11 2011 +0100
+++ b/web/ldtplatform/urls.py	Thu Feb 17 18:43:37 2011 +0100
@@ -1,6 +1,7 @@
 from django.conf.urls.defaults import patterns, include, handler500, handler404
 from django.contrib import admin
 from ldt.text import VERSION_STR
+from django.conf import settings
 
 
 # Uncomment the next two lines to enable the admin:
@@ -22,8 +23,12 @@
     (r'^api/', include('ldt.api.urls')),
     (r'^api/' + VERSION_STR + '/text/', include('ldt.text.urls')),
 
-    (r'^accounts/', include('registration.backends.simple.urls')),
+    (r'^auth_accounts/', include('registration.backends.simple.urls')),
+
+    (r'^accounts/', include('socialauth.urls')),
     (r'^oauth/', include('oauth_provider.urls')),
+    (r'^$', 'socialauth.views.signin_complete'),
     
     (r'^/?$', 'django.views.generic.simple.redirect_to', {'url': 'ldt'}),
+    #(r'^static/(?P<path>.*)$', 'django.views.static.serve', {'document_root': settings.MEDIA_ROOT}), 
 )