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

* Apply a patch from Carl Worth allowing a class attribute to be passed 

through the img plugin. Also allow the id attribute to be passed through.
master
joey 2007-05-28 19:07:38 +00:00
parent 51d7da8c87
commit 330bbd03df
5 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
IkiWiki/Plugin/img.pm
View File

@ -98,7 +98,10 @@ sub preprocess (@) { #{{{
return '<a href="'.$fileurl.'"><img src="'.$imgurl.
'" alt="'.$alt.'" width="'.$im->Get("width").
'" height="'.$im->Get("height").'" /></a>';
'" height="'.$im->Get("height").'"'.
(exists $params{class} ? ' class="'.$params{class}.'"' : '').
(exists $params{id} ? ' id="'.$params{id}.'"' : '').
' /></a>';
} #}}}
1

2
IkiWiki/Plugin/meta.pm
View File

@ -65,7 +65,7 @@ sub preprocess (@) { #{{{
}
}
elsif ($key eq 'title') {
$title{$page}=encode_entities($value);
$title{$page}=$value;
}
elsif ($key eq 'permalink') {
$permalink{$page}=$value;

4
debian/changelog vendored
View File

@ -16,8 +16,10 @@ ikiwiki (2.2) UNRELEASED; urgency=low
creating the same file. The move will be handled transparently, though you
might want to rebuild your wiki to make it occur in one step.
* Fix FTBFS in test suite introduced in last version. Closes: #425891
* Apply a patch from Carl Worth allowing a class attribute to be passed
through the img plugin. Also allow the id attribute to be passed through.
-- Joey Hess <joeyh@debian.org> Thu, 24 May 2007 16:09:59 -0400
-- Joey Hess <joeyh@debian.org> Mon, 28 May 2007 15:00:02 -0400
ikiwiki (2.1) unstable; urgency=low

2
doc/bugs/img_plugin_should_pass_through_class_attribute.mdwn
View File

@ -6,6 +6,8 @@ An example of the feature in use can be seen here (notice class="floatleft" and
And here's a patch to implement it. Will this survive markdown munging? It seems quite unlikely... How does one protect a block like this? Oh well, we'll see what happens.
> thanks, [[done]] --[[Joey]]
-Carl
From 405c29ba2ef97a514bade33ef826e71fe825962b Mon Sep 17 00:00:00 2001

17
doc/plugins/img.mdwn
View File

@ -16,10 +16,15 @@ Note that this is a stripped down version of Christian Mock's
\[[img image1.jpg size="200x200" alt="clouds"]]
The `alt` parameter is optional. The `size` parameter is also optional,
defaulting to full size. Note that the original image's aspect ratio is
always preserved, even if this means making the image smaller than the
specified size.
The image file will be searched for using the same rules as used to find
the file pointed to by a [[WikiLink]].
The `size` parameter is optional, defaulting to full size. Note that the
original image's aspect ratio is always preserved, even if this means
making the image smaller than the specified size.
You can also pass `alt`, `class` and `id` parameters. These are passed through
unchanged to the html img tag.
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.
@ -28,7 +33,3 @@ the page, unless overridden. Useful when including many images on a page.
\[[img photo1.jpg]]
\[[img photo2.jpg]]
\[[img photo3.jpg size=200x600]]
You can also reference an image in /images like this:
\[[img /images/photo3.jpg size=200x600]]