From 9c68254528b6f2c7d8c1921b452fa56064783782 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 2 Mar 2008 04:06:06 +0000
Subject: import rt 3.4.6

---
 rt/html/Elements/CollectionAsTable/Header      | 20 +++++++++-----------
 rt/html/Elements/CollectionAsTable/ParseFormat |  6 ++----
 rt/html/Elements/CollectionAsTable/Row         | 18 ++++++++----------
 3 files changed, 19 insertions(+), 25 deletions(-)

(limited to 'rt/html/Elements/CollectionAsTable')

diff --git a/rt/html/Elements/CollectionAsTable/Header b/rt/html/Elements/CollectionAsTable/Header
index a3277b317..9ed4be8ec 100644
--- a/rt/html/Elements/CollectionAsTable/Header
+++ b/rt/html/Elements/CollectionAsTable/Header
@@ -2,7 +2,7 @@
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2007 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -22,9 +22,7 @@
 %# 
 %# 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., 51 Franklin Street, Fifth Floor, Boston, MA
-%# 02110-1301 or visit their web page on the internet at
-%# http://www.gnu.org/copyleft/gpl.html.
+%# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 %# 
 %# 
 %# CONTRIBUTION SUBMISSION POLICY:
@@ -56,7 +54,7 @@ $Rows => undef
 $Page => undef
 $maxitems => undef
 </%ARGS>
-<tr class="collection-as-table">
+<TR class="collection-as-table">
 <%perl>
 
 my %generic_query_args = ( Query => $Query, Rows => $Rows, Page => $Page, Format => $FormatString );
@@ -64,18 +62,18 @@ my %generic_query_args = ( Query => $Query, Rows => $Rows, Page => $Page, Format
 my $item = 0;
 foreach my $col (@Format) {
     $item++;
-    if ( $col->{title} && ($col->{title} eq 'NEWLINE') ) {
+    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(qq{</TR>\n<TR class="collection-as-table">});
     }
     else {
-        $m->out('<th class="collection-as-table">');
-        my $title = $col->{title} || '';
+        $m->out('<TH class="collection-as-table">');
+        my $title = $col->{title};
         $title =~ s/^__(.*)__$/$1/o;
         $title = (
             $m->comp(
@@ -118,8 +116,8 @@ foreach my $col (@Format) {
         else {
             $m->out( loc($title) );
         }
-        $m->out('</th>');
+        $m->out('</TH>');
     }
 }
 </%perl>
-</tr>
+</TR>
diff --git a/rt/html/Elements/CollectionAsTable/ParseFormat b/rt/html/Elements/CollectionAsTable/ParseFormat
index 227076093..be56dea76 100644
--- a/rt/html/Elements/CollectionAsTable/ParseFormat
+++ b/rt/html/Elements/CollectionAsTable/ParseFormat
@@ -2,7 +2,7 @@
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2007 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -22,9 +22,7 @@
 %# 
 %# 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., 51 Franklin Street, Fifth Floor, Boston, MA
-%# 02110-1301 or visit their web page on the internet at
-%# http://www.gnu.org/copyleft/gpl.html.
+%# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 %# 
 %# 
 %# CONTRIBUTION SUBMISSION POLICY:
diff --git a/rt/html/Elements/CollectionAsTable/Row b/rt/html/Elements/CollectionAsTable/Row
index 64ecef41c..0de362ea8 100644
--- a/rt/html/Elements/CollectionAsTable/Row
+++ b/rt/html/Elements/CollectionAsTable/Row
@@ -2,7 +2,7 @@
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2007 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -22,9 +22,7 @@
 %# 
 %# 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., 51 Franklin Street, Fifth Floor, Boston, MA
-%# 02110-1301 or visit their web page on the internet at
-%# http://www.gnu.org/copyleft/gpl.html.
+%# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 %# 
 %# 
 %# CONTRIBUTION SUBMISSION POLICY:
@@ -55,17 +53,17 @@ $Warning => undef
 </%ARGS>
 
 <%PERL>
-$m->out('<tr class="' . ( $Warning ? 'warnline' : $i % 2 ? 'oddline' : 'evenline' ) . '" >' );
+$m->out('<TR class="' . ( $Warning ? 'warnline' : $i % 2 ? 'oddline' : 'evenline' ) . '" >' );
 my $item;
 foreach my $column (@Format) {
-    if ( defined $column->{title} && $column->{title} eq 'NEWLINE' ) {
+    if ( $column->{title} eq 'NEWLINE' ) {
         while ( $item < $maxitems ) {
             $m->out(qq{<td class="collection-as-table">&nbsp;</td>\n});
             $item++;
         }
         $item = 0;
-        $m->out('</tr>');
-        $m->out('<tr class="'
+        $m->out('</TR>');
+        $m->out('<TR class="'
               . ( $Warning ? 'warnline' : $i % 2 ? 'oddline' : 'evenline' )
               . '" >' );
         next;
@@ -101,7 +99,7 @@ foreach my $column (@Format) {
                 # Simple value; just escape it.
                 @out = $m->interp->apply_escapes( $value => 'h' );
             }
-            s/\n/<br \/>/gs for @out;
+            s/\n/<br>/gs for @out;
             $m->out( @out );
         }
         else {
@@ -110,5 +108,5 @@ foreach my $column (@Format) {
     }
     $m->out('</td>');
 }
-$m->out('</tr>');
+$m->out('</TR>');
 </%PERL>
-- 
cgit v1.2.1