Changeset 2412 for package_branches

Timestamp:

Aug 9, 2009, 6:45:36 PM (15 years ago)

Author:

quentin

Message:

Remove calls to helppopup from outside templates

Location:

package_branches/invirt-web/cherrypy/code

Files:

• main.py (modified) (3 diffs)
• templates/list.mako (modified) (1 diff)

package_branches/invirt-web/cherrypy/code/main.py

@@ -300 +300 @@
                 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)
@@ -557 +557 @@
                       'DISK_INFO',
                       ('state', 'state (xen format)'),
-                      ('cpu_weight', 'CPU weight'+helppopup('CPU Weight')),
                       ]
     fields = []
@@ -611 +610 @@
              max_mem=max_mem,
              max_disk=max_disk,
-             owner_help=helppopup("Owner"),
              fields = fields)
     return d

package_branches/invirt-web/cherrypy/code/templates/list.mako

@@ -113 +113 @@
 % if has_vnc[machine] == True:
 <a href="vnc?machine_id=${machine.machine_id}">Console</a>\
+% elif has_vnc[machine] == 'ParaVM':
+ParaVM${self.fn.helppopup("ParaVM Console")}
 % elif has_vnc[machine] != 'Off':
 ${has_vnc[machine]}