X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Furls.py;h=4c61801f8d3859499f33c0f49c90ba6fea599b83;hb=8e9f1db465d5579630eb84f51e3f3dd6b2458956;hp=bcd56e5f4d094470adb975aeed03d47de1fe79b7;hpb=0c34b56ff3e9887a592363ce92753a6a8383aa45;p=myslice.git

diff --git a/portal/urls.py b/portal/urls.py
index bcd56e5f..4c61801f 100644
--- a/portal/urls.py
+++ b/portal/urls.py
@@ -23,20 +23,22 @@
 from django.views.generic.base   import TemplateView
 from django.conf.urls           import patterns, include, url
 
+from portal.adminview           import AdminView
 from portal.platformsview       import PlatformsView
 from portal.platformview        import PlatformView
 from portal.resourceview        import ResourceView
 from portal.dashboardview       import DashboardView
 from portal.accountview         import AccountView, account_process
+from portal.manageuserview      import UserView, user_process    
 from portal.contactview         import ContactView
 from portal.slicerequestview    import SliceRequestView
 from portal.registrationview    import RegistrationView
+from portal.joinview            import JoinView
 from portal.sliceview           import SliceView
-from portal.passresetview       import PassResetView
+from portal.validationview      import ValidatePendingView
 
 # hopefully these should move in dedicated source files too
 from portal.views               import PresViewView, pres_view_static, pres_view_methods, pres_view_animation
-from portal.views               import ValidatePendingView
 from portal.django_passresetview import password_reset, password_reset_done, password_reset_confirm, password_reset_complete 
 
 # DEPRECATED #named_register_forms = (
@@ -58,6 +60,9 @@ urlpatterns = patterns('',
     url(r'^dashboard/?$', DashboardView.as_view(), name='dashboard'),
     #url(r'^my_account/?$', MyAccountView.as_view(), name='my_account'),
     url(r'^account/?$', AccountView.as_view(), name='account'),
+    url(r'^admin/?$', AdminView.as_view(), name='user_list'),
+    url(r'^user/(?P<email>[\w\s.@\-]+)/?$', AccountView.as_view(), name='account'),
+    url(r'^user/user_process/?$', user_process),
     url(r'^platforms/?$', PlatformsView.as_view(), name='platforms'),
     url(r'^platform/(?P<platformname>[\w\.\-]+)/?$', PlatformView.as_view(), name='platform'),
     url(r'^resource/(?P<urn>[\w\.\-\+\:]+)/?$', ResourceView.as_view(), name='resource'),
@@ -65,6 +70,7 @@ urlpatterns = patterns('',
     url(r'^slice/(?P<slicename>[\w\.]+)/?$', SliceView.as_view(),name='slice'),
     url(r'^account/account_process/?$', account_process),
     url(r'^register/?$', RegistrationView.as_view(), name='registration'),
+    url(r'^join/?$', JoinView.as_view(), name='join'),
     url(r'^contact/?$', ContactView.as_view(), name='contact'),
     #url(r'^pass_reset/?$', PassResetView.as_view(), name='pass_rest'),
     # Slice request