X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=myslice%2Furls.py;h=ca150a40f9c443e6962672bc744a2d0401d49080;hb=6c978327b002ef4b46047ce22ba7e8f61768f652;hp=af9a8007b52cba0ed41405e1657793525d70b98a;hpb=1757b94e83122aa5de77ebd935b7479b5a6e644e;p=unfold.git diff --git a/myslice/urls.py b/myslice/urls.py index af9a8007..ca150a40 100644 --- a/myslice/urls.py +++ b/myslice/urls.py @@ -16,6 +16,7 @@ import portal.platformsview import portal.dashboardview import portal.homeview import portal.newsview +import portal.loginwidget from portal.about import AboutView from portal.registrationview import RegistrationView @@ -44,6 +45,8 @@ import portal.slicetabmeasurements import portal.managementtababout import portal.managementtabrequests +import forge.views + #### high level choices # main entry point (set to the / URL) # beware that if this view is broken you end up in an endless cycle... @@ -89,6 +92,8 @@ urls = [ (r'^create/(?P[^/]+)/(?P[^/]+)?/?$', 'rest.create.dispatch'), (r'^delete/(?P[^/]+)/(?P[^/]+)?/?$', 'rest.delete.dispatch'), (r'^credentials/(?P[^/]+)/?$', 'rest.credentials.dispatch'), + (r'^cache/(?P[^/]+)/?$', 'rest.cache.dispatch'), + (r'^initscript/(?P[^/]+)/?$', 'rest.initscript.dispatch'), # # REST monitoring (r'^monitor/services/?$', 'rest.monitor.servicesStatus'), @@ -96,6 +101,8 @@ urls = [ #(r'^view/?', include('view.urls')), #(r'^list/slices', 'view.list.slices') # + # Login widget to be used in an iframe + (r'^loginwidget/?$', portal.loginwidget.LoginWidget.as_view()), # # Portal (r'^news/?$', portal.newsview.NewsView.as_view()), @@ -107,6 +114,7 @@ urls = [ (r'^testbeds/(?P[^/]+)/?$', portal.slicetabtestbeds.SliceTabTestbeds.as_view()), (r'^measurements/(?P[^/]+)/?$', portal.slicetabmeasurements.SliceTabMeasurements.as_view()), (r'^experiment/(?P[^/]+)/?$', portal.slicetabexperiment.ExperimentView.as_view()), + (r'^studentslabs/(?P[^/]+)/?$', forge.views.CreateCourseViev.as_view()), url(r'^about/?$', AboutView.as_view(), name='about'), @@ -124,7 +132,7 @@ urls = [ url(r'^portal/', include('portal.urls')), # SLA - url(r'^sla/', include('sla.urls')), +# url(r'^sla/', include('sla.urls')), ] #this one would not match the convention