Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab

[myslice.git] / portal / urls.py

diff --git a/portal/urls.py b/portal/urls.py
index c57d454..42a8dcb 100644 (file)
--- a/portal/urls.py
+++ b/portal/urls.py
@@ -44,15 +44,18 @@ from portal.validationview          import ValidatePendingView
 #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 
 
 from portal.reputationview      import ReputationView
 
@@ -96,6 +99,7 @@ urlpatterns = patterns('',
     # 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
@@ -122,7 +126,8 @@ urlpatterns = patterns('',
         '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'),