X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=myslice%2Furls.py;h=08d6f9f1376d5f64f424e09d29e2bdba9435875e;hb=af7c18aea18be19b7227b25a019af4d257cee7dd;hp=c76ad8be7b652a6a85669f56713b0bf4d414d859;hpb=3528c308c23c63774cccf92e473abed0d85893e0;p=myslice.git

diff --git a/myslice/urls.py b/myslice/urls.py
index c76ad8be..08d6f9f1 100644
--- a/myslice/urls.py
+++ b/myslice/urls.py
@@ -8,26 +8,45 @@ from django.conf.urls import patterns, include, url
 from django.template.loader import add_to_builtins
 add_to_builtins('insert_above.templatetags.insert_tags')
 
+# main entry point (set to the / URL)
+default_view='trash.pluginview.test_plugin_view'
+# where to be redirected after login
+after_login_view='trash.dashboard.dashboard_view'
+
 urlpatterns = patterns(
     '',
     # Examples:
     # url(r'^$', 'myslice.views.home', name='home'),
     # url(r'^myslice/', include('myslice.foo.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)),
-    (r'^/?$', 'engine.views.test_plugin_view'),
+    #
+    # default / view
+    #
+    (r'^/?$', default_view),
+    #
+    # login / logout
+    #
+    (r'^login-ok/?$', after_login_view),
     # seems to be what login_required uses to redirect ...
     (r'^accounts/login/$', 'auth.views.login_user'),
     (r'^login/?$', 'auth.views.login_user'),
     (r'^logout/?$', 'auth.views.logout_user'),
-    (r'^logout/confirm/?$', 'auth.views.do_logout_user'),
-    (r'^slice/?$', 'slice.views.fake_slice_view'),
-    (r'^slice/(?P<name>[\w\.]+)/?$', 'slice.views.fake_slice_view'),
-    (r'^tab/?$', 'slice.views.tab_view'),
-    (r'^scroll/?$', 'slice.views.scroll_view'),
-    (r'^plugin/?$', 'engine.views.test_plugin_view'),
+    #
+    # the manifold proxy
+    #
+    (r'^manifold/proxy/(?P<format>\w+)/?$', 'manifold.manifoldproxy.proxy'),
+    #
+    # 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'),
+    # Portal
+    url(r'^portal/', include('portal.urls')),
 )