Now ignore negative rights, rather than treat them as positive.

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

diff --git a/templates/info.tmpl b/templates/info.tmpl
index 29b5907..c0ff1ff 100644 (file)
--- a/templates/info.tmpl
+++ b/templates/info.tmpl
@@ -15,18 +15,8 @@ Info on $machine.name
 #end def
 
 #def commands()
 #end def
 
 #def commands()

-<script>
-function commandButton(elt, action){
-  form = elt.up('', 4);
-  cdrom = Form.serialize(form, true).cdrom;
-  new Ajax.Request('command', {method: 'post', 
-  parameters: 'machine_id=$machine.machine_id&js=info&cdrom='+cdrom+'&action='+action,
-  onSuccess: replaceFunc
-  });
-  return false;
-}
-</script>

 <form action="command" action="POST">
 <form action="command" action="POST">

+  <input type="hidden" name="back" value="info"/>

   <input type="hidden" name="machine_id" value="$machine.machine_id"/>
   <table>
     
   <input type="hidden" name="machine_id" value="$machine.machine_id"/>
   <table>
     

@@ -43,11 +33,11 @@ function commandButton(elt, action){
     </td></tr>
       <tr>
        #if $on
     </td></tr>
       <tr>
        #if $on

-       <td><input type="submit" class="button" name="action" value="Power off" onclick="return commandButton(this, 'Power off');"/></td>
-       <td><input type="submit" class="button" name="action" value="Shutdown" onclick="return commandButton(this, 'Shutdown');"/></td>
-       <td><input type="submit" class="button" name="action" value="Reboot" onclick="return commandButton(this, 'Reboot');"/></td>
+       <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>

        #else
        #else

-       <td><input type="submit" class="button" name="action" value="Power on" onclick="return commandButton(this, 'Power on');"/></td>
+       <td><input type="submit" class="button" name="action" value="Power on"/></td>

        #end if
       <td>Boot CD:</td>
       <td>$cdromList($cdroms)</td>
        #end if
       <td>Boot CD:</td>
       <td>$cdromList($cdroms)</td>

@@ -69,7 +59,7 @@ function commandButton(elt, action){
 (To edit ram, disk size, or machine name, turn off the machine first.)
 #end if
 </p>
 (To edit ram, disk size, or machine name, turn off the machine first.)
 #end if
 </p>

-<form action="modify" method="POST" onsubmit="return jsFormSubmit('modify', this);">
+<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>
   <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>

@@ -78,16 +68,12 @@ $errorRow('owner', $err)
 $errorRow('administrator', $err)
     <tr><td>Contact email:</td><td><input type="text" name="contact" value="$defaults.contact"/></td></tr>
 $errorRow('contact', $err)
 $errorRow('administrator', $err)
     <tr><td>Contact email:</td><td><input type="text" name="contact" value="$defaults.contact"/></td></tr>
 $errorRow('contact', $err)

-#if $machine.nics
-    <tr><td>Hostname:</td><td><input type="text" name="hostname" value="$defaults.hostname"/>.servers.csail.mit.edu</td></tr>
-#end if
-$errorRow('hostname', $err)

 #if not $on
     <tr><td>Machine Name:</td><td><input type="text" name="name" value="$defaults.name"/></td></tr>
 $errorRow('name', $err)
 #if not $on
     <tr><td>Machine Name:</td><td><input type="text" name="name" value="$defaults.name"/></td></tr>
 $errorRow('name', $err)

-    <tr><td>Ram:</td><td><input type="text" size=3 name="memory" value="$defaults.memory"/>MB (max $max_mem)</td></tr>
+    <tr><td>Ram:</td><td><input type="text" size=3 name="memory" value="$defaults.memory"/>MiB (max $max_mem)</td></tr>

 $errorRow('memory', $err)
 $errorRow('memory', $err)

-    <tr><td>Disk:</td><td><input type="text" size=3 name="disk" value="$defaults.disk"/>GB (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="disk" value="$defaults.disk"/>GiB (max $max_disk)</td><td>WARNING: Modifying disk size may corrupt your data.</td></tr>

 $errorRow('disk', $err)
 #else
 $errorRow('name', $err)
 $errorRow('disk', $err)
 #else
 $errorRow('name', $err)