X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fsliceview.py;h=78c2fabd498aa900db4365c5e81cf78fec03eed4;hb=437602b3ee7f5bcf6a6d8724b6d10734d6952124;hp=44effc9ab2303eef223fefbdb146f5c36cda6d16;hpb=a1334d41a53aec4a8bf2ebd7f3c67244eb8ac1a8;p=myslice.git

diff --git a/portal/sliceview.py b/portal/sliceview.py
index 44effc9a..78c2fabd 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,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,7 +235,6 @@ class SliceView (LoginRequiredAutoLogoutView):
         # --------------------------------------------------------------------------
         # USERS
     
-<<<<<<< HEAD
         if do_query_users:
             tab_users = Tabs(
                 page                = page,
@@ -263,37 +262,7 @@ class SliceView (LoginRequiredAutoLogoutView):
                     '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,
-                },
-            ))
->>>>>>> 0c8a634162f3271018102e75a3934c5db5e48f59
+
 # DEMO    
         # --------------------------------------------------------------------------
         # MEASUREMENTS