X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/cb9e9afb6d730bf2799919d2a8bd4bc2ba0ad44d..330e20e6262283b2e68fc22227672250849985e1:/common.inc.plp

diff --git a/common.inc.plp b/common.inc.plp
index 4c7fbb9..cd0626a 100644
--- a/common.inc.plp
+++ b/common.inc.plp
@@ -27,7 +27,7 @@ BEGIN {
 	$PLP::ERROR = sub {
 		my ($text, $html) = @_;
 		warn $text;
-		unless ($PLP::sentheaders and $PLP::sentheaders->[0] !~ m{/PLP\.pm\z}) {
+		unless ($PLP::sentheaders and $PLP::sentheaders->[0] !~ m{/PLP\.pm$}) {
 			Html({nocache => 1});
 			say '<h1>Page unavailable</h1>';
 		}
@@ -59,7 +59,7 @@ sub stylesheet {
 			my $cookie = CGI::Cookie->new(
 				-name    => 'style',
 				-value   => $setstyle || '',
-				-path    => '/',  # site-wide; current page is confusing to most users
+				-path    => '/',  # site-wide
 				-expires => $setstyle ? '+5y' : '-1d',
 			) or die "empty object returned\n";
 			AddCookie($cookie->as_string);
@@ -70,7 +70,7 @@ sub stylesheet {
 
 	return map { sprintf(
 		'<link rel="%s" type="text/css" media="all" href="%s" title="%s">',
-		$_ eq $style ? 'stylesheet' : 'alternate stylesheet', "/$_.css?1.9", $_
+		$_ eq $style ? 'stylesheet' : 'alternate stylesheet', "/$_.css?1.10", $_
 	) } @avail;
 }
 
@@ -105,7 +105,7 @@ sub Html {
 	}
 
 	# default fallbacks
-	$meta->{stylesheet} ||= [qw'light dark circus mono red terse'];
+	$meta->{stylesheet} ||= [qw( light dark circus mono red )];
 	$meta->{charset} ||= 'utf-8';
 
 	# convert options to arrays
@@ -117,13 +117,16 @@ sub Html {
 		unless $PLP::sentheaders;
 	unshift @{ $meta->{raw} }, stylesheet($meta->{stylesheet});
 
+	push @{ $meta->{raw} }, (
+		'<link rel="stylesheet" type="text/css" media="monochrome" href="/mono.css" title="light">',
+	);
+
 	# optional amends
 	push @{ $meta->{raw} }, (
 		'<!--[if lte IE 6]><style> .help dl.legend dt {margin:0 0 1px} </style><![endif]-->',
 		'<!--[if lte IE 7]><style> .help dl.legend dd {float:none} </style><![endif]-->',
-		!$showkeys ? '<style type="text/css"> .no {visibility:hidden} </style>'
-			: $showkeys eq 'ghost' ? '<style type="text/css"> .no, .alias {opacity:.5} </style>'
-			: (),
+		!$showkeys ? '<style> .no {visibility:hidden} </style>' :
+		$showkeys eq 'ghost' ? '<style> .no, .alias {opacity:.5} </style>' : (),
 		'<script type="text/javascript" src="/keys.js?1.6"></script>',
 	) if $meta->{keys};
 
@@ -132,7 +135,8 @@ sub Html {
 	say '<html lang="en">';
 	say '';
 	say '<head>';
-	say sprintf '<meta http-equiv="content-type" content="%s">', $header{content_type};
+	say sprintf '<meta http-equiv="content-type" content="%s">', $_
+		for $header{content_type};
 	say sprintf '<title>%s</title>', $meta->{title};
 	say sprintf '<meta name="description" content="%s">', EscapeHTML($_)
 		for join(' ', @{ $meta->{description} }) || ();
@@ -166,8 +170,9 @@ sub Html {
 	version <a href="http://git.shiar.nl/sheet.git/history/HEAD:/$file.plp"
 	 rel="vcs-git" title="Git repository">$meta->{version}</a>
 	created by <a href="http://shiar.nl/" rel="author">Shiar</a> â¢
-	<a href="http://www.fsf.org/licensing/licenses/agpl-3.0.html" rel="license copyright"
-	 title="Licensed under the GNU Affero General Public License, version 3">AGPLv3</a>
+	<a href="http://www.fsf.org/licensing/licenses/agpl-3.0.html"
+	 title="Licensed under the GNU Affero General Public License, version 3"
+	 rel="license">AGPLv3</a>
 EOT
 		say sprintf 'â¢ %.3fs', Time::HiRes::tv_interval($Time) if $Dev and $Time;
 		say '</p>';
@@ -179,6 +184,7 @@ EOT
 sub showlink {
 	my ($title, $href, $selected) = @_;
 	return sprintf(
+		!$href ? '%s' :
 		$selected ? '<strong>%s</strong>' : '<a href="%2$s">%s</a>',
 		EscapeHTML($title), EscapeHTML($href)
 	);
