X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Furls.py;h=ebf2a161766bf54ab332cf726d14c58d6898d859;hb=0b28b9a05826740f82decbd9e29662bf008e3b5c;hp=2887388a29defc5198916413e7139b43c77958d0;hpb=a6e8a7f63aa2d97ec9974b54cd485b4359e296c7;p=myslice.git

diff --git a/portal/urls.py b/portal/urls.py
index 2887388a..ebf2a161 100644
--- a/portal/urls.py
+++ b/portal/urls.py
@@ -20,10 +20,18 @@
 # 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 DashboardView, PresViewView, PlatformsView, PlatformView, ValidatePendingView # UserRegisterView, UserValidateView
-from portal.util      import TemplateView
+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 register_4m_f4f
+from portal.platformsview       import PlatformsView
+from portal.platformview        import PlatformView
+from portal.dashboardview       import DashboardView
+from portal.accountview         import AccountView, account_process
+from portal.contactview         import ContactView
+from portal.slicerequestview    import SliceRequestView
+
 
 # DEPRECATED #named_register_forms = (
 # DEPRECATED #    ("step1", RegisterUserForm),
@@ -43,18 +51,19 @@ urlpatterns = patterns('',
     #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'^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'^acc_process/?$', views.acc_process),
-    url(r'^register/?$', views.register_4m_f4f),
-    #url(r'^reg_process/?$', views.reg_4m_f4f_process),
-    url(r'^contact/?$', views.contact),
+    url(r'^account/account_process/?$', account_process),
+    url(r'^register/?$', register_4m_f4f),
+    url(r'^contact/?$', ContactView.as_view(), name='contact'),
     # 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'),
+     (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'),