myslice/config becomes myslice/configengine to avoid confusion

[myslice.git] / portal / resourceview.py

diff --git a/portal/resourceview.py b/portal/resourceview.py
index c4d6e28..ac1813c 100644 (file)
--- a/portal/resourceview.py
+++ b/portal/resourceview.py
@@ -2,14 +2,14 @@ from manifold.core.query        import Query
 from unfold.page                import Page
 
 from unfold.loginrequired       import FreeAccessView
 from unfold.page                import Page
 
 from unfold.loginrequired       import FreeAccessView

-from ui.topmenu                 import topmenu_items, the_user
+from ui.topmenu                 import topmenu_items_live, the_user

 
 from plugins.googlemap          import GoogleMap
 from plugins.querytable         import QueryTable
 from plugins.lists.simplelist   import SimpleList
 from plugins.slicestat          import SliceStat
 
 
 from plugins.googlemap          import GoogleMap
 from plugins.querytable         import QueryTable
 from plugins.lists.simplelist   import SimpleList
 from plugins.slicestat          import SliceStat
 

-from myslice.config             import Config
+from myslice.configengine       import ConfigEngine

 
 # View for 1 platform and its details
 class ResourceView(FreeAccessView):
 
 # View for 1 platform and its details
 class ResourceView(FreeAccessView):


@@ -53,7 +53,7 @@ class ResourceView(FreeAccessView):
             togglable  = True,
             query      = resource_query,
             query_all  = resource_query,
             togglable  = True,
             query      = resource_query,
             query_all  = resource_query,

-            googlemap_api_key = Config().googlemap_api_key(),
+            googlemap_api_key = ConfigEngine().googlemap_api_key(),

             checkboxes = False,
             # center on Paris
             #latitude   = 49.,
             checkboxes = False,
             # center on Paris
             #latitude   = 49.,


@@ -85,7 +85,7 @@ class ResourceView(FreeAccessView):
         # more general variables expected in the template
         context['title'] = 'Information about a resource'
         # the menu items on the top
         # more general variables expected in the template
         context['title'] = 'Information about a resource'
         # the menu items on the top

-        context['topmenu_items'] = topmenu_items(None, self.request)
+        context['topmenu_items'] = topmenu_items_live(None, page)

         # so we can sho who is logged
         context['username'] = the_user(self.request)
 
         # so we can sho who is logged
         context['username'] = the_user(self.request)