X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=blobdiff_plain;f=portal%2Furls.py;h=dd0b1c8c8a58ae98af8f424b80d4b3e9e1e2ddcf;hp=43ea63946a100539c71348b2039fbbc9f937562d;hb=2412985f0b73bc1c959976d5f1982cc556b040d8;hpb=e2df3c64f7c2a819529b32a5da06d6ae5b17af7d

diff --git a/portal/urls.py b/portal/urls.py
index 43ea6394..dd0b1c8c 100644
--- a/portal/urls.py
+++ b/portal/urls.py
@@ -23,7 +23,8 @@
 from django.views.generic.base   import TemplateView
 from django.conf.urls           import patterns, include, url
 
-from portal.adminview           import AdminView
+from portal.usersview           import UsersView
+from portal.manageuserview      import UserView, user_process    
 from portal.platformsview       import PlatformsView
 from portal.platformview        import PlatformView
 from portal.resourceview        import ResourceView
@@ -35,6 +36,7 @@ from portal.registrationview    import RegistrationView
 from portal.joinview            import JoinView
 from portal.sliceview           import SliceView
 from portal.validationview      import ValidatePendingView
+from portal.experimentview      import experiment_view
 
 # hopefully these should move in dedicated source files too
 from portal.views               import PresViewView, pres_view_static, pres_view_methods, pres_view_animation
@@ -59,8 +61,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'^users/?$', UsersView.as_view(), name='user_list'),
+    url(r'^user/(?P<email>[\w\s.@\-]+)/?$', UserView.as_view(), name='user'),
+    url(r'^user/(?P<email>[\w\s.@\-]+)/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'),
@@ -70,6 +73,7 @@ urlpatterns = patterns('',
     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'^experiment?$', experiment_view),
     #url(r'^pass_reset/?$', PassResetView.as_view(), name='pass_rest'),
     # Slice request
     url(r'^slice_request/?$', SliceRequestView.as_view(), name='slice_request'),