from plugins.raw import Raw
from plugins.stack import Stack
from plugins.tabs import Tabs
-from plugins.hazelnut import Hazelnut
+from plugins.querytable import QueryTable
from plugins.resources_selected import ResourcesSelected
from plugins.googlemap import GoogleMap
from plugins.senslabmap import SensLabMap
from plugins.active_filters import ActiveFilters
from plugins.quickfilter import QuickFilter
from plugins.messages import Messages
-from plugins.slicestat import Slicestat
+from plugins.slicestat import SliceStat
from myslice.config import Config
zoom = 4,
)
- resources_as_list = Hazelnut(
+ resources_as_list = QueryTable(
page = page,
domid = 'resources-list',
title = 'List view',
},
)
- resources_stats_cpu = Slicestat(
+ # 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,
+ domid="resources",
+ togglable=True,
+ title="Resources",
+ outline_complete=True,
+ sons=[ resources_as_map, resources_as_list_area ],
+ active_domid = 'resources-map',
+ )
+ main_stack.insert (resources_area)
+
+ # --------------------------------------------------------------------------
+ # USERS
+
+ if do_query_users:
+ tab_users = Tabs(
+ page = page,
+ domid = 'users',
+ outline_complete = True,
+ togglable = True,
+ title = 'Users',
+ active_domid = 'users-list',
+ )
+ main_stack.insert(tab_users)
+
+ tab_users.insert(QueryTable(
+ page = page,
+ title = 'Users List',
+ domid = 'users-list',
+ # tab's sons preferably turn this off
+ togglable = False,
+ # this is the query at the core of the slice list
+ query = sq_user,
+ query_all = query_user_all,
+ checkboxes = True,
+ datatables_options = {
+ 'iDisplayLength' : 25,
+ 'bLengthChange' : True,
+ 'bAutoWidth' : True,
+ },
+ ))
+
+# DEMO
+ # --------------------------------------------------------------------------
+ # MEASUREMENTS
+ measurements_stats_cpu = SliceStat(
title = "CPU Usage",
domid = 'resources-stats-cpu',
page = page,
o = 'cpu'
)
- resources_stats_mem = Slicestat(
+ measurements_stats_mem = SliceStat(
title = "Memory Usage",
domid = 'resources-stats-mem',
page = page,
o = 'mem'
)
- resources_stats_asb = Slicestat(
+ measurements_stats_asb = SliceStat(
title = "Traffic Sent",
domid = 'resources-stats-asb',
page = page,
o = 'asb'
)
- resources_stats_arb = Slicestat(
+ measurements_stats_arb = SliceStat(
title = "Traffic Received",
domid = 'resources-stats-arb',
page = page,
slicename = slicename,
o = 'arb'
)
-
- # with the new 'Filter' stuff on top, no need for anything but the hazelnut
- resources_as_list_area = resources_as_list
- resources_area = Tabs ( page=page,
- domid="resources",
+ tab_measurements = Tabs ( page=page,
+ domid="measurements",
togglable=True,
- title="Resources",
+ toggled = False,
+ title="Measurements",
outline_complete=True,
- sons=[ resources_as_map, resources_as_list_area, resources_stats_cpu, resources_stats_mem, resources_stats_asb, resources_stats_arb ],
- active_domid = 'resources-map',
+ sons=[ measurements_stats_cpu, measurements_stats_mem, measurements_stats_asb, measurements_stats_arb ],
+ active_domid = 'measurements_stats_cpu',
)
- main_stack.insert (resources_area)
-
- # --------------------------------------------------------------------------
- # USERS
-
-<<<<<<< HEAD
- if do_query_users:
- tab_users = Tabs(
- page = page,
- domid = 'users',
- outline_complete = True,
- togglable = True,
- title = 'Users',
- active_domid = 'users-list',
- )
- main_stack.insert(tab_users)
-
- tab_users.insert(Hazelnut(
- page = page,
- title = 'Users List',
- domid = 'users-list',
- # tab's sons preferably turn this off
- togglable = False,
- # this is the query at the core of the slice list
- query = sq_user,
- query_all = query_user_all,
- checkboxes = True,
- datatables_options = {
- 'iDisplayLength' : 25,
- 'bLengthChange' : True,
- 'bAutoWidth' : True,
- },
- ))
-
+ main_stack.insert (tab_measurements)
-=======
- if do_query_users:
- tab_users = Tabs(
- page = page,
- domid = 'users',
- outline_complete = True,
- togglable = True,
- title = 'Users',
- active_domid = 'users-list',
- )
- main_stack.insert(tab_users)
-
- tab_users.insert(Hazelnut(
- page = page,
- title = 'Users List',
- domid = 'users-list',
- # tab's sons preferably turn this off
- togglable = False,
- # this is the query at the core of the slice list
- query = sq_user,
- query_all = query_user_all,
- checkboxes = True,
- datatables_options = {
- 'iDisplayLength' : 25,
- 'bLengthChange' : True,
- 'bAutoWidth' : True,
- },
- ))
->>>>>>> 0c8a634162f3271018102e75a3934c5db5e48f59
-# DEMO
- # --------------------------------------------------------------------------
- # MEASUREMENTS
# tab_measurements = Tabs (
# page = page,
# active_domid = 'measurements-list',
# )
# main_stack.insert(tab_measurements)
#
-# tab_measurements.insert(Hazelnut(
+# tab_measurements.insert(QueryTable(
# page = page,
# title = 'Measurements',
# domid = 'measurements-list',
# variables that will get passed to the view-unfold1.html template
template_env = {}
- # define 'unfold1_main' to the template engine - the main contents
- template_env [ 'unfold1_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()
git://git.onelab.eu / myslice.git / blobdiff