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' of ssh://git.onelab.eu/git/myslice
[myslice.git]
/
portal
/
resourceview.py
diff --git
a/portal/resourceview.py
b/portal/resourceview.py
index
0ba8a26
..
155eff3
100644
(file)
--- a/
portal/resourceview.py
+++ b/
portal/resourceview.py
@@
-1,17
+1,18
@@
-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 u
nfold.page import Page
+from
unfold.loginrequired import FreeAccessView
+from u
i.topmenu import topmenu_items, 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.config import Config
# 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):
template_name = "resource.html"
def get_context_data(self, **kwargs):
@@
-32,7
+33,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',
@@
-53,6
+54,7
@@
class ResourceView(TemplateView):
togglable = True,
query = resource_query,
query_all = resource_query,
togglable = True,
query = resource_query,
query_all = resource_query,
+ googlemap_api_key = Config().googlemap_api_key(),
checkboxes = False,
# center on Paris
#latitude = 49.,
checkboxes = False,
# center on Paris
#latitude = 49.,