X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=myslice%2Furls.py;h=a2e06951e5b11bc7e445a26d9008ddad116aeefb;hb=72e1b6fd2be568712a4be6eb5805e0f686030ea3;hp=3b6844e3fdd9f214271b7bb206683cd080cc9530;hpb=b490e035bac3b74b66130548f5a4bf4a30ad8375;p=unfold.git

diff --git a/myslice/urls.py b/myslice/urls.py
index 3b6844e3..a2e06951 100644
--- a/myslice/urls.py
+++ b/myslice/urls.py
@@ -9,32 +9,42 @@ 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='engine.views.test_plugin_view'
+default_view='trash.pluginview.test_plugin_view'
 # where to be redirected after login
-after_login_view='myslice.dashboard.dashboard_view'
+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)),
+    #
+    # default / view
+    #
     (r'^/?$', default_view),
-    (r'^/login-ok?$', after_login_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'),
-    (r'^dashboard/?$', 'myslice.dashboard.dashboard_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'),
 )