X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Furls.py;h=35a3cf0e88381b981ba19f3d0291b92eb45fdc2f;hb=49f0381d60a23cd5b0bf546e97b0b5652de81b14;hp=47a75f5abc4b6829414b01742f54cb8a4023358f;hpb=02a6c1aea215c598d92bdcd37d19652800a6d156;p=myslice.git diff --git a/portal/urls.py b/portal/urls.py index 47a75f5a..35a3cf0e 100644 --- a/portal/urls.py +++ b/portal/urls.py @@ -20,12 +20,18 @@ # 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.views.generic.base import TemplateView from django.conf.urls import patterns, include, url -from portal import views -from portal.views import PresViewView, PlatformView, ValidatePendingView, AccountView # UserRegisterView, UserValidateView + +from portal.views import PresViewView, ValidatePendingView +from portal.views import slice_request, register_4m_f4f +from portal.accountview import account_process from portal.platformsview import PlatformsView +from portal.platformview import PlatformView from portal.dashboardview import DashboardView -from portal.util import TemplateView +from portal.accountview import AccountView +from portal.contactview import ContactView + # DEPRECATED #named_register_forms = ( # DEPRECATED # ("step1", RegisterUserForm), @@ -47,14 +53,12 @@ urlpatterns = patterns('', #url(r'^my_account/?$', MyAccountView.as_view(), name='my_account'), url(r'^account/?$', AccountView.as_view(), name='account'), 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/account_process/?$', views.account_process), - url(r'^register/?$', views.register_4m_f4f), - #url(r'^reg_process/?$', views.reg_4m_f4f_process), - url(r'^contact/?$', views.contact), + url(r'^account/account_process/?$', account_process), + url(r'^register/?$', register_4m_f4f), + url(r'^contact/?$', ContactView.as_view(), name='contact'), # Slice request - url(r'^slice_request/?$', views.slice_request), + url(r'^slice_request/?$', slice_request), # 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