X-Git-Url: https://git.sesse.net/?p=ccbs;a=blobdiff_plain;f=html%2Ftemplates%2Fshow-tournament.tmpl;h=291ccda9d6e9ea0fea45d853cb97beb4a4c0f5cd;hp=b91f94c6e204c7981f5524acb576696fa7915dcb;hb=6bdf86462be42eda23d9b1f9b08fa1f6951486f6;hpb=81ab2a21cc586b81bc6362c0d48c276515caaf50

diff --git a/html/templates/show-tournament.tmpl b/html/templates/show-tournament.tmpl
index b91f94c..291ccda 100644
--- a/html/templates/show-tournament.tmpl
+++ b/html/templates/show-tournament.tmpl
@@ -12,7 +12,7 @@
     </ul>
   </div>
 
-[% IF closing_valid %]
+[% IF closing_valid && !public %]
   <h2>Start ny runde</h2>
 
   <div>
@@ -54,7 +54,7 @@
   </div>
 [% END %]
   
-[% IF finishing_valid %]
+[% IF finishing_valid && !public %]
   <h2>Avslutt turnering</h2>
 
   <div>
@@ -79,9 +79,9 @@
     <ul>
 [% FOR r = rankings %]
 [% IF r.points == -1 %]
-      <li>[% r.ranking %]. plass: [% r.nick %]</li>
+      <li>[% r.ranking %]. plass: <a href="player.pl?id=[% r.player %]">[% r.nick %]</a></li>
 [% ELSE %]
-      <li>[% r.ranking %]. plass: [% r.nick %], med [% r.points %] poeng.</li>
+      <li>[% r.ranking %]. plass: <a href="player.pl?id=[% r.player %]">[% r.nick %]</a>, med [% r.points %] poeng.</li>
 [% END %]
 [% END %]
     </ul>
@@ -89,12 +89,13 @@
 [% END %]
 
 [% FOR r = rounds %]
+[% IF r.locked || !public %]
   <h2><a name="round[% r.round %]">Runde [% r.round %]</a></h2>
 
   <div>
 
   [% FOR p = r.parallels %]
-    [% IF bigscreen %]
+    [% IF bigscreen && !public %]
   <form method="post" action="do-set-active-round.pl">
     <p>
       <input type="hidden" name="tournament" value="[% tournament.tournament %]" />
@@ -107,6 +108,7 @@
       <input type="hidden" name="show" value="true" />
       <input type="submit" value="Vis på storskjerm" />
       Antall maskiner: <input name="nummachines" value="1" size="1" />
+      Antall spillere samtidig på hver maskin: <input name="playerspermachine" value="1" size="1" />
       [% END %]
     </p>
   </form>
@@ -149,7 +151,7 @@
       [% IF r.locked %]
     <tr>
       <th>
-        [% pl.nick %]
+        <a href="player.pl?id=[% pl.player %]">[% pl.nick %]</a>
       </th>
         [% FOR s = pl.songs %]
       <td class="score">[% s.score %]</td>
@@ -161,12 +163,16 @@
         [% END %]
         [% IF p.num_songs > 1 %]
      <td>[% pl.total %]</td>
-        [% END %]      
-     <td>[% pl.rank %]</td>
+        [% END %]  
+[% IF pl.best_rank == pl.worst_rank %]
+     <td>[% pl.best_rank %]
+[% ELSE %]     
+     <td>[% pl.best_rank %]-[% pl.worst_rank %]</td>
+[% END %]     
     </tr>
       [% ELSE %]
     <tr>
-      <th>[% pl.nick %]</th>
+      <th><a href="player.pl?id=[% pl.player %]">[% pl.nick %]</a></th>
         [% FOR s = pl.songs %]
       <td class="score">
         <input type="hidden" name="old-score[% pl.player %]-[% s.songnumber %]" value="[% s.score %]" />
@@ -224,7 +230,7 @@
       </td>
           [% IF s.chosen %]
       <td>
-        <input type="hidden" name="old-song[% pl.player %]-[% s.songnumber %]" value="[% ss.song %]" />
+        <input type="hidden" name="old-song[% pl.player %]-[% s.songnumber %]" value="[% s.song %]" />
         <select name="song[% pl.player %]-[% s.songnumber %]">
           <option value=""> </option>
             [% FOR ss = songs %]
@@ -252,3 +258,4 @@
 
   </div>
 [% END %]
+[% END %]