X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Furls.py;h=2887388a29defc5198916413e7139b43c77958d0;hb=c381d920d9a359eab2b11cb15e88ab1f4e55a82e;hp=b3969ec05f3b81d9a64f329307bf4d1464e22eba;hpb=7a3fcd0eed5066b3189d79729e95e98167988481;p=myslice.git

diff --git a/portal/urls.py b/portal/urls.py
index b3969ec0..2887388a 100644
--- a/portal/urls.py
+++ b/portal/urls.py
@@ -21,12 +21,9 @@
 # Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 from django.conf.urls import patterns, include, url
-
-# DEPRECATED #from django.forms.formsets import formset_factory
-# DEPRECATED #from portal.forms import RegisterUserForm, RegisterUserStep2Form
-# DEPRECATED #from portal.views import RegisterUserWizardView
-from portal import views
-from portal.views import UserRegisterView, UserValidateView
+from portal           import views
+from portal.views     import DashboardView, PresViewView, PlatformsView, PlatformView, ValidatePendingView # UserRegisterView, UserValidateView
+from portal.util      import TemplateView
 
 # DEPRECATED #named_register_forms = (
 # DEPRECATED #    ("step1", RegisterUserForm),
@@ -38,10 +35,31 @@ from portal.views import UserRegisterView, UserValidateView
 
 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'^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),
     # Slice request
+    url(r'^slice_request/?$', views.slice_request),
+    # Validate pending requests
+    url(r'^validate/?$', ValidatePendingView.as_view()),
+
+    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'),