[Rt-commit] rt branch, 3.8-trunk, updated. rt-3.8.7-189-g0cd457d

[Kevin Falcone]

The branch, 3.8-trunk has been updated
       via  0cd457dc6ec08aff3ea0a5b52a3b1efccb3786eb (commit)
       via  18a91c14e4d7b4ee7e2163bed78b3606b59f44c8 (commit)
      from  3a8fef3101fe8b4915798f29eeed64a9d30f2410 (commit)

Summary of changes:
 share/html/Ticket/Elements/UpdateCc |   18 ++++++++++++++----
 1 files changed, 14 insertions(+), 4 deletions(-)

- Log -----------------------------------------------------------------
commit 18a91c14e4d7b4ee7e2163bed78b3606b59f44c8
Author: Kevin Falcone <falcone at bestpractical.com>
Date:   Tue Mar 9 16:38:18 2010 -0500

    Add some wording to the check boxes on the reply pages
    
    Make it clearer why those email addresses and checkboxes exist.
    Also refactor the loop a bit.
    Contributed by Richard Harman

diff --git a/share/html/Ticket/Elements/UpdateCc b/share/html/Ticket/Elements/UpdateCc
index f7880ee..1faab95 100644
--- a/share/html/Ticket/Elements/UpdateCc
+++ b/share/html/Ticket/Elements/UpdateCc
@@ -49,8 +49,10 @@
 <input type="hidden" id="UpdateIgnoreAddressCheckboxes" name="UpdateIgnoreAddressCheckboxes" value="0">
         <br />
 
-%foreach my $addr ( keys %txn_addresses) {
-%    next if ( grep {$addr eq $_} @req_addresses );
+%if (scalar @one_time_Ccs) {
+<i class="label">(check to add)</i>
+%}
+%foreach my $addr ( @one_time_Ccs ) {
 <input 
 id="UpdateCc-<%$addr%>" 
 name="UpdateCc-<%$addr%>" 
@@ -62,8 +64,10 @@ name="UpdateCc-<%$addr%>"
 %}
 </td></tr>
 <tr><td class="label"><&|/l&>One-time Bcc</&>:</td><td><& /Elements/EmailInput, Name => 'UpdateBcc', Size => '60', Default => $ARGS{UpdateBcc} &><br />
-%foreach my $addr ( keys %txn_addresses) {
-%    next if ( grep {$addr eq $_} @req_addresses );
+%if (scalar @one_time_Ccs) {
+<i class="label">(check to add)</i>
+%}
+%foreach my $addr ( @one_time_Ccs ) {
 <input
     id="UpdateBcc-<%$addr%>"
     name="UpdateBcc-<%$addr%>"
@@ -81,4 +85,10 @@ $TicketObj
 <%init>
 my %txn_addresses = %{$TicketObj->TransactionAddresses};
 my @req_addresses = split /,/, $TicketObj->RequestorAddresses;
+my @one_time_Ccs;
+
+foreach my $addr ( keys %txn_addresses) {
+  next if ( grep {$addr eq $_} @req_addresses );
+  push @one_time_Ccs,$addr;
+}
 </%init>

commit 0cd457dc6ec08aff3ea0a5b52a3b1efccb3786eb
Author: Kevin Falcone <falcone at bestpractical.com>
Date:   Tue Mar 9 16:43:11 2010 -0500

    Fix localization

diff --git a/share/html/Ticket/Elements/UpdateCc b/share/html/Ticket/Elements/UpdateCc
index 1faab95..d3767ae 100644
--- a/share/html/Ticket/Elements/UpdateCc
+++ b/share/html/Ticket/Elements/UpdateCc
@@ -50,7 +50,7 @@
         <br />
 
 %if (scalar @one_time_Ccs) {
-<i class="label">(check to add)</i>
+<i class="label">(<&|/l&>check to add)</&></i>
 %}
 %foreach my $addr ( @one_time_Ccs ) {
 <input 
@@ -65,7 +65,7 @@ name="UpdateCc-<%$addr%>"
 </td></tr>
 <tr><td class="label"><&|/l&>One-time Bcc</&>:</td><td><& /Elements/EmailInput, Name => 'UpdateBcc', Size => '60', Default => $ARGS{UpdateBcc} &><br />
 %if (scalar @one_time_Ccs) {
-<i class="label">(check to add)</i>
+<i class="label">(<&|/l&>check to add)</&></i>
 %}
 %foreach my $addr ( @one_time_Ccs ) {
 <input

-----------------------------------------------------------------------