X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Furls.py;h=fa68d205596427a93e48d74e78feabbd26340146;hb=5a98d2bbf3603206e4574783633342ddcbbd4943;hp=6f2ee4e03647c00c47cb4dddd40a8316b1f2b334;hpb=cbde85d915cd1cb92ce141a6bf7f5b589703047e;p=myslice.git diff --git a/portal/urls.py b/portal/urls.py index 6f2ee4e0..fa68d205 100644 --- a/portal/urls.py +++ b/portal/urls.py @@ -23,7 +23,6 @@ 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.dashboardview import DashboardView @@ -31,6 +30,11 @@ 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 +57,9 @@ 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[\w\.]+)/?$', PlatformView.as_view(), name='platform'), + url(r'^platform/(?P[\w\-.]+)/?$', PlatformView.as_view(), name='platform'), + url(r'^slice/?$',SliceView.as_view(),name='slice'), + url(r'^slice/(?P[\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'),