Use daemon/sipb-xen.mit.edu and don't give user fake auth token in an HTML comment.

[invirt/packages/invirt-web.git] / templates / main.py

diff --git a/templates/main.py b/templates/main.py
index ab70cdd..cc8c3d8 100755 (executable)
--- a/templates/main.py
+++ b/templates/main.py
@@ -286,7 +286,7 @@ def getDiskInfo(data_dict, machine):
         name = disk.guest_device_name
         disk_fields.extend([(x % name, y % name) for x, y in 
                             disk_fields_template])
         name = disk.guest_device_name
         disk_fields.extend([(x % name, y % name) for x, y in 
                             disk_fields_template])

-        data_dict['%s_size' % name] = "%0.1f GB" % (disk.size / 1024.)
+        data_dict['%s_size' % name] = "%0.1f GiB" % (disk.size / 1024.)

     return disk_fields
 
 def command(user, fields):
     return disk_fields
 
 def command(user, fields):

@@ -496,7 +496,7 @@ def infoDict(user, machine):
     display_fields = (display_fields[:disk_point] + disk_fields + 
                       display_fields[disk_point+1:])
     
     display_fields = (display_fields[:disk_point] + disk_fields + 
                       display_fields[disk_point+1:])
     

-    main_status['memory'] += ' MB'
+    main_status['memory'] += ' MiB'

     for field, disp in display_fields:
         if field in ('uptime', 'cputime') and locals()[field] is not None:
             fields.append((disp, locals()[field]))
     for field, disp in display_fields:
         if field in ('uptime', 'cputime') and locals()[field] is not None:
             fields.append((disp, locals()[field]))