Slicestat -> SliceStat

diff --git a/portal/sliceview.py b/portal/sliceview.py
index 7d8aaf9..78c2fab 100644 (file)
--- 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,7 @@ class SliceView (LoginRequiredAutoLogoutView):
                 },
             )
 
-        resources_stats_cpu = Slicestat(
+        resources_stats_cpu = SliceStat(
             title = "CPU Usage",
             domid = 'resources-stats-cpu',
             page  = page,
@@ -186,7 +186,7 @@ class SliceView (LoginRequiredAutoLogoutView):
             o = 'cpu'
         )
         
-        resources_stats_mem = Slicestat(
+        resources_stats_mem = SliceStat(
             title = "Memory Usage",
             domid = 'resources-stats-mem',
             page  = page,
@@ -197,7 +197,7 @@ class SliceView (LoginRequiredAutoLogoutView):
             o = 'mem'
         )
         
-        resources_stats_asb = Slicestat(
+        resources_stats_asb = SliceStat(
             title = "Traffic Sent",
             domid = 'resources-stats-asb',
             page  = page,
@@ -208,7 +208,7 @@ class SliceView (LoginRequiredAutoLogoutView):
             o = 'asb'
         )
         
-        resources_stats_arb = Slicestat(
+        resources_stats_arb = SliceStat(
             title = "Traffic Received",
             domid = 'resources-stats-arb',
             page  = page,
@@ -235,33 +235,33 @@ class SliceView (LoginRequiredAutoLogoutView):
         # --------------------------------------------------------------------------
         # 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,
-#                 },
-#             ))
+        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    
         # --------------------------------------------------------------------------