X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Furls.py;h=1d6fae8a957c22ecc57fcc224b7076de6d64a385;hb=refs%2Fheads%2Fonelab;hp=157c6dd33ec5559523d3a2f5e0f91017f064c520;hpb=6e24f5c8289f13a60d28a86543e8a84db63f4426;p=myslice.git diff --git a/portal/urls.py b/portal/urls.py index 157c6dd3..1d6fae8a 100644 --- a/portal/urls.py +++ b/portal/urls.py @@ -37,22 +37,29 @@ 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.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.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), @@ -74,6 +81,7 @@ urlpatterns = patterns('', #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'), @@ -93,12 +101,17 @@ urlpatterns = patterns('', #url(r'^pass_reset/?$', PassResetView.as_view(), name='pass_rest'), # 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'), 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'), @@ -119,9 +132,15 @@ urlpatterns = patterns('', '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')),