Ignore:
Timestamp:
Aug 9, 2009, 6:45:36 PM (15 years ago)
Author:
quentin
Message:

Move machine-related pages into a REST-style URL.

Location:
package_branches/invirt-web/cherrypy/code/templates
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • package_branches/invirt-web/cherrypy/code/templates/info.mako

    r2411 r2413  
    2222  on Athena. <a href="https://xvm.scripts.mit.edu/wiki/SerialConsole">(more info)</a>
    2323 % elif has_vnc:
    24   <strong><a href="vnc?machine_id=${machine.machine_id}">Get Console</a></strong>
     24  <strong><a href="machine/${machine.machine_id}/vnc">Get Console</a></strong>
    2525 % else:
    2626  VNC console not enabled; still booting?

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

    r2412 r2413  
    9696          </form>
    9797        </td>
    98         <td><a href="info?machine_id=${machine.machine_id}">${machine.name}</a></td>
     98        <td><a href="machine/${machine.machine_id}">${machine.name}</a></td>
    9999        <td>${machine.memory}M</td>
    100100        <td>${machine.owner}</td>
    … …  
    112112        <td>\
    113113% if has_vnc[machine] == True:
    114 <a href="vnc?machine_id=${machine.machine_id}">Console</a>\
     114<a href="machine/${machine.machine_id}/vnc">Console</a>\
    115115% elif has_vnc[machine] == 'ParaVM':
    116116ParaVM${self.fn.helppopup("ParaVM Console")}

  • package_branches/invirt-web/cherrypy/code/templates/skeleton.mako

    r2410 r2413  
    66<html>
    77<head><title>${self.title()} &mdash; XVM</title>
     8  <base href="${cherrypy.request.base}" />
    89  <link href="static/favicon.ico" type="image/x-icon" rel="shortcut icon">
    910  <link rel="stylesheet" href="static/style.css" type="text/css" />
    … …  
    5455<li><a href="list">List</a></li>
    5556% if machine:
    56 <li><a href="info?machine_id=${machine.machine_id}">Info</a></li>
    57 <li><a href="vnc?machine_id=${machine.machine_id}">Console</a></li>
     57<li><a href="machine/${machine.machine_id}">Info</a></li>
     58<li><a href="machine/${machine.machine_id}/vnc">Console</a></li>
    5859% endif
    5960<li><a href="help">Help</a></li>
Note: See TracChangeset for help on using the changeset viewer.