1 files changed, 66 insertions, 51 deletions
diff --git a/rt/html/Ticket/Elements/EditBasics b/rt/html/Ticket/Elements/EditBasics
index 5d66b1fc1..7ad4a63b0 100644
--- a/rt/html/Ticket/Elements/EditBasics
+++ b/rt/html/Ticket/Elements/EditBasics
@@ -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,62 +20,71 @@
 %# 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.)
 %# 
-%# END LICENSE BLOCK
+%# 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 BPS TAGGED BLOCK
 <TABLE>
-  <TR><td>
-    <table>
+  <TR>
       <td class="label"><&|/l&>Subject</&>:</td>
-      <td class="value">
-        <input name=Subject value="<%$TicketObj->Subject|h%>" SIZE=50>
-      </td>
-    </table>
-  </td></TR>
-  <TR><td>
-    <table>
-      <TD>
-        <& /Elements/ShadedBox, 
-            title => loc('Status'),
-            content => $SelectStatus &>
-      </TD>
-      <TD>
-        <& /Elements/ShadedBox,
-	    title => loc('Time Worked'),
-	    content => "<input name=TimeWorked value=\"".$TicketObj->TimeWorked."\" SIZE=5>" &>
-      </TD>
-      <TD>
-        <& /Elements/ShadedBox,
-	    title => loc('Time Left'),
-	    content => "<input name=TimeLeft value=\"".$TicketObj->TimeLeft."\" SIZE=5>" 
-&>
-      </TD>
-      <TD>
-        <& /Elements/ShadedBox,
-	    title => loc('Priority'),
-	    content => "<input name=Priority value=\"".$TicketObj->Priority."\" SIZE=3>" &>
-      </TD>
-      <TD>
-        <& /Elements/ShadedBox,
-	    title => loc('Final Priority'),
-	    content => "<input name=FinalPriority value=\"".$TicketObj->FinalPriority."\" SIZE=3>" &>
-      </TD>
-      <TD>
-        <& /Elements/ShadedBox,
-            title => loc('Queue'),
-            content => "$SelectQueue" &>
-      </TD>
-    </table>
-  </td></TR>
+      <td class="value"><input name=Subject value="<%$TicketObj->Subject|h%>" SIZE=50></td>
+    </TR>
+
+  <TR>
+      <td class="label"><&|/l&>Status</&>:</td>
+      <td class="value"><%$SelectStatus|n%></td>
+    </TR>
+  <TR>
+      <td class="label"><&|/l&>Queue</&>:</td>
+      <td class="value"><%$SelectQueue|n%></td>
+    </TR>
+  <TR>
+      <td class="label"><&|/l&>Time Estimated</&>:</td>
+      <td class="value"><input name=TimeEstimated value="<%$TicketObj->TimeEstimated|h%>" SIZE="5"></td>
+    </TR>
+  <TR>
+      <td class="label"><&|/l&>Time Worked</&>:</td>
+      <td class="value"><input name=TimeWorked value="<%$TicketObj->TimeWorked|h%>" SIZE="5"></td>
+    </TR>
+  <TR>
+      <td class="label"><&|/l&>Time Left</&>:</td>
+      <td class="value"><input name=TimeLeft value="<%$TicketObj->TimeLeft|h%>" SIZE="5"></td>
+    </TR>
+
+  <TR>
+      <td class="label"><&|/l&>Priority</&>:</td>
+      <td class="value"><input name=Priority value="<%$TicketObj->Priority|h%>" SIZE="5"></td>
+    </TR>
+
+  <TR>
+      <td class="label"><&|/l&>Final Priority</&>:</td>
+      <td class="value"><input name=FinalPriority value="<%$TicketObj->FinalPriority|h%>" SIZE="5"></td>
+    </TR>
+<& /Elements/Callback, _CallbackName => 'EndOfList', TicketObj => $TicketObj, %ARGS &>
 </TABLE>
 
 <%INIT>
 #It's hard to do this inline, so we'll preload the html of the selectstatus in here.
-my $SelectStatus = $m->scomp("/Elements/SelectStatus", Name => 'Status', Default=> $TicketObj->Status);
+my $SelectStatus = $m->scomp("/Elements/SelectStatus", Name => 'Status', DefaultLabel => loc("[_1] (Unchanged)",$TicketObj->Status));
 my $SelectQueue = $m->scomp("/Elements/SelectQueue", Name => 'Queue', Default =>$TicketObj->QueueObj->Id);
 
 </%INIT>