X-Git-Url: http://git.shiar.net/sheet.git/blobdiff_plain/f3267a45a926414f2b97855ec4ea76e04f22e09f..4e5cd85f8f19880be2521048426d413f4bbb8931:/common.inc.plp?ds=sidebyside
diff --git a/common.inc.plp b/common.inc.plp
index 6295de7..fec7b57 100644
--- a/common.inc.plp
+++ b/common.inc.plp
@@ -54,8 +54,7 @@ our $style;
$header{content_type} = 'text/html; charset=utf-8';
sub stylesheet {
- my ($avail) = @_;
- my @avail = ref $avail eq 'ARRAY' ? @{$avail} : $avail or return;
+ my @avail = qw( light dark circus mono red );
my %styles = map {$_ => $_} @avail;
if (defined( my $setstyle = $get{style} )) {
@@ -72,12 +71,10 @@ sub stylesheet {
} or warn "Unable to create style cookie: $@";
}
- $style ||= exists $cookie{style} && $styles{ $cookie{style} } || $avail[0];
-
- return map { sprintf(
- '',
- $_ eq $style ? 'stylesheet' : 'alternate stylesheet', "/$_.css?1.14", $_
- ) } @avail;
+ my $setstyle = $style;
+ $style ||= $styles{$_} for $cookie{style} || ();
+ $style ||= $avail[0];
+ return $setstyle;
}
sub checkmodified {
@@ -106,7 +103,7 @@ sub Data {
local $/; # slurp
return JSON::decode_json(readline $cache);
};
- if ($! or $@ or !@data or !$data[0]) {
+ if ($@ or !@data or !$data[0]) {
die ['Table data not found', $@ || $!];
}
if (@data == 1 and ref $data[0] eq 'HASH' and not %{$data[0]}) {
@@ -129,7 +126,6 @@ sub Html {
}
# default fallbacks
- $meta->{stylesheet} ||= [qw( light dark circus mono red )];
$meta->{charset} ||= 'utf-8';
$meta->{lang} ||= 'en';
@@ -141,11 +137,11 @@ sub Html {
$header{content_type} = "text/html; charset=$meta->{charset}"
unless $PLP::sentheaders;
exit if $ENV{REQUEST_METHOD} eq 'HEAD';
- unshift @{ $meta->{raw} }, stylesheet($meta->{stylesheet});
- push @{ $meta->{raw} }, (
- '',
+ unshift @{ $meta->{raw} }, (
+ '',
);
+ $meta->{stylesheet} = stylesheet();
if (my $img = $meta->{image}) {
my $proto = sprintf('http%s://', !!$ENV{HTTPS} && 's');
@@ -157,10 +153,18 @@ sub Html {
my ($file) = $ENV{SCRIPT_FILENAME} =~ m{ ([^/]+) \.plp$ }x;
+ $meta->{canonical} //= "/$file" . ($Request ne '' && "/$Request");
+ if (my $url = $meta->{canonical}) {
+ $url = "https://sheet.shiar.nl$url";
+ push @{ $meta->{raw} }, qq();
+ }
+
PLP_START {
# leading output
say '';
- say qq();
+ my $rootattr = '';
+ $rootattr .= qq( class="s-$_") for $meta->{stylesheet} || ();
+ say qq();
say '';
say '';
say sprintf '', $_
@@ -174,6 +178,7 @@ sub Html {
say '';
say for map { @{$_} } $meta->{raw} || ();
say '' if $Dev;
+ say '';
say '';
say '';
say sprintf '', $file;