myslice/config becomes myslice/configengine to avoid confusion

[myslice.git] / portal / resourceview.py

diff --git a/portal/resourceview.py b/portal/resourceview.py
index 0421854..ac1813c 100644 (file)
--- a/portal/resourceview.py
+++ b/portal/resourceview.py
@@ -1,21 +1,24 @@
-from django.views.generic.base   import TemplateView
+from manifold.core.query        import Query
+from unfold.page                import Page
 
-from manifold.core.query         import Query
-from unfold.page                 import Page
+from unfold.loginrequired       import FreeAccessView
+from ui.topmenu                 import topmenu_items_live, the_user
 
-from ui.topmenu                  import topmenu_items, 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.hazelnut            import Hazelnut
-from plugins.lists.simplelist    import SimpleList
-from plugins.slicestat           import Slicestat
+from myslice.configengine       import ConfigEngine
 
 # View for 1 platform and its details
-class ResourceView(TemplateView):
+class ResourceView(FreeAccessView):
     template_name = "resource.html"
 
     def get_context_data(self, **kwargs):
         page = Page(self.request)
+        
+        page.add_js_files  ( [ "js/common.functions.js" ] )
 
         for key, value in kwargs.iteritems():
             print "%s = %s" % (key, value)       
@@ -28,9 +31,8 @@ class ResourceView(TemplateView):
         page.enqueue_query(resource_query)
 
         page.expose_js_metadata()
-        page.expose_queries()
 
-        resourcelist = Hazelnut(
+        resourcelist = QueryTable(
             page  = page,
             title = 'List',
             domid = 'checkboxes',
@@ -51,6 +53,7 @@ class ResourceView(TemplateView):
             togglable  = True,
             query      = resource_query,
             query_all  = resource_query,
+            googlemap_api_key = ConfigEngine().googlemap_api_key(),
             checkboxes = False,
             # center on Paris
             #latitude   = 49.,
@@ -64,9 +67,10 @@ class ResourceView(TemplateView):
 #            query = resource_query,
 #        )
 
-        resource_stats = Slicestat(
+        resource_stats = SliceStat(
             title = None,
             page  = page,
+            stats = 'node',
             key   = 'hrn',
             query = resource_query
         )
@@ -81,7 +85,7 @@ class ResourceView(TemplateView):
         # more general variables expected in the template
         context['title'] = 'Information about a resource'
         # the menu items on the top
-        context['topmenu_items'] = topmenu_items('Dashboard', self.request)
+        context['topmenu_items'] = topmenu_items_live(None, page)
         # so we can sho who is logged
         context['username'] = the_user(self.request)