[Rt-commit] rt branch, squelch, updated. rt-3.8.8-841-g5c4a36d

[Thomas Sibley]

The branch, squelch has been updated
       via  5c4a36d286ab3d722fc07d92cd4b6c75cfd2086e (commit)
      from  2632132f09828373901ff6a09f86a20553c41e1f (commit)

Summary of changes:
 share/html/NoAuth/css/base/ticket-form.css |    7 +++++--
 share/html/Ticket/Elements/PreviewScrips   |   12 ++++++------
 share/html/Ticket/ModifyPeople.html        |   15 ++++++++++-----
 3 files changed, 21 insertions(+), 13 deletions(-)

- Log -----------------------------------------------------------------
commit 5c4a36d286ab3d722fc07d92cd4b6c75cfd2086e
Author: Thomas Sibley <trs at bestpractical.com>
Date:   Thu Sep 23 17:11:01 2010 -0400

    Improve the wording of ticket and txn squelching and use ShowUser
    
    This respects the user display preference, and the use of the proper
    <label> element lets people click on the label to toggle the ticky box.

diff --git a/share/html/NoAuth/css/base/ticket-form.css b/share/html/NoAuth/css/base/ticket-form.css
index 2bf1aea..1d615ce 100644
--- a/share/html/NoAuth/css/base/ticket-form.css
+++ b/share/html/NoAuth/css/base/ticket-form.css
@@ -54,8 +54,7 @@
     font-weight: normal;
 }
 
-#ticket-create-message .messagedetails,
-#ticket-update-message .messagedetails {
+#ticket-create-message .messagedetails, #previewscrips {
     margin-bottom: 0.5em;
 }
 
@@ -69,6 +68,10 @@
     padding-bottom: 2em;
 }
 
+.ticket-info-squelch ul, #previewscrips ul {
+    list-style: none;
+}
+
 /*
 % if ( RT->Config->Get("UseSideBySideLayout", $session{'CurrentUser'}) ) {
 */
diff --git a/share/html/Ticket/Elements/PreviewScrips b/share/html/Ticket/Elements/PreviewScrips
index 340b8d9..7027be0 100755
--- a/share/html/Ticket/Elements/PreviewScrips
+++ b/share/html/Ticket/Elements/PreviewScrips
@@ -52,10 +52,10 @@ $TicketObj => undef
 my $Object = $TicketObj->DryRun(%ARGS);
 my %recips;
 </%init>
-<h2><&|/l&>This message will be sent to...</&></h2>
-<i><&|/l, RT->Config->Get('WebPath')."/Ticket/ModifyPeople.html?id=".$TicketObj->Id,
-&>Uncheck boxes to disable notifications to the listed recipients <b>for this transaction only</b>; persistent squelching is managed on the <a href="[_1]">People page</a>.</&></i>
-<br /><br />
+<p>
+<&|/l, RT->Config->Get('WebPath')."/Ticket/ModifyPeople.html?id=".$TicketObj->Id,
+&>Uncheck boxes to disable notifications to the listed recipients <b>for this transaction only</b>; persistent squelching is managed on the <a href="[_1]">People page</a>.</&>
+</p>
 
 % if ( $Object and $Object->Scrips ) {
 %     for my $scrip (@{$Object->Scrips->Prepared}) {
@@ -72,8 +72,8 @@ my %recips;
 %                 my $checked = 1;
 %                 $m->callback(CallbackName => 'BeforeAddress', Ticket => $TicketObj, Address => $addr, Type => $type, Checked => \$checked);
 %                 $recips{$addr->address}++;
-                  <b><%loc($type)%></b>: <input type="checkbox" class="checkbox" name="TxnSendMailTo" checked="<% $checked %>" value="<%$addr->address%>" />
-                                         <%$addr->address%>
+                  <b><%loc($type)%></b>: <input type="checkbox" class="checkbox" name="TxnSendMailTo" checked="<% $checked %>" value="<%$addr->address%>" id="TxnSendMailTo-<% $addr->address %>" />
+                  <label for="TxnSendMailTo-<% $addr->address %>"><& /Elements/ShowUser, Address => $addr &></label>
 %                 $m->callback(CallbackName => 'AfterAddress', Ticket => $TicketObj, Address => $addr, Type => $type);
                   </li>
 %             }
diff --git a/share/html/Ticket/ModifyPeople.html b/share/html/Ticket/ModifyPeople.html
index 7b901d1..195a7de 100755
--- a/share/html/Ticket/ModifyPeople.html
+++ b/share/html/Ticket/ModifyPeople.html
@@ -61,15 +61,20 @@
 <& Elements/EditPeople, Ticket => $Ticket, UserField => $UserField, UserString => $UserString, UserOp => $UserOp, GroupString => $GroupString, GroupOp => $GroupOp, GroupField => $GroupField &>
 </&>
 <&| /Widgets/TitleBox, title => loc("Modify who receives mail for ticket #[_1]", $Ticket->Id),   width => "100%", color=> "#333399", class=>'ticket-info-squelch' &>
-<p><em>The checked addresses will possibly receive e-mail related to
-actions on this ticket, depending on the action taken. To prevent an
-address from receiving e-mail for this ticket, uncheck the
-address.</em></p>
+<p>
+  The checked users may receive email related to this ticket depending on the
+  action taken.  Uncheck users to stop sending email to them about this ticket.
+</p>
 
+<ul>
 % for my $addr (sort keys %recips) {
+  <li>
   <input type="hidden" name="autorecipient" value="<% $addr %>">
-  <input type="checkbox" name="checked_recipient" value="<%$addr%>" <% $recips{$addr} ? "checked" : "" %>> <%$addr%><br />
+  <input type="checkbox" name="checked_recipient" id="checked_recipient_<%$addr%>" value="<%$addr%>" <% $recips{$addr} ? "checked" : "" %>>
+  <label for="checked_recipient_<%$addr%>"><& /Elements/ShowUser, Address => Email::Address->parse($addr) &></label>
+  </li>
 % }
+</ul>
 </&>
 <& /Elements/Submit, Name => 'SubmitTicket', Label => loc('Save Changes'), Caption => loc("If you've updated anything above, be sure to"), color => "#333399" &>
 </form>

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