X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-web.git/blobdiff_plain/e73cda9748a8726531dba4b309783dde1597549a..215d45efd45e47073a2f4238e4e3cef2dd342dc9:/code/templates/info.mako

diff --git a/code/templates/info.mako b/code/templates/info.mako
index d6a1cfb..1fb4284 100644
--- a/code/templates/info.mako
+++ b/code/templates/info.mako
@@ -5,12 +5,23 @@
 Info on ${machine.name}
 </%def>
 
+%if os.path.exists("/etc/invirt/motd.html"):
+<div class="result">
+<p class="error">${open('/etc/invirt/motd.html').read()|n}</p>
+</div>
+%endif
+
 <%def name="infoTable()">
 <h2>Info</h2>
 <table>
   % for key, value in fields:
   <tr><td>${key}:</td><td>${value}</td></tr>
   % endfor
+  % if on:
+   % if 'monitoring' in config and len(config.monitoring) and 'baseuri' in config.monitoring[0]:
+    <tr><td>CPU history:</td><td><img src="${config.monitoring[0].baseuri}usage.cgi?type=cpu;uuid=${machine.uuid}" alt="Domain CPU usage" /></td></tr>
+   % endif
+  % endif
 </table>
 </%def>
 
@@ -45,9 +56,8 @@ Info on ${machine.name}
 	% endif
   </div>
   <div>
-	${command_button("Delete VM", "delete", extra='''onclick="return confirm('Are you sure that you want to delete this VM?');"''')}
+  ${command_button("Delete VM", "delete", extra='''onclick="return confirm('Are you sure that you want to delete this VM (\\\'%s\\\')?');"''' % (machine.name))}
   </div>
-</form>
 </%def>
 
 <%def name="modifyForm()">
@@ -59,8 +69,7 @@ Info on ${machine.name}
 % 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>