Show inactive supporters on sponsors page too.

tools/nimweb.nim

@@ -94,7 +94,8 @@ Compile_options:
   rYearMonthDay = r"(\d{4})_(\d{2})_(\d{2})"
   rssUrl = "http://nim-lang.org/news.xml"
   rssNewsUrl = "http://nim-lang.org/news.html"
-  sponsors = "web/sponsors.csv"
+  activeSponsors = "web/sponsors.csv"
+  inactiveSponsors = "web/inactive_sponsors.csv"
   validAnchorCharacters = Letters + Digits
 
 
@@ -446,8 +447,9 @@ proc readSponsors(sponsorsFile: string): seq[Sponsor] =
         since: parser.row[5], level: parser.row[6].parseInt))
   parser.close()
 
-proc buildSponsors(c: var TConfigData, sponsorsFile: string, outputDir: string) =
-  let sponsors = generateSponsors(readSponsors(sponsorsFile))
+proc buildSponsors(c: var TConfigData, outputDir: string) =
+  let sponsors = generateSponsorsPage(readSponsors(activeSponsors),
+                                      readSponsors(inactiveSponsors))
   let outFile = outputDir / "sponsors.html"
   var f: File
   if open(f, outFile, fmWrite):
@@ -500,7 +502,7 @@ proc buildWebsite(c: var TConfigData) =
     buildPage(c, file, if file == "question": "FAQ" else: file, rss)
   copyDir("web/assets", "web/upload/assets")
   buildNewsRss(c, "web/upload")
-  buildSponsors(c, sponsors, "web/upload")
+  buildSponsors(c, "web/upload")
   buildNews(c, "web/news", "web/upload/news")
 
 proc main(c: var TConfigData) =

tools/website.tmpl

@@ -218,14 +218,9 @@ runForever()
 </html>
 #end proc
 #
+#
 #proc generateSponsors(sponsors: seq[Sponsor]): string =
 #result = ""
-<h1 id="our-current-sponsors">Our Current Sponsors</h1>
-<p>This page lists the companies and individuals that are, very kindly, contributing a
-monthly amount to help sustain Nim's development. For more details take a
-look at the <a href="https://salt.bountysource.com/teams/nim">Bountysource campaign</a>.</p>
-<p class="lastUpdate">Last updated: ${getTime().getGMTime().format("dd/MM/yyyy")}</p>
-<dl>
 #for sponsor in sponsors:
   <dt class="level-${sponsor.level}">
     #if sponsor.url.len > 0:
@@ -248,6 +243,24 @@ look at the <a href="https://salt.bountysource.com/teams/nim">Bountysource campa
     Donated $$${sponsor.allTime} in total since ${sponsor.since}
   </dd>
 #end for
+#end proc
+#proc generateSponsorsPage(activeSponsors, inactiveSponsors: seq[Sponsor]): string =
+#result = ""
+<h1 id="our-current-sponsors">Our Current Sponsors</h1>
+<p>This section lists the companies and individuals that are, very kindly, contributing a
+monthly amount to help sustain Nim's development. For more details take a
+look at the <a href="https://salt.bountysource.com/teams/nim">Bountysource campaign</a>.</p>
+<p class="lastUpdate">Last updated: ${getTime().getGMTime().format("dd/MM/yyyy")}</p>
+<dl>
+${generateSponsors(activeSponsors)}
+</dl>
+#
+<h1 id="our-past-sponsors">Our Past Sponsors</h1>
+<p>This section lists the companies and individuals that have contributed
+money in the past to help sustain Nim's development. For more details take a
+look at the <a href="https://salt.bountysource.com/teams/nim">Bountysource campaign</a>.</p>
+<dl>
+${generateSponsors(inactiveSponsors)}
 </dl>
 #
 #end proc

web/inactive_sponsors.csv

