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
show googlemap AND 3dmap and list view
[myslice.git]
/
portal
/
sliceview.py
diff --git
a/portal/sliceview.py
b/portal/sliceview.py
index
b41e92c
..
38c90fc
100644
(file)
--- a/
portal/sliceview.py
+++ b/
portal/sliceview.py
@@
-11,8
+11,8
@@
from ui.topmenu import topmenu_items, the_user
from plugins.raw import Raw
from plugins.stack import Stack
from plugins.tabs import Tabs
from plugins.raw import Raw
from plugins.stack import Stack
from plugins.tabs import Tabs
-from plugins.
hazelnut import Hazelnut
-from plugins.
resources_selected import ResourcesSelected
+from plugins.
querytable import QueryTable
+from plugins.
queryupdater import QueryUpdater
from plugins.googlemap import GoogleMap
from plugins.senslabmap import SensLabMap
from plugins.querycode import QueryCode
from plugins.googlemap import GoogleMap
from plugins.senslabmap import SensLabMap
from plugins.querycode import QueryCode
@@
-102,9
+102,9
@@
class SliceView (LoginRequiredAutoLogoutView):
)
# --------------------------------------------------------------------------
)
# --------------------------------------------------------------------------
- #
ResourcesSelected
(Pending Operations)
+ #
QueryUpdater
(Pending Operations)
- main_stack.insert(
ResourcesSelected
(
+ main_stack.insert(
QueryUpdater
(
page = page,
title = 'Pending operations',
query = main_query,
page = page,
title = 'Pending operations',
query = main_query,
@@
-145,7
+145,7
@@
class SliceView (LoginRequiredAutoLogoutView):
# RESOURCES
# the resources part is made of a Tabs (Geographic, List),
# RESOURCES
# the resources part is made of a Tabs (Geographic, List),
- resources_as_map = GoogleMap(
+ resources_as_
g
map = GoogleMap(
page = page,
title = 'Geographic view',
domid = 'resources-map',
page = page,
title = 'Geographic view',
domid = 'resources-map',
@@
-160,7
+160,15
@@
class SliceView (LoginRequiredAutoLogoutView):
zoom = 4,
)
zoom = 4,
)
- resources_as_list = Hazelnut(
+ resources_as_3dmap = SensLabMap(
+ page = page,
+ title = '3D Map',
+ domid = 'senslabmap',
+ query = sq_resource,
+ query_all = query_resource_all,
+ )
+
+ resources_as_list = QueryTable(
page = page,
domid = 'resources-list',
title = 'List view',
page = page,
domid = 'resources-list',
title = 'List view',
@@
-175,7
+183,7
@@
class SliceView (LoginRequiredAutoLogoutView):
},
)
},
)
- # with the new 'Filter' stuff on top, no need for anything but the
hazelnut
+ # with the new 'Filter' stuff on top, no need for anything but the
querytable
resources_as_list_area = resources_as_list
resources_area = Tabs ( page=page,
resources_as_list_area = resources_as_list
resources_area = Tabs ( page=page,
@@
-183,7
+191,9
@@
class SliceView (LoginRequiredAutoLogoutView):
togglable=True,
title="Resources",
outline_complete=True,
togglable=True,
title="Resources",
outline_complete=True,
- sons=[ resources_as_map, resources_as_list_area ],
+ sons=[ resources_as_gmap,
+ resources_as_3dmap,
+ resources_as_list_area, ],
active_domid = 'resources-map',
)
main_stack.insert (resources_area)
active_domid = 'resources-map',
)
main_stack.insert (resources_area)
@@
-202,7
+212,7
@@
class SliceView (LoginRequiredAutoLogoutView):
)
main_stack.insert(tab_users)
)
main_stack.insert(tab_users)
- tab_users.insert(
Hazelnut
(
+ tab_users.insert(
QueryTable
(
page = page,
title = 'Users List',
domid = 'users-list',
page = page,
title = 'Users List',
domid = 'users-list',
@@
-269,6
+279,7
@@
class SliceView (LoginRequiredAutoLogoutView):
tab_measurements = Tabs ( page=page,
domid="measurements",
togglable=True,
tab_measurements = Tabs ( page=page,
domid="measurements",
togglable=True,
+ toggled = False,
title="Measurements",
outline_complete=True,
sons=[ measurements_stats_cpu, measurements_stats_mem, measurements_stats_asb, measurements_stats_arb ],
title="Measurements",
outline_complete=True,
sons=[ measurements_stats_cpu, measurements_stats_mem, measurements_stats_asb, measurements_stats_arb ],
@@
-286,7
+297,7
@@
class SliceView (LoginRequiredAutoLogoutView):
# )
# main_stack.insert(tab_measurements)
#
# )
# main_stack.insert(tab_measurements)
#
-# tab_measurements.insert(
Hazelnut
(
+# tab_measurements.insert(
QueryTable
(
# page = page,
# title = 'Measurements',
# domid = 'measurements-list',
# page = page,
# title = 'Measurements',
# domid = 'measurements-list',
@@
-323,8
+334,8
@@
class SliceView (LoginRequiredAutoLogoutView):
# variables that will get passed to the view-unfold1.html template
template_env = {}
# variables that will get passed to the view-unfold1.html template
template_env = {}
- # define 'unfold
1
_main' to the template engine - the main contents
- template_env [ 'unfold
1
_main' ] = main_stack.render(request)
+ # define 'unfold_main' to the template engine - the main contents
+ template_env [ 'unfold_main' ] = main_stack.render(request)
# more general variables expected in the template
template_env [ 'title' ] = '%(slicename)s'%locals()
# more general variables expected in the template
template_env [ 'title' ] = '%(slicename)s'%locals()