X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Furls.py;h=907267c492d40aac5c5c5c0b5a2ad52e11c6c549;hb=13da78a3a067fa976585ce56b85362df82211a61;hp=c055685df259180123a4cee3bbd455f6704f2da7;hpb=7854df75afedb76acc75692956a5c7b65da64ee0;p=myslice.git

diff --git a/portal/urls.py b/portal/urls.py
index c055685d..907267c4 100644
--- a/portal/urls.py
+++ b/portal/urls.py
@@ -42,8 +42,11 @@ from portal.joinview                import JoinView
 from portal.sliceviewold            import SliceView
 from portal.validationview          import ValidatePendingView
 #from portal.experimentview         import ExperimentView
-
+from portal.termsview               import TermsView
 from portal.univbrisview            import UnivbrisView
+from portal.manualdelegationview    import ManualDelegationView
+
+from portal.servicedirectory         import ServiceDirectoryView
 
 from portal.documentationview       import DocumentationView
 from portal.supportview             import SupportView
@@ -91,12 +94,14 @@ urlpatterns = patterns('',
     #url(r'^pass_reset/?$', PassResetView.as_view(), name='pass_rest'),
     # 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'),
@@ -117,7 +122,8 @@ urlpatterns = patterns('',
         'portal.django_passresetview.password_reset_complete'),
 
     url(r'^univbris/?$', UnivbrisView.as_view(), name='univbris'),
-    # ...
+    
+    url(r'^servicedirectory/?$', ServiceDirectoryView.as_view(), name='servicedirectory'),
 
 )
 # (r'^accounts/', include('registration.backends.default.urls')),