X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-web.git/blobdiff_plain/14f651c500c554436376dd5d10450703478669b6..8f7f618a72a975abf592788212301fc315c21d55:/code/templates/list.tmpl

diff --git a/code/templates/list.tmpl b/code/templates/list.tmpl
index e9200dd..8a0231e 100644
--- a/code/templates/list.tmpl
+++ b/code/templates/list.tmpl
@@ -1,4 +1,5 @@
 #from skeleton import skeleton
+#from invirt.config import structs as config
 #extends skeleton
 #import datetime
 
@@ -25,7 +26,7 @@ VM List
 #end filter
 	<tr>
 	  <td>Name</td>
-	  <td><input type="text" name="name" value="$defaults.name"/>.xvm.mit.edu</td>
+	  <td><input type="text" name="name" value="$defaults.name"/>.${config.dns.domains[0]}</td>
 	</tr>
 #filter None
 $errorRow('name', $err)
@@ -72,21 +73,23 @@ $errorRow('autoinstall', $err)
 	<tr>
 	  <td>Autoinstall#slurp
 #filter None
-$helppopup('Autoinstall')#slurp
+$helppopup('Autoinstalls')#slurp
 #end filter
 </td>
-	  <td><input type="radio" name="cd_or_auto" id="cd_or_auto_auto">
+	  <td><input type="radio" name="cd_or_auto" id="cd_or_auto_auto"
+                 onchange="\$('cdromlist').value = ''; \$('vmtype-linux').checked = true">
 #filter None
-$autoList($defaults.cdrom, "document.getElementById('cd_or_auto_auto').checked = true;document.getElementById('cdromlist').value = ''")
-	      (experimental; 1-2 minutes, and you have a machine; root pw is 'password'.)
+$autoList($defaults.cdrom, "$('cd_or_auto_auto').checked = true;$('cdromlist').value = '';$('vmtype-linux').checked = true")
+	      (experimental; 2-3 minutes, and you have a machine with empty root password.)
 #end filter
 	  </input>
 	</tr>
 	<tr>
 	  <td>Boot CD</td>
-	  <td><input type="radio" name="cd_or_auto" id="cd_or_auto_cd" checked>
+	  <td><input type="radio" name="cd_or_auto" id="cd_or_auto_cd" checked="checked"
+                onchange="\$('autoinstalllist').value = ''; \$('vmtype-linux-hvm').checked = true">
 #filter None
-$cdromList($defaults.cdrom, "document.getElementById('cd_or_auto_cd').checked = true;document.getElementById('autoinstalllist').value = ''")
+$cdromList($defaults.cdrom, "$('cd_or_auto_cd').checked = true;$('autoinstalllist').value = '';$('vmtype-linux-hvm').checked = true")
 #end filter
 </td>
 	  </input>
@@ -101,7 +104,11 @@ $errorRow('cdrom', $err)
 	$errorRow('owner', $err)
 #end filter
       </table>
-      <input type="submit" class="button" value="Create it!"/>
+      <input type="submit" class="button" value="Create it!"/><br />
+      Windows notes: #slurp
+#filter None
+$helppopup('Windows')#slurp
+#end filter
     </form>
 #end if
 #end def
@@ -113,13 +120,15 @@ $errorRow('cdrom', $err)
 	    <input type="hidden" name="back" value="list"/>
 	    <input type="hidden" name="machine_id"
 		   value="$machine.machine_id"/>
-<input type="image" class="power #slurp
+<input type="submit" class="power #slurp
 #if $machine.uptime then 'on' else 'off'
 " name="action" value="#slurp
 #if $machine.uptime then 'Power off' else 'Power on'
-" src="#slurp
-#if $machine.uptime then 'static/power_button_on.png' else 'static/power_button_off.png'
-"/>
+"#slurp
+#if $machine.uptime
+ onclick="return confirm('Are you sure you want to power off this VM?');"
+#end if
+/>
 	  </form>
 	</td>
 	<td><a href="info?machine_id=$machine.machine_id">$machine.name</a></td>
@@ -189,7 +198,7 @@ $helppopup('Administrator')#slurp
 
 
 #def body
-<p style="font-size: 125%;">SIPB Virtual Servers is an <strong>alpha service</strong>.  <a href="/static/about.html">What does this mean?</a></p>
+<p style="font-size: 125%;"><a href="http://${config.web.hostname}">What is XVM?</a></p>
 #if not $machines
 <p>You don't currently control any VMs.</p>   
 #end if