X-Git-Url: https://git.sesse.net/?p=ccbs;a=blobdiff_plain;f=html%2Ftemplates%2Fshow-tournament.tmpl;h=3dce27b495383f6b7aed5d0a80ebc5723d4cad00;hp=fac6ed0a42557ed8a1d1a904e6526ee7a1fdcc6f;hb=36e1563a700fa4a2a13bc265e054a657f512e141;hpb=22b4ad6760e9b0a21f799fa27af0c1be0d12c029

diff --git a/html/templates/show-tournament.tmpl b/html/templates/show-tournament.tmpl
index fac6ed0..3dce27b 100644
--- a/html/templates/show-tournament.tmpl
+++ b/html/templates/show-tournament.tmpl
@@ -33,8 +33,18 @@
           <th>Antall som går videre fra hver gruppe</th>
   	  <td><input name="numqual" />
         </tr>
+        <tr>
+          <th>Antall tilfeldige sanger</th>
+  	  <td><input name="numrandom" />
+        </tr>
+        <tr>
+          <th>Antall selvvalgte sanger</th>
+  	  <td><input name="numchosen" />
+        </tr>
 	<tr>
 	  <th colspan="2">
+	    <input type="hidden" name="tournament" value="[% tournament.tournament %]" />
+	    <input type="hidden" name="round" value="[% num_rounds + 1 %]" />
 	    <input type="submit" value="Start neste runde" />
 	  </th>
 	</tr>
@@ -42,6 +52,7 @@
     </form>
   </div>
 
+[% IF num_rankings > 0 %]
   <h2>Rankingliste</h2>
 
   <div>
@@ -55,6 +66,7 @@
 [% END %]
     </ul>
   </div>
+[% END %]
 
 [% FOR r = rounds %]
   <h2>Runde [% r.round %]</h2>
@@ -70,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 %]      
@@ -81,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>