From: Loic Baron <loic.baron@lip6.fr>
Date: Thu, 15 Jan 2015 10:09:28 +0000 (+0100)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.3~122
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=5369b2e117fef0073efb9b2690dcf86312518e52;hp=-c;p=myslice.git

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

5369b2e117fef0073efb9b2690dcf86312518e52
diff --combined myslice/urls.py
index d09f4807,083fbdc4..c815148e
--- a/myslice/urls.py
+++ b/myslice/urls.py
@@@ -16,6 -16,7 +16,7 @@@ import portal.platformsvie
  import portal.dashboardview
  import portal.homeview
  import portal.newsview
+ import portal.loginwidget
  
  from portal.about                   import AboutView
  from portal.registrationview        import RegistrationView
@@@ -91,7 -92,6 +92,7 @@@ urls = 
      (r'^create/(?P<object_type>[^/]+)/(?P<object_name>[^/]+)?/?$', 'rest.create.dispatch'),
      (r'^delete/(?P<object_type>[^/]+)/(?P<object_name>[^/]+)?/?$', 'rest.delete.dispatch'),
      (r'^credentials/(?P<action>[^/]+)/?$', 'rest.credentials.dispatch'),
 +    (r'^initscript/(?P<action>[^/]+)/?$', 'rest.initscript.dispatch'),
      #
      # REST monitoring
      (r'^monitor/services/?$', 'rest.monitor.servicesStatus'),
@@@ -99,6 -99,8 +100,8 @@@
      #(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()),