* img: Allow link=somepage to cause the image to link to a given page.

Slight overriding of link, as link=no is still used to disable the linking
  entirely. Unless you have a page named "no"..
master
joey 2007-09-22 16:46:27 +00:00
parent 7bde880fa8
commit 622b866f3e
4 changed files with 11 additions and 3 deletions

View File

@ -106,6 +106,10 @@ sub preprocess (@) { #{{{
if (! defined $params{link} || lc($params{link}) eq 'yes') { if (! defined $params{link} || lc($params{link}) eq 'yes') {
return '<a href="'.$fileurl.'">'.$imgtag.'</a>'; return '<a href="'.$fileurl.'">'.$imgtag.'</a>';
} }
elsif (length bestlink($params{page}, $params{link})) {
return htmllink($params{page}, $params{destpage},
$params{link}, linktext => $imgtag);
}
else { else {
return $imgtag; return $imgtag;
} }

5
debian/changelog vendored
View File

@ -9,8 +9,11 @@ ikiwiki (2.9) UNRELEASED; urgency=low
are not included in the map. Include special styling for such pages. are not included in the map. Include special styling for such pages.
* map: Remove common prefixes and don't over-indent. * map: Remove common prefixes and don't over-indent.
* Add class option to htmllink(). * Add class option to htmllink().
* img: Allow link=somepage to cause the image to link to a given page.
Slight overriding of link, as link=no is still used to disable the linking
entirely. Unless you have a page named "no"..
-- Joey Hess <joeyh@debian.org> Sat, 22 Sep 2007 12:31:22 -0400 -- Joey Hess <joeyh@debian.org> Sat, 22 Sep 2007 12:36:37 -0400
ikiwiki (2.8) unstable; urgency=low ikiwiki (2.8) unstable; urgency=low

View File

@ -27,8 +27,8 @@ You can also pass `alt`, `class` and `id` parameters. These are passed through
unchanged to the html img tag. unchanged to the html img tag.
The `link` parameter is used to control whether the scaled down image links The `link` parameter is used to control whether the scaled down image links
to the full size version. By default it does; set "link=no" to disable to the full size version. By default it does; set "link=somepage" to link
this. to another page instead, or "link=no" to disable the link.
You can also set default values that will be applied to all later images on You can also set default values that will be applied to all later images on
the page, unless overridden. Useful when including many images on a page. the page, unless overridden. Useful when including many images on a page.

View File

@ -4,3 +4,4 @@ on <http://www.bddebian.com/~wiki/sidebar/> I'd like to have the
logo link to \[[hurd/logo]] / <http://www.bddebian.com/~wiki/hurd/logo/> logo link to \[[hurd/logo]] / <http://www.bddebian.com/~wiki/hurd/logo/>
instead of linking to the PNG image file. --[[tschwinge]] instead of linking to the PNG image file. --[[tschwinge]]
> Done, use link=somepage --[[Joey]]