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

diff --git a/portal/urls.py b/portal/urls.py
index 64333b67..dd0b1c8c 100644
--- a/portal/urls.py
+++ b/portal/urls.py
@@ -20,10 +20,27 @@
 # this program; see the file COPYING.  If not, write to the Free Software
 # Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-from django.conf.urls import patterns, include, url
-from portal           import views
-from portal.views     import UserRegisterView, UserValidateView, DashboardView
-from portal.util      import TemplateView
+from django.views.generic.base   import TemplateView
+from django.conf.urls           import patterns, include, url
+
+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, 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 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
+from portal.django_passresetview import password_reset, password_reset_done, password_reset_confirm, password_reset_complete 
 
 # DEPRECATED #named_register_forms = (
 # DEPRECATED #    ("step1", RegisterUserForm),
@@ -35,19 +52,56 @@ from portal.util      import TemplateView
 
 urlpatterns = patterns('',
     # User registration
-    url(r'^user/register/?$', UserRegisterView.as_view(), name='user_register'),
+    #url(r'^user/register/?$', UserRegisterView.as_view(), name='user_register'),
     url(r'^user/register/complete/$',
         TemplateView.as_view(template_name='user_register_complete.html'),
         name='user_register_complete'),
     # User validation
-    url(r'^user/validate/?$', UserValidateView.as_view(), name='user_validate'),
+    #url(r'^user/validate/?$', UserValidateView.as_view(), name='user_validate'),
     url(r'^dashboard/?$', DashboardView.as_view(), name='dashboard'),
-    url(r'^contact/?$', views.contact),
+    #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'^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/?$', 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/?$', views.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'),
+    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'),
+    (r'^animation/(?P<constraints>[^/]+)/(?P<id>\w+)/?$', 'portal.views.pres_view_animation'),
+    (r'^static/(?P<constraints>[^/]+)/(?P<id>\w+)/?$', 'portal.views.pres_view_static'),
     #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')),
 
@@ -55,4 +109,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")