[Rt-commit] r4131 - in rt/branches/3.5-TESTING/html: Elements Search/Elements Ticket Ticket/Elements

[ruz at bestpractical.com]

Author: ruz
Date: Mon Nov 21 22:54:02 2005
New Revision: 4131

Modified:
   rt/branches/3.5-TESTING/html/Elements/SelectTimeUnits
   rt/branches/3.5-TESTING/html/Search/Elements/PickBasics
   rt/branches/3.5-TESTING/html/Ticket/Create.html
   rt/branches/3.5-TESTING/html/Ticket/Elements/EditBasics
   rt/branches/3.5-TESTING/html/Ticket/Update.html
Log:
 r1332 at cubic-pc (orig r4124):  ruz | 2005-11-21 22:30:53 +0300
  r1329 at cubic-pc:  cubic | 2005-11-21 17:38:22 +0300
  * Name sufix -TimeUnits is optional in Elements/SelectTimeUnits
  * get rid of sufix in the callers
 


Modified: rt/branches/3.5-TESTING/html/Elements/SelectTimeUnits
==============================================================================
--- rt/branches/3.5-TESTING/html/Elements/SelectTimeUnits	(original)
+++ rt/branches/3.5-TESTING/html/Elements/SelectTimeUnits	Mon Nov 21 22:54:02 2005
@@ -43,10 +43,13 @@
 %# those contributions and any derivatives thereof.
 %# 
 %# END BPS TAGGED BLOCK }}}
-<SELECT NAME="<%$Name%>">
-<OPTION VALUE="minutes" SELECTED><%loc('Minutes')%></OPTION>
-<OPTION VALUE="hours" ><%loc('Hours')%></OPTION>
-</SELECT>
+<select name="<% $Name %>">
+<option value="minutes" selected><% loc('Minutes') %></option>
+<option value="hours"><% loc('Hours') %></option>
+</select>
+<%INIT>
+$Name .= '-TimeUnits' unless $Name =~ /-TimeUnits$/io;
+</%INIT>
 <%ARGS>
-$Name => undef
+$Name => ''
 </%ARGS>

Modified: rt/branches/3.5-TESTING/html/Search/Elements/PickBasics
==============================================================================
--- rt/branches/3.5-TESTING/html/Search/Elements/PickBasics	(original)
+++ rt/branches/3.5-TESTING/html/Search/Elements/PickBasics	Mon Nov 21 22:54:02 2005
@@ -138,7 +138,7 @@
 <& /Elements/SelectEqualityOperator, Name => "TimeOp" &>
 </td><td>
 <input Name="ValueOfTime" SIZE=5>
-<& /Elements/SelectTimeUnits, Name =>'ValueOfTime-TimeUnits' &>
+<& /Elements/SelectTimeUnits, Name =>'ValueOfTime' &>
 </td>
 </tr>
 <tr>

Modified: rt/branches/3.5-TESTING/html/Ticket/Create.html
==============================================================================
--- rt/branches/3.5-TESTING/html/Ticket/Create.html	(original)
+++ rt/branches/3.5-TESTING/html/Ticket/Create.html	Mon Nov 21 22:54:02 2005
@@ -181,19 +181,19 @@
 <tr><td align="right"><&|/l&>Time Estimated</&>:</td>
 <td>
 <input size="3" name="TimeEstimated" value="<%$ARGS{TimeEstimated}%>" />
-<& /Elements/SelectTimeUnits, Name =>'TimeEstimated-TimeUnits' &>
+<& /Elements/SelectTimeUnits, Name =>'TimeEstimated' &>
 
 </td></tr>
 <tr><td align="RIGHT"><&|/l&>Time Worked</&>:</td>
 <td>
 <input size="3" name="TimeWorked" value="<%$ARGS{TimeWorked}%>" />
-<& /Elements/SelectTimeUnits, Name =>'TimeWorked-TimeUnits' &>
+<& /Elements/SelectTimeUnits, Name =>'TimeWorked' &>
 
 </td></tr>
 <tr>
 <td align="RIGHT"><&|/l&>Time Left</&>:</td>
 <td><input size="3" name="TimeLeft" value="<%$ARGS{TimeLeft}%>" />
-<& /Elements/SelectTimeUnits, Name =>'TimeLeft-TimeUnits' &>
+<& /Elements/SelectTimeUnits, Name =>'TimeLeft' &>
 </td></tr>
 </table>
 </&>

Modified: rt/branches/3.5-TESTING/html/Ticket/Elements/EditBasics
==============================================================================
--- rt/branches/3.5-TESTING/html/Ticket/Elements/EditBasics	(original)
+++ rt/branches/3.5-TESTING/html/Ticket/Elements/EditBasics	Mon Nov 21 22:54:02 2005
@@ -66,20 +66,20 @@
   <tr>
       <td class="label"><&|/l&>Time Estimated</&>:</td>
       <td class="value"><input name=TimeEstimated value="<%$TicketObj->TimeEstimated|h%>" SIZE="5">
-    <& /Elements/SelectTimeUnits, Name =>'TimeEstimated-TimeUnits' &>
+    <& /Elements/SelectTimeUnits, Name =>'TimeEstimated' &>
 </td>
     </tr>
   <tr>
       <td class="label"><&|/l&>Time Worked</&>:</td>
       <td class="value"><input name=TimeWorked value="<%$TicketObj->TimeWorked|h%>" SIZE="5">
-    <& /Elements/SelectTimeUnits, Name =>'TimeWorked-TimeUnits' &>
+    <& /Elements/SelectTimeUnits, Name =>'TimeWorked' &>
 </td>
 
     </tr>
   <tr>
       <td class="label"><&|/l&>Time Left</&>:</td>
       <td class="value"><input name=TimeLeft value="<%$TicketObj->TimeLeft|h%>" SIZE="5">
-    <& /Elements/SelectTimeUnits, Name =>'TimeLeft-TimeUnits' &>
+    <& /Elements/SelectTimeUnits, Name =>'TimeLeft' &>
     </td>
     </tr>
 

Modified: rt/branches/3.5-TESTING/html/Ticket/Update.html
==============================================================================
--- rt/branches/3.5-TESTING/html/Ticket/Update.html	(original)
+++ rt/branches/3.5-TESTING/html/Ticket/Update.html	Mon Nov 21 22:54:02 2005
@@ -61,9 +61,8 @@
 <& /Elements/SelectStatus, Name=>"Status", DefaultLabel => loc("[_1] (Unchanged)", loc($TicketObj->Status)), Default => $ARGS{'Status'} || ($TicketObj->Status eq $DefaultStatus ? undef : $DefaultStatus)&>
 <&|/l&>Owner</&>:  
 <& /Elements/SelectOwner, Name=>"Owner", DefaultLabel => loc("[_1] (Unchanged)", $TicketObj->OwnerObj->Name()), QueueObj => $TicketObj->QueueObj, TicketObj => $TicketObj, Default => $ARGS{'Owner'} &>
-<&|/l&>Worked</&>: <input size="4" name="UpdateTimeWorked" value="<%
-$ARGS{UpdateTimeWorked}%>"> 
-<& /Elements/SelectTimeUnits, Name => 'UpdateTimeWorked-TimeUnits'&>
+<&|/l&>Worked</&>: <input size="4" name="UpdateTimeWorked" value="<% $ARGS{UpdateTimeWorked} %>"> 
+<& /Elements/SelectTimeUnits, Name => 'UpdateTimeWorked'&>
 </td></tr>
 % my $skip;
 <& /Elements/Callback, _CallbackName => 'BeforeUpdateType', skip => \$skip, %ARGS &>