X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=blobdiff_plain;f=portal%2Furls.py;h=790e927dbfaf8021be2ec32e06b56fed7ebf2c13;hp=35a3cf0e88381b981ba19f3d0291b92eb45fdc2f;hb=80742c757c9ad65f100fa3dc45bc764348b162b5;hpb=49f0381d60a23cd5b0bf546e97b0b5652de81b14

diff --git a/portal/urls.py b/portal/urls.py
index 35a3cf0e..790e927d 100644
--- a/portal/urls.py
+++ b/portal/urls.py
@@ -23,15 +23,24 @@
 from django.views.generic.base   import TemplateView
 from django.conf.urls           import patterns, include, url
 
-from portal.views               import PresViewView, ValidatePendingView
-from portal.views               import slice_request, register_4m_f4f
-from portal.accountview         import account_process
+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
 from portal.dashboardview       import DashboardView
-from portal.accountview         import AccountView
+from portal.accountview         import AccountView, account_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.validationview      import ValidatePendingView
+from portal.experimentview      import ExperimentView
+from portal.documentationview   import DocumentationView
+# 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.django_passresetview import password_reset, password_reset_done, password_reset_confirm, password_reset_complete 
 
 # DEPRECATED #named_register_forms = (
 # DEPRECATED #    ("step1", RegisterUserForm),
@@ -52,18 +61,28 @@ 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'^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'^platform/(?P<platformname>[\w\.\-]+)/?$', PlatformView.as_view(), name='platform'),
+    url(r'^resource/(?P<urn>[\w\.\-\+\:]+)/?$', ResourceView.as_view(), name='resource'),
+    url(r'^slice/?$',SliceView.as_view(),name='slice'),
+    url(r'^slice/(?P<slicename>[\w\.]+)/?$', SliceView.as_view(),name='slice'),
     url(r'^account/account_process/?$', account_process),
-    url(r'^register/?$', register_4m_f4f),
+    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?$', ExperimentView.as_view(), name='experiment'),
+    url(r'^support/documentation?$', DocumentationView.as_view(), name='FAQ'),
+    #url(r'^pass_reset/?$', PassResetView.as_view(), name='pass_rest'),
     # Slice request
-    url(r'^slice_request/?$', slice_request),
+    url(r'^slice_request/?$', SliceRequestView.as_view(), name='slice_request'),
     # Validate pending requests
     url(r'^validate/?$', ValidatePendingView.as_view()),
     # http://stackoverflow.com/questions/2360179/django-urls-how-to-pass-a-list-of-items-via-clean-urls
     # (r'^validate_action/(?P<constraints>[^/]+)/(?P<id>\w+)/?$', 'portal.views.pres_view_static'),
-     (r'^validate_action(?P<id>(?:/\w+)+)/?$', 'portal.actions.validate_action'),
+    url(r'^validate_action(?P<id>(?:/\w+)+)/?$', 'portal.actions.validate_action'),
 
     url(r'^pres_view/?$', PresViewView.as_view(), name='pres_view'),
     (r'^methods/(?P<type>\w+)/?$', 'portal.views.pres_view_methods'),
@@ -72,6 +91,18 @@ urlpatterns = patterns('',
     #url(r'^slice/request/?$',  views.slice_request,  name='slice_request'),
     # Slice confirmation
     #url(r'^slice/validate/?$', views.slice_validate, name='slice_validate'),
+    url(r'^pass_reset/$', 
+        'portal.django_passresetview.password_reset', 
+        {'post_reset_redirect' : '/portal/password/reset/done/'}),
+    (r'^password/reset/done/$',
+        'portal.django_passresetview.password_reset_done'),
+    (r'^password/reset/(?P<uidb36>[0-9A-Za-z]+)-(?P<token>.+)/$', 
+        'portal.django_passresetview.password_reset_confirm', 
+        {'post_reset_redirect' : '/portal/password/done/'}),
+    (r'^password/done/$', 
+        'portal.django_passresetview.password_reset_complete'),
+    # ...
+
 )
 # (r'^accounts/', include('registration.backends.default.urls')),
 
@@ -79,4 +110,4 @@ urlpatterns = patterns('',
 # DEPRECATED #    url(r'^$', views.index, name='index'),
 # DEPRECATED #    url(r"^registerwizard/(?P<step>[-\w]+)/$", register_wizard,
 # DEPRECATED #        name="register_wizard_step"),
-# DEPRECATED #    url(r"^registerwizard/$", register_wizard, name="register_wizard")
+# DEPRECATED #    url(r"^registerwizard/$", regster_wizard, name="register_wizard")