Switch to XHTML MIME type for now, fix a validation error or two.

[ccbs] / html / templates / show-tournament.tmpl

diff --git a/html/templates/show-tournament.tmpl b/html/templates/show-tournament.tmpl
index 1ae4de193498dbf5cbe701030020ca4219d9bead..c7566430271a6c0bec6bdeeb2172541e2fa0b05b 100644 (file)
--- a/html/templates/show-tournament.tmpl
+++ b/html/templates/show-tournament.tmpl
@@ -27,19 +27,19 @@
       <table>
         <tr>
           <th>Antall grupper</th>
-         <td><input name="numgroups" />
+         <td><input name="numgroups" /></td>
         </tr>
         <tr>
           <th>Antall som går videre fra hver gruppe</th>
-         <td><input name="numqual" />
+         <td><input name="numqual" /></td>
         </tr>
         <tr>
           <th>Antall tilfeldige sanger</th>
-         <td><input name="numrandom" />
+         <td><input name="numrandom" /></td>
         </tr>
         <tr>
           <th>Antall selvvalgte sanger</th>
-         <td><input name="numchosen" />
+         <td><input name="numchosen" /></td>
         </tr>
        <tr>
          <th colspan="2">
@@ -82,8 +82,12 @@
       <th>Gruppe [% p.parallel %]</th>
 [% END %]
 [% FOR s = p.songs %]
+[% IF s == '' %]
+      <th colspan="2">Selvvalgt</th>
+[% ELSE %]
       <th>[% s %]</th>
 [% END %]
+[% END %]
 [% IF p.num_songs > 1 %]
       <th>Total</th>
 [% END %]      
@@ -93,12 +97,10 @@
     <tr>
       <th>[% pl.nick %]</th>
 [% FOR s = pl.songs %]
-      <td>
-        [% s.score %]
+      <td>[% s.score %]</td>
 [% IF s.chosen %]
-        : [% s.title %]
+      <td>[% s.title %]</td>
 [% END %]
-      </td>
 [% END %]
 [% IF p.num_songs > 1 %]
      <td>[% pl.total %]</td>