X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Furls.py;h=47a75f5abc4b6829414b01742f54cb8a4023358f;hb=5fa503e8ad5b16353ddb8b88eaa914c7a4ee5748;hp=eba1c9cd9eeb524eb0e83922a2f650c8a8533f9e;hpb=ac2dda758798f7e44de062d370763c639cc6a375;p=myslice.git

diff --git a/portal/urls.py b/portal/urls.py
index eba1c9cd..47a75f5a 100644
--- a/portal/urls.py
+++ b/portal/urls.py
@@ -20,10 +20,12 @@
 # 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, PresViewView
-from portal.util      import TemplateView
+from django.conf.urls           import patterns, include, url
+from portal                     import views
+from portal.views               import PresViewView, PlatformView, ValidatePendingView, AccountView # UserRegisterView, UserValidateView
+from portal.platformsview       import PlatformsView
+from portal.dashboardview       import DashboardView
+from portal.util                import TemplateView
 
 # DEPRECATED #named_register_forms = (
 # DEPRECATED #    ("step1", RegisterUserForm),
@@ -35,21 +37,29 @@ 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'^my_account/?$', MyAccountView.as_view(), name='my_account'),
-    url(r'^account/?$', views.my_account),
-    url(r'^acc_process/?$', views.acc_process),
+    url(r'^account/?$', AccountView.as_view(), name='account'),
+    url(r'^platforms/?$', PlatformsView.as_view(), name='platforms'),
+    #url(r'^portal/platform/?$', PlatformView.platform_view(), name='platform'),
+    url(r'^platform/(?P<platformname>[\w\.]+)/?$', PlatformView.as_view(), name='platform'),
+    url(r'^account/account_process/?$', views.account_process),
     url(r'^register/?$', views.register_4m_f4f),
     #url(r'^reg_process/?$', views.reg_4m_f4f_process),
     url(r'^contact/?$', views.contact),
     # Slice request
     url(r'^slice_request/?$', views.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'^pres_view/?$', PresViewView.as_view(), name='pres_view'),
     (r'^methods/(?P<type>\w+)/?$', 'portal.views.pres_view_methods'),