1 files changed, 34 insertions, 66 deletions

diff --git a/rt/html/Elements/CollectionAsTable/Header b/rt/html/Elements/CollectionAsTable/Header
index 9ed4be8..2d1574d 100644
--- a/rt/html/Elements/CollectionAsTable/Header
+++ b/rt/html/Elements/CollectionAsTable/Header
@@ -1,14 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# BEGIN LICENSE BLOCK;
 %# 
-%# COPYRIGHT:
-%#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
-%#                                          <jesse@bestpractical.com>
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
 %# 
-%# (Except where explicitly superseded by other copyright notices)
-%# 
-%# 
-%# LICENSE:
+%# (Except where explictly superceded by other copyright notices)
 %# 
 %# This work is made available to you under the terms of Version 2 of
 %# the GNU General Public License. A copy of that license should have
@@ -20,32 +14,16 @@
 %# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 %# General Public License for more details.
 %# 
-%# You should have received a copy of the GNU General Public License
-%# along with this program; if not, write to the Free Software
-%# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-%# 
-%# 
-%# CONTRIBUTION SUBMISSION POLICY:
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
 %# 
-%# (The following paragraph is not intended to limit the rights granted
-%# to you to modify and distribute this software under the terms of
-%# the GNU General Public License and is only of importance to you if
-%# you choose to contribute your changes and enhancements to the
-%# community by submitting them to Best Practical Solutions, LLC.)
 %# 
-%# By intentionally submitting any modifications, corrections or
-%# derivatives to this work, or any other work intended for use with
-%# Request Tracker, to Best Practical Solutions, LLC, you confirm that
-%# you are the copyright holder for those contributions and you grant
-%# Best Practical Solutions,  LLC a nonexclusive, worldwide, irrevocable,
-%# royalty-free, perpetual, license to use, copy, create derivative
-%# works based on those contributions, and sublicense and distribute
-%# those contributions and any derivatives thereof.
-%# 
-%# END BPS TAGGED BLOCK }}}
+%# END LICENSE BLOCK
+
 <%ARGS>
 @Format => undef
-$FormatString => undef
 $AllowSorting => undef
 $Order=>undef
 $BaseURL => undef
@@ -54,63 +32,53 @@ $Rows => undef
 $Page => undef
 $maxitems => undef
 </%ARGS>
-<TR class="collection-as-table">
+<TR>
 <%perl>
 
-my %generic_query_args = ( Query => $Query, Rows => $Rows, Page => $Page, Format => $FormatString );
+my %generic_query_args = ( Query => $Query, Rows => $Rows, Page => $Page );
 
 my $item = 0;
+$$maxitems = 0;
 foreach my $col (@Format) {
     $item++;
+    $$maxitems = $item if $item > $$maxitems;
     if ( $col->{title} eq 'NEWLINE' ) {
-        while ( $item < $maxitems ) {
-            $m->out(qq{<th class="collection-as-table">&nbsp;</th>\n});
-            $item++;
-        }
-
-        $item = 0;
-        $m->out(qq{</TR>\n<TR class="collection-as-table">});
+        $m->out('</TR>       <TR>');
+	$item = 0;
     }
     else {
-        $m->out('<TH class="collection-as-table">');
+        $m->out('<TH align="center">');
         my $title = $col->{title};
         $title =~ s/^__(.*)__$/$1/o;
-        $title = (
-            $m->comp(
-                '/Elements/RT__Ticket/ColumnMap',
-                Name => $title,
-                Attr => 'title'
-              )
-              || $title
-        );
-        if (
-               $AllowSorting
+        $title = ( $m->comp('/Elements/RT__Ticket/ColumnMap', 
+                     Name => $title, 
+                     Attr => 'title' 
+                 )  
+                     || $title
+                 );
+        if (   $AllowSorting
             && $col->{'attribute'}
-            && $m->comp(
-                '/Elements/RT__Ticket/ColumnMap',
-                Name => $col->{'attribute'},
-                Attr => 'attribute'
-            )
-          )
+            && $m->comp('/Elements/RT__Ticket/ColumnMap',
+                          Name => $col->{'attribute'},
+                          Attr => 'attribute' ) 
+           )
         {
 
             $m->out(
-                '<a href="' . $BaseURL
+                '<a href="' . $BaseURL 
                   . $m->comp(
                     '/Elements/QueryString',
                     %generic_query_args,
                     OrderBy => (
-                        $m->comp(
-                            '/Elements/RT__Ticket/ColumnMap',
-                            Name => $col->{'attribute'},
-                            Attr => 'attribute'
-                          )
+                        $m->comp('/Elements/RT__Ticket/ColumnMap',
+                          Name => $col->{'attribute'},
+                          Attr => 'attribute' 
+                    )
                           || $col->{'attribute'}
                     ),
                     Order => ( $ARGS{'Order'} eq 'ASC' ? 'DESC' : 'ASC' )
-                  )
-                  . '">'
-                  . loc($title) . '</a>'
+                  ).
+                  '">' . loc($title) . '</a>'
             );
         }
         else {