X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=html%2Ftemplates%2Fshow-tournament.tmpl;h=80a103fc99c62928cb938d7913b7c5970ca253de;hb=34271723bcc84fea7cd3504054a63ecc3ca0d0e2;hp=640946341420440045a4a727029593cb26925bf3;hpb=8d6dd33b77319cdf11131da25ba3e3b462dfbca0;p=ccbs

diff --git a/html/templates/show-tournament.tmpl b/html/templates/show-tournament.tmpl
index 6409463..80a103f 100644
--- a/html/templates/show-tournament.tmpl
+++ b/html/templates/show-tournament.tmpl
@@ -1,52 +1,53 @@
 [%# vim:set filetype=html: %]
-  <h2>Generelle fakta</h2>
+  <h2>General facts</h2>
 
   <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> 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><_>At the moment, there's been</_> <strong>[% num_rounds %]</strong> <_>full rounds,
+      which means that you could start round</_> <strong>[% num_rounds + 1 %]</strong>
+      <_>if you'd like. Note that you can't start a new round before the
+      previous one has been completely done.</_></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><_>There are</_> <strong>[% num_qualified %]</strong> <_>players going
+      onto the next round, and these will be spread evenly out over how many
+      groups you select.</_></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>
@@ -54,34 +55,35 @@
   </div>
 [% END %]
   
-[% IF finishing_valid %]
-  <h2>Avslutt turnering</h2>
+[% IF finishing_valid && !public %]
+  <h2>End tournament</h2>
 
   <div>
-    <p>Ettersom det bare er igjen én gruppe og runden er ferdigspilt, kan du om du ønsker
-      det avslutte turneringen. Vær obs på at når du har avsluttet turneringen vil rankinglister
-      genereres og CC-poeng utdeles, og det er ingen vei tilbake (dvs. turneringen er permanent
-      avsluttet).</p>
+    <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="Avslutt turneringen" />
+        <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 %]. <_>place</_>: <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 %]. <_>place</_>: <a href="player.pl?id=[% r.player %]">[% r.nick %]</a>, <_>with</_> [% r.points %] <_>points</_>.</li>
 [% END %]
 [% END %]
     </ul>
@@ -89,12 +91,13 @@
 [% 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 %]
+    [% IF bigscreen && !public %]
   <form method="post" action="do-set-active-round.pl">
     <p>
       <input type="hidden" name="tournament" value="[% tournament.tournament %]" />
@@ -106,6 +109,8 @@
       [% 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>
@@ -125,12 +130,12 @@
         <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 %]
+        <_>Group</_> [% p.parallel %]
       </th>
     [% END %]
     [% FOR s = p.songs %]
       [% IF s.song == -1 %]
-      <th colspan="4">Selvvalgt</th>
+      <th colspan="4">Self-selected</th>
       [% ELSE %]
       <th colspan="3"><a href="song.pl?id=[% s.song %]">[% s.title %]</a></th>
       [% END %]
@@ -139,16 +144,16 @@
       <th>Total</th>
     [% END %]      
       <th>Rank</th>
-    [% IF !r.locked %]
+    [% IF !r.locked && !public %]
       <th></th>
     [% END %]      
     </tr>
     
     [% FOR pl = p.players %]
-      [% IF r.locked %]
+      [% IF r.locked || public %]
     <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>
@@ -160,12 +165,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 %]" />
@@ -223,7 +232,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 %]
@@ -241,7 +250,7 @@
      <td>[% pl.total %]</td>
         [% END %]
      <td>[% pl.rank %]</td>
-     <td><input type="submit" value="Oppdater" /></td>
+     <td><input type="submit" value="Update" /></td>
     </tr>
       [% END %]
     [% END %]
@@ -251,3 +260,4 @@
 
   </div>
 [% END %]
+[% END %]