git://git.onelab.eu
/
myslice.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into newnames
[myslice.git]
/
portal
/
resourceview.py
diff --git
a/portal/resourceview.py
b/portal/resourceview.py
index
22d4b2e
..
f0f856a
100644
(file)
--- 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 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 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.lists.simplelist import SimpleList
-from plugins.slicestat import Slice
s
tat
+from plugins.slicestat import Slice
S
tat
# View for 1 platform and its details
# View for 1 platform and its details
-class ResourceView(
Template
View):
+class ResourceView(
FreeAccess
View):
template_name = "resource.html"
def get_context_data(self, **kwargs):
page = Page(self.request)
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)
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()
page.expose_js_metadata()
page.expose_queries()
- resourcelist =
Hazelnut
(
+ resourcelist =
QueryTable
(
page = page,
title = 'List',
domid = 'checkboxes',
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
title = 'Geographic view',
domid = 'resources-map',
# tab's sons preferably turn this off
- togglable =
Fals
e,
+ togglable =
Tru
e,
query = resource_query,
query_all = resource_query,
checkboxes = False,
query = resource_query,
query_all = resource_query,
checkboxes = False,
@@
-64,9
+65,10
@@
class ResourceView(TemplateView):
# query = resource_query,
# )
# query = resource_query,
# )
- resource_stats = Slice
s
tat(
+ resource_stats = Slice
S
tat(
title = None,
page = page,
title = None,
page = page,
+ stats = 'node',
key = 'hrn',
query = resource_query
)
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
# 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)
# so we can sho who is logged
context['username'] = the_user(self.request)