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 1d0248c..07db378 100644 (file)
--- a/myslice/urls.py
+++ b/myslice/urls.py
@@ -16,7 +16,12 @@ import portal.platformsview
 import portal.dashboardview
 import portal.homeview
 import portal.newsview
+
+import plugins.cafe.edelberto
+
 from portal.registrationview        import RegistrationView
+from portal.termsview               import TermsView
+
 home_view=portal.homeview.HomeView.as_view()
 dashboard_view=portal.dashboardview.DashboardView.as_view()
 platforms_view=portal.platformsview.PlatformsView.as_view()
@@ -98,6 +103,8 @@ urls = [
     (r'^management/about/?$', portal.managementtababout.ManagementAboutView.as_view()),
     #
     url(r'^register/?$', RegistrationView.as_view(), name='registration'),     
+    url(r'^terms/?$', TermsView.as_view(), name='terms'),
+    #
     url(r'^portal/', include('portal.urls')),
 
     # SLA
@@ -112,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'),
+)
+