git://git.onelab.eu
/
myslice.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
[myslice.git]
/
myslice
/
urls.py
diff --git
a/myslice/urls.py
b/myslice/urls.py
index
d09f480
..
c815148
100644
(file)
--- 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.dashboardview
import portal.homeview
import portal.newsview
+import portal.loginwidget
from portal.about import AboutView
from portal.registrationview import RegistrationView
from portal.about import AboutView
from portal.registrationview import RegistrationView
@@
-99,6
+100,8
@@
urls = [
#(r'^view/?', include('view.urls')),
#(r'^list/slices', 'view.list.slices')
#
#(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()),
#
# Portal
(r'^news/?$', portal.newsview.NewsView.as_view()),