Log Message:
-----------
Format preview email better. Make COL[] info line up. Also identify
preview user.
Modified Files:
--------------
webwork2/lib/WeBWorK/ContentGenerator/Instructor:
SendMail.pm
Revision Data
-------------
Index: SendMail.pm
===================================================================
RCS file: /webwork/cvs/system/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm,v
retrieving revision 1.64
retrieving revision 1.65
diff -Llib/WeBWorK/ContentGenerator/Instructor/SendMail.pm -Llib/WeBWorK/ContentGenerator/Instructor/SendMail.pm -u -r1.64 -r1.65
--- lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm
+++ lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm
@@ -496,6 +496,11 @@
my $recipients = join(" ",@{$self->{ra_send_to} });
my $errorMessage = defined($self->{submit_message}) ? CGI::i($self->{submit_message} ) : '' ;
+
+ # Format message keeping the preview_header lined up
+ $errorMessage = wrap("","",$errorMessage);
+ $msg = wrap("","",$msg);
+
$msg = join("",
$errorMessage,
$preview_header,
@@ -506,7 +511,8 @@
$msg , "\n"
);
- return join("", '<pre>',wrap("","",$msg),"\n","\n",
+# return join("", '<pre>',wrap("","",$msg),"\n","\n",
+ return join("", '<pre>',$msg,"\n","\n",
'</pre>',
CGI::p('Use browser back button to return from preview mode'),
CGI::h3('Emails to be sent to the following:'),
@@ -633,7 +639,7 @@
-labels=>{all_students=>'All students in course',studentID => 'Selected students'},
-default=>'studentID', -linebreak=>0),
CGI::br(),$scrolling_user_list,
- CGI::i("Preview set to: "), $preview_record->last_name,
+ CGI::i("Preview set to: "), $preview_record->last_name,'(', $preview_record->user_id,')',
CGI::submit(-name=>'action', -value=>'preview',-label=>'Preview message'),' ',
),
); # end Tr
@@ -933,7 +939,7 @@
if ($for_preview) {
my @preview_COL = @COL;
shift @preview_COL; ## shift back for preview
- my $preview_header = CGI::pre({},data_format(1..($#COL)),"<br>", data_format2(@preview_COL)).
+ my $preview_header = CGI::p('',data_format(1..($#COL)),"<br>", data_format2(@preview_COL)).
CGI::h3( "This sample mail would be sent to $EMAIL");
return $msg, $preview_header;
} else {
|
