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
myslice.ini possible themes = onelab, fed4fire, fibre, smartfire
[myslice.git]
/
portal
/
urls.py
diff --git
a/portal/urls.py
b/portal/urls.py
index
c1ca5b1
..
18c177d
100644
(file)
--- a/
portal/urls.py
+++ b/
portal/urls.py
@@
-23,19
+23,22
@@
from django.views.generic.base import TemplateView
from django.conf.urls import patterns, include, url
from django.views.generic.base import TemplateView
from django.conf.urls import patterns, include, url
-from portal.adminview import AdminView
+from portal.usersview import UsersView
+from portal.manageuserview import UserView, user_process
from portal.platformsview import PlatformsView
from portal.platformview import PlatformView
from portal.resourceview import ResourceView
from portal.dashboardview import DashboardView
from portal.accountview import AccountView, account_process
from portal.platformsview import PlatformsView
from portal.platformview import PlatformView
from portal.resourceview import ResourceView
from portal.dashboardview import DashboardView
from portal.accountview import AccountView, account_process
-from portal.manageuserview import UserView, user_process
from portal.contactview import ContactView
from portal.slicerequestview import SliceRequestView
from portal.registrationview import RegistrationView
from portal.joinview import JoinView
from portal.sliceview import SliceView
from portal.validationview import ValidatePendingView
from portal.contactview import ContactView
from portal.slicerequestview import SliceRequestView
from portal.registrationview import RegistrationView
from portal.joinview import JoinView
from portal.sliceview import SliceView
from portal.validationview import ValidatePendingView
+from portal.experimentview import ExperimentView
+from portal.documentationview import DocumentationView
+from portal.supportview import SupportView
# hopefully these should move in dedicated source files too
from portal.views import PresViewView, pres_view_static, pres_view_methods, pres_view_animation
# hopefully these should move in dedicated source files too
from portal.views import PresViewView, pres_view_static, pres_view_methods, pres_view_animation
@@
-60,7
+63,7
@@
urlpatterns = patterns('',
url(r'^dashboard/?$', DashboardView.as_view(), name='dashboard'),
#url(r'^my_account/?$', MyAccountView.as_view(), name='my_account'),
url(r'^account/?$', AccountView.as_view(), name='account'),
url(r'^dashboard/?$', DashboardView.as_view(), name='dashboard'),
#url(r'^my_account/?$', MyAccountView.as_view(), name='my_account'),
url(r'^account/?$', AccountView.as_view(), name='account'),
- url(r'^
admin/?$', Admin
View.as_view(), name='user_list'),
+ url(r'^
users/?$', Users
View.as_view(), name='user_list'),
url(r'^user/(?P<email>[\w\s.@\-]+)/?$', UserView.as_view(), name='user'),
url(r'^user/(?P<email>[\w\s.@\-]+)/user_process/?$', user_process),
url(r'^platforms/?$', PlatformsView.as_view(), name='platforms'),
url(r'^user/(?P<email>[\w\s.@\-]+)/?$', UserView.as_view(), name='user'),
url(r'^user/(?P<email>[\w\s.@\-]+)/user_process/?$', user_process),
url(r'^platforms/?$', PlatformsView.as_view(), name='platforms'),
@@
-72,6
+75,9
@@
urlpatterns = patterns('',
url(r'^register/?$', RegistrationView.as_view(), name='registration'),
url(r'^join/?$', JoinView.as_view(), name='join'),
url(r'^contact/?$', ContactView.as_view(), name='contact'),
url(r'^register/?$', RegistrationView.as_view(), name='registration'),
url(r'^join/?$', JoinView.as_view(), name='join'),
url(r'^contact/?$', ContactView.as_view(), name='contact'),
+ url(r'^experiment?$', ExperimentView.as_view(), name='experiment'),
+ url(r'^support/?$', SupportView.as_view(), name='support'),
+ url(r'^support/documentation?$', DocumentationView.as_view(), name='FAQ'),
#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'),