table: Support header=column to make the table header be the first column of the data. (AlexandreDupas)
parent
ecb2626309
commit
657bf7846d
|
@ -22,7 +22,7 @@ sub getsetup () { #{{{
|
||||||
sub preprocess (@) { #{{{
|
sub preprocess (@) { #{{{
|
||||||
my %params =(
|
my %params =(
|
||||||
format => 'auto',
|
format => 'auto',
|
||||||
header => 'yes',
|
header => 'row',
|
||||||
@_
|
@_
|
||||||
);
|
);
|
||||||
|
|
||||||
|
@ -74,7 +74,7 @@ sub preprocess (@) { #{{{
|
||||||
}
|
}
|
||||||
|
|
||||||
my $header;
|
my $header;
|
||||||
if (lc($params{header}) eq "yes") {
|
if (lc($params{header}) eq "row" || lc($params{header}) eq "yes") {
|
||||||
$header=shift @data;
|
$header=shift @data;
|
||||||
}
|
}
|
||||||
if (! @data) {
|
if (! @data) {
|
||||||
|
@ -86,11 +86,10 @@ sub preprocess (@) { #{{{
|
||||||
? "<table class=\"".$params{class}.'">'
|
? "<table class=\"".$params{class}.'">'
|
||||||
: '<table>';
|
: '<table>';
|
||||||
push @lines, "\t<thead>",
|
push @lines, "\t<thead>",
|
||||||
genrow($params{page}, $params{destpage}, "th", @$header),
|
genrow(\%params, "th", @$header),
|
||||||
"\t</thead>" if defined $header;
|
"\t</thead>" if defined $header;
|
||||||
push @lines, "\t<tbody>" if defined $header;
|
push @lines, "\t<tbody>" if defined $header;
|
||||||
push @lines, genrow($params{page}, $params{destpage}, "td", @$_)
|
push @lines, genrow(\%params, "td", @$_) foreach @data;
|
||||||
foreach @data;
|
|
||||||
push @lines, "\t</tbody>" if defined $header;
|
push @lines, "\t</tbody>" if defined $header;
|
||||||
push @lines, '</table>';
|
push @lines, '</table>';
|
||||||
my $html = join("\n", @lines);
|
my $html = join("\n", @lines);
|
||||||
|
@ -153,26 +152,39 @@ sub split_dsv ($$) { #{{{
|
||||||
return @data;
|
return @data;
|
||||||
} #}}}
|
} #}}}
|
||||||
|
|
||||||
sub genrow ($$$@) { #{{{
|
sub genrow ($@) { #{{{
|
||||||
my $page = shift;
|
my %params=%{shift()};
|
||||||
my $destpage = shift;
|
|
||||||
my $elt = shift;
|
my $elt = shift;
|
||||||
my @data = @_;
|
my @data = @_;
|
||||||
|
|
||||||
|
my $page=$params{page};
|
||||||
|
my $destpage=$params{destpage};
|
||||||
|
my $type=pagetype($pagesources{$page});
|
||||||
|
|
||||||
my @ret;
|
my @ret;
|
||||||
push @ret, "\t\t<tr>";
|
push @ret, "\t\t<tr>";
|
||||||
for (my $x=0; $x < @data; $x++) {
|
for (my $x=0; $x < @data; $x++) {
|
||||||
my $cell=htmlize($page, $destpage, $data[$x]);
|
my $cell=IkiWiki::htmlize($page, $destpage, $type,
|
||||||
|
IkiWiki::preprocess($page, $destpage, $data[$x]));
|
||||||
|
|
||||||
|
# automatic colspan for empty cells
|
||||||
my $colspan=1;
|
my $colspan=1;
|
||||||
while ($x+1 < @data && $data[$x+1] eq '') {
|
while ($x+1 < @data && $data[$x+1] eq '') {
|
||||||
$x++;
|
$x++;
|
||||||
$colspan++;
|
$colspan++;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# check if the first column should be a header
|
||||||
|
my $e=$elt;
|
||||||
|
if ($x == 0 && lc($params{header}) eq "column") {
|
||||||
|
$e="th";
|
||||||
|
}
|
||||||
|
|
||||||
if ($colspan > 1) {
|
if ($colspan > 1) {
|
||||||
push @ret, "\t\t\t<$elt colspan=\"$colspan\">$cell</$elt>"
|
push @ret, "\t\t\t<$e colspan=\"$colspan\">$cell</$e>"
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
push @ret, "\t\t\t<$elt>$cell</$elt>"
|
push @ret, "\t\t\t<$e>$cell</$e>"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
push @ret, "\t\t</tr>";
|
push @ret, "\t\t</tr>";
|
||||||
|
@ -180,12 +192,4 @@ sub genrow ($$$@) { #{{{
|
||||||
return @ret;
|
return @ret;
|
||||||
} #}}}
|
} #}}}
|
||||||
|
|
||||||
sub htmlize ($$$) { #{{{
|
|
||||||
my $page = shift;
|
|
||||||
my $destpage = shift;
|
|
||||||
|
|
||||||
return IkiWiki::htmlize($page, $destpage, pagetype($pagesources{$page}),
|
|
||||||
IkiWiki::preprocess($page, $destpage, shift));
|
|
||||||
}
|
|
||||||
|
|
||||||
1
|
1
|
||||||
|
|
|
@ -9,6 +9,8 @@ ikiwiki (2.63) UNRELEASED; urgency=low
|
||||||
* style.css: Add missing semicolon. Closes: #497176
|
* style.css: Add missing semicolon. Closes: #497176
|
||||||
* filecheck: Fall back to testing for binary or plain text files
|
* filecheck: Fall back to testing for binary or plain text files
|
||||||
if no mime type is detected.
|
if no mime type is detected.
|
||||||
|
* table: Support header=column to make the table header be the first
|
||||||
|
column of the data. (AlexandreDupas)
|
||||||
|
|
||||||
-- Joey Hess <joeyh@debian.org> Thu, 28 Aug 2008 16:08:18 -0400
|
-- Joey Hess <joeyh@debian.org> Thu, 28 Aug 2008 16:08:18 -0400
|
||||||
|
|
||||||
|
|
|
@ -41,5 +41,6 @@ cells. For example:
|
||||||
* `delimiter` - The character used to separate fields. By default,
|
* `delimiter` - The character used to separate fields. By default,
|
||||||
DSV format uses a pipe (`|`), and CSV uses a comma (`,`).
|
DSV format uses a pipe (`|`), and CSV uses a comma (`,`).
|
||||||
* `class` - A CSS class for the table html element.
|
* `class` - A CSS class for the table html element.
|
||||||
* `header` - Set to "no" to make a table without a header. By default,
|
* `header` - By default, or if set to "row", the first data line is used
|
||||||
the first data line is used as the table header.
|
as the table header. Set it to "no" to make a table without a header, or
|
||||||
|
"column" to make the first column be the header.
|
||||||
|
|
|
@ -24,3 +24,8 @@ Here is the links to the patch and to a patched version of the plugin :
|
||||||
I hope this might be intresting for some ikiwiki user's.
|
I hope this might be intresting for some ikiwiki user's.
|
||||||
|
|
||||||
--[[AlexandreDupas]]
|
--[[AlexandreDupas]]
|
||||||
|
|
||||||
|
> Thanks for the patch, I've merged it in.
|
||||||
|
> (Just FYI, in future, I recommend using a unified diff. Also, not
|
||||||
|
> renaming variables that don't really need to be renamed makes your patch
|
||||||
|
> easier to apply.) --[[Joey]]
|
||||||
|
|
|
@ -3,3 +3,5 @@ Tables support a header row or no header, but do not support a header column.
|
||||||
> I have proposed a patch to the table plugin that enable such behaviour: [[table/discussion|plugins/table/discussion]].
|
> I have proposed a patch to the table plugin that enable such behaviour: [[table/discussion|plugins/table/discussion]].
|
||||||
>
|
>
|
||||||
> -- [[AlexandreDupas]]
|
> -- [[AlexandreDupas]]
|
||||||
|
|
||||||
|
>> [applied|done]]
|
||||||
|
|
Loading…
Reference in New Issue