diff -r 8251c6a02d6f -r 328aea4ee92b web/ldtplatform/urls.py --- a/web/ldtplatform/urls.py Mon Nov 26 18:56:46 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,45 +0,0 @@ -from django.conf.urls.defaults import patterns, include, url -from django.contrib import admin -from ldt.auth.views import login as pf_login -from ldt.text import VERSION_STR - -#from django.conf import settings - -# Uncomment the next two lines to enable the admin: -admin.autodiscover() - -js_info_dict = { - 'packages': ('django.contrib.admin',), -} - -urlpatterns = patterns('', - # Example: - - # Uncomment the admin/doc line below and add 'django.contrib.admindocs' - # to INSTALLED_APPS to enable admin documentation: - # (r'^admin/doc/', include('django.contrib.admindocs.urls')), - - # Uncomment the next line to enable the admin: - (r'^admin/', include(admin.site.urls)), - (r'^i18n/', include('django.conf.urls.i18n')), - - (r'^ldt/', include('ldt.ldt_utils.urls')), - (r'^user/', include('ldt.user.urls')), - (r'^api/', include('ldt.api.urls')), - (r'^api/' + VERSION_STR + '/text/', include('ldt.text.urls')), - - (r'^auth_accounts/', include('registration.backends.simple.urls')), - - #(r'^accounts/', include('socialauth.urls')), - (r'^accounts/', include('social_auth.urls')), - url(r'^accounts/login/$',pf_login,{'template_name': 'registration/login.html'},name='auth_login'), - (r'^oauth/', include('oauth_provider.urls')), - - #(r'^$', 'socialauth.views.signin_complete'), - #(r'^$', 'social_auth.views.complete'), - - (r'^/?$', 'django.views.generic.simple.redirect_to', {'url': 'ldt'}), - #(r'^static/(?P.*)$', 'django.views.static.serve', {'document_root': settings.STATIC_ROOT}), - - (r'^jsi18n/$', 'django.views.i18n.javascript_catalog', js_info_dict), -)