X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fsliceview.py;h=8461b1a6e7bcf21331b9fe70e3f46dc9994c62f4;hb=83f3bc8abee6f1312ad9a0a24e63871fc1ee8b16;hp=7d8aaf9f85e58771c0bbfbb70d468d5d785d3421;hpb=dadf82b73ca1616e64269a2641926d89c8aaf107;p=unfold.git

diff --git a/portal/sliceview.py b/portal/sliceview.py
index 7d8aaf9f..8461b1a6 100644
--- a/portal/sliceview.py
+++ b/portal/sliceview.py
@@ -20,7 +20,7 @@ from plugins.query_editor            import QueryEditor
 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
 
@@ -175,7 +175,54 @@ class SliceView (LoginRequiredAutoLogoutView):
                 },
             )
 
-        resources_stats_cpu = Slicestat(
+       # 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",
+                                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(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,
+                },
+            ))
+
+# DEMO    
+        # --------------------------------------------------------------------------
+        # MEASUREMENTS
+        measurements_stats_cpu = SliceStat(
             title = "CPU Usage",
             domid = 'resources-stats-cpu',
             page  = page,
@@ -186,7 +233,7 @@ class SliceView (LoginRequiredAutoLogoutView):
             o = 'cpu'
         )
         
-        resources_stats_mem = Slicestat(
+        measurements_stats_mem = SliceStat(
             title = "Memory Usage",
             domid = 'resources-stats-mem',
             page  = page,
@@ -197,7 +244,7 @@ class SliceView (LoginRequiredAutoLogoutView):
             o = 'mem'
         )
         
-        resources_stats_asb = Slicestat(
+        measurements_stats_asb = SliceStat(
             title = "Traffic Sent",
             domid = 'resources-stats-asb',
             page  = page,
@@ -208,7 +255,7 @@ class SliceView (LoginRequiredAutoLogoutView):
             o = 'asb'
         )
         
-        resources_stats_arb = Slicestat(
+        measurements_stats_arb = SliceStat(
             title = "Traffic Received",
             domid = 'resources-stats-arb',
             page  = page,
@@ -218,54 +265,18 @@ class SliceView (LoginRequiredAutoLogoutView):
             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
-    
-#         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,
-#                 },
-#             ))
-
-# DEMO    
-        # --------------------------------------------------------------------------
-        # MEASUREMENTS
+        main_stack.insert (tab_measurements)
+        
 #        tab_measurements = Tabs (
 #            page                = page,
 #            active_domid        = 'measurements-list',