Upgrade info page to Mako, and use REST-style URLs.

[invirt/packages/invirt-web.git] / code / templates / list.mako

diff --git a/code/templates/list.mako b/code/templates/list.mako
index 71a8943..e500896 100644 (file)
--- a/code/templates/list.mako
+++ b/code/templates/list.mako
@@ -1,7 +1,6 @@
 <%page expression_filter="h"/>
 <%inherit file="skeleton.mako" />
 <%!
-       from invirt.config import structs as config
        import datetime
 %>
 
@@ -96,7 +95,7 @@ ${self.fn.cdromList(defaults.cdrom, "$('cd_or_auto_cd').checked = true;$('autoin
 />
          </form>
        </td>
-       <td><a href="info?machine_id=${machine.machine_id}">${machine.name}</a></td>
+       <td><a href="machine/${machine.machine_id}">${machine.name}</a></td>
        <td>${machine.memory}M</td>
        <td>${machine.owner}</td>
        <td>${machine.administrator}</td>
@@ -112,7 +111,9 @@ ${datetime.timedelta(seconds=int(machine.uptime))}\
 </td>
        <td>\
 % if has_vnc[machine] == True:
-<a href="vnc?machine_id=${machine.machine_id}">Console</a>\
+<a href="machine/${machine.machine_id}/vnc">Console</a>\
+% elif has_vnc[machine] == 'ParaVM':
+ParaVM${self.fn.helppopup("ParaVM Console")}
 % elif has_vnc[machine] != 'Off':
 ${has_vnc[machine]}
 % endif