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

diff --git a/portal/urls.py b/portal/urls.py
index 53d4b7c2..35a3cf0e 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 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.views               import PresViewView, ValidatePendingView
+from portal.views               import slice_request, register_4m_f4f
+from portal.accountview         import account_process
+from portal.platformsview       import PlatformsView
+from portal.platformview        import PlatformView
+from portal.dashboardview       import DashboardView
+from portal.accountview         import AccountView
+from portal.contactview         import ContactView
+
 
 # DEPRECATED #named_register_forms = (
 # DEPRECATED #    ("step1", RegisterUserForm),
@@ -35,14 +43,32 @@ 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/?$', AccountView.as_view(), name='account'),
+    url(r'^platforms/?$', PlatformsView.as_view(), name='platforms'),
+    url(r'^platform/(?P<platformname>[\w\.]+)/?$', PlatformView.as_view(), name='platform'),
+    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/?$', 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'),
+    (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'),