X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=myslice%2Furls.py;h=891eaafa964ef47420f95dd2dddb7858c3d5290b;hb=93ac75da63ac1891764f3ddcb82aebe9b12a2660;hp=f16f93641b6b2b3db8b89631e5a29e094a99d29e;hpb=ac4738d8b9f72414ad94708f99578a62cc01938a;p=myslice.git

diff --git a/myslice/urls.py b/myslice/urls.py
index f16f9364..891eaafa 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
@@ -8,33 +9,59 @@ from django.conf.urls import patterns, include, url
 from django.template.loader import add_to_builtins
 add_to_builtins('insert_above.templatetags.insert_tags')
 
+import portal.sliceview
+
 # main entry point (set to the / URL)
-default_view='engine.views.test_plugin_view'
+default_view='trash.pluginview.test_plugin_view'
+#default_view='portal.views.PlatformsView'
 # 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),
+    #
+    # 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'),
+    # 
+    # the slice view
+    #
+    (r'^slice/?$',                        portal.sliceview.SliceView.as_view()),
+    (r'^slice/(?P<slicename>[\w\.]+)/?$', portal.sliceview.SliceView.as_view()),
+    #
+    # 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'),
+    # Portal
+    url(r'^portal/', include('portal.urls')),
+    # Portal
+    url(r'^sample/', include('sample.urls')),
+    # Debug
+    url(r'^debug/', include('debug_platform.urls')),
+    # Static files
+    (r'^static/(?P<path>.*)$', 'django.views.static.serve', {'document_root': settings.STATIC_ROOT}),
+
+
 )