#from portal.experimentview import ExperimentView
from portal.termsview import TermsView
from portal.univbrisview import UnivbrisView
+from portal.univbrisvtam import UnivbrisVtam
-from portal.servicedirectory import ServiceDirectoryView
+from portal.manualdelegationview import ManualDelegationView
+
+from portal.servicedirectory import ServiceDirectoryView
from portal.documentationview import DocumentationView
from portal.supportview import SupportView
from portal.emailactivationview import ActivateEmailView
# 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.django_passresetview import password_reset, password_reset_done, password_reset_confirm, password_reset_complete
+from portal.views import PresViewView, pres_view_static, pres_view_methods, pres_view_animation
+from portal.django_passresetview import password_reset, password_reset_done, password_reset_confirm, password_reset_complete
# DEPRECATED #named_register_forms = (
# DEPRECATED # ("step1", RegisterUserForm),
# Slice request
url(r'^slice_request/?$', SliceRequestView.as_view(), name='slice_request'),
url(r'^terms/?$', TermsView.as_view(), name='terms'),
+ url(r'^manual_delegation/?$', ManualDelegationView.as_view(), name='manual_delegation'),
# 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'),
url(r'^validate_action(?P<id>(?:/\w+)+)/?$', 'portal.actions.validate_action'),
-
+ url(r'^reject_action(?P<id>(?:/\w+)+)/?$', 'portal.actions.reject_action'),
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'),
'portal.django_passresetview.password_reset_complete'),
url(r'^univbris/?$', UnivbrisView.as_view(), name='univbris'),
-
+ url(r'^univbrisvtam/?$', UnivbrisVtam.as_view(), name='univbrisvtam'),
+
url(r'^servicedirectory/?$', ServiceDirectoryView.as_view(), name='servicedirectory'),
)