@@ -0,0 +1,44 @@
+logo, name, url, this_month, all_time, since, level
+,mikra,,0,400,"Apr 28, 2016",1
+,linkmonitor,,0,180,"Jan 28, 2016",1
+,"Benny Luypaert",,0,100,"Apr 10, 2016",1
+,"Chris Heller",,0,100,"May 19, 2016",1
+,PhilipWitte,,0,100,"Aug 5, 2016",1
+,Boxifier,,0,75,"Apr 12, 2016",1
+,iolloyd,,0,75,"Apr 29, 2016",1
+,WilRubin,,0,50,"Aug 11, 2015",1
+,rb01,,0,50,"May 4, 2016",1
+,TedSinger,,0,45,"Apr 9, 2016",1
+,martinbbjerregaard,,0,35,"Jun 9, 2016",1
+,benbve,,0,30,"Jul 12, 2016",1
+,barcharcraz,,0,25,"Jun 2, 2016",1
+,"Landon Bass",,0,25,"Jun 7, 2016",1
+,jimrichards,,0,25,"Jun 8, 2016",1
+,jjzazuet,,0,25,"Jul 10, 2016",1
+,zolern,,0,20,"Apr 15, 2016",1
+,mirek,,0,15,"Apr 9, 2016",1
+,rickc,,0,15,"Jul 31, 2016",1
+,jpkx1984,,0,13,"Jul 11, 2016",1
+,vlkrav,,0,12,"Aug 9, 2015",1
+,tebanep,,0,12,"Aug 7, 2016",1
+,McSpiros,,0,10,"Apr 6, 2016",1
+,"Brandon Hunter",,0,10,"Apr 7, 2016",1
+,funny-falcon,,0,10,"Apr 7, 2016",1
+,teroz,,0,10,"Apr 8, 2016",1
+,iLikeLego,,0,10,"Apr 16, 2016",1
+,Angluca,,0,10,"May 3, 2016",1
+,calind,,0,10,"Jun 7, 2016",1
+,goldenreign,,0,10,"Jun 10, 2016",1
+,kteza1,,0,10,"Jun 10, 2016",1
+,cinnabardk,,0,10,"Aug 6, 2016",1
+,reddec,,0,10,"Aug 31, 2016",1
+,niv,,0,5,"Apr 6, 2016",1
+,goniz,,0,5,"Apr 7, 2016",1
+,genunix,,0,5,"Apr 12, 2016",1
+,CynepHy6,,0,5,"Apr 14, 2016",1
+,ivanflorentin,,0,5,"May 3, 2016",1
+,stevenyhw,,0,5,"May 20, 2016",1
+,"Sanjay Singh",,0,5,"Jun 6, 2016",1
+,yuttie,,0,5,"Jun 7, 2016",1
+,hron,,0,5,"Jun 11, 2016",1
+,laszlowaty,,0,5,"Jun 17, 2016",1

web/news/2016_09_03_nim_community_survey_results.rst

@@ -580,7 +580,7 @@ respondents, not just Nim users.
 
   Are you interested in purchasing a copy of
   `Nim in Action <https://manning.com/books/nim-in-action?a_aid=niminaction&a_bid=78a27e81>`_?
-  If so, you can use code ``wm090316lt`` to get 50% off the eBook today only!
+  If so, you can use code ``wm090416lt`` to get 50% off the printed book today only!
   If you purchase it now you will get access to an early access copy of
   Nim in Action in eBook form and will be able to take part in the development
   of this book.

web/sponsors.csv

@@ -1,31 +1,36 @@
 logo, name, url, this_month, all_time, since, level
