use wildcard for config.web.errormail_exclude

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

diff --git a/code/templates/info.tmpl b/code/templates/info.tmpl
index 91a2c3b..9346129 100644 (file)
--- a/code/templates/info.tmpl
+++ b/code/templates/info.tmpl
@@ -65,9 +65,10 @@ $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
+$helppopup("Owner")#slurp
 #end filter
 :</td><td><input type="text" name="owner", value="$defaults.owner"/></td></tr>
 #filter None
@@ -75,9 +76,9 @@ $errorRow('owner', $err)
 #end filter
     <tr><td>Administrator#slurp
 #filter None
-$helppopup("administrator")#slurp
+$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,14 +87,14 @@ $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
     <tr>
       <td>HVM/ParaVM#slurp
 #filter None
-$helppopup('hvm_paravm')#slurp
+$helppopup('HVM/ParaVM')#slurp
 #end filter
 </td>
       <td>#slurp
@@ -106,7 +107,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