From ab169aa6e4620964ab1565af48085f96d20037c4 Mon Sep 17 00:00:00 2001
From: Greg Price <price@mit.edu>
Date: Sat, 6 Dec 2008 01:47:28 -0500
Subject: [PATCH] web: info: move console message out of commands form table

svn path=/trunk/packages/invirt-web/; revision=1791
---
 code/templates/info.tmpl |   27 +++++++++++----------------
 1 file changed, 11 insertions(+), 16 deletions(-)

diff --git a/code/templates/info.tmpl b/code/templates/info.tmpl
index d115955..b090906 100644
--- a/code/templates/info.tmpl
+++ b/code/templates/info.tmpl
@@ -15,26 +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=100>
-	#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
-	#else
-
-	#end if
-    </td></tr>
       <tr>
 	#if $on
 	<td><button type="submit" class="button" name="action" value="Power off">Power off (hard)</button></td>
-- 
1.7.9.5