Add basic functionality for self-registration.

[cas.git] / src / cas / urls.py

diff --git a/src/cas/urls.py b/src/cas/urls.py
index 4a285fd..29c63e3 100644 (file)
--- a/src/cas/urls.py
+++ b/src/cas/urls.py
@@ -1,13 +1,15 @@
 # -*- coding: utf-8 -*-
 # -*- coding: utf-8 -*-

-from django.conf.urls.defaults import *
-from django.views.generic.simple import redirect_to
+from django.conf.urls import include, patterns, url
+from django.views.generic import RedirectView

 from django.contrib import admin
 from django.conf import settings
 from django.contrib import admin
 from django.conf import settings

+from django.views.defaults import page_not_found

 
 admin.autodiscover()
 
 
 admin.autodiscover()
 

+

 urlpatterns = patterns('',
 urlpatterns = patterns('',

-    url(r'^$', redirect_to, {'url': '/accounts/'}),
+    url(r'^$', RedirectView.as_view(url='/accounts/')),

 
     # django-cas-provider
     url(r'^cas/', include('cas_provider.urls')),
 
     # django-cas-provider
     url(r'^cas/', include('cas_provider.urls')),


@@ -18,8 +20,15 @@ urlpatterns = patterns('',
 
     url(r'^accounts/', include('accounts.urls')),
 
 
     url(r'^accounts/', include('accounts.urls')),
 

-    url(r'^%s(?P<path>.+)$' % settings.MEDIA_URL[1:], 'django.views.static.serve',
-        {'document_root': settings.MEDIA_ROOT, 'show_indexes': True}),
+    url(r'^accounts/', include('accounts.urls')),
+    url(r'^auth/(email|signup|login|logout|confirm_email)', page_not_found),
+    url(r'^auth/', include('allauth.urls')),

 )
 
 
 )
 
 

+if settings.DEBUG:
+    urlpatterns += patterns('',
+        url(r'^media/(?P<path>.*)$', 'django.views.static.serve', {
+            'document_root': settings.MEDIA_ROOT,
+        }),
+   )