X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=myslice%2Furls.py;h=8b1f31d9d3026b522554ae0f0118e4d1d5b2756e;hb=8fa475745bff5a615bc57869178ecab3e9628225;hp=b5389a1e322eb5841de317bb97263966fcf77f27;hpb=2757273117a830a2ec078139acdfb996ed8aec78;p=myslice.git

diff --git a/myslice/urls.py b/myslice/urls.py
index b5389a1e..8b1f31d9 100644
--- a/myslice/urls.py
+++ b/myslice/urls.py
@@ -34,18 +34,20 @@ urlpatterns = patterns(
     (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'),
     #
     # the manifold proxy
     #
-    (r'^manifold/api/(?P<format>\w+)/?$', 'engine.manifoldproxy.api'),
+    (r'^manifold/proxy/(?P<format>\w+)/?$', 'manifold.manifoldproxy.proxy'),
     #
     # various trash views
     #
-    (r'^slice/?$', 'trash.sampleviews.slice_view'),
-    (r'^slice/(?P<name>[\w\.]+)/?$', 'trash.sampleviews.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'),
+    (r'^slice/?$', 'trash.sliceview.slice_view'),
+    (r'^slice/(?P<slicename>[\w\.]+)/?$', 'trash.sliceview.slice_view'),
+    # Portal
+    url(r'^portal/', include('portal.urls')),
+
 )