Misc. changes -- some formatting and add a preliminary "start new round" form.

diff --git a/html/show-tournament.pl b/html/show-tournament.pl
index b204270422048e58ee57d461c324df362a509efb..87df626191e301cd01851f47e8b59a2ebd7d7c03 100755 (executable)
--- a/html/show-tournament.pl
+++ b/html/show-tournament.pl
@@ -61,10 +61,13 @@ for my $score (@$scores) {
        $pl->[$#$pl]->{'total'} += $score->{'score'};
 }
 
        $pl->[$#$pl]->{'total'} += $score->{'score'};
 }
 

+my $num_rounds = scalar @rounds;
+

 ccbs::print_header();
 ccbs::process_template('show-tournament.tmpl', $tournament->{'tournamentname'}, {
        tournament => $tournament,
        rankings => $rankings,
 ccbs::print_header();
 ccbs::process_template('show-tournament.tmpl', $tournament->{'tournamentname'}, {
        tournament => $tournament,
        rankings => $rankings,

-       rounds => \@rounds
+       rounds => \@rounds,
+       num_rounds => $num_rounds

 });
 $dbh->disconnect;
 });
 $dbh->disconnect;

diff --git a/html/templates/show-tournament.tmpl b/html/templates/show-tournament.tmpl
index 733b1cfc8e64d37c8566fd6f7220f5b0f456d757..fac6ed0a42557ed8a1d1a904e6526ee7a1fdcc6f 100644 (file)
--- a/html/templates/show-tournament.tmpl
+++ b/html/templates/show-tournament.tmpl
@@ -1,30 +1,66 @@
 [%# vim:set filetype=html: %]
   <h2>Generelle fakta</h2>
 
 [%# 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" />
+        </tr>
+        <tr>
+          <th>Antall som går videre fra hver gruppe</th>
+         <td><input name="numqual" />
+        </tr>
+       <tr>
+         <th colspan="2">
+           <input type="submit" value="Start neste runde" />
+         </th>
+       </tr>
+      </table>
+    </form>
+  </div>

 
   <h2>Rankingliste</h2>
 
 
   <h2>Rankingliste</h2>
 

-  <ul>
+  <div>
+    <ul>

 [% FOR r = rankings %]
 [% IF r.points == -1 %]
 [% FOR r = rankings %]
 [% IF r.points == -1 %]

-    <li>[% r.ranking %]. plass: [% r.nick %]</li>
+      <li>[% r.ranking %]. plass: [% r.nick %]</li>

 [% ELSE %]
 [% 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 %]
 [% END %]
 [% END %]

-  </ul>
+    </ul>
+  </div>

 
 [% FOR r = rounds %]
   <h2>Runde [% r.round %]</h2>
 
 
 [% FOR r = rounds %]
   <h2>Runde [% r.round %]</h2>
 

+  <div>
+

 [% FOR p = r.parallels %]
   <table class="scores">
     <tr>
 [% FOR p = r.parallels %]
   <table class="scores">
     <tr>


@@ -59,5 +95,6 @@
 [% END %]
   </table>
 [% END %]
 [% END %]
   </table>
 [% END %]

-  
+
+  </div>

 [% END %]
 [% END %]