X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fresourceview.py;h=1d3b9af1fb28f0dff1d5efb833162469d85d8841;hb=0300e4a519eb44fa1e2b769f1c871471ebfe0620;hp=155eff3f8c0a559bff824c3955af08573b063ddc;hpb=8be9b358a544e1ea9e53ad40495fa42e9d5edf9a;p=myslice.git

diff --git a/portal/resourceview.py b/portal/resourceview.py
index 155eff3f..1d3b9af1 100644
--- a/portal/resourceview.py
+++ b/portal/resourceview.py
@@ -2,17 +2,18 @@ from manifold.core.query        import Query
 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 myslice.config             import Config
+from myslice.configengine       import ConfigEngine
+from myslice.theme import ThemeView
 
 # View for 1 platform and its details
-class ResourceView(FreeAccessView):
+class ResourceView(FreeAccessView, ThemeView):
     template_name = "resource.html"
 
     def get_context_data(self, **kwargs):
@@ -21,7 +22,6 @@ class ResourceView(FreeAccessView):
         page.add_js_files  ( [ "js/common.functions.js" ] )
 
         for key, value in kwargs.iteritems():
-            print "%s = %s" % (key, value)       
             if key == "urn":
                 resource_urn=value
                 
@@ -31,7 +31,6 @@ class ResourceView(FreeAccessView):
         page.enqueue_query(resource_query)
 
         page.expose_js_metadata()
-        page.expose_queries()
 
         resourcelist = QueryTable(
             page  = page,
@@ -54,7 +53,7 @@ class ResourceView(FreeAccessView):
             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.,
@@ -86,10 +85,10 @@ class ResourceView(FreeAccessView):
         # 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)
-
+        context['theme'] = self.theme
         context.update(page.prelude_env())
 
         return context