[Rt-commit] r17972 - in rt/3.999/branches/merge_to_3.8.2: share/html/Elements/CollectionAsTable

[sunnavy at bestpractical.com]

Author: sunnavy
Date: Wed Jan 28 22:33:34 2009
New Revision: 17972

Modified:
   rt/3.999/branches/merge_to_3.8.2/   (props changed)
   rt/3.999/branches/merge_to_3.8.2/share/html/Elements/CollectionAsTable/Row

Log:
 r19132 at sunnavys-mb:  sunnavy | 2009-01-29 10:14:42 +0800
 merged share/html/Elements/CollectionAsTable/Row


Modified: rt/3.999/branches/merge_to_3.8.2/share/html/Elements/CollectionAsTable/Row
==============================================================================
--- rt/3.999/branches/merge_to_3.8.2/share/html/Elements/CollectionAsTable/Row	(original)
+++ rt/3.999/branches/merge_to_3.8.2/share/html/Elements/CollectionAsTable/Row	Wed Jan 28 22:33:34 2009
@@ -76,12 +76,15 @@
         next;
     }
 
-    $item++;
     my $css_class = $column->{class} ? encode_entities( $column->{class}, q{'"&<>} ) : 'collection-as-table';
     $m->out(qq{<td class="$css_class" });
 
     my $align = $column->{align};
     my $style = $column->{style};
+    my $span  = $column->{span};
+
+    $item += ($span || 1);
+    
 
     my @out;
     foreach my $subcol ( @{ $column->{output} } ) {
@@ -129,8 +132,14 @@
         }
         s/\n/<br \/>/gs for @out;
     }
-    $m->out( 'align="' . $align . '"' ) if $align;
-    $m->out( 'style="' . $style . '"' ) if $style;
+
+    $m->out( 'align="'   . $m->interp->apply_escapes( $align => 'h' ) . '"' )
+        if $align;
+    $m->out( 'style="'   . $m->interp->apply_escapes( $style => 'h' ) . '"' )
+        if $style;
+    $m->out( 'colspan="' . $m->interp->apply_escapes( $span  => 'h' ) . '"' )
+        if $span;
+
     $m->out('>');
     $m->out(@out) if @out;
     $m->out( '</td>' . "\n" );