From 9c68254528b6f2c7d8c1921b452fa56064783782 Mon Sep 17 00:00:00 2001 From: ivan Date: Sun, 2 Mar 2008 04:06:06 +0000 Subject: import rt 3.4.6 --- rt/html/Ticket/Elements/ShowTransaction | 64 ++++++++++++++------------------- 1 file changed, 27 insertions(+), 37 deletions(-) (limited to 'rt/html/Ticket/Elements/ShowTransaction') diff --git a/rt/html/Ticket/Elements/ShowTransaction b/rt/html/Ticket/Elements/ShowTransaction index 12d8d3b68..8bf589d45 100644 --- a/rt/html/Ticket/Elements/ShowTransaction +++ b/rt/html/Ticket/Elements/ShowTransaction @@ -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 %# %# %# (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: @@ -45,33 +43,25 @@ %# those contributions and any derivatives thereof. %# %# END BPS TAGGED BLOCK }}} -
<% $RowNum % 2 ? ' odd' : ' even' %>"> - - - - + + + + % my $desc = $Transaction->BriefDescription; % $m->comp('/Elements/Callback', _CallbackName => 'ModifyDisplay', text => \$desc, Transaction => $Transaction, %ARGS); - - - - - - - + + + + - -
- # - <% $LastTransaction ? ' ' : ' ' |n %> - <% $transdate|n %>
#<% $LastTransaction ? ' ' : ' ' |n %>  <% $transdate|n %>  - <%$Transaction->CreatorObj->Name%> - <%$TicketString%> <%$desc%> - <%$TimeTaken%><%$titlebar_commands|n%>
+<%$Transaction->CreatorObj->Name%> - <%$TicketString%> <%$desc%> + +<%$TimeTaken%> <%$titlebar_commands|n%>
% if ($Transaction->CustomFieldValues->Count) { - <& /Elements/ShowCustomFields, Object => $Transaction &> +<& /Elements/ShowCustomFields, Object => $Transaction &> % } % $m->comp('ShowTransactionAttachments', %ARGS, Parent => 0) unless ($Collapsed ||!$ShowBody); -
-
+ + <%ARGS> $Ticket => undef @@ -92,37 +82,37 @@ $LastTransaction => 0 <%INIT> -my ( $TimeTaken, $TicketString, $type_class ); +my ( $TimeTaken, $TicketString, $bgcolor ); my $transdate = $Transaction->CreatedAsString(); $transdate =~ s/\s/ /g; if ( $Transaction->Type =~ /^(Create|Correspond|Comment$)/ ) { if ( $Transaction->IsInbound ) { - $type_class = 'message'; + $bgcolor = "#336699"; } else { - $type_class = 'message'; + $bgcolor = "#339999"; } } elsif ( ( $Transaction->Field =~ /^Owner$/ ) or ( $Transaction->Type =~ /^(AddWatcher|DelWatcher)$/ ) ) { - $type_class = 'people'; + $bgcolor = "#333399"; } elsif ( $Transaction->Type =~ /^(AddLink|DeleteLink)$/ ) { - $type_class = 'links'; + $bgcolor = "#336633"; } elsif ( $Transaction->Type =~ /^(Status|Set|Told)$/ ) { if ( $Transaction->Field =~ /^(Told|Starts|Started|Due)$/ ) { - $type_class = 'dates'; + $bgcolor = "#663366"; } else { - $type_class = 'basics'; + $bgcolor = "#993333"; } } else { - $type_class = 'other'; + $bgcolor = "#cccccc"; } if ( $Ticket->Id != $Transaction->Ticket ) { @@ -148,15 +138,15 @@ my @DisplayHeaders=qw ( _all); if ( $Transaction->Type =~ /EmailRecord$/ ) { @DisplayHeaders = qw(To Cc Bcc); - my $aid = - $titlebar_commands .= "[Ticket . "&Transaction=" . $Transaction->Id . "&Attachment=" - . ( $Attachments->[0] && $Attachments->[0]->id ) + . ( $Transaction->Attachments->First + && $Transaction->Attachments->First->Id ) + . '">' . loc('Show') . "] "; $ShowBody = 0; } -- cgit v1.2.1