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

diff --git a/myslice/urls.py b/myslice/urls.py
index b5389a1e..8ff01f93 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,10 +9,24 @@ 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.platformsview
+import portal.dashboardview
+import portal.homeview
+
+home_view=portal.homeview.HomeView.as_view()
+dashboard_view=portal.dashboardview.DashboardView.as_view()
+platforms_view=portal.platformsview.PlatformsView.as_view()
+
+#### high level choices
 # main entry point (set to the / URL)
-default_view='trash.pluginview.test_plugin_view'
+# beware that if this view is broken you end up in an endless cycle...
+# maybe platforms_view would be best on the longer run
+the_default_view=home_view
 # where to be redirected after login
-after_login_view='trash.dashboard.dashboard_view'
+the_after_login_view=dashboard_view
+# where to redirect when login is required
+# might need another one ?
+the_login_view=home_view
 
 urlpatterns = patterns(
     '',
@@ -25,27 +40,29 @@ urlpatterns = patterns(
     #
     # default / view
     #
-    (r'^/?$', default_view),
+    (r'^/?$', the_default_view),
     #
     # login / logout
     #
-    (r'^login-ok/?$', after_login_view),
+    (r'^login-ok/?$', the_after_login_view, {'state': 'Welcome to MySlice'} ),
     # seems to be what login_required uses to redirect ...
-    (r'^accounts/login/$', 'auth.views.login_user'),
-    (r'^login/?$', 'auth.views.login_user'),
+    (r'^accounts/login/$', the_login_view),
+    (r'^login/?$', the_login_view),
     (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
+    # Portal
+    url(r'^portal/', include('portal.urls')),
+    # Portal
+    url(r'^sample/', include('sample.urls')),
+    # Debug
+#    url(r'^debug/', include('debug_platform.urls')),
     #
-    (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'),
+    # various trash views - bound to go away 
+    #
+#    url(r'^trash/', include('trash.urls')),
+
 )