use bootstrap-3.0.0 - I haven't seen any obvious regression at first sight

[myslice.git] / portal / urls.py

diff --git a/portal/urls.py b/portal/urls.py
index 229974c..c5c270f 100644 (file)
--- a/portal/urls.py
+++ b/portal/urls.py
@@ -22,7 +22,7 @@
 
 from django.conf.urls import patterns, include, url
 from portal           import views
-from portal.views     import DashboardView, PresViewView, PlatformsView, ValidatePendingView # UserRegisterView, UserValidateView
+from portal.views     import DashboardView, PresViewView, PlatformsView, PlatformView, ValidatePendingView, AccountView # UserRegisterView, UserValidateView
 from portal.util      import TemplateView
 
 # DEPRECATED #named_register_forms = (
@@ -43,9 +43,11 @@ 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'^acc_process/?$', views.acc_process),
+    #url(r'^portal/platform/?$', PlatformView.platform_view(), name='platform'),
+    url(r'^platform/(?P<platformname>[\w\.]+)/?$', PlatformView.as_view(), name='platform'),
+    url(r'^account/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),
@@ -53,6 +55,9 @@ urlpatterns = patterns('',
     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'),