X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=html%2Ftemplates%2Fshow-tournament.tmpl;h=9dc1083a09b95aa3a0b4234d85ca8c1d857cb9a0;hb=cf6d5eed376fa7626418562831fa178517e3be70;hp=1ae4de193498dbf5cbe701030020ca4219d9bead;hpb=f441216a623854ca492d416d0ebe825ae07ab40d;p=ccbs

diff --git a/html/templates/show-tournament.tmpl b/html/templates/show-tournament.tmpl
index 1ae4de1..9dc1083 100644
--- a/html/templates/show-tournament.tmpl
+++ b/html/templates/show-tournament.tmpl
@@ -27,19 +27,19 @@
       <table>
         <tr>
           <th>Antall grupper</th>
-  	  <td><input name="numgroups" />
+  	  <td><input name="numgroups" /></td>
         </tr>
         <tr>
           <th>Antall som går videre fra hver gruppe</th>
-  	  <td><input name="numqual" />
+  	  <td><input name="numqual" /></td>
         </tr>
         <tr>
           <th>Antall tilfeldige sanger</th>
-  	  <td><input name="numrandom" />
+  	  <td><input name="numrandom" /></td>
         </tr>
         <tr>
           <th>Antall selvvalgte sanger</th>
-  	  <td><input name="numchosen" />
+  	  <td><input name="numchosen" /></td>
         </tr>
 	<tr>
 	  <th colspan="2">
@@ -73,40 +73,70 @@
 
   <div>
 
-[% FOR p = r.parallels %]
+  [% FOR p = r.parallels %]
   <table class="scores">
     <tr>
-[% IF p.parallel == 0 %]
+    [% IF p.parallel == 0 %]
       <th></th>
-[% ELSE %]
+    [% ELSE %]
       <th>Gruppe [% p.parallel %]</th>
-[% END %]
-[% FOR s = p.songs %]
+    [% END %]
+    [% FOR s = p.songs %]
+      [% IF s == '' %]
+      <th colspan="2">Selvvalgt</th>
+      [% ELSE %]
       <th>[% s %]</th>
-[% END %]
-[% IF p.num_songs > 1 %]
+      [% END %]
+    [% END %]
+    [% IF p.num_songs > 1 %]
       <th>Total</th>
-[% END %]      
+    [% END %]      
+      <th></th>
     </tr>
     
-[% FOR pl = p.players %]
+    [% FOR pl = p.players %]
+      [% IF pl.locked %]
+    <tr>
+      <th>[% pl.nick %]</th>
+        [% FOR s = pl.songs %]
+      <td>[% s.score %]</td>
+          [% IF s.chosen %]
+      <td>[% s.title %]</td>
+          [% END %]
+        [% END %]
+        [% IF p.num_songs > 1 %]
+     <td>[% pl.total %]</td>
+        [% END %]      
+    </tr>
+      [% ELSE %]
     <tr>
       <th>[% pl.nick %]</th>
-[% FOR s = pl.songs %]
+        [% FOR s = pl.songs %]
+      <td><input name="score[% s.songnumber %]" value="[% s.score %]" size="5" /></td>
+          [% IF s.chosen %]
       <td>
-        [% s.score %]
-[% IF s.chosen %]
-        : [% s.title %]
-[% END %]
+        <select name="song[% s.songnumber %]">
+          <option value=""> </option>
+            [% FOR ss = songs %]
+              [% IF s.song == ss.song %]
+          <option value="[% ss.song %]" selected="selected">[% ss.title %]</option>
+              [% ELSE %]	  
+          <option value="[% ss.song %]">[% ss.title %]</option>
+              [% END %]	  
+            [% END %]
+        </select>
       </td>
-[% END %]
-[% IF p.num_songs > 1 %]
+          [% END %]
+        [% END %]
+        [% IF p.num_songs > 1 %]
      <td>[% pl.total %]</td>
-[% END %]      
+        [% END %]
+     <td><input type="submit" value="Oppdater" /></td>
     </tr>
-[% END %]
+      [% END %]
+    [% END %]
   </table>
-[% END %]
+  [% END %]
 
   </div>
 [% END %]