X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Furls.py;h=87ff1e1ebbf6619375dc52d2995c0153a8dc81d8;hb=0917b2644c0b1bf2337f7e04a98d0e4ec4dbebf2;hp=c7135ec3a94329eb602a982207ca695c5bce321f;hpb=4b0898259ce6c4795e752e05d9a04e9d4f88f501;p=myslice.git

diff --git a/portal/urls.py b/portal/urls.py
index c7135ec3..87ff1e1e 100644
--- a/portal/urls.py
+++ b/portal/urls.py
@@ -20,13 +20,24 @@
 # 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, ValidatePendingView, AccountView # UserRegisterView, UserValidateView
+
 from portal.platformsview       import PlatformsView
 from portal.platformview        import PlatformView
+from portal.resourceview        import ResourceView
 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
+from portal.passresetview       import PassResetView
+
+# 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),
@@ -48,18 +59,21 @@ 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'^platform/(?P<platformname>[\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'^platform/(?P<platformname>[\w\.\-]+)/?$', PlatformView.as_view(), name='platform'),
+    url(r'^resource/(?P<urn>[\w\.\-\+\:]+)/?$', ResourceView.as_view(), name='resource'),
+    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'),
+    url(r'^pass_reset/?$', PassResetView.as_view(), name='pass_rest'),
     # 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
     # (r'^validate_action/(?P<constraints>[^/]+)/(?P<id>\w+)/?$', 'portal.views.pres_view_static'),
-     (r'^validate_action(?P<id>(?:/\w+)+)/?$', 'portal.actions.validate_action'),
+    url(r'^validate_action(?P<id>(?:/\w+)+)/?$', 'portal.actions.validate_action'),
 
     url(r'^pres_view/?$', PresViewView.as_view(), name='pres_view'),
     (r'^methods/(?P<type>\w+)/?$', 'portal.views.pres_view_methods'),