X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-web.git/blobdiff_plain/a9679b94c0821c37b6fecabfc8839b0da9453157..refs/heads/andersk:/code/templates/info.mako?ds=inline

diff --git a/code/templates/info.mako b/code/templates/info.mako
index 5423f3d..8ceb715 100644
--- a/code/templates/info.mako
+++ b/code/templates/info.mako
@@ -5,6 +5,12 @@
 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>
@@ -14,6 +20,7 @@ Info on ${machine.name}
   % 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>
+    <tr><td>Network history:</td><td><img src="${config.monitoring[0].baseuri}usage.cgi?type=net;uuid=${machine.uuid}" alt="Domain network usage" /></td></tr>
    % endif
   % endif
 </table>
@@ -50,7 +57,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 (\\\'" + machine.name + "\\\')?');\"")}
+  ${command_button("Delete VM", "delete", extra='''onclick="return confirm('Are you sure that you want to delete this VM (\\\'%s\\\')?');"''' % (machine.name))}
   </div>
 </%def>