Remove calls to helppopup from outside templates

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

diff --git a/code/main.py b/code/main.py
index 656c209..222520c 100755 (executable)
--- a/code/main.py
+++ b/code/main.py
@@ -315,7 +315,7 @@ def getListDict(username, state):
             elif m.type.hvm:
                 has_vnc[m] = "WTF?"
             else:
             elif m.type.hvm:
                 has_vnc[m] = "WTF?"
             else:

-                has_vnc[m] = "ParaVM"+helppopup("ParaVM Console")
+                has_vnc[m] = "ParaVM"

     max_memory = validation.maxMemory(username, state)
     max_disk = validation.maxDisk(username)
     checkpoint.checkpoint('Got max mem/disk')
     max_memory = validation.maxMemory(username, state)
     max_disk = validation.maxDisk(username)
     checkpoint.checkpoint('Got max mem/disk')

@@ -572,7 +572,6 @@ def infoDict(username, state, machine):
                       ('memory', 'RAM'),
                       'DISK_INFO',
                       ('state', 'state (xen format)'),
                       ('memory', 'RAM'),
                       'DISK_INFO',
                       ('state', 'state (xen format)'),

-                      ('cpu_weight', 'CPU weight'+helppopup('CPU Weight')),

                       ]
     fields = []
     machine_info = {}
                       ]
     fields = []
     machine_info = {}

@@ -626,7 +625,6 @@ def infoDict(username, state, machine):
              ram=machine.memory,
              max_mem=max_mem,
              max_disk=max_disk,
              ram=machine.memory,
              max_mem=max_mem,
              max_disk=max_disk,

-             owner_help=helppopup("Owner"),

              fields = fields)
     return d
 
              fields = fields)
     return d