Fixes for queries on cherrypy compat

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

diff --git a/code/templates/info.mako b/code/templates/info.mako
index 9628e70..e83fef1 100644 (file)
--- 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 (\\\'%s\\\')?');"''' % (machine.name))}
   </div>
 </%def>