X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=myslice%2Furls.py;h=8b1f31d9d3026b522554ae0f0118e4d1d5b2756e;hb=7a3fcd0eed5066b3189d79729e95e98167988481;hp=5a8f3a5f3f9b329f9d85d36e6fc62052d60a9360;hpb=9b89a32f1ae0a1e0618a9cc11138a766a4ba870b;p=myslice.git

diff --git a/myslice/urls.py b/myslice/urls.py
index 5a8f3a5f..8b1f31d9 100644
--- a/myslice/urls.py
+++ b/myslice/urls.py
@@ -18,23 +18,36 @@ 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),
+    #
+    # 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/?$', 'trash.sampleviews.slice_view'),
-    (r'^slice/(?P<name>[\w\.]+)/?$', 'trash.sampleviews.slice_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')),
+
 )