X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Furls.py;h=5541d6d6483dd7f841d50223ffd967fe9010c847;hb=e8d994654a8ff4d764551839c12f2c50cc0266b2;hp=ebf2a161766bf54ab332cf726d14c58d6898d859;hpb=4b6b013580973461964d6a2f3ed66636ac5e7dbc;p=unfold.git

diff --git a/portal/urls.py b/portal/urls.py
index ebf2a161..5541d6d6 100644
--- a/portal/urls.py
+++ b/portal/urls.py
@@ -23,14 +23,21 @@
 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 register_4m_f4f
 from portal.platformsview       import PlatformsView
 from portal.platformview        import PlatformView
 from portal.dashboardview       import DashboardView
 from portal.accountview         import AccountView, account_process
 from portal.contactview         import ContactView
 from portal.slicerequestview    import SliceRequestView
+from portal.registrationview    import RegistrationView
+#from portal.sliceview           import SliceView
+
+# DEMO
+from portal.demo_sliceview      import SliceView
+
+# hopefully these should move in dedicated source files too
+from portal.views               import PresViewView, pres_view_static, pres_view_methods, pres_view_animation
+from portal.views               import ValidatePendingView
 
 
 # DEPRECATED #named_register_forms = (
@@ -54,8 +61,10 @@ urlpatterns = patterns('',
     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'^slice/?$',SliceView.as_view(),name='slice'),
+    url(r'^slice/(?P<slicename>[\w\.]+)/?$', SliceView.as_view(),name='slice'),
     url(r'^account/account_process/?$', account_process),
-    url(r'^register/?$', register_4m_f4f),
+    url(r'^register/?$', RegistrationView.as_view(), name='registration'),
     url(r'^contact/?$', ContactView.as_view(), name='contact'),
     # Slice request
     url(r'^slice_request/?$', SliceRequestView.as_view(), name='slice_request'),