X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Furls.py;h=1d6fae8a957c22ecc57fcc224b7076de6d64a385;hb=refs%2Fheads%2Fonelab;hp=c5c270f9e8280bdcdb1792a443f272861eefc1bc;hpb=d7fd4a2f12d405812f6a0de5c1a3625d9affe701;p=myslice.git diff --git a/portal/urls.py b/portal/urls.py index c5c270f9..1d6fae8a 100644 --- a/portal/urls.py +++ b/portal/urls.py @@ -4,7 +4,10 @@ # This file is part of the Manifold project. # # Authors: -# Jordan Augé +# Jordan Augé +# Mohammed Yasin Rahman +# Ciro Scognamiglio # Copyright 2013, UPMC Sorbonne Universités / LIP6 # # This program is free software; you can redistribute it and/or modify it under @@ -20,10 +23,43 @@ # this program; see the file COPYING. If not, write to the Free Software # Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -from django.conf.urls import patterns, include, url -from portal import views -from portal.views import DashboardView, PresViewView, PlatformsView, PlatformView, ValidatePendingView, AccountView # UserRegisterView, UserValidateView -from portal.util import TemplateView +from django.views.generic.base import TemplateView +from django.conf.urls import patterns, include, url + +from portal.about import AboutView +from portal.institution import InstitutionView +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.contactview import ContactView +from portal.slicerequestview import SliceRequestView +from portal.projectrequestview import ProjectRequestView +from portal.registrationview import RegistrationView +from portal.joinview import JoinView +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.univbrisvtam import UnivbrisVtam + +from portal.manualdelegationview import ManualDelegationView +from portal.releasenotesview import ReleaseNotesView + +from portal.servicedirectory import ServiceDirectoryView + +from portal.documentationview import DocumentationView +from portal.supportview import SupportView +from portal.emailactivationview import ActivateEmailView +# hopefully these should move in dedicated source files too +from portal.views import PresViewView, pres_view_static, pres_view_methods, pres_view_animation +from portal.django_passresetview import password_reset, password_reset_done, password_reset_confirm, password_reset_complete + +from portal.reputationview import ReputationView # DEPRECATED #named_register_forms = ( # DEPRECATED # ("step1", RegisterUserForm), @@ -44,21 +80,38 @@ 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'^institution/?$', InstitutionView.as_view(), name='institution'), + url(r'^project/(?P[\w\.]+)/?$', InstitutionView.as_view(), name='project'), + url(r'^about/?$', AboutView.as_view(), name='about'), + url(r'^users/?$', UsersView.as_view(), name='user_list'), + url(r'^user/(?P[\w\s.@\-]+)/?$', UserView.as_view(), name='user'), + url(r'^user/(?P[\w\s.@\-]+)/user_process/?$', user_process), url(r'^platforms/?$', PlatformsView.as_view(), name='platforms'), - #url(r'^portal/platform/?$', PlatformView.platform_view(), name='platform'), - url(r'^platform/(?P[\w\.]+)/?$', PlatformView.as_view(), name='platform'), - url(r'^account/acc_process/?$', views.acc_process), - url(r'^register/?$', views.register_4m_f4f), - #url(r'^reg_process/?$', views.reg_4m_f4f_process), - url(r'^contact/?$', views.contact), + url(r'^platform/(?P[\w\.\-]+)/?$', PlatformView.as_view(), name='platform'), + url(r'^resource/(?P[\w\.\-\+\:]+)/?$', ResourceView.as_view(), name='resource'), + url(r'^slice/?$',SliceView.as_view(),name='slice'), + url(r'^slice/(?P[\w\.]+)/?$', SliceView.as_view(),name='slice'), + url(r'^account/account_process/?$', account_process), + 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/?$', views.slice_request), + url(r'^slice_request/?$', SliceRequestView.as_view(), name='slice_request'), + # Project request + url(r'^project_request/?$', ProjectRequestView.as_view(), name='project_request'), + url(r'^terms/?$', TermsView.as_view(), name='terms'), + url(r'^manual_delegation/?$', ManualDelegationView.as_view(), name='manual_delegation'), + url(r'^release_notes/?$', ReleaseNotesView.as_view(), name='release_notes'), # 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 # (r'^validate_action/(?P[^/]+)/(?P\w+)/?$', 'portal.views.pres_view_static'), - (r'^validate_action(?P(?:/\w+)+)/?$', 'portal.actions.validate_action'), - + url(r'^validate_action(?P(?:/\w+)+)/?$', 'portal.actions.validate_action'), + url(r'^reject_action(?P(?:/\w+)+)/?$', 'portal.actions.reject_action'), url(r'^pres_view/?$', PresViewView.as_view(), name='pres_view'), (r'^methods/(?P\w+)/?$', 'portal.views.pres_view_methods'), (r'^animation/(?P[^/]+)/(?P\w+)/?$', 'portal.views.pres_view_animation'), @@ -66,6 +119,28 @@ urlpatterns = patterns('', #url(r'^slice/request/?$', views.slice_request, name='slice_request'), # Slice confirmation #url(r'^slice/validate/?$', views.slice_validate, name='slice_validate'), + url(r'^email_activation/(?P[\w\W\-]+)/?$', ActivateEmailView.as_view(), name='email_activate'), + url(r'^pass_reset/$', + 'portal.django_passresetview.password_reset', + {'post_reset_redirect' : '/portal/password/reset/done/'}), + (r'^password/reset/done/$', + 'portal.django_passresetview.password_reset_done'), + (r'^password/reset/(?P[0-9A-Za-z]+)-(?P.+)/$', + 'portal.django_passresetview.password_reset_confirm', + {'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'^univbrisvtam/?$', UnivbrisVtam.as_view(), name='univbrisvtam'), + + url(r'^servicedirectory/?$', ServiceDirectoryView.as_view(), name='servicedirectory'), + + + url(r'^reputation/?$', ReputationView.as_view(), name='reputation'), + url(r'^reputation/submit_eval/?$', ReputationView.as_view(), name='reputation_submit_eval'), + + ) # (r'^accounts/', include('registration.backends.default.urls')), @@ -73,4 +148,4 @@ urlpatterns = patterns('', # DEPRECATED # url(r'^$', views.index, name='index'), # DEPRECATED # url(r"^registerwizard/(?P[-\w]+)/$", register_wizard, # DEPRECATED # name="register_wizard_step"), -# DEPRECATED # url(r"^registerwizard/$", register_wizard, name="register_wizard") +# DEPRECATED # url(r"^registerwizard/$", regster_wizard, name="register_wizard")