Index: share/html/Elements/CollectionAsTable/ParseFormat =================================================================== --- share/html/Elements/CollectionAsTable/ParseFormat (revision 6284) +++ share/html/Elements/CollectionAsTable/ParseFormat (working copy) @@ -77,6 +77,9 @@ if ( $col =~ s!/ALIGN:([^\/]+)!!io ) { $colref->{'align'} = $1; } + if ( $col =~ s!/SPAN:([^\/]+)!!io ) { + $colref->{'span'} = $1; + } if ( $col =~ /__(.*?)__/io ) { my @subcols; while ( $col =~ s/^(.*?)__(.*?)__//o ) { Index: share/html/Elements/CollectionAsTable/Row =================================================================== --- share/html/Elements/CollectionAsTable/Row (revision 6284) +++ share/html/Elements/CollectionAsTable/Row (working copy) @@ -76,13 +76,15 @@ next; } - $item++; my $class = $column->{class} ? encode_entities( $column->{class}, q{'"&<>} ) : 'collection-as-table'; $m->out(qq{{align}; my $style = $column->{style}; + my $span = $column->{span}; + $item += ($span || 1); + my @out; foreach my $subcol ( @{ $column->{output} } ) { unless ( $subcol =~ /^__(.*?)__$/ ) { @@ -131,6 +133,7 @@ } $m->out( 'align="' . $align . '"' ) if $align; $m->out( 'style="' . $style . '"' ) if $style; + $m->out( 'colspan="' . $span . '"' ) if $span; $m->out('>'); $m->out(@out) if @out; $m->out( '' . "\n" ); Index: share/html/Elements/CollectionAsTable/Header =================================================================== --- share/html/Elements/CollectionAsTable/Header (revision 6284) +++ share/html/Elements/CollectionAsTable/Header (working copy) @@ -87,9 +87,12 @@ next; } - $item++; + my $span = $col->{'span'}; + $item += ($span || 1); - $m->out(''); + $m->out('out(' colspan="' . $span . '"') if $span; + $m->out('>'); $title =~ s/^__(.*)__$/$1/o; my $tmp = $m->comp( '/Elements/ColumnMap',