Split chosen songs into two table cells.

diff --git a/html/show-tournament.pl b/html/show-tournament.pl
index b4b6e04b47d478161ecf202fbab859beb9975f11..5a98ff85436e520a8bea7dc7744375edc7009e3c 100755 (executable)
--- a/html/show-tournament.pl
+++ b/html/show-tournament.pl
@@ -39,7 +39,7 @@ for my $score (@$scores) {
        }
        if ($score->{'position'} == 1) {
                if ($score->{'chosen'}) {
        }
        if ($score->{'position'} == 1) {
                if ($score->{'chosen'}) {

-                       push @{$p->[$#$p]->{'songs'}}, 'Selvvalgt';
+                       push @{$p->[$#$p]->{'songs'}}, '';

                } else {
                        push @{$p->[$#$p]->{'songs'}}, $score->{'title'};
                }
                } else {
                        push @{$p->[$#$p]->{'songs'}}, $score->{'title'};
                }

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 %]
       <th>Gruppe [% p.parallel %]</th>
 [% END %]
 [% FOR s = p.songs %]

+[% IF s == '' %]
+      <th colspan="2">Selvvalgt</th>
+[% ELSE %]

       <th>[% s %]</th>
 [% END %]
       <th>[% s %]</th>
 [% END %]

+[% END %]

 [% IF p.num_songs > 1 %]
       <th>Total</th>
 [% END %]      
 [% IF p.num_songs > 1 %]
       <th>Total</th>
 [% END %]      


@@ -93,12 +97,10 @@
     <tr>
       <th>[% pl.nick %]</th>
 [% FOR s = pl.songs %]
     <tr>
       <th>[% pl.nick %]</th>
 [% FOR s = pl.songs %]

-      <td>
-        [% s.score %]
+      <td>[% s.score %]</td>

 [% IF s.chosen %]
 [% IF s.chosen %]

-        : [% s.title %]
+      <td>[% s.title %]</td>

 [% END %]
 [% END %]

-      </td>

 [% END %]
 [% IF p.num_songs > 1 %]
      <td>[% pl.total %]</td>
 [% END %]
 [% IF p.num_songs > 1 %]
      <td>[% pl.total %]</td>