# 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, PlatformsView, PlatformView, ValidatePendingView, AccountView # UserRegisterView, UserValidateView
+
+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, account_process
+from portal.contactview import ContactView
+from portal.slicerequestview import SliceRequestView
+from portal.registrationview import RegistrationView
+from portal.sliceview import SliceView
+
+# 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.views import ValidatePendingView
+
# DEPRECATED #named_register_forms = (
# DEPRECATED # ("step1", RegisterUserForm),
#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<platformname>[\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'^slice/?$',SliceView.as_view(),name='slice'),
+ url(r'^slice/(?P<slicename>[\w\.]+)/?$', SliceView.as_view(),name='slice'),
+ url(r'^account/account_process/?$', account_process),
+ url(r'^register/?$', RegistrationView.as_view(), name='registration'),
+ url(r'^contact/?$', ContactView.as_view(), name='contact'),
# Slice request
- url(r'^slice_request/?$', views.slice_request),
+ url(r'^slice_request/?$', SliceRequestView.as_view(), name='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