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

only use css alignment stuff for table 

This way users can use all the other alignment values when not including a
caption. Also, it will work without the standard style, and I don't have to
worry about regressions this way.
master
Joey Hess 2010-01-07 16:09:34 -05:00
parent cf5f1c3a3a
commit eb30cfb310
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
IkiWiki/Plugin/img.pm
View File

@ -156,11 +156,10 @@ sub preprocess (@) {
(exists $params{alt} ? ' alt="'.$params{alt}.'"' : ''). (exists $params{alt} ? ' alt="'.$params{alt}.'"' : '').
(exists $params{title} ? ' title="'.$params{title}.'"' : ''). (exists $params{title} ? ' title="'.$params{title}.'"' : '').
(exists $params{class} ? ' class="'.$params{class}.'"' : ''). (exists $params{class} ? ' class="'.$params{class}.'"' : '').
(exists $params{align} && ! exists $params{caption} ? ' align="'.$params{align}.'"' : '').
(exists $params{id} ? ' id="'.$params{id}.'"' : ''). (exists $params{id} ? ' id="'.$params{id}.'"' : '').
' />'; ' />';
my $alignclass=exists $params{align} ? "align-$params{align}" : "";
my $link; my $link;
if (! defined $params{link}) { if (! defined $params{link}) {
$link=$fileurl; $link=$fileurl;
@ -170,9 +169,7 @@ sub preprocess (@) {
} }
if (defined $link) { if (defined $link) {
$imgtag='<a href="'.$link.'"'. $imgtag='<a href="'.$link.'">'.$imgtag.'</a>';
(!exists $params{caption} && $alignclass ? ' class="'.$alignclass.'"' : '').
'>'.$imgtag.'</a>';
} }
else { else {
my $b = bestlink($params{page}, $params{link}); my $b = bestlink($params{page}, $params{link});
@ -182,15 +179,13 @@ sub preprocess (@) {
$imgtag=htmllink($params{page}, $params{destpage}, $imgtag=htmllink($params{page}, $params{destpage},
$params{link}, linktext => $imgtag, $params{link}, linktext => $imgtag,
noimageinline => 1, noimageinline => 1,
(!exists $params{caption} && $alignclass) ?
(class => $alignclass) : (),
); );
} }
} }
if (exists $params{caption}) { if (exists $params{caption}) {
return '<table class="img'. return '<table class="img'.
($alignclass ? ' '.$alignclass : ''). (exists $params{align} ? " align-$params{align}" : "").
'">'. '">'.
'<caption>'.$params{caption}.'</caption>'. '<caption>'.$params{caption}.'</caption>'.
'<tr><td>'.$imgtag.'</td></tr>'. '<tr><td>'.$imgtag.'</td></tr>'.