Get username from cherrypy request object

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

diff --git a/code/templates/info.tmpl b/code/templates/info.tmpl
index 64b9445..d872fce 100644 (file)
--- a/code/templates/info.tmpl
+++ b/code/templates/info.tmpl
@@ -15,41 +15,38 @@ Info on $machine.name
 #end def
 
 #def commands()
 #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"/>
 <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>
+  <div>

        #if $on
        #if $on

-       <td><button type="submit" class="button" name="action" value="Power off">Power off (hard)</button></td>
-       <td><button type="submit" class="button" name="action" value="Shutdown">Shut down</button></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
        #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
        #end if

-      <td>Boot CD:</td>
-      <td>#slurp
+  </div>
+  <div>
+    Boot CD:

 #filter None
 $cdromList()#slurp
 #end filter
 #filter None
 $cdromList()#slurp
 #end filter

-</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>
+      <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
 
 </form>
 #end def
 

@@ -65,6 +62,7 @@ $cdromList()#slurp
 <form action="modify" method="POST">
   <input type="hidden" name="machine_id" value="$defaults.machine_id"/>
   <table>
 <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
     <tr><td>Owner#slurp
 #filter None
 $helppopup("Owner")#slurp

@@ -77,7 +75,7 @@ $errorRow('owner', $err)
 #filter None
 $helppopup("Administrator")#slurp
 #end filter
 #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
 #filter None
 $errorRow('administrator', $err)
 #end filter

@@ -86,7 +84,7 @@ $errorRow('administrator', $err)
 $errorRow('contact', $err)
 #end filter
 #if not $on
 $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
 #filter None
 $errorRow('name', $err)
 #end filter

@@ -106,7 +104,7 @@ $vmTypeList($defaults.type)#slurp
 #filter None
 $errorRow('memory', $err)
 #end filter
 #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
 #filter None
 $errorRow('disk', $err)
 #end filter