fix column alignment

[freeside.git] / httemplate / search / elements / search-html.html

diff --git a/httemplate/search/elements/search-html.html b/httemplate/search/elements/search-html.html
index c0bb721..37178dc 100644 (file)
--- a/httemplate/search/elements/search-html.html
+++ b/httemplate/search/elements/search-html.html
@@ -144,11 +144,6 @@
 %               $cgi->param('_type', 'html-print'); 
                 as <A HREF="<% $cgi->self_url %>">printable copy</A>
 
-              <% $opt{'extra_choices_callback'}
-                 ? &{$opt{'extra_choices_callback'}}($cgi->query_string)
-                 : ''
-              %>
-
               </TD>
 %             $cgi->param('_type', "html" ); 
 %           } 
@@ -182,8 +177,13 @@
 
                 <TR>
 %                 my $h2 = 0;
+%                 my $colspan = 0;
 %                 foreach my $header ( @{ $opt{header} } ) { 
+%                   $colspan-- if $colspan > 0;
+%                   next if $colspan;
+%
 %                   my $label = ref($header) ? $header->{label} : $header;
+%                   $colspan = ref($header) ? $header->{colspan} : 0;
 %                   my $rowspan = 1;
 %                   my $style = '';
 %                   if ( $opt{header2} ) {
@@ -198,6 +198,7 @@
                     <TH CLASS   = "grid"
                         BGCOLOR = "#cccccc"
                         ROWSPAN = "<% $rowspan %>"
+                        <% $colspan ? 'COLSPAN = "'.$colspan.'"' : '' %>
                         <% $style %>
 
                     >
@@ -394,11 +395,12 @@
 
 %               } 
 
-%               if ( $opt{'footer'} ) { 
+%               if ( $opt{'footer'} ) {
 
                   <TR>
 
 %                   foreach my $footer ( @{ $opt{'footer'} } ) { 
+%                     $footer = &{$footer}() if ref($footer) eq 'CODE';
                       <TD CLASS="grid" BGCOLOR="#dddddd" STYLE="border-top: dashed 1px black;"><i><% $footer %></i></TD>
 %                   }