Link to the web terminal page from the VM list for paravms

svn path=/package_branches/invirt-web/ajaxterm-rebased/; revision=2755

diff --git a/code/templates/list.mako b/code/templates/list.mako
index d513763..7718bed 100644 (file)
--- a/code/templates/list.mako
+++ b/code/templates/list.mako
@@ -117,7 +117,7 @@ ${datetime.timedelta(seconds=int(machine.uptime))}\
 % if has_vnc[machine] == True:
 <a href="machine/${machine.machine_id}/vnc">Console</a>\
 % elif has_vnc[machine] == 'ParaVM':
 % if has_vnc[machine] == True:
 <a href="machine/${machine.machine_id}/vnc">Console</a>\
 % elif has_vnc[machine] == 'ParaVM':

-ParaVM${self.fn.helppopup("ParaVM Console")}
+<a href="machine/${machine.machine_id}/terminal">Terminal</a>\

 % elif has_vnc[machine] != 'Off':
 ${has_vnc[machine]}
 % endif
 % elif has_vnc[machine] != 'Off':
 ${has_vnc[machine]}
 % endif

@@ -138,7 +138,7 @@ ${has_vnc[machine]}
         <th>Administrator${self.fn.helppopup('Administrator')}</th>
        <th>IP</th>
        <th>Uptime</th>
         <th>Administrator${self.fn.helppopup('Administrator')}</th>
        <th>IP</th>
        <th>Uptime</th>

-       <th>VNC</th>
+       <th>Console</th>

       </tr>
 % for machine in machines:
        ${machineRow(machine)}
       </tr>
 % for machine in machines:
        ${machineRow(machine)}