X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-web.git/blobdiff_plain/61154617919ca57b6f1d4bed02aa9847ef14232a..c8d4c0b540095113a4c605b445536050791ba7c9:/code/templates/info.tmpl

diff --git a/code/templates/info.tmpl b/code/templates/info.tmpl
index e5eb5eb..d872fce 100644
--- a/code/templates/info.tmpl
+++ b/code/templates/info.tmpl
@@ -6,7 +6,7 @@ Info on $machine.name
 #end def
 
 #def infoTable()
-<p>Info on ${machine.name}:</p>
+<h2>Info</h2>
 <table>
   #for $key, $value in $fields
   <tr><td>$key:</td><td>$value</td></tr>
@@ -15,37 +15,38 @@ 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>
-	#if $on
-	#if $has_vnc
-	<a href="vnc?machine_id=$machine.machine_id">Console</a>
-	#else
-	VNC is not enabled
-	#end if
-	#else
-
-	#end if
-    </td></tr>
-      <tr>
+  <div>
 	#if $on
-	<td><input type="submit" class="button" name="action" value="Power off"/></td>
-	<td><input type="submit" class="button" name="action" value="Shutdown"/></td>
-	<td><input type="submit" class="button" name="action" value="Reboot"/></td>
+	<button type="submit" class="button" name="action" value="Power off">Power off (hard)</button>
+	<button type="submit" class="button" name="action" value="Shutdown">Shut down</button>
+	<input type="submit" class="button" name="action" value="Reboot"/>
 	#else
-	<td><input type="submit" class="button" name="action" value="Power on"/></td>
+	<input type="submit" class="button" name="action" value="Power on"/>
 	#end if
-      <td>Boot CD:</td>
-      <td>$cdromList($cdroms)</td>
-  </tr>
-    <tr>
-      <td><input type="submit" class="button" name="action" value="Delete VM" onclick="return confirm('Are you sure that you want to delete this VM?');"/></td>
-    </tr>
-  </table>
+  </div>
+  <div>
+    Boot CD:
+#filter None
+$cdromList()#slurp
+#end filter
+  </div>
+  <div>
+      <input type="submit" class="button" name="action" value="Delete VM" onclick="return confirm('Are you sure that you want to delete this VM?');"/>
+  </div>
 </form>
 #end def
 
@@ -58,27 +59,61 @@ Info on $machine.name
 #if $on
 (To edit ram, disk size, or machine name, turn off the machine first.)
 #end if
-</p>
 <form action="modify" method="POST">
   <input type="hidden" name="machine_id" value="$defaults.machine_id"/>
   <table>
-    <tr><td>Owner${helppopup("owner")}:</td><td><input type="text" name="owner", value="$defaults.owner"/></td></tr>
+    <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
+#end filter
+:</td><td><input type="text" name="owner", value="$defaults.owner"/></td></tr>
+#filter None
 $errorRow('owner', $err)
-    <tr><td>Administrator${helppopup("administrator")}:</td><td><input type="text" name="administrator", value="$defaults.administrator"/></td></tr>
+#end filter
+    <tr><td>Administrator#slurp
+#filter None
+$helppopup("Administrator")#slurp
+#end filter
+:</td><td><input type="text" name="admin", value="$defaults.administrator"/></td></tr>
+#filter None
 $errorRow('administrator', $err)
+#end filter
     <tr><td>Contact email:</td><td><input type="text" name="contact" value="$defaults.contact"/></td></tr>
+#filter None
 $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
+    <tr>
+      <td>HVM/ParaVM#slurp
+#filter None
+$helppopup('HVM/ParaVM')#slurp
+#end filter
+</td>
+      <td>#slurp
+#filter None
+$vmTypeList($defaults.type)#slurp
+#end filter
+</td>
+    </tr>
     <tr><td>Ram:</td><td><input type="text" size=3 name="memory" value="$defaults.memory"/>MiB (max $max_mem)</td></tr>
+#filter None
 $errorRow('memory', $err)
-    <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>
+#end filter
+    <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
 #else
+#filter None
 $errorRow('name', $err)
 $errorRow('memory', $err)
 $errorRow('disk', $err)
+#end filter
 #end if
     <tr><td><input type="submit" class="button" name="action" value="Change"/></td></tr>
   </table>
@@ -87,15 +122,21 @@ $errorRow('disk', $err)
 
 #def body
 <div id="info">
+#filter None
   $infoTable()
+#end filter
 </div>
 
-<p>Commands:</p>
+<h2>Commands</h2>
 <div id="commands">
+#filter None
   $commands()
+#end filter
 </div>
-<p>Change settings:
+<h2>Settings</h2>
 <div id="modify">
+#filter None
   $modifyForm()
+#end filter
 </div>
 #end def