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

[unfold.git] / myslice / urls.py

diff --git a/myslice/urls.py b/myslice/urls.py
index 32d343b..07db378 100644 (file)
--- a/myslice/urls.py
+++ b/myslice/urls.py
@@ -17,6 +17,8 @@ import portal.dashboardview
 import portal.homeview
 import portal.newsview
 
+import plugins.cafe.edelberto
+
 from portal.registrationview        import RegistrationView
 from portal.termsview               import TermsView
 
@@ -34,6 +36,7 @@ import portal.slicetabtestbeds
 import portal.slicetabusers
 import portal.slicetabmeasurements 
 
+import portal.managementtababout
 import portal.managementtabrequests
 
 #### high level choices
@@ -97,6 +100,7 @@ urls = [
     (r'^experiment/(?P<slicename>[^/]+)/?$', portal.slicetabexperiment.ExperimentView.as_view()),
     #
     (r'^management/requests/?$', portal.managementtabrequests.ManagementRequestsView.as_view()),
+    (r'^management/about/?$', portal.managementtababout.ManagementAboutView.as_view()),
     #
     url(r'^register/?$', RegistrationView.as_view(), name='registration'),     
     url(r'^terms/?$', TermsView.as_view(), name='terms'),
@@ -115,3 +119,10 @@ for aux in auxiliaries:
         urls.append ( url ( r'^%s/'%aux, include ('%s.urls'%aux )))
 
 urlpatterns = patterns(*urls)
+
+# Shibboleth - Edelberto
+urlpatterns += patterns('',
+   url(r'^cafe/', plugins.cafe.edelberto.EdelbertoView.as_view()),
+   #url(r'^cafe/', 'plugins.cafe.edelberto.index'),
+)
+