use wildcard for config.web.errormail_exclude

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

diff --git a/code/templates/list.tmpl b/code/templates/list.tmpl
index e9200dd..f6dc5c4 100644 (file)
--- 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"/>.xvm.mit.edu</td>
+         <td><input type="text" name="name" value="$defaults.name"/>.${config.dns.domains[0]}</td>
        </tr>
 #filter None
 $errorRow('name', $err)
@@ -78,7 +78,7 @@ $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>
@@ -101,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
@@ -113,12 +117,10 @@ $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'
 "/>
          </form>
        </td>