diff --git a/css/main2.css b/css/main2.css index c95647ec1..a2975f8d8 100644 --- a/css/main2.css +++ b/css/main2.css @@ -42,6 +42,7 @@ body#homepage { margin: 80px; text-align: left; } +.didntcave { color: #dd0000 } .caption { color: #004C4C; font-family: Tahoma,'Trebuchet MS','Lucida Grande',Verdana,Arial,Sans-Serif; diff --git a/scripts/make-folklist.py b/scripts/make-folklist.py index 9f2ccc4bc..f8eb74865 100755 --- a/scripts/make-folklist.py +++ b/scripts/make-folklist.py @@ -72,6 +72,12 @@ def collapse(m): #output = re.sub(r'(<td></td>)+',collapse, output) +lastyear=1976+1+len([t for t in headcounts_byyear if t > 0]) # no expo in 1986 + +# moved to main.css +#<style type="text/css"> +#.didntcave { color: #dd0000 } + print """ <!DOCTYPE html> <html> @@ -79,8 +85,6 @@ print """ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <title>CUCC's Austria expeditions: Members</title> <link rel="stylesheet" type="text/css" href="../css/main2.css" /> -<style type="text/css"> -.didntcave { color: #dd0000 } <!-- table.fancy { border-collapse: collapse; border: 2px solid black } table.fancy td { border: 1px solid black; padding: 2pt } @@ -91,8 +95,10 @@ table.fancy td.nonempty { background: #eee } <body> <!-- DO NOT EDIT THIS DOCUMENT BY HAND! It is automatically generated by "scripts/make-folklist.py" --> -<h1>CUCC members and guests in Austria 1976 to present</h1> +<h1>CUCC members and guests in Austria</br> 1976 to %s</h1> +""" % lastyear +print """ <p>This is a pretty much complete list of all the personnel on %d CUCC expeditions (there was no expo in 1986), together with the total number of expeditions each has attended and the total number of people on each expedition.</p> @@ -123,10 +129,14 @@ times. These include particularly Karl Gaisberger Gunter Graf, Sepp Steinberger and Robert Seebacher <a href="i/robert.jpg"><img alt=":-)" src="i/mug.png" /></a>.</p> - -<hr /><table class="fancy"> """ % len([t for t in headcounts_byyear if t > 0]) +y2 = lastyear-2 +y1 = lastyear-1 +print """ +<p>Links to recent expos: <a href="http://expo.survex.com/expedition/%s">last year</a> +<hr /><table class="fancy"> +""" % y1,y1 print output