X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fportalpage.py;h=2023e4f7693cb07f0ba8935410800e0328bb478d;hb=f0f76a08ca9dc5d208e1521a73ba1ba60a3c0065;hp=3cc5ab9816e7f600eba588a4301003e8e00f7426;hpb=1aea42c3668602aacfe22bc762ee939672129f53;p=myslice.git

diff --git a/portal/portalpage.py b/portal/portalpage.py
index 3cc5ab98..2023e4f7 100644
--- a/portal/portalpage.py
+++ b/portal/portalpage.py
@@ -2,7 +2,7 @@ from django.template import RequestContext
 from django.shortcuts import render_to_response
 
 from unfold.page import Page
-from myslice.viewutils import topmenu_items, the_user
+from ui.topmenu import topmenu_items, the_user
 
 class PortalPage(Page):
     def __init__(self, request):
@@ -15,8 +15,8 @@ class PortalPage(Page):
     def render(self):
         template_env = {}
         
-        # define 'unfold1_main' to the template engine - the main contents
-        template_env [ 'unfold1_main' ] = "\n".join(self._content)
+        # define 'unfold_main' to the template engine - the main contents
+        template_env [ 'unfold_main' ] = "\n".join(self._content)
 
         # more general variables expected in the template
         template_env [ 'title' ] = 'Test view that combines various plugins'
@@ -29,6 +29,8 @@ class PortalPage(Page):
         # Jordan: it seems we need this to init plugins js
         # Issue a "manifold is not defined" error
         #self.expose_queries ()
+        # Thierry: this is deprecated anyway, and will happen as part of prelude_env
+        # "manifold not defined" would be due to a missing dependency to manifold.js or something...
 
         template_env.update(self.prelude_env())
         result=render_to_response ('view-unfold1.html',template_env,