X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=myslice%2Furls.py;h=ad151789a0a6788b4bb925ee25221de8376671d6;hb=5976423e0a726cb636a67bd77d61c8f36b23e7ce;hp=ca150a40f9c443e6962672bc744a2d0401d49080;hpb=6c978327b002ef4b46047ce22ba7e8f61768f652;p=unfold.git

diff --git a/myslice/urls.py b/myslice/urls.py
index ca150a40..ad151789 100644
--- a/myslice/urls.py
+++ b/myslice/urls.py
@@ -2,6 +2,11 @@ from django.conf.urls import patterns, include, url
 from django.conf      import settings
 from django.contrib import admin
 
+##
+# components module
+##
+import components
+
 # Uncomment the next two lines to enable the admin:
 # from django.contrib import admin
 # admin.autodiscover()
@@ -12,24 +17,20 @@ add_to_builtins('insert_above.templatetags.insert_tags')
 
 from settings import auxiliaries, INSTALLED_APPS
 
+import portal.about
+import portal.institution
+import portal.registrationview
+import portal.accountview
+import portal.contactview
+import portal.termsview
+import portal.supportview
+
 import portal.platformsview
 import portal.dashboardview
 import portal.homeview
 import portal.newsview
 import portal.loginwidget
 
-from portal.about                   import AboutView
-from portal.registrationview        import RegistrationView
-from portal.accountview             import AccountView, account_process
-from portal.institution             import InstitutionView
-
-from portal.supportview             import SupportView
-from portal.contactview             import ContactView
-
-from portal.termsview               import TermsView
-
-home_view=portal.homeview.HomeView.as_view()
-dashboard_view=portal.dashboardview.DashboardView.as_view()
 platforms_view=portal.platformsview.PlatformsView.as_view()
 
 #import portal.testbedlist
@@ -45,19 +46,6 @@ import portal.slicetabmeasurements
 import portal.managementtababout
 import portal.managementtabrequests
 
-import forge.views
-
-#### high level choices
-# main entry point (set to the / URL)
-# beware that if this view is broken you end up in an endless cycle...
-# maybe platforms_view would be best on the longer run
-the_default_view=home_view
-# where to be redirected after login
-the_after_login_view=dashboard_view
-# where to redirect when login is required
-# might need another one ?
-the_login_view=home_view
-admin.autodiscover()
 urls = [
     '',
     # Examples:
@@ -66,17 +54,17 @@ urls = [
     # Uncomment the admin/doc line below to enable admin documentation:
     # url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
     # Uncomment the next line to enable the admin:
-     url(r'^admin/', include(admin.site.urls)),
+    url(r'^admin/', include(admin.site.urls)),
     #
     # default / view
-    (r'^/?$', the_default_view),
+    (r'^/?$', portal.homeview.HomeView.as_view()),
     #
     # login / logout
-    (r'^login-ok/?$', the_after_login_view, {'state': 'Welcome to MySlice'} ),
+    (r'^login-ok/?$', portal.dashboardview.DashboardView.as_view(), {'state': 'Welcome to MySlice'} ),
     #
     # seems to be what login_required uses to redirect ...
-    (r'^accounts/login/$', the_login_view),
-    (r'^login/?$', the_login_view),
+    (r'^accounts/login/$', portal.homeview.HomeView.as_view()),
+    (r'^login/?$', portal.homeview.HomeView.as_view()),
     (r'^logout/?$', 'auth.views.logout_user'),
     #
     # the manifold proxy
@@ -114,20 +102,20 @@ urls = [
     (r'^testbeds/(?P<slicename>[^/]+)/?$', portal.slicetabtestbeds.SliceTabTestbeds.as_view()),
     (r'^measurements/(?P<slicename>[^/]+)/?$', portal.slicetabmeasurements.SliceTabMeasurements.as_view()),
     (r'^experiment/(?P<slicename>[^/]+)/?$', portal.slicetabexperiment.ExperimentView.as_view()),
-    (r'^studentslabs/(?P<slicename>[^/]+)/?$', forge.views.CreateCourseViev.as_view()),
     
-    url(r'^about/?$', AboutView.as_view(), name='about'),
     
-    url(r'^institution/?$', InstitutionView.as_view(), name='institution'),
+    url(r'^about/?$', portal.about.AboutView.as_view(), name='about'),
+    
+    url(r'^institution/?$', portal.institution.InstitutionView.as_view(), name='institution'),
     (r'^management/requests/?$', portal.managementtabrequests.ManagementRequestsView.as_view()),
     (r'^management/about/?$', portal.managementtababout.ManagementAboutView.as_view()),
     #
-    url(r'^register/?$', RegistrationView.as_view(), name='registration'),
-    url(r'^account/?$', AccountView.as_view(), name='account'),
-    url(r'^account/account_process/?$', account_process),
-    url(r'^contact/?$', ContactView.as_view(), name='contact'),
-    url(r'^terms/?$', TermsView.as_view(), name='terms'),
-    url(r'^support/?$', SupportView.as_view(), name='support'),
+    url(r'^register/?$', portal.registrationview.RegistrationView.as_view(), name='registration'),
+    url(r'^account/?$', portal.accountview.AccountView.as_view(), name='account'),
+    url(r'^account/account_process/?$', portal.accountview.account_process),
+    url(r'^contact/?$', portal.contactview.ContactView.as_view(), name='contact'),
+    url(r'^terms/?$', portal.termsview.TermsView.as_view(), name='terms'),
+    url(r'^support/?$', portal.supportview.SupportView.as_view(), name='support'),
     #
     url(r'^portal/', include('portal.urls')),
 
@@ -135,11 +123,13 @@ urls = [
 #    url(r'^sla/', include('sla.urls')),
 ]
 
+urls.extend( components.urls() )
+
 #this one would not match the convention
 # url(r'^debug/', include('debug_platform.urls')),
 # but it was commented out anyways
 for aux in auxiliaries:
     if aux in INSTALLED_APPS:
-        urls.append ( url ( r'^%s/'%aux, include ('%s.urls'%aux )))
+        urls.append ( url ( r'^%s/'%aux, include ('%s.urls' % aux )))
 
 urlpatterns = patterns(*urls)