X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=html%2Ftemplates%2Fshow-tournament.tmpl;h=162558dd9d290f012bad337abd453775635cc7af;hb=3c8e4e7e075f55a77e313275479a41b057ca4fc1;hp=0c4e350899baf0926475a41d63bbfef2d4bd2665;hpb=ce2049430f3c984487fce48dc40184caca97c626;p=ccbs

diff --git a/html/templates/show-tournament.tmpl b/html/templates/show-tournament.tmpl
index 0c4e350..162558d 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,11 +89,31 @@
 [% END %]
 
 [% FOR r = rounds %]
-  <h2>Runde [% r.round %]</h2>
+[% IF r.locked || !public %]
+  <h2><a name="round[% r.round %]">Runde [% r.round %]</a></h2>
 
   <div>
 
   [% FOR p = r.parallels %]
+    [% IF bigscreen && !public %]
+  <form method="post" action="do-set-active-round.pl">
+    <p>
+      <input type="hidden" name="tournament" value="[% tournament.tournament %]" />
+      <input type="hidden" name="round" value="[% r.round %]" />
+      <input type="hidden" name="parallel" value="[% p.parallel %]" />
+      [% IF p.bigscreen %]
+      <input type="hidden" name="show" value="false" />
+      <input type="submit" value="Fjern fra storskjerm" />
+      [% ELSE %]
+      <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>
+    [% END %]
+  
   <form method="post" action="do-edit-scores.pl">
   <table class="scores">
     <tr>
@@ -112,15 +132,16 @@
       </th>
     [% END %]
     [% FOR s = p.songs %]
-      [% IF s == '' %]
+      [% IF s.song == -1 %]
       <th colspan="4">Selvvalgt</th>
       [% ELSE %]
-      <th colspan="3">[% s %]</th>
+      <th colspan="3"><a href="song.pl?id=[% s.song %]">[% s.title %]</a></th>
       [% END %]
     [% END %]
     [% IF p.num_songs > 1 %]
       <th>Total</th>
     [% END %]      
+      <th>Rank</th>
     [% IF !r.locked %]
       <th></th>
     [% END %]      
@@ -130,23 +151,24 @@
       [% 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>
       <td class="playmode">[% s.playmode %]</td>
       <td class="difficulty">[% s.difficulty %]</td>
           [% IF s.chosen %]
-      <td>[% s.title %]</td>
+      <td><a href="song.pl?id=[% s.song %]">[% s.title %]</a></td>
           [% END %]
         [% END %]
         [% IF p.num_songs > 1 %]
      <td>[% pl.total %]</td>
         [% END %]      
+     <td>[% pl.rank %]</td>
     </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 %]" />
@@ -221,6 +243,7 @@
         [% IF p.num_songs > 1 %]
      <td>[% pl.total %]</td>
         [% END %]
+     <td>[% pl.rank %]</td>
      <td><input type="submit" value="Oppdater" /></td>
     </tr>
       [% END %]
@@ -231,3 +254,4 @@
 
   </div>
 [% END %]
+[% END %]