[freeside-commits] freeside/rt/share/html/Ticket/Elements ShowSummary, 1.2, 1.3 ShowTransactionAttachments, 1.2, 1.3 Tabs, 1.2, 1.3
Ivan,,,
ivan at wavetail.420.am
Tue May 18 12:20:31 PDT 2010
Update of /home/cvs/cvsroot/freeside/rt/share/html/Ticket/Elements
In directory wavetail.420.am:/tmp/cvs-serv2904/share/html/Ticket/Elements
Modified Files:
ShowSummary ShowTransactionAttachments Tabs
Log Message:
merging rt \3.8.8 to HEAD
Index: Tabs
===================================================================
RCS file: /home/cvs/cvsroot/freeside/rt/share/html/Ticket/Elements/Tabs,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -d -r1.2 -r1.3
--- Tabs 3 Jan 2010 08:04:33 -0000 1.2
+++ Tabs 18 May 2010 19:20:29 -0000 1.3
@@ -75,11 +75,13 @@
# Don't display prev links if we're on the first ticket
if ( $item_map->{ $Ticket->Id }->{prev} ) {
+ if ( $item_map->{first} ) {
$searchtabs->{'_a'} = {
class => "nav",
path => "Ticket/Display.html?id=" . $item_map->{first},
title => '<< ' . loc('First')
};
+ }
$searchtabs->{"_b"} = {
class => "nav",
path => "Ticket/Display.html?id="
@@ -96,6 +98,7 @@
. $item_map->{ $Ticket->Id }->{next},
title => loc('Next') . ' >'
};
+ if ( $item_map->{last} ) {
$searchtabs->{'e'} = {
class => "nav",
path => "Ticket/Display.html?id=" . $item_map->{last},
@@ -103,6 +106,7 @@
};
}
}
+ }
$tabs->{"this"} = {
class => "currentnav",
Index: ShowTransactionAttachments
===================================================================
RCS file: /home/cvs/cvsroot/freeside/rt/share/html/Ticket/Elements/ShowTransactionAttachments,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -d -r1.2 -r1.3
--- ShowTransactionAttachments 3 Jan 2010 08:04:33 -0000 1.2
+++ ShowTransactionAttachments 18 May 2010 19:20:29 -0000 1.3
@@ -67,6 +67,9 @@
% if ( $DownloadableHeaders && !$message->Filename && $message->ContentType =~ /text/ ) {
/ <a href="<% $AttachPath %>/WithHeaders/<% $message->Id %>"><% loc('with headers') %></a>
% }
+
+% $m->callback(CallbackName => 'AfterDownloadLinks', ARGSRef => \%ARGS, Ticket => $Ticket, Transaction => $Transaction, Attachment => $message);
+
<br />
<span class="downloadcontenttype"><% $message->ContentType %> <% $size_to_str->( $size ) %></span>
</div>
@@ -76,7 +79,7 @@
% if ( scalar ( grep $_->__Value('Parent') == $message->id, @$Attachments ) ) {
<div class="messageattachments">
% } else {
-<div class="messagebody <% RT->Config->Get('PlainTextMono', $session{'CurrentUser'}) ? ' plain-text-white-space' : ''%>">
+<div class="messagebody">
% }
<%PERL>
Index: ShowSummary
===================================================================
RCS file: /home/cvs/cvsroot/freeside/rt/share/html/Ticket/Elements/ShowSummary,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -d -r1.2 -r1.3
--- ShowSummary 3 Jan 2010 08:04:33 -0000 1.2
+++ ShowSummary 18 May 2010 19:20:28 -0000 1.3
@@ -48,66 +48,80 @@
<table width="100%" class="ticket-summary">
<tr>
<td valign="top" class="boxcontainer">
+% $m->callback( %ARGS, CallbackName => 'LeftColumnTop' );
+
<&| /Widgets/TitleBox, title => loc('The Basics'),
title_href => RT->Config->Get('WebPath')."/Ticket/Modify.html?id=".$Ticket->Id,
- class => 'ticket-info-basics' &>
+ class => 'ticket-info-basics',
+ &>
<& /Ticket/Elements/ShowBasics, Ticket => $Ticket &>
</&>
% if ($Ticket->CustomFields->First) {
<&| /Widgets/TitleBox, title => loc('Custom Fields'),
title_href => RT->Config->Get('WebPath')."/Ticket/Modify.html?id=".$Ticket->Id,
- class => 'ticket-info-cfs' &>
+ class => 'ticket-info-cfs',
+ &>
<& /Ticket/Elements/ShowCustomFields, Ticket => $Ticket &>
</&>
% }
- <&| /Widgets/TitleBox, title => loc('People'),
- title_href => RT->Config->Get('WebPath')."/Ticket/ModifyPeople.html?id=".$Ticket->Id,
- class => 'ticket-info-people' &>
- <& /Ticket/Elements/ShowPeople, Ticket => $Ticket &>
- </&>
<&| /Widgets/TitleBox, title => loc('Customers'),
title_href => RT->Config->Get('WebPath')."/Ticket/ModifyCustomers.html?id=".$Ticket->Id,
- class => 'ticket-info-customers' &>
+ class => 'ticket-info-customers'
+ &>
<& /Ticket/Elements/ShowCustomers, Ticket => $Ticket &>
</&>
+ <&| /Widgets/TitleBox, title => loc('People'),
+ title_href => RT->Config->Get('WebPath')."/Ticket/ModifyPeople.html?id=".$Ticket->Id,
+ class => 'ticket-info-people',
+ &>
+ <& /Ticket/Elements/ShowPeople, Ticket => $Ticket &>
+ </&>
+
<& /Ticket/Elements/ShowAttachments, Ticket => $Ticket, Attachments => $Attachments &>
<& /Ticket/Elements/ShowRequestor, Ticket => $Ticket &>
% $m->callback( %ARGS, CallbackName => 'LeftColumn' );
+
</td>
<td valign="top" class="boxcontainer">
+
+% $m->callback( %ARGS, CallbackName => 'RightColumnTop' );
+
% if ( RT->Config->Get('EnableReminders') ) {
<&|/Widgets/TitleBox, title => loc("Reminders"),
title_href => RT->Config->Get('WebPath')."/Ticket/Reminders.html?id=".$Ticket->Id,
- class => 'ticket-info-reminders' &>
- <table>
- <tr>
- <td>
+ class => 'ticket-info-reminders',
+ &>
+ <table><tr><td>
<form action="<%RT->Config->Get('WebPath')%>/Ticket/Display.html" method="post">
<& /Ticket/Elements/Reminders, Ticket => $Ticket, ShowCompleted => 0 &>
<div align="right"><input type="submit" class="button" value="<&|/l&>Save</&>" /></div>
</form>
- </td>
- </tr>
- </table>
+ </td></tr></table>
</&>
% }
+
<&| /Widgets/TitleBox, title => loc("Dates"),
title_href => RT->Config->Get('WebPath')."/Ticket/ModifyDates.html?id=".$Ticket->Id,
- class => 'ticket-info-dates' &>
+ class => 'ticket-info-dates',
+ &>
<& /Ticket/Elements/ShowDates, Ticket => $Ticket &>
</&>
+
% my (@extra);
% push @extra, titleright_raw => '<a href="'. RT->Config->Get('WebPath'). '/Ticket/Graphs/index.html?id='.$Ticket->id.'">'.loc('Graph').'</a>' unless RT->Config->Get('DisableGraphViz');
<&| /Widgets/TitleBox, title => loc('Links'),
title_href => RT->Config->Get('WebPath')."/Ticket/ModifyLinks.html?id=".$Ticket->Id,
- class => 'ticket-info-links', @extra &>
+ class => 'ticket-info-links',
+ @extra,
+ &>
<& /Elements/ShowLinks, Ticket => $Ticket &>
</&>
+
% $m->callback( %ARGS, CallbackName => 'RightColumn' );
</td>
@@ -117,7 +131,3 @@
$Ticket => undef
$Attachments => undef
</%ARGS>
-
-
-
-
More information about the freeside-commits
mailing list