X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Furls.py;h=ef900185f6b38b2024770afebac46555521f33cb;hb=302efe6c34063df7d9c12e15d5828f4d5bb76276;hp=6f2ee4e03647c00c47cb4dddd40a8316b1f2b334;hpb=b4ab1b3fb9c0820ea410167f7b8bf05ab2ccae24;p=myslice.git

diff --git a/portal/urls.py b/portal/urls.py
index 6f2ee4e0..ef900185 100644
--- a/portal/urls.py
+++ b/portal/urls.py
@@ -23,14 +23,19 @@
 from django.views.generic.base   import TemplateView
 from django.conf.urls           import patterns, include, url
 
-from portal.views               import PresViewView, ValidatePendingView
 from portal.platformsview       import PlatformsView
 from portal.platformview        import PlatformView
+from portal.resourceview        import ResourceView
 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
+
+# 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 = (
@@ -53,7 +58,10 @@ urlpatterns = patterns('',
     #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'^platform/(?P<platformname>[\w\.\-]+)/?$', PlatformView.as_view(), name='platform'),
+    url(r'^resource/(?P<urn>[\w\.\-\+\:]+)/?$', ResourceView.as_view(), name='resource'),
+    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/?$', RegistrationView.as_view(), name='registration'),
     url(r'^contact/?$', ContactView.as_view(), name='contact'),