-assets/bountysource/secondspectrum.png,Second Spectrum,http://www.secondspectrum.com/,250,750,"May 5, 2016",250
-assets/bountysource/xored.svg,"Xored Software, Inc.",http://xored.com/,250,500,"Jun 20, 2016",250
-,avsej,http://avsej.net,75,85,"Jun 10, 2016",75
-,shkolnick-kun,https://github.com/shkolnick-kun,75,75,"Jul 6, 2016",75
-,flyx,http://flyx.org,35,140,"Apr 7, 2016",75
-,endragor,https://github.com/endragor,25,100,"Apr 7, 2016",25
-,euantorano,http://euantorano.co.uk,25,50,"Jun 7, 2016",25
-,FedericoCeratto,http://firelet.net,25,100,"Apr 7, 2016",25
-,"Adrian Veith",,25,100,"Apr 20, 2016",25
-,xxlabaza,https://github.com/xxlabaza,25,45,"Jun 17, 2016",25
-,"Yuriy Glukhov",,25,100,"Apr 6, 2016",25
-,"Jonathan Arnett",,10,30,"May 20, 2016",10
-,"Oskari Timperi",,10,20,"Jun 8, 2016",10
-,zachaysan,http://venn.lc,10,20,"Jun 7, 2016",10
-,"Matthew Baulch",,10,20,"Jun 7, 2016",10
-,RationalG,https://github.com/RationalG,10,20,"Jun 17, 2016",10
-,btbytes,https://www.btbytes.com/,10,40,"Apr 6, 2016",10
-,niebaopeng,https://github.com/niebaopeng,10,30,"Apr 15, 2016",10
-,moigagoo,http://sloth-ci.com,5,15,"May 13, 2016",5
-,calind,http://calindon.net,5,10,"Jun 7, 2016",5
-,swalf,https://github.com/swalf,5,35,"May 9, 2016",5
-,johnnovak,http://www.johnnovak.net/,5,20,"Apr 29, 2016",5
-,RyanMarcus,http://rmarcus.info,5,5,"Jul 19, 2016",5
-,Blumenversand,https://blumenversender.com/,5,5,"Jul 21, 2016",5
-,lenzenmi,https://github.com/lenzenmi,5,5,"Jul 28, 2016",5
-,"Handojo Goenadi",,5,20,"Apr 19, 2016",5
-,"Date in Asia",,5,5,"Jul 30, 2016",5
-,"Matthew Newton",,5,20,"Apr 20, 2016",5
-,"Michael D. Sklaroff",,1,4,"Apr 27, 2016",1
-,"Svend Knudsen",,1,4,"Apr 11, 2016",1
+,bogen,https://github.com/bogen,250,1010,"Jul 23, 2016",250
+assets/bountysource/secondspectrum.png,Second Spectrum,http://www.secondspectrum.com/,250,1000,"May 5, 2016",250
+assets/bountysource/xored.svg,"Xored Software, Inc.",http://xored.com/,250,750,"Jun 20, 2016",250
+,flyx,http://flyx.org,35,175,"Apr 7, 2016",75
+,shkolnick-kun,https://github.com/shkolnick-kun,75,150,"Jul 6, 2016",75
+,"Yuriy Glukhov",,25,125,"Apr 6, 2016",25
+,endragor,https://github.com/endragor,25,125,"Apr 7, 2016",25
+,FedericoCeratto,http://firelet.net,25,125,"Apr 7, 2016",25
+,"Adrian Veith",,25,125,"Apr 20, 2016",25
+,avsej,http://avsej.net,25,110,"Jun 10, 2016",25
+,euantorano,http://euantorano.co.uk,25,75,"Jun 7, 2016",25
+,xxlabaza,https://github.com/xxlabaza,25,70,"Jun 17, 2016",25
+,btbytes,https://www.btbytes.com/,10,50,"Apr 6, 2016",10
+,niebaopeng,https://github.com/niebaopeng,10,40,"Apr 15, 2016",10
+,"pyloor ",https://schwarz-weiss.cc/,10,40,"May 16, 2016",10
+,"Jonathan Arnett",,10,40,"May 20, 2016",10
+,swalf,https://github.com/swalf,5,40,"May 9, 2016",5
+,zachaysan,http://venn.lc,10,30,"Jun 7, 2016",10
+,"Matthew Baulch",,10,30,"Jun 7, 2016",10
+,"Oskari Timperi",,10,30,"Jun 8, 2016",10
+,RationalG,https://github.com/RationalG,10,30,"Jun 17, 2016",10
+,"Handojo Goenadi",,5,25,"Apr 19, 2016",5
+,"Matthew Newton",,5,25,"Apr 20, 2016",5
+,johnnovak,http://www.johnnovak.net/,5,25,"Apr 29, 2016",5
+,moigagoo,http://sloth-ci.com,5,20,"May 13, 2016",5
+,RyanMarcus,http://rmarcus.info,5,10,"Jul 19, 2016",5
+,Blumenversand,https://github.com/blumenversand,5,10,"Jul 21, 2016",5
+,lenzenmi,https://github.com/lenzenmi,5,10,"Jul 28, 2016",5
+,DateinAsia,,5,10,"Jul 30, 2016",5
+,pandada8,https://github.com/pandada8,5,5,"Aug 12, 2016",5
+,abeaumont,http://alfredobeaumont.org/blog,5,5,"Aug 12, 2016",5
+,"Svend Knudsen",,1,5,"Apr 11, 2016",1
+,"Michael D. Sklaroff",,1,5,"Apr 27, 2016",1
+,nicck,,1,1,"Aug 9, 2016",1
+