X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/b97ebd969b2e520d3e65509c0f892edacae70520..3301a8a999962dee1aa9a6e6c32e3a72e8367f6c:/common.inc.plp diff --git a/common.inc.plp b/common.inc.plp index e4cc5f9..7935a8e 100644 --- a/common.inc.plp +++ b/common.inc.plp @@ -11,9 +11,13 @@ use HTTP::Date; use Encode qw( decode_utf8 ); sub Alert { - my ($title, $debug) = @_; - $title .= ": $debug" if $Dev and defined $debug; - say "

$title

\n"; + my ($html, $debug) = @_; + ref $html eq 'ARRAY' or $html = [$html]; + my ($title, @lines) = @{$html}; + $body = "

$title

"; + $body .= "\n

$_

" for @lines; + $body .= "\n
$debug
" if $Dev and $debug; + say "
$body
\n"; } $PLP::ERROR = sub { @@ -101,6 +105,10 @@ sub Html { ref $_ eq 'ARRAY' or $_ = [$_] for grep {$_} $meta->{raw}, $meta->{description}, $meta->{keywords}; + # document headers before output + $header{content_type} = "text/html; charset=$meta->{charset}"; + unshift @{ $meta->{raw} }, stylesheet($meta->{stylesheet}); + # optional amends push @{ $meta->{raw} }, ( '', @@ -112,7 +120,6 @@ sub Html { ) if $meta->{keys}; # leading output - $header{content_type} = "text/html; charset=$meta->{charset}"; say ''; say ''; say ''; @@ -125,7 +132,6 @@ sub Html { for join(', ', @{ $meta->{keywords} }) || (); say ''; say ''; - say for stylesheet($meta->{stylesheet}); say for map { @{$_} } $meta->{raw} || (); say '' if $Dev; say ''; @@ -155,10 +161,18 @@ sub Html { AGPLv3 EOT - say sprintf '• %.3fs', Time::HiRes::tv_interval($Time) if $Dev; + say sprintf '• %.3fs', Time::HiRes::tv_interval($Time) if $Dev and $Time; say '

'; say ''; say ''; }; } +sub showlink { + my ($title, $href, $selected) = @_; + return sprintf( + $selected ? '%s' : '%s', + EscapeHTML($title), EscapeHTML($href) + ); +} +