Split chosen songs into two table cells.

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

diff --git a/html/templates/show-tournament.tmpl b/html/templates/show-tournament.tmpl
index 1ae4de193498dbf5cbe701030020ca4219d9bead..3dce27b495383f6b7aed5d0a80ebc5723d4cad00 100644 (file)
--- a/html/templates/show-tournament.tmpl
+++ b/html/templates/show-tournament.tmpl
@@ -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>