X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fresourceview.py;h=f0f856ae9bcc3573cce2d1a1a2dbb9a1d3259894;hb=8e47d1e76551223a1997d9383ac0bb987e04dfad;hp=22d4b2e479f9bb309e6f4855bd0c61151bc29406;hpb=4677eab771a87bd902972d3672556e3b9d8fd1b7;p=myslice.git

diff --git a/portal/resourceview.py b/portal/resourceview.py
index 22d4b2e4..f0f856ae 100644
--- a/portal/resourceview.py
+++ b/portal/resourceview.py
@@ -1,21 +1,22 @@
-from django.views.generic.base   import TemplateView
-
 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 plugins.googlemap           import GoogleMap
-from plugins.hazelnut            import Hazelnut
+from plugins.querytable          import QueryTable
 from plugins.lists.simplelist    import SimpleList
-from plugins.slicestat           import Slicestat
+from plugins.slicestat           import SliceStat
 
 # 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)       
@@ -30,7 +31,7 @@ class ResourceView(TemplateView):
         page.expose_js_metadata()
         page.expose_queries()
 
-        resourcelist = Hazelnut(
+        resourcelist = QueryTable(
             page  = page,
             title = 'List',
             domid = 'checkboxes',
@@ -48,7 +49,7 @@ class ResourceView(TemplateView):
             title      = 'Geographic view',
             domid      = 'resources-map',
             # tab's sons preferably turn this off
-            togglable  = False,
+            togglable  = True,
             query      = resource_query,
             query_all  = resource_query,
             checkboxes = False,
@@ -64,9 +65,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 +83,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(None, self.request)
         # so we can sho who is logged
         context['username'] = the_user(self.request)