From: Steinar H. Gunderson <sesse@samfundet.no>
Date: Mon, 14 Feb 2005 22:15:04 +0000 (+0000)
Subject: Split chosen songs into two table cells.
X-Git-Url: https://git.sesse.net/?p=ccbs;a=commitdiff_plain;h=36e1563a700fa4a2a13bc265e054a657f512e141

Split chosen songs into two table cells.
---

diff --git a/html/show-tournament.pl b/html/show-tournament.pl
index b4b6e04..5a98ff8 100755
--- 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'}) {
-			push @{$p->[$#$p]->{'songs'}}, 'Selvvalgt';
+			push @{$p->[$#$p]->{'songs'}}, '';
 		} else {
 			push @{$p->[$#$p]->{'songs'}}, $score->{'title'};
 		}
diff --git a/html/templates/show-tournament.tmpl b/html/templates/show-tournament.tmpl
index 1ae4de1..3dce27b 100644
--- 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>