Merge branch 'master' of ssh://git.onelab.eu/git/myslice
authorCiro Scognamiglio <ciro.scognamiglio@cslash.net>
Thu, 24 Oct 2013 15:09:24 +0000 (17:09 +0200)
committerCiro Scognamiglio <ciro.scognamiglio@cslash.net>
Thu, 24 Oct 2013 15:09:24 +0000 (17:09 +0200)
1  2 
portal/resourceview.py

diff --combined portal/resourceview.py
@@@ -16,8 -16,6 +16,8 @@@ class ResourceView(TemplateView)
  
      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)       
@@@ -69,7 -67,6 +69,7 @@@
          resource_stats = Slicestat(
              title = None,
              page  = page,
 +            stats = 'node',
              key   = 'hrn',
              query = resource_query
          )
@@@ -84,7 -81,7 +84,7 @@@
          # 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)