diff --git a/Makefile b/Makefile
index 52bcf1c..3a49664 100644
--- a/Makefile
+++ b/Makefile
@@ -51,7 +51,7 @@ $(DESTDIR)/g.cgi: g.cgi.c
$(CC) -o $@ $<
$(DESTDIR)/%-sm.jpg: %.jpg
- jpegtopnm $< | pnmscale -xysize 200 200 | pnmtojpeg > $@
+ jpegtopnm $< | pnmscale -xysize 600 600 | pnmtojpeg > $@
default: $(TARGETS)
diff --git a/chumby-photo.cgi b/chumby-photo.cgi
index 8137e9a..fe16dda 100755
--- a/chumby-photo.cgi
+++ b/chumby-photo.cgi
@@ -4,5 +4,20 @@ cd /home/neale/lib/images/chumby
echo Content-type: image/jpeg
echo
+
fn=$(ls *.jpg | shuf | head -n1)
-cat $fn
+
+# Guess at scale based on file size
+s=$(du "$fn" | cut -d' ' -f1)
+if [ $s -lt 100 ]; then
+ scale=1/1
+elif [ $s -lt 1000 ]; then
+ scale=1/2
+elif [ $s -lt 10000 ]; then
+ scale=1/4
+else
+ scale=1/8
+fi
+
+djpeg -scale $scale "$fn" | pnmscale -xysize 320 240 | cjpeg
+
diff --git a/default.css b/default.css
index 92554d6..cf4aa46 100644
--- a/default.css
+++ b/default.css
@@ -27,6 +27,10 @@ a:hover {
color: #bb3;
}
+img {
+ max-width: 60%;
+}
+
pre {
background: #ccc;
}
diff --git a/mdwntohtml b/mdwntohtml
index 81a57cc..79eee5d 100755
--- a/mdwntohtml
+++ b/mdwntohtml
@@ -7,7 +7,7 @@ while IFS=: read field value; do
;;
Title)
# echo strips leading and trailing whitespace
- title=$(echo $value)
+ title=${value# }
;;
esac
done
diff --git a/papers/derby-copyright.mdwn b/papers/derby-copyright.mdwn
index 8943042..5f7e4b1 100644
--- a/papers/derby-copyright.mdwn
+++ b/papers/derby-copyright.mdwn
@@ -46,8 +46,8 @@ debt to humanity that can only be repayed by
How This Pertains to Roller Derby
-------------------------------------
-To avoid drama, your league needs to be aware of copyright law,
-and who is reserving which rights on what works.
+To avoid butthurt and drama, your league needs to be aware of
+copyright law, and who is reserving which rights on what works.
A few years ago, apparently ASCAP was aggressively bullying Roller
Derby leagues to pay a "performance fee" for having music at their
@@ -59,22 +59,24 @@ while, I'll be offering a bittorrent download of a double-header's
worth of Creative Commons music for leagues to use, allowing you to
cheerfully tell ASCAP to get bent.)
-Maybe your graphic artist is a "market economy" type of gal, and your
-computer nerd is a "gift ecomony" guy. The graphic artist is going to
-want tangible payment, but the nerd is going to be happy to be doing
-something useful. What happens when the nerd finds out you've been
-giving money to the artist for the time she's spent on art, but he
-hasn't been getting a dime for his hours? Or what if your league
-thought that the donations from both the nerd and artist were given
-freely and without expectations? The answer to both questions is the
-same: butthurt and drama.
+[Look what can happen](http://www.derbyinfocus.com/2012/08/on-value-of-derby-photos.html)
+when you get a market economy person in a gift economy situation. He's
+laying out his argument very reasonably, because there's nothing
+unreasonable about market economies. But he's missing the point that
+(most) leagues are gift economies. Read between the lines here:
+those leagues are losing their photographer because, suddenly, he's
+demanding payment or increased gratitude. I'll bet those leagues had
+a couple really long drawn-out meetings about this: do the other
+volunteers feel this way? Are we not appreciating our volunteers
+enough? Butthurt! Drama!
-At this point I need to reveal that I am a "gift economy" thinker.
-People interested in my creds just need to visit [my
-homepage](http://woozle.org/~neale/) or do a web search on my name to
-see my involvement in free culture. Suffice it to say that I'm
-passionate about this stuff. Derby's do-it-yourself ethic was a
-very comfortable thing for me to get involved with.
+And payment is a Pandora's box. As a gift economy guy living in a
+market economy country, I can tell you that if my league decided to
+start paying one volunteer, I would probably adjust my view of
+the relationship, and get hacked off that I wasn't valued enough as an
+official, DJ, photographer, and software developer, to be paid too.
+Or, if I knew the full situation, I'd think that guy was
+being a jerk by extorting the poor league. Butthurt! Drama!
What should you do about this?
@@ -95,25 +97,6 @@ you need your dues--and ticket sales, if you have those--to pay for
things you can't get from volunteers, like insurance, paint, photocopies, and
tape.
-[Look what can happen](http://www.derbyinfocus.com/2012/08/on-value-of-derby-photos.html)
-when you get a market economy person in a gift economy situation. He's
-laying out his argument very reasonably, because there's nothing
-unreasonable about market economies. But he's missing the point that
-(most) leagues are gift economies. Read between the lines here:
-those leagues are losing their photographer because, suddenly, he's
-demanding payment or increased gratitude. I'll bet those leagues had
-a couple really long drawn-out meetings about this: do the other
-volunteers feel this way? Are we not appreciating our volunteers
-enough? Butthurt! Drama!
-
-And payment is a Pandora's box. As a gift economy guy living in a
-market economy country, I can tell you that if my league decided to
-start paying certain volunteers, I would probably adjust my view of
-the relationship, and get hacked off that I wasn't valued enough as an
-official, DJ, photographer, and software developer, to be paid too.
-Or, if I knew the full situation, I'd think that photographer was
-being a douchebag by extorting the poor league. Butthurt! Drama!
-
Sure, the presentation is going to suffer when you get out-of-focus or
poorly-framed photos, amateurish artwork, and web sites that look like
Geocities in 1997. But the skater-run, non-professional feel of small
diff --git a/portal.cgi b/portal.cgi
index 8f6732a..c58ceaf 100755
--- a/portal.cgi
+++ b/portal.cgi
@@ -81,8 +81,10 @@ h2 {
EOF
-[ "$NOCAL" ] || \
- echo ''
+if ! [ "$NOCAL" ]; then
+ printf '\n' \
+ 'https://www.google.com/calendar/embed?title=Calendar&showTitle=0&showDate=0&showPrint=0&showTz=0&mode=AGENDA&height=350&wkst=1&bgcolor=%23FFFFFF&src=2cdrf19kah6jkonhom8evck38c%40group.calendar.google.com&color=%23333333&src=s531giqfiotabht4qrn59tjf9g%40group.calendar.google.com&color=%231B887A&src=dartcatcher%40gmail.com&color=%23125A12&src=laderbydames%40gmail.com&color=%2323164E&src=uulosalamos.org_gu7e0s8dsh1tn8iktt468tk95k%40group.calendar.google.com&color=%232F6309&src=en.usa%23holiday%40group.v.calendar.google.com&color=%238D6F47&ctz=America%2FDenver'
+fi
if [ "$TINY" ]; then
echo '