X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Furls.py;h=05c84888fccf77c9d8ac7a73fde959745a8e87d1;hb=79491376e46b23c10fff08041d772a4eb6dbafe6;hp=31c8908eb66b9ee3b62db8c101248d3b599063fa;hpb=26d84333b968352f844b47740021dd2a2fcafa41;p=myslice.git diff --git a/portal/urls.py b/portal/urls.py index 31c8908e..05c84888 100644 --- a/portal/urls.py +++ b/portal/urls.py @@ -20,10 +20,11 @@ # 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 # UserRegisterView, UserValidateView -from portal.util import TemplateView +from django.conf.urls import patterns, include, url +from portal import views +from portal.views import PresViewView, PlatformsView, PlatformView, ValidatePendingView, AccountView # UserRegisterView, UserValidateView +from portal.dashboardview import DashboardView +from portal.util import TemplateView # DEPRECATED #named_register_forms = ( # DEPRECATED # ("step1", RegisterUserForm), @@ -43,11 +44,11 @@ urlpatterns = patterns('', #url(r'^user/validate/?$', UserValidateView.as_view(), name='user_validate'), url(r'^dashboard/?$', DashboardView.as_view(), name='dashboard'), #url(r'^my_account/?$', MyAccountView.as_view(), name='my_account'), - url(r'^account/?$', views.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'^acc_process/?$', views.acc_process), + 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),