X-Git-Url: https://git.sesse.net/?p=ccbs;a=blobdiff_plain;f=html%2Ftemplates%2Fshow-tournament.tmpl;h=c111fdcef2bd65a2925dc6a7c8ad61d1e3910ffb;hp=e9d56e378678ad12e084e0823b43a0251d7d5c6b;hb=87881566f149570c4aaec139213f66f370c58e6f;hpb=c88ada628f39026c983b389ef6f3b0ae4874e7d4

diff --git a/html/templates/show-tournament.tmpl b/html/templates/show-tournament.tmpl
index e9d56e3..c111fdc 100644
--- a/html/templates/show-tournament.tmpl
+++ b/html/templates/show-tournament.tmpl
@@ -3,67 +3,86 @@
 
   <div>
     <ul>
-      <li>Sesong: [% tournament.seasonname %]</li>
-      <li>Land: [% tournament.countryname %]</li>
-      <li>Sted: [% tournament.location %]</li>
-      <li>Dato: [% tournament.date %]</li>
-      <li>Maskin: [% tournament.machinename %]</li>
-      <li>Scoresystem: [% tournament.scoringsystemname %]</li>
+      <li><_>Season:</_> [% tournament.seasonname %]</li>
+      <li><_>Country:</_> [% tournament.countryname %]</li>
+      <li><_>Place:</_> [% tournament.location %]</li>
+      <li><_>Date:</_> [% tournament.date %]</li>
+      <li><_>Machine:</_> [% tournament.machinename %]</li>
+      <li><_>Scoring system:</_> [% tournament.scoringsystemname %]</li>
     </ul>
   </div>
 
-[% IF closing_valid %]
-  <h2>Start ny runde</h2>
+[% IF closing_valid && !public %]
+  <h2>Start new round</h2>
 
   <div>
-    <p>For øyeblikket har det vært avholdt <strong>[% num_rounds %]</strong> runder,
-      hvilket vil si at du kan begynne runde <strong>[% num_rounds + 1 %]</strong>
-      om du skulle ønske det. Vær oppmerksom på at du ikke kan begynne en ny runde
-      før den forrige er gjort helt ferdig.</p>
+    <p><_>For øyeblikket har det vært avholdt</_> <strong>[% num_rounds %]</strong> <_>fulle runder,
+      hvilket vil si at du kan begynne runde</_> <strong>[% num_rounds + 1 %]</strong>
+      <_>om du skulle ønske det. Vær oppmerksom på at du ikke kan begynne en ny runde
+      før den forrige er gjort helt ferdig.</_></p>
 
-    <p>Det er <strong>[% num_qualified %]</strong> mennesker som vil gå videre til
-      neste runde, og disse vil bli spredd jevnt utover så mange grupper som du velger.</p>
+    <p><_>Det er</_> <strong>[% num_qualified %]</strong> <_>mennesker som vil gå videre til
+      neste runde, og disse vil bli spredd jevnt utover så mange grupper som du velger.</_></p>
 
     <form method="post" action="do-start-round.pl">
       <table>
         <tr>
-          <th>Antall grupper</th>
+          <th>Number of groups</th>
   	  <td><input name="numgroups" /></td>
         </tr>
         <tr>
-          <th>Antall som går videre fra hver gruppe</th>
+          <th>Number to advance from each group</th>
   	  <td><input name="numqual" /></td>
         </tr>
         <tr>
-          <th>Antall tilfeldige sanger</th>
+          <th>Number of random songs</th>
   	  <td><input name="numrandom" /></td>
         </tr>
         <tr>
-          <th>Antall selvvalgte sanger</th>
+          <th>Number of self-selected songs</th>
   	  <td><input name="numchosen" /></td>
         </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" />
+	    <input type="submit" value="<_>Start next round</_>" />
 	  </th>
 	</tr>
       </table>
     </form>
   </div>
 [% END %]
+  
+[% IF finishing_valid && !public %]
+  <h2>End tournament</h2>
+
+  <div>
+    <p>As there's only one group left and that group is done, you can end the
+    tournament if you'd like to. Note that when you've ended the tournament, 
+    the ranking lists will be generated and the CC points will be handed out, and
+    there's no way back (that is, the tournament is permanently ended).
+    </p>
+
+    <form method="post" action="do-finish-tournament.pl">
+      <p>
+        <input type="hidden" name="tournament" value="[% tournament.tournament %]" />
+        <input type="submit" value="<_>End the tournament</_>" />
+      </p>
+    </form>
+  </div>
+[% END %]
 
 [% IF num_rankings > 0 %]
-  <h2>Rankingliste</h2>
+  <h2>Ranking list</h2>
 
   <div>
     <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>
@@ -71,11 +90,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" />
+      <_>Number of machines:</_> <input name="nummachines" value="1" size="1" />
+      <_>Number of simultaneous players on each machine:</_> <input name="playerspermachine" value="1" size="1" />
+      [% END %]
+    </p>
+  </form>
+    [% END %]
+  
   <form method="post" action="do-edit-scores.pl">
   <table class="scores">
     <tr>
@@ -90,19 +129,20 @@
         <input type="hidden" name="tournament" value="[% tournament.tournament %]" />
         <input type="hidden" name="round" value="[% r.round %]" />
         <input type="hidden" name="group" value="[% p.parallel %]" />
-        Gruppe [% p.parallel %]
+        <_>Gruppe</_> [% p.parallel %]
       </th>
     [% END %]
     [% FOR s = p.songs %]
-      [% IF s == '' %]
-      <th colspan="4">Selvvalgt</th>
+      [% IF s.song == -1 %]
+      <th colspan="4">Self-selected</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 %]      
@@ -112,23 +152,28 @@
       [% 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 %]      
+        [% 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 %]" />
@@ -186,7 +231,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 %]
@@ -203,6 +248,7 @@
         [% IF p.num_songs > 1 %]
      <td>[% pl.total %]</td>
         [% END %]
+     <td>[% pl.rank %]</td>
      <td><input type="submit" value="Oppdater" /></td>
     </tr>
       [% END %]
@@ -213,3 +259,4 @@
 
   </div>
 [% END %]
+[% END %]