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 slice_request, register_4m_f4f
-from portal.accountview import account_process
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
+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 = (
#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/?$', 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/?$', slice_request),
+ url(r'^slice_request/?$', SliceRequestView.as_view(), name='slice_request'),
# Validate pending requests
url(r'^validate/?$', ValidatePendingView.as_view()),
# http://stackoverflow.com/questions/2360179/django-urls-how-to-pass-a-list-of-items-via-clean-urls
# (r'^validate_action/(?P<constraints>[^/]+)/(?P<id>\w+)/?$', 'portal.views.pres_view_static'),
- (r'^validate_action(?P<id>(?:/\w+)+)/?$', 'portal.actions.validate_action'),
+ url(r'^validate_action(?P<id>(?:/\w+)+)/?$', 'portal.actions.validate_action'),
url(r'^pres_view/?$', PresViewView.as_view(), name='pres_view'),
(r'^methods/(?P<type>\w+)/?$', 'portal.views.pres_view_methods'),