update the rest of the code to support the new config format

[iron-blogger] / templates / week.tmpl

diff --git a/templates/week.tmpl b/templates/week.tmpl
index e2631c4a303e9901208d318a2974ce1b68c4011b..dee7ee47b2d699114e3f8c9e040083666bfa60da 100644 (file)
--- a/templates/week.tmpl
+++ b/templates/week.tmpl
@@ -1,34 +1,71 @@
+Results for week beginning ${week_start.strftime("%F")}

 <h2>People who posted</h2>
 <h2>People who posted</h2>

-<ul>
+<dl>

 % for u in sorted(good, key=lambda u:u.username):
 % for u in sorted(good, key=lambda u:u.username):

-<li><b>${u.username}:</b>
+<dt><span class="user">${u.username}:</span></dt>
+<dd>

   <ul>
  % for p in u.weeks[week]:
    <li><a href="${p['url']}">${p['title'] or "[untitled post]"}</a></li>
  % endfor
   </ul>
   <ul>
  % for p in u.weeks[week]:
    <li><a href="${p['url']}">${p['title'] or "[untitled post]"}</a></li>
  % endfor
   </ul>

-</li>
+</dd>

 % endfor
 % endfor

-</ul>
+</dl>

 
 <h2>People who failed to post</h2>
 <ul>
 % for u in sorted(lame, key=lambda u:u.username):
 
 <h2>People who failed to post</h2>
 <ul>
 % for u in sorted(lame, key=lambda u:u.username):

-<li><b>${u.username}</b></li>
+<li class="user">${u.username}</li>
+% endfor
+</ul>
+
+% if punt:
+<h2>People punted for excessive outstanding balances:</h2>
+<ul>
+% for u in sorted(punt):
+<li class="user">${u}</li>

 % endfor
 </ul>
 % endfor
 </ul>

+% endif

 
 % if skip:
 <h2>People who have not yet started</h2>
 <ul>
 % for u in sorted(skip, key=lambda u:u.username):
 
 % if skip:
 <h2>People who have not yet started</h2>
 <ul>
 % for u in sorted(skip, key=lambda u:u.username):

-  <li><b>${u.username}</b></li>
+  <li class="user">${u.username}</li>

 % endfor
 </ul>
 % endif
 
 <h2>Beer pool:</h2>
 <table>
 % endfor
 </ul>
 % endif
 
 <h2>Beer pool:</h2>
 <table>

-  <tr> <td> This week: </td> <td> $${5 * len(lame)}.00 </td> </tr>
-  <tr> <td> Total: </td> <td> $X.00 </td> </tr>
+  <tr> <td> This week: </td> <td> ${currency}${fine * len(lame)} </td> </tr>
+  <tr> <td> Total: </td> <td> ${currency}${pool} </td> </tr>
+  <tr> <td> Paid: </td> <td> ${currency}${paid} </td> </tr>

 </table>
 </table>

+
+<h2>Debts:</h2>
+<% i = 0 %>
+<table class="debts">
+% for (u, v) in sorted(debts, key=lambda p:p[1], reverse=True):
+% if i % 3 == 0:
+<tr>\
+% endif
+<% i += 1 %>\
+<td class="user">${u}</td> <td class="money">${currency}${v}</td>\
+% if i % 3 == 0:
+</tr>
+%endif
+% endfor
+% if i % 3 != 0:
+</tr>
+%endif
+</table>
+
+<h2>Previously Punted (pay $30 to return):</h2>
+<ul>
+% for (u) in sorted(punted, key=lambda p:p.username):
+<li>${u.username} (${u.end})</li>
+% endfor
+</ul>