--- loncom/interface/lonmsgdisplay.pm 2010/02/12 15:21:37 1.148 +++ loncom/interface/lonmsgdisplay.pm 2010/08/07 19:23:51 1.154 @@ -1,7 +1,7 @@ -# The LearningOnline Network with CAPA +# $textareaclass The LearningOnline Network with CAPA # Routines for messaging display # -# $Id: lonmsgdisplay.pm,v 1.148 2010/02/12 15:21:37 bisitz Exp $ +# $Id: lonmsgdisplay.pm,v 1.154 2010/08/07 19:23:51 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -225,18 +225,18 @@ function folder_choice(targetform,caller
'.$lt{'fold'}.' '."\n". - &Apache::loncommon::select_form($folder,'folder',%formhash).' + &Apache::loncommon::select_form($folder,'folder',\%formhash).' |
'.$lt{'show'}.' '."\n". &Apache::loncommon::select_form($env{'form.interdis'},'interdis', - %show).' + \%show).' |
'.$lt{'status'}.' '."\n". - &Apache::loncommon::select_form($msgstatus,'msgstatus',%statushash).' + &Apache::loncommon::select_form($msgstatus,'msgstatus',\%statushash).' |
'.$lt{'actn'}.' '."\n".' '. - &Apache::loncommon::select_form('view','folderaction',%actions). + &Apache::loncommon::select_form('view','folderaction',\%actions). ' @@ -626,9 +626,7 @@ sub disgroup { return; } else { $hasfloat = 1; - unless($env{'environment.wysiwygeditor'} eq 'on') { - $r->print(' ');
- }
+ $r->print(' ');
}
return $hasfloat;
}
@@ -1098,7 +1094,9 @@ ENDDISHEADER
if ($lastdis>$#temp) { $lastdis=$#temp; }
$r->print(&scrollbuttons($startdis,$number,$firstdis,$lastdis,$totalnumber,$msgstatus));
$r->print('');
if ($hasfloat) {
- unless($env{'environment.wysiwygeditor'} eq 'on') {
- $r->print('');
- }
+ $r->print('');
}
$r->print(&generate_preview_form);
}
@@ -1995,6 +1999,7 @@ sub facetoface {
.&Apache::lonhtmlcommon::end_pick_box()
.'');
my %Sortby = (
active => {},
previous => {},
@@ -701,9 +699,7 @@ sub disgroup {
}
}
}
- unless($env{'environment.wysiwygeditor'} eq 'on') {
- $r->print(' ');
- }
+ $r->print('' .'' + .'' ); if (($stage ne 'query') && @@ -3170,7 +3175,7 @@ sub sendoffmail { my ($recuname,$recdomain)=split(/\:/,$address); my $msgtxt = $savemsg; if ($toaddr{$address}) { - $msgtxt.=' '.$toaddr{$address}; + $msgtxt.="\n".' '."\n".$toaddr{$address}; } my @thismsg; if ($msgtype eq 'critical') { @@ -3295,6 +3300,9 @@ sub sendoffmail { $r->print($message); } } + } else { + &printheader($r,'','Messages cancelled.'); + return 'cancelled'; } return $sendstatus; } |