Removed name= on the submit buttons again, we don't need it anymore.

[ccbs] / html / templates / show-tournament.tmpl

diff --git a/html/templates/show-tournament.tmpl b/html/templates/show-tournament.tmpl
index 074e21eb482b3ce321559a52b4907b222773cef3..abaf236667dfe9f387a9cb79b5f411a04cf9acef 100644 (file)
--- a/html/templates/show-tournament.tmpl
+++ b/html/templates/show-tournament.tmpl
@@ -81,19 +81,21 @@
       <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>
         <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 %]
@@ -103,13 +105,15 @@
     </tr>
     
     [% FOR pl = p.players %]
-      [% IF pl.locked %]
+      [% IF r.locked %]
     <tr>
       <th>
         [% pl.nick %]
       </th>
         [% FOR s = pl.songs %]
       <td>[% s.score %]</td>
+      <td>[% s.playmode %]</td>
+      <td>[% s.difficulty %]</td>
           [% IF s.chosen %]
       <td>[% s.title %]</td>
           [% END %]
@@ -122,11 +126,12 @@
     <tr>
       <th>[% pl.nick %]</th>
         [% FOR s = pl.songs %]
-      <td class="nowrap">
+      <td>
         <input type="hidden" name="old-score[% pl.player %]-[% s.songnumber %]" value="[% s.score %]" />
-        <input type="hidden" name="old-playmode[% pl.player %]-[% s.songnumber %]" value="[% s.playmode %]" />
-        <input type="hidden" name="old-difficulty[% pl.player %]-[% s.songnumber %]" value="[% s.difficulty %]" />
         <input name="score[% pl.player %]-[% s.songnumber %]" value="[% s.score %]" size="5" />
+      </td>
+      <td>
+        <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' %]
@@ -140,6 +145,9 @@
          <option value="double">D</option>
         [% END %]
        </select>
+      </td>
+      <td>
+        <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' %]
@@ -188,7 +196,7 @@
         [% IF p.num_songs > 1 %]
      <td>[% pl.total %]</td>
         [% END %]
-     <td><input type="submit" name="update[% pl.player %]" value="Oppdater" /></td>
+     <td><input type="submit" value="Oppdater" /></td>
     </tr>
       [% END %]
     [% END %]