X-Git-Url: https://git.sesse.net/?p=ccbs;a=blobdiff_plain;f=html%2Ftemplates%2Fshow-tournament.tmpl;h=c7566430271a6c0bec6bdeeb2172541e2fa0b05b;hp=733b1cfc8e64d37c8566fd6f7220f5b0f456d757;hb=f2a075e3a1d402fbc1922c3dcf7a4d7fb4370832;hpb=682984b549e3e4d53ebe5cc50202226445cf4e60

diff --git a/html/templates/show-tournament.tmpl b/html/templates/show-tournament.tmpl
index 733b1cf..c756643 100644
--- a/html/templates/show-tournament.tmpl
+++ b/html/templates/show-tournament.tmpl
@@ -1,30 +1,78 @@
 [%# vim:set filetype=html: %]
   <h2>Generelle fakta</h2>
 
-  <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>
-  </ul>
+  <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>
+    </ul>
+  </div>
 
+  <h2>Start ny runde</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>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>
+  	  <td><input name="numgroups" /></td>
+        </tr>
+        <tr>
+          <th>Antall som går videre fra hver gruppe</th>
+  	  <td><input name="numqual" /></td>
+        </tr>
+        <tr>
+          <th>Antall tilfeldige sanger</th>
+  	  <td><input name="numrandom" /></td>
+        </tr>
+        <tr>
+          <th>Antall selvvalgte sanger</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" />
+	  </th>
+	</tr>
+      </table>
+    </form>
+  </div>
+
+[% IF num_rankings > 0 %]
   <h2>Rankingliste</h2>
 
-  <ul>
+  <div>
+    <ul>
 [% FOR r = rankings %]
 [% IF r.points == -1 %]
-    <li>[% r.ranking %]. plass: [% r.nick %]</li>
+      <li>[% r.ranking %]. plass: [% r.nick %]</li>
 [% ELSE %]
-    <li>[% r.ranking %]. plass: [% r.nick %], med [% r.points %] poeng.</li>
+      <li>[% r.ranking %]. plass: [% r.nick %], med [% r.points %] poeng.</li>
+[% END %]
 [% END %]
+    </ul>
+  </div>
 [% END %]
-  </ul>
 
 [% FOR r = rounds %]
   <h2>Runde [% r.round %]</h2>
 
+  <div>
+
 [% FOR p = r.parallels %]
   <table class="scores">
     <tr>
@@ -34,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 %]      
@@ -45,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>
@@ -59,5 +109,6 @@
 [% END %]
   </table>
 [% END %]
-  
+
+  </div>
 [% END %]