git.shiar.nl
/
sheet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
8c3e7dc
)
common: join page options inline
author
Mischa POSLAWSKY
<perl@shiar.org>
Wed, 29 Mar 2017 16:05:12 +0000
(18:05 +0200)
committer
Mischa POSLAWSKY
<perl@shiar.org>
Mon, 24 Apr 2017 18:25:16 +0000
(20:25 +0200)
common.inc.plp
patch
|
blob
|
history
diff --git
a/common.inc.plp
b/common.inc.plp
index 6330329cc907f5c27f400326037a39c255d521eb..d6ef393c0313c437124e6c0d5f626394d9d76914 100644
(file)
--- a/
common.inc.plp
+++ b/
common.inc.plp
@@
-85,7
+85,9
@@
sub Html {
$meta->{stylesheet} ||= [qw'light dark circus mono red terse'];
$meta->{charset} ||= 'utf-8';
$meta->{stylesheet} ||= [qw'light dark circus mono red terse'];
$meta->{charset} ||= 'utf-8';
- ref $_ eq 'ARRAY' or $_ = [$_] for $meta->{raw};
+ # convert options to arrays
+ ref $_ eq 'ARRAY' or $_ = [$_]
+ for grep {$_} $meta->{raw}, $meta->{description}, $meta->{keywords};
# optional amends
push @{ $meta->{raw} }, (
# optional amends
push @{ $meta->{raw} }, (
@@
-97,11
+99,6
@@
sub Html {
'<script type="text/javascript" src="/keys.js?1.6"></script>',
) if $meta->{keys};
'<script type="text/javascript" src="/keys.js?1.6"></script>',
) if $meta->{keys};
- # flatten arrays
- ref $_ eq 'ARRAY' and $_ = join ' ', @$_ for $meta->{description};
- ref $_ eq 'ARRAY' and $_ = join ', ', @$_ for $meta->{keywords};
- ref $_ eq 'ARRAY' and $_ = join "\n", @$_ for $meta->{raw};
-
# other vars
my $Dev = $ENV{HTTP_HOST} =~ /\bdev\./;
my ($file) = $ENV{SCRIPT_FILENAME} =~ m{ ([^/]+) \.plp$ }x;
# other vars
my $Dev = $ENV{HTTP_HOST} =~ /\bdev\./;
my ($file) = $ENV{SCRIPT_FILENAME} =~ m{ ([^/]+) \.plp$ }x;
@@
-115,13
+112,15
@@
sub Html {
<head>
<meta http-equiv="content-type" content="$header{content_type}">
<title>$meta->{title}</title>
<head>
<meta http-equiv="content-type" content="$header{content_type}">
<title>$meta->{title}</title>
-<meta name="description" content="$meta->{description}">
-<meta name="keywords" content="$meta->{keywords}">
-<meta name="viewport" content="width=device-width, initial-scale=1">
-<link rel="icon" type="image/png" href="/clip.png">
EOT
EOT
+ say sprintf '<meta name="description" content="%s">', EscapeHTML($_)
+ for join(' ', @{ $meta->{description} }) || ();
+ say sprintf '<meta name="keywords" content="%s">', EscapeHTML($_)
+ for join(', ', @{ $meta->{keywords} }) || ();
+ say '<meta name="viewport" content="width=device-width, initial-scale=1">';
+ say '<link rel="icon" type="image/png" href="/clip.png">';
say for stylesheet($meta->{stylesheet});
say for stylesheet($meta->{stylesheet});
- say for $meta->{raw} || ();
+ say for
map { @{$_} }
$meta->{raw} || ();
say '<meta name="robots" content="noindex">' if $Dev;
say qq{</head>\n\n<body id="$file">};
say '<meta name="robots" content="noindex">' if $Dev;
say qq{</head>\n\n<body id="$file">};