X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-web.git/blobdiff_plain/db3da6812e1c7d7855a2e53c0e3d153e84dcff79..c5a49472aecdf0577bbf728828e509e84169c71c:/code/templates/list.tmpl

diff --git a/code/templates/list.tmpl b/code/templates/list.tmpl
index b696321..e1d66c4 100644
--- a/code/templates/list.tmpl
+++ b/code/templates/list.tmpl
@@ -25,7 +25,7 @@ VM List
 #end filter
 	<tr>
 	  <td>Name</td>
-	  <td><input type="text" name="name" value="$defaults.name"/></td>
+	  <td><input type="text" name="name" value="$defaults.name"/>.${config.dns.domains[0]}</td>
 	</tr>
 #filter None
 $errorRow('name', $err)
@@ -66,20 +66,10 @@ $vmTypeList($defaults.type)
 #filter None
 $errorRow('vmtype', $err)
 #end filter
-        <tr>
-          <td>Clone image?</td>
-#if $can_clone
-          <td><input type="checkbox" name="clone_from" id="clone_from" value="ice3" onchange="onclone(event)"/>
-              (experimental; 1-2 minutes, and you have an etch machine; root pw is 'password'.)
-              <script type='text/javascript'>function onclone(e){ document.getElementById('cdromlist').value = ''; }</script></td>
-#else
-	  <td><input type="checkbox" name="clone_from" id="clone_from" value="ice3" disabled="disabled"/> Image cloning is currently disabled for maintenance</td>
-#end if
-        </tr>
 #filter None
 $errorRow('autoinstall', $err)
 #end filter
-	<!--<tr>
+	<tr>
 	  <td>Autoinstall#slurp
 #filter None
 $helppopup('Autoinstall')#slurp
@@ -88,10 +78,10 @@ $helppopup('Autoinstall')#slurp
 	  <td><input type="radio" name="cd_or_auto" id="cd_or_auto_auto">
 #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'.)
+	      (experimental; 1-2 minutes, and you have a machine with empty root password.)
 #end filter
 	  </input>
-	</tr>-->
+	</tr>
 	<tr>
 	  <td>Boot CD</td>
 	  <td><input type="radio" name="cd_or_auto" id="cd_or_auto_cd" checked>
@@ -111,7 +101,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
@@ -123,7 +117,9 @@ $errorRow('cdrom', $err)
 	    <input type="hidden" name="back" value="list"/>
 	    <input type="hidden" name="machine_id"
 		   value="$machine.machine_id"/>
-<input type="submit" class="button" name="action" value="#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'
 "/>
 	  </form>
@@ -195,7 +191,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="/static/about.html">What is XVM?</a></p>
 #if not $machines
 <p>You don't currently control any VMs.</p>   
 #end if