Merge branch 'master' of ssh://git.onelab.eu/git/myslice

[myslice.git] / trash / dashboard.py

diff --git a/trash/dashboard.py b/trash/dashboard.py
index 20bc15f..f4bde8f 100644 (file)
--- a/trash/dashboard.py
+++ b/trash/dashboard.py
@@ -16,10 +16,10 @@ from plugins.lists.slicelist import SliceList
 from plugins.querycode import QueryCode
 from plugins.quickfilter import QuickFilter
 
-from trash.trashutils  import quickfilter_criterias
+from trash.trashutils import quickfilter_criterias
 
 # 
-from myslice.viewutils import topmenu_items, the_user
+from ui.topmenu import topmenu_items, the_user
 
 @login_required
 def dashboard_view (request):
@@ -65,8 +65,8 @@ def dashboard_view (request):
     # variables that will get passed to the view-unfold2.html template
     template_env = {}
     
-    # define 'unfold2_main' to the template engine
-    template_env [ 'unfold2_main' ] = main_plugin.render(request)
+    # define 'unfold_main' to the template engine
+    template_env [ 'unfold_main' ] = main_plugin.render(request)
 
     # more general variables expected in the template
     template_env [ 'title' ] = 'Test view for a full request cycle'
@@ -87,10 +87,10 @@ def dashboard_view (request):
         query=slices_query,
         )
     # likewise but on the side view
-    template_env [ 'unfold2_margin' ] = related_plugin.render (request)
+    template_env [ 'unfold_margin' ] = related_plugin.render (request)
     
     # add our own css in the mix
-    page.add_css_files ( 'css/dashboard.css')
+    #page.add_css_files ( 'css/dashboard.css')
     
     # don't forget to run the requests
     page.expose_queries ()