More fixes to hanging query in cherrypy compat

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

diff --git a/code/templates/info.mako b/code/templates/info.mako
index 35e5074..e83fef1 100644 (file)
--- a/code/templates/info.mako
+++ b/code/templates/info.mako
@@ -11,6 +11,11 @@ Info on ${machine.name}
   % for key, value in fields:
   <tr><td>${key}:</td><td>${value}</td></tr>
   % endfor
   % 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>
 
 </table>
 </%def>
 

@@ -45,9 +50,8 @@ Info on ${machine.name}
        % endif
   </div>
   <div>
        % 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>
   </div>

-</form>

 </%def>
 
 <%def name="modifyForm()">
 </%def>
 
 <%def name="modifyForm()">

@@ -60,7 +64,6 @@ Info on ${machine.name}
 (To edit ram, disk size, or machine name, turn off the machine first.)
 % endif
 <form action="machine/${machine.machine_id}/modify" method="POST">
 (To edit ram, disk size, or machine name, turn off the machine first.)
 % endif
 <form action="machine/${machine.machine_id}/modify" method="POST">

-  <input type="hidden" name="machine_id" value="${defaults.machine_id}"/>

   <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>