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

diff --git a/html/templates/show-tournament.tmpl b/html/templates/show-tournament.tmpl
index 49f9b6d..e9d56e3 100644
--- a/html/templates/show-tournament.tmpl
+++ b/html/templates/show-tournament.tmpl
@@ -12,6 +12,7 @@
     </ul>
   </div>
 
+[% IF closing_valid %]
   <h2>Start ny runde</h2>
 
   <div>
@@ -51,6 +52,7 @@
       </table>
     </form>
   </div>
+[% END %]
 
 [% IF num_rankings > 0 %]
   <h2>Rankingliste</h2>
@@ -78,29 +80,44 @@
   <table class="scores">
     <tr>
     [% IF p.parallel == 0 %]
-      <th></th>
+      <th>
+        <input type="hidden" name="tournament" value="[% tournament.tournament %]" />
+        <input type="hidden" name="round" value="[% r.round %]" />
+        <input type="hidden" name="group" value="[% p.parallel %]" />
+      </th>
     [% ELSE %]
-      <th>Gruppe [% p.parallel %]</th>
+      <th>
+        <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 %]
+      </th>
     [% END %]
     [% FOR s = p.songs %]
       [% IF s == '' %]
-      <th colspan="2">Selvvalgt</th>
+      <th colspan="4">Selvvalgt</th>
       [% ELSE %]
-      <th>[% s %]</th>
+      <th colspan="3">[% s %]</th>
       [% END %]
     [% END %]
     [% IF p.num_songs > 1 %]
       <th>Total</th>
     [% END %]      
+    [% IF !r.locked %]
       <th></th>
+    [% END %]      
     </tr>
     
     [% FOR pl = p.players %]
-      [% IF pl.locked %]
+      [% IF r.locked %]
     <tr>
-      <th>[% pl.nick %]</th>
+      <th>
+        [% pl.nick %]
+      </th>
         [% FOR s = pl.songs %]
-      <td>[% s.score %]</td>
+      <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>
           [% END %]
@@ -113,8 +130,12 @@
     <tr>
       <th>[% pl.nick %]</th>
         [% FOR s = pl.songs %]
-      <td class="nowrap">
+      <td class="score">
+        <input type="hidden" name="old-score[% pl.player %]-[% s.songnumber %]" value="[% s.score %]" />
         <input name="score[% pl.player %]-[% s.songnumber %]" value="[% s.score %]" size="5" />
+      </td>
+      <td class="playmode">
+        <input type="hidden" name="old-playmode[% pl.player %]-[% s.songnumber %]" value="[% s.playmode %]" />
 	<select name="playmode[% pl.player %]-[% s.songnumber %]">
 	  <option value=""> </option>
          [% IF s.playmode == 'single' %]
@@ -128,6 +149,12 @@
 	  <option value="double">D</option>
 	 [% END %]
 	</select>
+      </td>
+      <td class="difficulty">
+[% IF !s.chosen %]
+        <input type="hidden" name="song[% pl.player %]-[% s.songnumber %]" value="[% s.song %]" />
+[% END %]	
+        <input type="hidden" name="old-difficulty[% pl.player %]-[% s.songnumber %]" value="[% s.difficulty %]" />
 	<select name="difficulty[% pl.player %]-[% s.songnumber %]">
 	  <option value=""> </option>
          [% IF s.difficulty == 'beginner' %]
@@ -159,7 +186,8 @@
       </td>
           [% IF s.chosen %]
       <td>
-        <select name="song[% s.player %]-[% s.songnumber %]">
+        <input type="hidden" name="old-song[% pl.player %]-[% s.songnumber %]" value="[% ss.song %]" />
+        <select name="song[% pl.player %]-[% s.songnumber %]">
           <option value=""> </option>
             [% FOR ss = songs %]
               [% IF s.song == ss.song %]