From 886d8d9970ccfe4eae1efe0c11160ad0c69c1339 Mon Sep 17 00:00:00 2001
From: mark <mark>
Date: Wed, 7 Sep 2011 23:43:24 +0000
Subject: future ticket resolve fixes, #13583

---
 rt/share/html/Ticket/Elements/EditDates |  2 +-
 rt/share/html/Ticket/Elements/ShowDates |  2 +-
 rt/share/html/Ticket/Update.html        | 19 ++++++++++---------
 3 files changed, 12 insertions(+), 11 deletions(-)

(limited to 'rt/share/html')

diff --git a/rt/share/html/Ticket/Elements/EditDates b/rt/share/html/Ticket/Elements/EditDates
index 371f6e31e..4b9a93bb8 100755
--- a/rt/share/html/Ticket/Elements/EditDates
+++ b/rt/share/html/Ticket/Elements/EditDates
@@ -71,7 +71,7 @@
     </td>
   </tr>
   <tr>
-    <td class="label"><&|/l&>Close After</&>:</td>
+    <td class="label"><&|/l&>Resolve After</&>:</td>
     <td class="entry">
       <& /Elements/SelectDate, menu_prefix => 'WillResolve', current => 0 &> (<% $TicketObj->WillResolveObj->AsString %>)
     </td>
diff --git a/rt/share/html/Ticket/Elements/ShowDates b/rt/share/html/Ticket/Elements/ShowDates
index fc0146194..1df0f8084 100755
--- a/rt/share/html/Ticket/Elements/ShowDates
+++ b/rt/share/html/Ticket/Elements/ShowDates
@@ -72,7 +72,7 @@
 % }
   </tr>
   <tr>
-    <td class="label date resolved"><&|/l&>Closed</&>:</td>
+    <td class="label date resolved"><&|/l&>Resolved</&>:</td>
     <td class="value date resolved"><% $Ticket->ResolvedObj->AsString  %></td>
   </tr>
 % my $willresolve = $Ticket->WillResolveObj;
diff --git a/rt/share/html/Ticket/Update.html b/rt/share/html/Ticket/Update.html
index 7c28cc30d..0d4e3b223 100755
--- a/rt/share/html/Ticket/Update.html
+++ b/rt/share/html/Ticket/Update.html
@@ -90,15 +90,7 @@ function changeStatus() {
               || ($TicketObj->Status eq $DefaultStatus ? undef : $DefaultStatus,
     onchange => 'changeStatus()'
 )&>
-<span class="label"><&|/l&>Owner</&>:</span>
-<& /Elements/SelectOwner,
-    Name         => "Owner",
-    TicketObj    => $TicketObj,
-    QueueObj     => $TicketObj->QueueObj,
-    DefaultLabel => loc("[_1] (Unchanged)", $m->scomp('/Elements/ShowUser', User => $TicketObj->OwnerObj)),
-    Default      => $ARGS{'Owner'}
-&>
-<span class="label"><&|/l&>Close this Ticket on</&>:</span>
+<span class="label"><&|/l&>Resolve this Ticket on</&>:</span>
 <& /Elements/SelectDate, 
     menu_prefix => 'WillResolve',
     current => 0,
@@ -132,6 +124,15 @@ changeStatus();
 % if (!$skip) {
 <input type="hidden" class="hidden" name="id" value="<%$TicketObj->Id%>" /><br />
 % }
+<tr><td class="label"><&|/l&>Owner</&>:</td>
+<td><& /Elements/SelectOwner,
+    Name         => "Owner",
+    TicketObj    => $TicketObj,
+    QueueObj     => $TicketObj->QueueObj,
+    DefaultLabel => loc("[_1] (Unchanged)", $m->scomp('/Elements/ShowUser', User => $TicketObj->OwnerObj)),
+    Default      => $ARGS{'Owner'}
+&></td>
+</tr>
 <tr><td class="label"><&|/l&>Update Type</&>:</td>
 <td><select name="UpdateType">
 % if ($CanComment) {
-- 
cgit v1.2.1