[rt-commit] [svn] r473 - in rt/branches/rt-3.1/html: NoAuth Ticket/Elements

[jesse at fsck.com]

Author: jesse
Date: Fri Mar  5 00:40:58 2004
New Revision: 473

Modified:
   rt/branches/rt-3.1/html/NoAuth/webrt.css
   rt/branches/rt-3.1/html/Ticket/Elements/PreviewScrips
Log:
Slight CSS cleanup.

Scrip preview updates



Modified: rt/branches/rt-3.1/html/NoAuth/webrt.css
==============================================================================
--- rt/branches/rt-3.1/html/NoAuth/webrt.css	(original)
+++ rt/branches/rt-3.1/html/NoAuth/webrt.css	Fri Mar  5 00:40:58 2004
@@ -155,7 +155,7 @@
 
 TD.mainbody {
         padding-top: 0.5em;
-        padding-left: 0em;
+        padding-left: 1em;
         padding-right: 1em;
         margin-left: 1em;
         margin-right: 1em;

Modified: rt/branches/rt-3.1/html/Ticket/Elements/PreviewScrips
==============================================================================
--- rt/branches/rt-3.1/html/Ticket/Elements/PreviewScrips	(original)
+++ rt/branches/rt-3.1/html/Ticket/Elements/PreviewScrips	Fri Mar  5 00:40:58 2004
@@ -22,7 +22,7 @@
 
 my $action;
 
-if ( $ARGS{'UpdateType'} eq 'response' ) {
+if (( $ARGS{'UpdateType'} eq 'response' ) || ($ARGS{'Action'} eq 'Respond' )) {
     $action = 'Correspond';
 }
 else {
@@ -45,18 +45,8 @@
 
 my @non_recipients = $TicketObj->SquelchMailTo;
 </%init>
-
-<h2><&|/l&>Squelched message recipients</&></h2>
-<i><&|/l&>(Check boxes to enable notifications to the listed recipients)</&></i>
-<br>
-<ul>
-% foreach my $recipient (@non_recipients) {
-<li><input type="checkbox" name="Ticket-<%$TicketObj->id%>-UnsquelchMailTo" value="<%$recipient->Content%>">
-<% $recipient->Content %>
-% }
-</ul>
-<h2><&|/l&>Message recipients</&></h2>
-<i><&|/l&>(Check boxes to disable notifications to the listed recipients)</&></i>
+<h2><&|/l&>This message will be sent to...</&></h2>
+<i><&|/l&>(Check boxes to disable notifications to the listed recipients)</&></i><br>
 % foreach my $scrip (@{$Object->Scrips->Prepared}) {
 % next unless $scrip->ActionObj->Action->isa('RT::Action::SendEmail');
 <b><%$scrip->Description%></b><br>
@@ -64,20 +54,26 @@
 <br>
 %foreach my $type qw(To Cc Bcc) {
 %my @addresses =  $scrip->ActionObj->Action->$type();
-% next unless $addresses[0];
-<%loc($type)%>:
 <ul>
 %foreach my $addr (@addresses) {
-<li><input type="checkbox" name="Ticket-<%$TicketObj->id%>-SquelchMailTo" value="<%$addr->address%>"> <%$addr->address%>
+<li> <b><%loc($type)%></b>: <input type="checkbox" name="Ticket-<%$TicketObj->id%>-SquelchMailTo" value="<%$addr->address%>"> <%$addr->address%>
 % }
 </ul>
-<br>
 % }
 % if ($RT::PreviewScripMessages) {
 <textarea cols=80 rows="5">
 <%$scrip->ActionObj->TemplateObj->MIMEObj->as_string%>
 </textarea>
 % }
-<hr>
 %}
+<br>
+<h2><&|/l&>Messages about this ticket will not be sent to...</&></h2>
+<i><&|/l&>(Check boxes to enable notifications to the listed recipients)</&></i>
+<br>
+<ul>
+% foreach my $recipient (@non_recipients) {
+<li><input type="checkbox" name="Ticket-<%$TicketObj->id%>-UnsquelchMailTo" value="<%$recipient->Content%>">
+<% $recipient->Content %>
+% }
+</ul>
 <& /Elements/Submit, Value => 'UpdatePreview', Label => loc('Save changes')&>