Merge branch 'jordan' of ssh://git.onelab.eu/git/myslice into jordan

[myslice.git] / portal / urls.py

diff --git a/portal/urls.py b/portal/urls.py
index 083a1e8..229974c 100644 (file)
--- a/portal/urls.py
+++ b/portal/urls.py
@@ -20,12 +20,10 @@
 # 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, 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 django.conf.urls import patterns, include, url
+from portal           import views
+from portal.views     import DashboardView, PresViewView, PlatformsView, ValidatePendingView # UserRegisterView, UserValidateView
+from portal.util      import TemplateView
 
 # DEPRECATED #named_register_forms = (
 # DEPRECATED #    ("step1", RegisterUserForm),
@@ -37,14 +35,35 @@ from portal import views
 
 urlpatterns = patterns('',
     # User registration
-    url(r'^user/register/?$',  views.user_register,  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'^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'^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'^user/validate/?$',  views.user_validate,  name='user_validate'),
-    # User confirmation
-    url(r'^slice/request/?$',  views.slice_request,  name='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'),
+    #url(r'^slice/validate/?$', views.slice_validate, name='slice_validate'),
 )
+# (r'^accounts/', include('registration.backends.default.urls')),
+
 
 # DEPRECATED #    url(r'^$', views.index, name='index'),
 # DEPRECATED #    url(r"^registerwizard/(?P<step>[-\w]+)/$", register_wizard,