From: Benjamin Mako Hill Date: Wed, 8 Aug 2012 17:57:56 +0000 (-0400) Subject: Merge branch 'master' of git+ssh://projects.mako.cc/git/iron-blogger X-Git-Url: https://projects.mako.cc/source/iron-blogger/commitdiff_plain/f2984ef5a6c2c6f44c8657bbc82ad676e48e7657?hp=f418b0de447a3ea5b9b7eb061da18830ea711ba2 Merge branch 'master' of git+ssh://projects.mako.cc/git/iron-blogger --- diff --git a/README b/README new file mode 100644 index 0000000..ea15fb1 --- /dev/null +++ b/README @@ -0,0 +1,2 @@ +http://etherpad.mit.edu/iOQ6K3S7HZ + diff --git a/bloggers.yml b/bloggers.yml index f29d2df..2d1da28 100644 --- a/bloggers.yml +++ b/bloggers.yml @@ -7,7 +7,6 @@ adelaida: - [Sarah Adelaida McIntire, 'https://saddlebaggins.wordpress.com/', 'https://saddlebaggins.wordpress.com/feed/'] start: 07/09/2012 andresmh: - end: '2012-06-16' links: - ["Andr\xE9s Monroy-Hern\xE1ndez", 'http://blogs.law.harvard.edu/andresmh/', 'http://blogs.law.harvard.edu/andresmh/feed/'] start: 10/31/2011 @@ -32,6 +31,7 @@ bkolko: - [Beth Kolko, 'http://bethkolko.wordpress.com/', 'http://bethkolko.wordpress.com/feed/'] start: 11/14/2011 cjb: + end: '2012-07-23' links: - [Chris Ball, 'http://blog.printf.net/', 'http://blog.printf.net/xml/rss20/feed.xml'] start: 02/20/2011 @@ -53,6 +53,7 @@ dandennis: - [Daniel Jones, 'http://dandennis.tumblr.com/', 'http://dandennis.tumblr.com/rss'] start: 11/21/2011 denten: + end: '2012-07-09' links: - [Dennis Tenen, 'http://d3nten.com/', 'http://d3nten.com/feed/'] start: 2/20/2011 @@ -62,7 +63,6 @@ djcp: - [Dan Collis-Puro, 'http://blogs.law.harvard.edu/djcp/', 'http://blogs.law.harvard.edu/djcp/feed'] start: 11/14/2011 dlarochelle: - end: '2012-06-16' links: - [David Larochelle, 'http://blogs.law.harvard.edu/dlarochelle', 'http://blogs.law.harvard.edu/dlarochelle/feed/'] start: 11/14/2011 @@ -71,6 +71,10 @@ epopko: links: - [Ed Popko, 'http://blogs.law.harvard.edu/okpop/', 'http://blogs.law.harvard.edu/okpop/feed/'] start: 02/06/2012 +hannah: + links: + - [Hannah Hildreth, 'http://sleepyjeandances.wordpress.com', 'https://sleepyjeandances.wordpress.com/feed/'] + start: 07/30/2012 jeff: links: - [Jeff Warren (Unterbahn), 'http://unterbahn.com', 'http://unterbahn.com/feed/'] @@ -125,6 +129,7 @@ mollydb: - [Molly de Blanc, 'http://mmillions.wordpress.com', 'http://mmillions.wordpress.com/feed/'] start: 11/07/2011 mstone: + end: '2012-07-09' links: - [Michael Stone, 'http://mstone.info/posts/', 'http://mstone.info/posts/atom.xml'] start: 11/14/2011 @@ -138,6 +143,7 @@ nadya: - [Nadya Peek, 'http://infosyncratic.nl/weblog', 'http://infosyncratic.nl/weblog/feed'] start: 11/14/2011 pablo: + end: '2012-07-30' links: - [Pablo Rey (Meipi), 'http://www.meipi.com/author/pablo/', 'http://www.meipi.com/author/pablo/feed'] - [Pablo Rey (600km), 'http://www.6000km.org/author/pablo/', 'http://www.6000km.org/author/pablo/feed/'] diff --git a/ledger b/ledger index dc7d966..abe3c7a 100644 --- a/ledger +++ b/ledger @@ -1523,3 +1523,114 @@ 2012-07-09 Week 36 User:nadya $-5 Pool:Owed:nadya + +2012-07-24 Payment + Pool:Owed:nadya $-20 + Pool:Paid + +2012-07-16 Week 37 + User:cjb $-5 + Pool:Owed:cjb +2012-07-16 Week 37 + User:denten $-5 + Pool:Owed:denten +2012-07-16 Week 37 + User:mako $-5 + Pool:Owed:mako +2012-07-16 Week 37 + User:mstone $-5 + Pool:Owed:mstone +2012-07-16 Week 37 + User:nadya $-5 + Pool:Owed:nadya +2012-07-16 Week 37 + User:vaughn $-5 + Pool:Owed:vaughn + +2012-07-09 Punt + Pool:Owed:denten $-30.0 + User:denten +2012-07-09 Punt + Pool:Owed:mstone $-30.0 + User:mstone + +2012-07-23 Week 38 + User:aarons $-5 + Pool:Owed:aarons +2012-07-23 Week 38 + User:cjb $-5 + Pool:Owed:cjb +2012-07-23 Week 38 + User:mad $-5 + Pool:Owed:mad +2012-07-23 Week 38 + User:mako $-5 + Pool:Owed:mako + +2012-07-24 Unpunt + Pool:Owed:dlarochelle $30.0 + User:dlarochelle +2012-07-24 Payment + Pool:Owed:dlarochelle $-20.0 + Pool:Paid + +2012-08-08 Unpunt + Pool:Owed:andresmh $30 + User:andresmh +2012-08-08 Payment + Pool:Owed:andresmh $-20 + Pool:Paid + +2012-07-30 Week 39 + User:andresmh $-5 + Pool:Owed:andresmh +2012-07-30 Week 39 + User:cjb $-5 + Pool:Owed:cjb +2012-07-30 Week 39 + User:mad $-5 + Pool:Owed:mad +2012-07-30 Week 39 + User:nadya $-5 + Pool:Owed:nadya +2012-07-30 Week 39 + User:pablo $-5 + Pool:Owed:pablo + +2012-07-23 Punt + Pool:Owed:cjb $-30.0 + User:cjb + +2012-08-08 Payment + Pool:Owed:mako $-25 + Pool:Paid + + +2012-08-06 Week 40 + User:aarons $-5 + Pool:Owed:aarons +2012-08-06 Week 40 + User:andresmh $-5 + Pool:Owed:andresmh +2012-08-06 Week 40 + User:mad $-5 + Pool:Owed:mad +2012-08-06 Week 40 + User:mako $-5 + Pool:Owed:mako +2012-08-06 Week 40 + User:nadya $-5 + Pool:Owed:nadya +2012-08-06 Week 40 + User:pablo $-5 + Pool:Owed:pablo +2012-08-06 Week 40 + User:shauna $-5 + Pool:Owed:shauna +2012-08-06 Week 40 + User:sj $-5 + Pool:Owed:sj + +2012-07-30 Punt + Pool:Owed:pablo $-30.0 + User:pablo diff --git a/templates/users.tmpl b/templates/users.tmpl index 9971306..e111138 100644 --- a/templates/users.tmpl +++ b/templates/users.tmpl @@ -1,10 +1,40 @@ +

Participants in Good Standing

+ + + + + + +% for u in sorted(userlist, key=lambda u:u.username): + <% if u.end: continue %> + + + + + +% endfor +
WhoBlog linkStart Week
${u.username} + % if u.links: + % for a in u.links: + ${a[0]} + % endfor + % else: + Undecided + % endif + ${u.start}
+ +% if any(map(lambda u: u.end, userlist)): +

Former Participants Punted for Lack of Payment

+ + % for u in sorted(userlist, key=lambda u:u.username): + <% if not u.end: continue %> + % endfor
Who Blog link Start WeekEnd Week
${u.username} @@ -17,6 +47,9 @@ % endif ${u.start} ${u.end}
+ +% endif