X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=trash%2Fdashboard.py;h=cd1ba3d61ebb16756d6fb8b997e5062ac44224cb;hb=45273da0859095cd4e7565f7ea0fc1496ef2f2de;hp=3f92b9dc3aea9e6844b36bf367c1da187b6081ec;hpb=b709866ba93d98c32127ff4deae5b783e271e5b3;p=unfold.git

diff --git a/trash/dashboard.py b/trash/dashboard.py
index 3f92b9dc..cd1ba3d6 100644
--- a/trash/dashboard.py
+++ b/trash/dashboard.py
@@ -10,7 +10,7 @@ from django.contrib.auth.decorators import login_required
 from unfold.page import Page
 from manifold.manifoldquery import ManifoldQuery
 
-from plugins.verticallayout.verticallayout import VerticalLayout
+from plugins.stack.stack import Stack
 from plugins.lists.slicelist import SliceList
 from plugins.querycode.querycode import QueryCode
 from plugins.quickfilter.quickfilter import QuickFilter
@@ -26,9 +26,10 @@ def dashboard_view (request):
     page = Page(request)
 
     slices_query = ManifoldQuery (action='get',
-                                  method='slice',
+                                  subject='slice',
                                   timestamp='latest',
                                   fields=['slice_hrn'],
+                                  filters=[],
                                   # xxx filter : should filter on the slices the logged user can see
                                   # we don't have the user's hrn yet
                                   # in addition this currently returns all slices anyways
@@ -36,7 +37,7 @@ def dashboard_view (request):
                                   sort='slice_hrn',)
     page.enqueue_query (slices_query)
 
-    main_plugin = VerticalLayout (
+    main_plugin = Stack (
         page=page,
         title="Putting stuff together",
         sons=[ 
@@ -47,6 +48,8 @@ def dashboard_view (request):
                 toggled=False,
                 ),
             QuickFilter (
+                # we play with this one for demo purposes in dashboard.css
+                domid='myquickfilter',
                 page=page,
                 title='play with filters',
                 criterias=quickfilter_criterias,
@@ -65,17 +68,8 @@ def dashboard_view (request):
     # variables that will get passed to the view-plugin.html template
     template_env = {}
     
-    # define 'content_main' to the template engine
-    template_env [ 'content_main' ] = main_plugin.render(request)
-
-#    ########## add another plugin with the same request, on the RHS pane
-#    # lacks a/href to /slice/%s
-#    related_plugin = SliceList (title='SliceList plugin',domid='slicelist1',
-#                                with_datatables='yes', 
-#                                list=hard_wired_slice_names, 
-#                                header='Slices')
-#    # likewise but on the side view
-#    template_env [ 'content_related' ] = related_plugin.render (request)
+    # define 'unfold2_main' to the template engine
+    template_env [ 'unfold2_main' ] = main_plugin.render(request)
 
     # more general variables expected in the template
     template_env [ 'title' ] = 'Test view for a full request cycle'
@@ -84,8 +78,8 @@ def dashboard_view (request):
     # so we can sho who is logged
     template_env [ 'username' ] = the_user (request) 
 
-    ##########
-    # lacks a/href to /slice/%s
+#   ########## add another plugin with the same request, on the RHS pane
+#   will show up in the right-hand side area named 'related'
     related_plugin = SliceList (
         page=page,
         title='Same request, other layout',
@@ -96,7 +90,7 @@ def dashboard_view (request):
         query=slices_query,
         )
     # likewise but on the side view
-    template_env [ 'content_related' ] = related_plugin.render (request)
+    template_env [ 'unfold2_margin' ] = related_plugin.render (request)
     
     # add our own css in the mix
     page.add_css_files ( 'css/dashboard.css')
@@ -109,7 +103,7 @@ def dashboard_view (request):
 
     # the prelude object in page contains a summary of the requirements() for all plugins
     # define {js,css}_{files,chunks}
-    prelude_env = page.template_env()
+    prelude_env = page.prelude_env()
     template_env.update(prelude_env)
     return render_to_response ('view-plugin.html',template_env,
                                context_instance=RequestContext(request))