git://git.onelab.eu
/
unfold.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
[unfold.git]
/
portal
/
urls.py
diff --git
a/portal/urls.py
b/portal/urls.py
index
c7df398
..
e6e63e6
100644
(file)
--- a/
portal/urls.py
+++ b/
portal/urls.py
@@
-42,6
+42,11
@@
from portal.joinview import JoinView
from portal.sliceviewold import SliceView
from portal.validationview import ValidatePendingView
#from portal.experimentview import ExperimentView
from portal.sliceviewold import SliceView
from portal.validationview import ValidatePendingView
#from portal.experimentview import ExperimentView
+from portal.termsview import TermsView
+from portal.univbrisview import UnivbrisView
+
+from portal.servicedirectory import ServiceDirectoryView
+
from portal.documentationview import DocumentationView
from portal.supportview import SupportView
from portal.emailactivationview import ActivateEmailView
from portal.documentationview import DocumentationView
from portal.supportview import SupportView
from portal.emailactivationview import ActivateEmailView
@@
-88,6
+93,7
@@
urlpatterns = patterns('',
#url(r'^pass_reset/?$', PassResetView.as_view(), name='pass_rest'),
# Slice request
url(r'^slice_request/?$', SliceRequestView.as_view(), name='slice_request'),
#url(r'^pass_reset/?$', PassResetView.as_view(), name='pass_rest'),
# Slice request
url(r'^slice_request/?$', SliceRequestView.as_view(), name='slice_request'),
+ url(r'^terms/?$', TermsView.as_view(), name='terms'),
# Validate pending requests
url(r'^validate/?$', ValidatePendingView.as_view()),
# http://stackoverflow.com/questions/2360179/django-urls-how-to-pass-a-list-of-items-via-clean-urls
# Validate pending requests
url(r'^validate/?$', ValidatePendingView.as_view()),
# http://stackoverflow.com/questions/2360179/django-urls-how-to-pass-a-list-of-items-via-clean-urls
@@
-112,7
+118,10
@@
urlpatterns = patterns('',
{'post_reset_redirect' : '/portal/password/done/'}),
(r'^password/done/$',
'portal.django_passresetview.password_reset_complete'),
{'post_reset_redirect' : '/portal/password/done/'}),
(r'^password/done/$',
'portal.django_passresetview.password_reset_complete'),
- # ...
+
+ url(r'^univbris/?$', UnivbrisView.as_view(), name='univbris'),
+
+ url(r'^servicedirectory/?$', ServiceDirectoryView.as_view(), name='servicedirectory'),
)
# (r'^accounts/', include('registration.backends.default.urls')),
)
# (r'^accounts/', include('registration.backends.default.urls')),