X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=rt%2Fhtml%2FTicket%2FElements%2FShowBasics;h=55e923fa2e7e661e4dde8fa0a86fd49dc17fc159;hb=d39d52aac8f38ea9115628039f0df5aa3ac826de;hp=ad23e8c8c775dcb9c8571a6cb8fc42fdd2882247;hpb=c582e92888b4a5553e1b4e5214cf35217e4a0cf0;p=freeside.git

diff --git a/rt/html/Ticket/Elements/ShowBasics b/rt/html/Ticket/Elements/ShowBasics
index ad23e8c8c..55e923fa2 100644
--- a/rt/html/Ticket/Elements/ShowBasics
+++ b/rt/html/Ticket/Elements/ShowBasics
@@ -1,8 +1,14 @@
-%# BEGIN LICENSE BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
-%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# COPYRIGHT:
+%#  
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
+%#                                          <jesse@bestpractical.com>
 %# 
-%# (Except where explictly superceded by other copyright notices)
+%# (Except where explicitly superseded by other copyright notices)
+%# 
+%# 
+%# LICENSE:
 %# 
 %# 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
@@ -14,13 +20,29 @@
 %# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 %# General Public License for more details.
 %# 
-%# 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.
+%# 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:
+%# 
+%# (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 LICENSE BLOCK
+%# }}} END BPS TAGGED BLOCK
 <table>
   <tr>
     <td class="label"><&|/l&>Id</&>:</td>
@@ -30,9 +52,21 @@
     <td class="label"><&|/l&>Status</&>:</td>
     <td class="value"><&|/l&><% $Ticket->Status%></&></td>
   </tr>
+% if ($Ticket->TimeEstimated) {
+  <tr>
+    <td class="label"><&|/l&>Estimated</&>:</td>
+    <td class="value"><&|/l, $Ticket->TimeEstimated &>[_1] min</&></td>
+  </tr>
+% }
+% if ($Ticket->TimeWorked) {
   <tr>
     <td class="label"><&|/l&>Worked</&>:</td>
-    <td class="value"><&|/l, $TimeWorked &>[_1] min</&></td>
+    <td class="value"><&|/l, $Ticket->TimeWorked &>[_1] min</&></td>
+  </tr>
+% }
+  <tr>
+    <td class="label"><&|/l&>Left</&>:</td>
+    <td class="value"><&|/l, $Ticket->TimeLeft &>[_1] min</&></td>
   </tr>
   <tr>
     <td class="label"><&|/l&>Priority</&>:</td>
@@ -42,13 +76,8 @@
     <td class="label"><&|/l&>Queue</&>:</td>
     <td class="value"><%$Ticket->QueueObj->Name%></td>
   </tr>
+<& /Elements/Callback, _CallbackName => 'EndOfList', TicketObj => $Ticket, %ARGS &>
 </table>
-<%INIT>
-my $TimeWorked = $Ticket->TimeWorked;
-if ($Ticket->TimeLeft > 0 ) {
-  $TimeWorked = $Ticket->TimeWorked."/".$Ticket->TimeLeft;
-}
-</%INIT>
 <%ARGS>
 $Ticket => undef
 </%ARGS>