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

* img: Allow the link parameter to point to an exterior url.

master
Joey Hess 2007-12-28 16:14:43 -05:00
parent 633f8d4dd3
commit c2afda7f90
4 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
IkiWiki/Plugin/img.pm
View File

@ -106,7 +106,11 @@ sub preprocess (@) { #{{{
if (! defined $params{link} || lc($params{link}) eq 'yes') {
return '<a href="'.$fileurl.'">'.$imgtag.'</a>';
}
elsif ($params{link} =~ /^\w+:\/\//) {
return '<a href="'.$params{link}.'">'.$imgtag.'</a>';
}
elsif (length bestlink($params{page}, $params{link})) {
add_depends($params{page}, $params{link});
return htmllink($params{page}, $params{destpage},
$params{link}, linktext => $imgtag,
noimageinline => 1);

1
debian/changelog vendored
View File

@ -3,6 +3,7 @@ ikiwiki (2.17) UNRELEASED; urgency=low
* Improved parentlinks special case for index pages.
* redir: Support for specifying anchors.
* img: Avoid nesting images when linking to another image. Closes: #457780
* img: Allow the link parameter to point to an exterior url.
-- Joey Hess <joeyh@debian.org> Wed, 19 Dec 2007 16:39:07 -0500

3
doc/plugins/img.mdwn
View File

@ -28,7 +28,8 @@ unchanged to the html img tag.
The `link` parameter is used to control whether the scaled down image links
to the full size version. By default it does; set "link=somepage" to link
to another page instead, or "link=no" to disable the link.
to another page instead, or "link=no" to disable the link, or
"link=http://url" to link to a given url.
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.

8
po/ikiwiki.pot
View File

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2007-12-18 16:38-0500\n"
"POT-Creation-Date: 2007-12-27 19:28-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -239,15 +239,15 @@ msgstr ""
msgid "stylesheet not found"
msgstr ""
#: ../IkiWiki/Plugin/meta.pm:114
#: ../IkiWiki/Plugin/meta.pm:116
msgid "redir page not found"
msgstr ""
#: ../IkiWiki/Plugin/meta.pm:126
#: ../IkiWiki/Plugin/meta.pm:129
msgid "redir cycle is not allowed"
msgstr ""
#: ../IkiWiki/Plugin/meta.pm:143
#: ../IkiWiki/Plugin/meta.pm:146
msgid "link is no longer supported"
msgstr ""