1 from django.conf.urls.defaults import patterns, include, handler500, handler404 |
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 |
6 |
6 |
7 |
7 # Uncomment the next two lines to enable the admin: |
8 # Uncomment the next two lines to enable the admin: |
8 admin.autodiscover() |
9 admin.autodiscover() |
9 |
10 |
23 (r'^api/', include('ldt.api.urls')), |
24 (r'^api/', include('ldt.api.urls')), |
24 (r'^api/' + VERSION_STR + '/text/', include('ldt.text.urls')), |
25 (r'^api/' + VERSION_STR + '/text/', include('ldt.text.urls')), |
25 |
26 |
26 (r'^auth_accounts/', include('registration.backends.simple.urls')), |
27 (r'^auth_accounts/', include('registration.backends.simple.urls')), |
27 |
28 |
28 (r'^accounts/', include('socialauth.urls')), |
29 #(r'^accounts/', include('socialauth.urls')), |
|
30 (r'^accounts/', include('social_auth.urls')), |
|
31 url(r'^accounts/login/$',auth_views.login,{'template_name': 'registration/login.html'},name='auth_login'), |
29 (r'^oauth/', include('oauth_provider.urls')), |
32 (r'^oauth/', include('oauth_provider.urls')), |
30 (r'^$', 'socialauth.views.signin_complete'), |
33 |
|
34 #(r'^$', 'socialauth.views.signin_complete'), |
|
35 #(r'^$', 'social_auth.views.complete'), |
31 |
36 |
32 (r'^/?$', 'django.views.generic.simple.redirect_to', {'url': 'ldt'}), |
37 (r'^/?$', 'django.views.generic.simple.redirect_to', {'url': 'ldt'}), |
33 #(r'^static/(?P<path>.*)$', 'django.views.static.serve', {'document_root': settings.MEDIA_ROOT}), |
38 #(r'^static/(?P<path>.*)$', 'django.views.static.serve', {'document_root': settings.MEDIA_ROOT}), |
34 ) |
39 ) |