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

refactor

master
Joey Hess 2010-01-07 15:36:49 -05:00
parent e68cce6d1d
commit 253b1a41c1
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
IkiWiki/Plugin/img.pm
View File

@ -159,21 +159,20 @@ sub preprocess (@) {
(exists $params{id} ? ' id="'.$params{id}.'"' : '').
' />';
my $alignclass=exists $params{align} ? "align-$params{align}" : "";
my $link;
if (! defined $params{link} || lc($params{link}) eq 'yes') {
if (exists $params{caption} || !exists $params{align}) {
$imgtag='<a href="'.$fileurl.'">'.$imgtag.'</a>';
}
else {
$imgtag='<a href="'.$fileurl.'" class="align-'.$params{align}.'">'.$imgtag.'</a>';
}
$link=$fileurl;
}
elsif ($params{link} =~ /^\w+:\/\//) {
if (exists $params{caption} || !exists $params{align}) {
$imgtag='<a href="'.$params{link}.'">'.$imgtag.'</a>';
}
else {
$imgtag='<a href="'.$params{link}.'" class="align-'.$params{align}.'">'.$imgtag.'</a>';
}
$link=$params{link};
}
if (defined $link) {
$imgtag='<a href="'.$link.'"'.
(!exists $params{caption} && $alignclass ? ' class="'.$alignclass.'"' : '').
'>'.$imgtag.'</a>';
}
else {
my $b = bestlink($params{page}, $params{link});
@ -183,14 +182,15 @@ sub preprocess (@) {
$imgtag=htmllink($params{page}, $params{destpage},
$params{link}, linktext => $imgtag,
noimageinline => 1,
(exists $params{caption} || !exists $params{align}) ?
() : (class => 'align-'.$params{align}));
(!exists $params{caption} && $alignclass) ?
(class => $alignclass) : (),
);
}
}
if (exists $params{caption}) {
return '<table class="img'.
(exists $params{align} ? ' align-'.$params{align} : '').
($alignclass ? ' '.$alignclass : '').
'">'.
'<caption>'.$params{caption}.'</caption>'.
'<tr><td>'.$imgtag.'</td></tr>'.