Update focus rules to failback in safari

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

diff --git a/code/templates/info.mako b/code/templates/info.mako
index b98e7c2..cd74458 100644 (file)
--- a/code/templates/info.mako
+++ b/code/templates/info.mako
@@ -17,18 +17,18 @@ Info on ${machine.name}
 <%def name="commands()">
 % if on:
  % if not machine.type.hvm:
 <%def name="commands()">
 % if on:
  % if not machine.type.hvm:

-  Console access: type
+  Console access: <a href="machine/${machine.machine_id}/terminal">Web Terminal</a> or type

   <tt>ssh ${machine.name}@${config.console.hostname}</tt>
   on Athena. <a href="https://xvm.scripts.mit.edu/wiki/SerialConsole">(more info)</a>
  % elif has_vnc:
   <tt>ssh ${machine.name}@${config.console.hostname}</tt>
   on Athena. <a href="https://xvm.scripts.mit.edu/wiki/SerialConsole">(more info)</a>
  % elif has_vnc:

-  <strong><a href="machine/${machine.machine_id}/vnc">Get Console</a></strong>
+  <strong><a href="machine/${machine.machine_id}/vnc">Get Console</a> or <a href="machine/${machine.machine_id}/terminal">Web Terminal</a></strong>

  % else:
   VNC console not enabled; still booting?
  % endif
 % endif
 <%def name="command_button(title, value, cdrom=False, extra='')">
 <form action="machine/${machine.machine_id}/command/${value}" method="POST">
  % else:
   VNC console not enabled; still booting?
  % endif
 % endif
 <%def name="command_button(title, value, cdrom=False, extra='')">
 <form action="machine/${machine.machine_id}/command/${value}" method="POST">

-  <input type="hidden" name="back" value="machine/${machine.machine_id}/info" />
+  <input type="hidden" name="back" value="info" />

   <input type="submit" class="button" name="action" value="${title}" ${extra | n}/>
 % if cdrom:
   Boot CD: ${self.fn.cdromList()}
   <input type="submit" class="button" name="action" value="${title}" ${extra | n}/>
 % if cdrom:
   Boot CD: ${self.fn.cdromList()}

@@ -59,8 +59,7 @@ Info on ${machine.name}
 % if on:
 (To edit ram, disk size, or machine name, turn off the machine first.)
 % endif
 % if on:
 (To edit ram, disk size, or machine name, turn off the machine first.)
 % endif

-<form action="modify" method="POST">
-  <input type="hidden" name="machine_id" value="${defaults.machine_id}"/>
+<form action="machine/${machine.machine_id}/modify" method="POST">

   <table>
     <tr><td>Description:</td><td colspan="2"><textarea name="description" rows="4" cols="60">${defaults.description}</textarea></td></tr>
     <tr><td>Owner${self.fn.helppopup("Owner")}:</td><td><input type="text" name="owner", value="${defaults.owner}"/></td></tr>
   <table>
     <tr><td>Description:</td><td colspan="2"><textarea name="description" rows="4" cols="60">${defaults.description}</textarea></td></tr>
     <tr><td>Owner${self.fn.helppopup("Owner")}:</td><td><input type="text" name="owner", value="${defaults.owner}"/></td></tr>