urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add osm.png 

Add an underlay for the osm plugin.

Update links to right path to icon. Note that the osm plugin has a
pervasive bug in how it links to icons; it assumes the site is at /.
I did not attempt to fix that; it should be using urlto() to make a correct
relative link.
master
Joey Hess 2012-03-03 12:16:00 -04:00
parent 8125cfa45b
commit 77344163ed
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
IkiWiki/Plugin/osm.pm
View File

@ -10,6 +10,7 @@ use IkiWiki 3.0;
sub import { sub import {
add_underlay("javascript"); add_underlay("javascript");
add_underlay("osm");
hook(type => "getsetup", id => "osm", call => \&getsetup); hook(type => "getsetup", id => "osm", call => \&getsetup);
hook(type => "format", id => "osm", call => \&format); hook(type => "format", id => "osm", call => \&format);
hook(type => "preprocess", id => "osm", call => \&preprocess); hook(type => "preprocess", id => "osm", call => \&preprocess);
@ -34,7 +35,7 @@ sub getsetup () {
}, },
osm_default_icon => { osm_default_icon => {
type => "string", type => "string",
example => "img/osm.png", example => "/ikiwiki/images/osm.png",
description => "the icon shon on links and on the main map", description => "the icon shon on links and on the main map",
safe => 0, safe => 0,
rebuild => 1, rebuild => 1,
@ -137,7 +138,7 @@ sub process_waypoint {
my $name = scrub($params{'name'} || $p, $page, $dest); # sanitized here my $name = scrub($params{'name'} || $p, $page, $dest); # sanitized here
my $desc = scrub($params{'desc'} || '', $page, $dest); # sanitized here my $desc = scrub($params{'desc'} || '', $page, $dest); # sanitized here
my $zoom = scrub($params{'zoom'} // $config{'osm_default_zoom'} // 15, $page, $dest); # sanitized below my $zoom = scrub($params{'zoom'} // $config{'osm_default_zoom'} // 15, $page, $dest); # sanitized below
my $icon = $config{'osm__default_icon'} || "img/osm.png"; # sanitized: we trust $config my $icon = $config{'osm__default_icon'} || "/ikiwiki/images/osm.png"; # sanitized: we trust $config
my $map = scrub($params{'map'} || 'map', $page, $dest); # sanitized here my $map = scrub($params{'map'} || 'map', $page, $dest); # sanitized here
my $alt = $config{'osm_alt'} ? "alt=\"$config{'osm_alt'}\"" : ''; # sanitized: we trust $config my $alt = $config{'osm_alt'} ? "alt=\"$config{'osm_alt'}\"" : ''; # sanitized: we trust $config
if ($zoom !~ /^\d\d?$/ || $zoom < 2 || $zoom > 18) { if ($zoom !~ /^\d\d?$/ || $zoom < 2 || $zoom > 18) {
@ -169,7 +170,7 @@ sub process_waypoint {
} }
} }
} }
$icon = "/img/unknown.png" unless $icon; $icon = "/ikiwiki/images/osm.png" unless $icon;
$tag = '' unless $tag; $tag = '' unless $tag;
if ($page eq $dest) { if ($page eq $dest) {
if (!defined($config{'osm_format'}) || !$config{'osm_format'}) { if (!defined($config{'osm_format'}) || !$config{'osm_format'}) {

BIN
underlays/osm/ikiwiki/images/osm.png 100644
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.9 KiB