Merge branch 'jordan' of ssh://git.onelab.eu/git/myslice into jordan

[myslice.git] / myslice / urls.py

diff --git a/myslice/urls.py b/myslice/urls.py
index ef1f30c..79a808d 100644 (file)
--- a/myslice/urls.py
+++ b/myslice/urls.py
@@ -9,10 +9,17 @@ from django.conf      import settings
 from django.template.loader import add_to_builtins
 add_to_builtins('insert_above.templatetags.insert_tags')
 
+import portal.sliceview
+import portal.platformsview
+import portal.dashboardview
+
 # main entry point (set to the / URL)
-default_view='trash.pluginview.test_plugin_view'
+## beware before adopting this one
+# if anything goes wrong in this page you end up in an endless cycle
+#default_view=portal.platformsview.PlatformsView.as_view()
+default_view='auth.views.login_user'
 # where to be redirected after login
-after_login_view='trash.dashboard.dashboard_view'
+after_login_view=portal.dashboardview.DashboardView.as_view()
 
 urlpatterns = patterns(
     '',
@@ -39,15 +46,18 @@ urlpatterns = patterns(
     # the manifold proxy
     #
     (r'^manifold/proxy/(?P<format>\w+)/?$', 'manifold.manifoldproxy.proxy'),
+    # 
+    # the slice view
+    #
+    (r'^slice/?$',                        portal.sliceview.SliceView.as_view()),
+    (r'^slice/(?P<slicename>[\w\.]+)/?$', portal.sliceview.SliceView.as_view()),
     #
     # various trash views
     #
-    (r'^tab/?$', 'trash.sampleviews.tab_view'),
-    (r'^scroll/?$', 'trash.sampleviews.scroll_view'),
-    (r'^plugin/?$', 'trash.pluginview.test_plugin_view'),
-    (r'^dashboard/?$', 'trash.dashboard.dashboard_view'),
-    (r'^slice/?$', 'trash.sliceview.slice_view'),
-    (r'^slice/(?P<slicename>[\w\.]+)/?$', 'trash.sliceview.slice_view'),
+    (r'^tab/?$',                          'trash.sampleviews.tab_view'),
+    (r'^scroll/?$',                       'trash.sampleviews.scroll_view'),
+    (r'^plugin/?$',                       'trash.pluginview.test_plugin_view'),
+    (r'^dashboard/?$',                    'trash.dashboard.dashboard_view'),
     # Portal
     url(r'^portal/', include('portal.urls')),
     # Portal