cleanup and working membership list

1 files changed, 14 insertions, 9 deletions

diff --git a/coip/urls.py b/coip/urls.py
index d24cc15..eda9440 100644
--- a/coip/urls.py
+++ b/coip/urls.py
@@ -2,16 +2,21 @@ from django.conf.urls.defaults import *
 
 # Uncomment the next two lines to enable the admin:
 from django.contrib import admin
+from django.contrib.auth.views import login
+from settings import ADMIN_MEDIA_ROOT
+from settings import MEDIA_ROOT
 admin.autodiscover()
 
 urlpatterns = patterns('',
-    # Example:
-    # (r'^coip/', include('coip.foo.urls')),
-
-    # 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'^admin-media/(?P<path>.*)$',                 'django.views.static.serve',{'document_root': ADMIN_MEDIA_ROOT}),
+    (r'^site-media/(?P<path>.*)$',                  'django.views.static.serve',{'document_root': MEDIA_ROOT}),
+    (r'^admin/',                                    include(admin.site.urls)),
+    # Login/Logout
+    (r'^accounts/login/$',                          login,{'template_name': "login.html"}),
+    (r'^accounts/login-federated/$',                'coip.apps.auth.views.accounts_login_federated'),
+    (r'^accounts/logout/$',                         'coip.apps.auth.views.logout'),
+    # Profiles and user information
+    (r'^user/merge/?P<pkey>.+$',                    'coip.apps.userprofile.views.merge'),
+    (r'^user/merge$',                               'coip.apps.userprofile.views.merge'),
+    (r'^user/home$',                                'coip.apps.userprofile.views.home'),
 )