X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=myslice%2Furls.py;h=8accdb59688a40fc707b2ae26e3a6e8f76c73e29;hb=d1e5d12b2b9519801f7b981a2177b3f36115714a;hp=5c185290664044b0026baf3aaa0ae670a8b746e4;hpb=96a59721af48d73df6e504807378c52fa1750743;p=myslice.git

diff --git a/myslice/urls.py b/myslice/urls.py
index 5c185290..8accdb59 100644
--- a/myslice/urls.py
+++ b/myslice/urls.py
@@ -1,4 +1,5 @@
 from django.conf.urls import patterns, include, url
+from django.conf      import settings
 
 # Uncomment the next two lines to enable the admin:
 # from django.contrib import admin
@@ -41,10 +42,18 @@ urlpatterns = patterns(
     #
     # 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')),
+    # Debug
+    url(r'^debug/', include('debug_platform.urls')),
+    # Static files
+    (r'^static/(?P<path>.*)$', 'django.views.static.serve', {'document_root': settings.STATIC_ROOT}),
+
+
 )