X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=rt%2Fhtml%2FTicket%2FElements%2FShowHistory;h=45cd5122f06e22a8dc162460909f5e2ce88358a4;hp=75e34776fa3aca6595058ac9dfae307dfb31458b;hb=ef20b2b6b1feb47ad02b5ff7525f1a0fd11d0fa4;hpb=a513c0bef534d05f03c1242831b6f3be19b97dae

diff --git a/rt/html/Ticket/Elements/ShowHistory b/rt/html/Ticket/Elements/ShowHistory
index 75e34776f..45cd5122f 100644
--- a/rt/html/Ticket/Elements/ShowHistory
+++ b/rt/html/Ticket/Elements/ShowHistory
@@ -2,7 +2,7 @@
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2007 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -22,7 +22,9 @@
 %# 
 %# 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.
+%# 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.
 %# 
 %# 
 %# CONTRIBUTION SUBMISSION POLICY:
@@ -43,47 +45,45 @@
 %# those contributions and any derivatives thereof.
 %# 
 %# END BPS TAGGED BLOCK }}}
+<%doc>
+#   This is (ab)used in Admin/(Users|Groups)/History.html and should probably
+#   be generalized at some point.
+</%doc>
 <%perl>
- if ($ShowDisplayModes or $ShowTitle) {
-my $title;
-my $titleright;
-if ($ShowTitle) {
-    $title = loc('History');
-}
-else {
-    $title = '&nbsp;';
-}
-$titleright = loc('Display mode') . ":";
-if ($ShowHeaders) {
-    $titleright .= "[<A HREF=\"" . $URIFile . "?id="
-      . $Ticket->id . "\">"
-      . loc("Brief headers")
-      . "</a>] <b>["
-      . loc("Full headers") . "]</b>";
-}
-else {
-    $titleright .= "<b>["
-      . loc("Brief headers")
-      . "]</b> [<A HREF=\""
-      . $URIFile
-      . "?ShowHeaders=1"
-      . "&id="
-      . $Ticket->id . "\">"
-      . loc("Full headers") . "</a>]";
-}
+if ($ShowDisplayModes or $ShowTitle) {
+    my $title = $ShowTitle
+                    ? loc('History')
+                    : '&nbsp;';
+
+    my $titleright;
+
+    if ($ShowDisplayModes) {
+        $titleright = q[<span style="color: black">] . loc('Display mode') . ':</span> ';
+        
+        if ($ShowHeaders) {
+            $titleright .= qq{<a href="$URIFile?id=} .
+                           $Ticket->id.qq{">} .
+                           loc("Brief headers") .
+                           qq{</a> &mdash; };
+            $titleright .= q[<span class="selected">] . loc("Full headers") . "</span>";
+        }
+        else {
+            $titleright .= q[<span class="selected">] . loc("Brief headers") . "</span> &mdash; ";
+            $titleright .= qq{<a href="$URIFile?ShowHeaders=1;id=} .
+                           $Ticket->id.qq{">} .
+                           loc("Full headers") .
+                           qq{</a>};
+        }
+    }
 </%perl>
-<& /Elements/TitleBoxStart, title => $title, titleright => $titleright, bodyclass=> ''&>
+<& /Widgets/TitleBoxStart, title => $title, titleright => $titleright &>
 % }
 
-<TABLE WIDTH=100% CELLSPACING=0 CELLPADDING=2 BORDER=0>
+<div id="ticket-history">
 <%perl>
 my @attachments = @{$Attachments->ItemsArrayRef()};
 my @attachment_content = @{$AttachmentContent->ItemsArrayRef()};
 
-
-
-
-
 while ( my $Transaction = $Transactions->Next ) {
     my $skip = 0;
     $m->comp( '/Elements/Callback',
@@ -123,9 +123,9 @@ $m->flush_buffer();
 }
 
 </%perl>
-</TABLE>
+</div>
 % if ($ShowDisplayModes or $ShowTitle) {
-<& /Elements/TitleBoxEnd &>
+<& /Widgets/TitleBoxEnd &>
 % }
 <%INIT>
 my $Transactions = new RT::Transactions($session{'CurrentUser'});
@@ -136,8 +136,16 @@ if ($Tickets) {
 } else {
     $Transactions = $Ticket->Transactions;
 }
-my $i;
 
+
+my $OldestFirst = $RT::OldestTransactionsFirst? 'ASC': 'DESC';
+$Transactions->OrderByCols( { FIELD => 'Created',
+                              ORDER => $OldestFirst },
+                            { FIELD => 'id',
+                              ORDER => $OldestFirst },
+                          );
+
+my $i;
 $Attachments ||=  $m->comp('/Ticket/Elements/FindAttachments', Ticket => $Ticket, Tickets => $Tickets || undef);
 $AttachmentContent ||= $m->comp('/Ticket/Elements/LoadTextAttachments', Ticket => $Ticket);