X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-web.git/blobdiff_plain/2dee827ad9edd2f7521ac10f62c72956df918e7d..51436d938c9a10d3899f19fd6d6755108333a1ec:/templates/info.tmpl

diff --git a/templates/info.tmpl b/templates/info.tmpl
index ca7d107..6ac0227 100644
--- a/templates/info.tmpl
+++ b/templates/info.tmpl
@@ -56,21 +56,20 @@ Info on $machine.name
 </form>
 <p>Change settings:
 #if $on
-(To edit ram and disk size, turn off the machine first.)
+(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="$machine.machine_id"/>
   <table>
-    <tr><td>Owner:</td><td><input type="text" name="owner", value="$machine.owner"/></td>
-	<td>NOTE: The Owner must the name of a locker that you administer</td></tr>
+    <tr><td>Owner${helppopup("owner")}:</td><td><input type="text" name="owner", value="$machine.owner"/></td></tr>
+    <tr><td>Administrator${helppopup("administrator")}:</td><td><input type="text" name="administrator", value="$machine.administrator"/></td></tr>
     <tr><td>Contact email:</td><td><input type="text" name="contact" value="$machine.contact"/></td></tr>
-    <tr><td>Machine Name:</td><td><input type="text" name="name" value="$machine.name"/></td></tr>
 #if $machine.nics
-    <tr><td>Hostname:</td><td><input type="text" name="hostname" value="$machine.nics[0].hostname"/>.servers.csail.mit.edu</td>
-	<td>NOTE: The hostname must being with "Owner_".</td></tr>
+    <tr><td>Hostname:</td><td><input type="text" name="hostname" value="$machine.nics[0].hostname"/>.servers.csail.mit.edu</td></tr>
 #end if
 #if not $on
+    <tr><td>Machine Name:</td><td><input type="text" name="name" value="$machine.name"/></td></tr>
     <tr><td>Ram:</td><td><input type="text" size=3 name="memory" value="$machine.memory"/>MB (max $max_mem)</td></tr>
     <tr><td>Disk:</td><td><input type="text" size=3 name="disk" value="${machine.disks[0].size/1024.}"/>GB (max $max_disk)</td><td>WARNING: Modifying disk size may corrupt your data.</td></tr>
 #end if