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

diff --git a/code/templates/info.mako b/code/templates/info.mako
index 9628e70..5423f3d 100644
--- a/code/templates/info.mako
+++ b/code/templates/info.mako
@@ -11,12 +11,12 @@ Info on ${machine.name}
   % 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>
-% if on:
- % if 'monitoring' in config and len(config.monitoring) and 'baseuri' in config.monitoring[0]:
-  <img src="${config.monitoring[0].baseuri}usage.cgi?type=cpu;uuid=${machine.uuid}" alt="Domain CPU usage" />
- % endif
-% endif
 </%def>
 
 <%def name="commands()">
@@ -50,7 +50,7 @@ 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 (\\\'" + machine.name + "\\\')?');\"")}
   </div>
 </%def>