X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-web.git/blobdiff_plain/cd40d6f384656638504b9ec67b73e446401033a8..880cccfcec2b9d02c9f1021aff834ca7b2af0b39:/code/templates/info.tmpl diff --git a/code/templates/info.tmpl b/code/templates/info.tmpl index 64b9445..b090906 100644 --- a/code/templates/info.tmpl +++ b/code/templates/info.tmpl @@ -15,22 +15,21 @@ Info on $machine.name #end def #def commands() +#if $on + #if not $machine.type.hvm + Console access: type + <tt>ssh $machine.name@$config.console.hostname</tt> + on Athena. <a href="https://xvm.scripts.mit.edu/wiki/SerialConsole">(more info)</a> + #elif $has_vnc + <strong><a href="vnc?machine_id=$machine.machine_id">Get Console</a></strong> + #else + VNC console not enabled; still booting? + #end if +#end if <form action="command" method="POST"> <input type="hidden" name="back" value="info"/> <input type="hidden" name="machine_id" value="$machine.machine_id"/> <table> - - <tr><td colspan=3> - #if $on - #if $has_vnc - <strong><a href="vnc?machine_id=$machine.machine_id">Get Console</a></strong> - #else - VNC console not enabled; still booting? - #end if - #else - - #end if - </td></tr> <tr> #if $on <td><button type="submit" class="button" name="action" value="Power off">Power off (hard)</button></td> @@ -65,6 +64,7 @@ $cdromList()#slurp <form action="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#slurp #filter None $helppopup("Owner")#slurp @@ -77,7 +77,7 @@ $errorRow('owner', $err) #filter None $helppopup("Administrator")#slurp #end filter -:</td><td><input type="text" name="administrator", value="$defaults.administrator"/></td></tr> +:</td><td><input type="text" name="admin", value="$defaults.administrator"/></td></tr> #filter None $errorRow('administrator', $err) #end filter @@ -86,7 +86,7 @@ $errorRow('administrator', $err) $errorRow('contact', $err) #end filter #if not $on - <tr><td>Machine Name:</td><td><input type="text" name="name" value="$defaults.name"/></td></tr> + <tr><td>Machine Name:</td><td><input type="text" name="name" value="$defaults.name"/>.${config.dns.domains[0]}</td></tr> #filter None $errorRow('name', $err) #end filter @@ -106,7 +106,7 @@ $vmTypeList($defaults.type)#slurp #filter None $errorRow('memory', $err) #end filter - <tr><td>Disk:</td><td><input type="text" size=3 name="disk" value="$defaults.disk"/>GiB (max $max_disk)</td><td>WARNING: Modifying disk size may corrupt your data.</td></tr> + <tr><td>Disk:</td><td><input type="text" size=3 name="disksize" value="$defaults.disk"/>GiB (max $max_disk)</td><td>WARNING: Modifying disk size may corrupt your data.</td></tr> #filter None $errorRow('disk', $err) #end filter