From: Costas Yiotis Date: Tue, 18 Nov 2014 12:25:16 +0000 (+0200) Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab X-Git-Tag: myslice-1.1~13^2~9 X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=558fe659b62f98ccc7f4e64cab68dee712a9be30 Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab --- 558fe659b62f98ccc7f4e64cab68dee712a9be30 diff --cc portal/urls.py index c57d454b,8859e624..42a8dcb5 --- a/portal/urls.py +++ b/portal/urls.py @@@ -51,11 -54,9 +54,11 @@@ from portal.documentationview imp 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), # DEPRECATED # ("step2", RegisterUserStep2Form) @@@ -122,14 -124,10 +126,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')),