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

diff --git a/portal/urls.py b/portal/urls.py
index 53d4b7c2..eba1c9cd 100644
--- 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 UserRegisterView, UserValidateView, DashboardView
+from portal.views     import UserRegisterView, UserValidateView, DashboardView, PresViewView
 from portal.util      import TemplateView
 
 # DEPRECATED #named_register_forms = (
@@ -42,7 +42,19 @@ urlpatterns = patterns('',
     # User validation
     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'^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),
+
+    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'),