1 from django.conf.urls.defaults import patterns, include, handler500, handler404, url |
1 from django.conf.urls.defaults import patterns, include, handler500, handler404, url |
2 from django.contrib import admin |
2 from django.contrib import admin |
3 from ldt.text import VERSION_STR |
3 from ldt.text import VERSION_STR |
4 from django.conf import settings |
4 from django.conf import settings |
5 from django.contrib.auth import views as auth_views |
5 from ldt.auth.views import login as pf_login |
6 |
|
7 |
6 |
8 # Uncomment the next two lines to enable the admin: |
7 # Uncomment the next two lines to enable the admin: |
9 admin.autodiscover() |
8 admin.autodiscover() |
10 |
9 |
11 urlpatterns = patterns('', |
10 urlpatterns = patterns('', |
26 |
25 |
27 (r'^auth_accounts/', include('registration.backends.simple.urls')), |
26 (r'^auth_accounts/', include('registration.backends.simple.urls')), |
28 |
27 |
29 #(r'^accounts/', include('socialauth.urls')), |
28 #(r'^accounts/', include('socialauth.urls')), |
30 (r'^accounts/', include('social_auth.urls')), |
29 (r'^accounts/', include('social_auth.urls')), |
31 url(r'^accounts/login/$',auth_views.login,{'template_name': 'registration/login.html'},name='auth_login'), |
30 url(r'^accounts/login/$',pf_login,{'template_name': 'registration/login.html'},name='auth_login'), |
32 (r'^oauth/', include('oauth_provider.urls')), |
31 (r'^oauth/', include('oauth_provider.urls')), |
33 |
32 |
34 #(r'^$', 'socialauth.views.signin_complete'), |
33 #(r'^$', 'socialauth.views.signin_complete'), |
35 #(r'^$', 'social_auth.views.complete'), |
34 #(r'^$', 'social_auth.views.complete'), |
36 |
35 |