Don't show renumber button for 'renumber' other_action

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

diff --git a/code/templates/info.mako b/code/templates/info.mako
index d6a1cfb..7bec8fd 100644 (file)
--- a/code/templates/info.mako
+++ b/code/templates/info.mako
@@ -5,12 +5,24 @@
 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>
+    <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>
 </%def>
 
@@ -35,6 +47,16 @@ Info on ${machine.name}
 % endif
 </form>
 </%def>
+  % if renumber:
+  <div>
+  <p>This machine's IP address is slated to be changed. Your machine's new IP address, netmask, and gateway are shown above. Please configure your machine for DHCP or update the machine's configuration and then press this button:</p>
+    % if on:
+    ${command_button("Power cycle and renumber", "renumber", extra='''onclick="return confirm('Are you sure that you want to power this VM off and on again?');"''')}
+    % else:
+    ${command_button("Renumber", "renumber")}
+    % endif
+  </div>
+  % endif
   <div>
        % if on:
        ${command_button("Power off", "destroy")}
@@ -45,9 +67,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 +80,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>