Correct the incomplete fix from r1155

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

diff --git a/code/templates/list.tmpl b/code/templates/list.tmpl
index 93f7181..cf59937 100644 (file)
--- a/code/templates/list.tmpl
+++ b/code/templates/list.tmpl
@@ -1,4 +1,5 @@
 #from skeleton import skeleton
 #from skeleton import skeleton

+#from invirt.config import structs as config

 #extends skeleton
 #import datetime
 
 #extends skeleton
 #import datetime
 

@@ -25,7 +26,7 @@ VM List
 #end filter
        <tr>
          <td>Name</td>
 #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)
        </tr>
 #filter None
 $errorRow('name', $err)

@@ -72,21 +73,23 @@ $errorRow('autoinstall', $err)
        <tr>
          <td>Autoinstall#slurp
 #filter None
        <tr>
          <td>Autoinstall#slurp
 #filter None

-$helppopup('Autoinstall')#slurp
+$helppopup('Autoinstalls')#slurp

 #end filter
 </td>
 #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
 #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>
 #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
+                onchange="\$('autoinstalllist').value = ''; \$('vmtype-linux-hvm').checked = true">

 #filter None
 #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>
 #end filter
 </td>
          </input>

@@ -101,7 +104,11 @@ $errorRow('cdrom', $err)
        $errorRow('owner', $err)
 #end filter
       </table>
        $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
     </form>
 #end if
 #end def

@@ -187,7 +194,7 @@ $helppopup('Administrator')#slurp
 
 
 #def body
 
 
 #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
 #if not $machines
 <p>You don't currently control any VMs.</p>   
 #end if