--- loncom/interface/lonmsgdisplay.pm 2009/01/12 04:11:25 1.109
+++ loncom/interface/lonmsgdisplay.pm 2009/02/04 20:14:45 1.111
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Routines for messaging display
#
-# $Id: lonmsgdisplay.pm,v 1.109 2009/01/12 04:11:25 raeburn Exp $
+# $Id: lonmsgdisplay.pm,v 1.111 2009/02/04 20:14:45 weissno Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -583,7 +583,9 @@ sub disgroup {
return;
} else {
$hasfloat = 1;
- $r->print('
');
+ unless($env{'environment.wysiwygeditor'} eq 'on') {
+ $r->print('
');
+ }
my %Sortby = (
active => {},
previous => {},
@@ -651,10 +653,13 @@ sub disgroup {
}
}
$r->print(&Apache::loncommon::end_data_table().''.
- '
');
+ '
');
}
}
}
+ unless($env{'environment.wysiwygeditor'} eq 'on') {
+ $r->print('
');
+ }
}
return $hasfloat;
}
@@ -1235,7 +1240,7 @@ sub compout {
} elsif ($multiforward) {
&Apache::lonhtmlcommon::add_breadcrumb
({href=>"/adm/email?folder=".&escape($folder),
- text=>"Display All Messages"});
+ text=>"Display all Messages"});
&printheader($r,'/adm/email?compose=multiforward',
'Forwarding Multiple Messages');
if ($multiforward > 1) {
@@ -1319,7 +1324,11 @@ sub compout {
if ($group eq '') {
my $studentsel = &discourse(\%access_status);
if ($studentsel) {
- $r->print(''.$studentsel.'
');
+ if ($env{'environment.wysiwygeditor'} eq 'on') {
+ $r->print($studentsel);
+ } else {
+ $r->print(''.$studentsel.'
');
+ }
$hasfloat = 1;
}
} else {
@@ -1411,7 +1420,11 @@ ENDREPSCRIPT
if ($env{'form.text'}) { $dismsg=$env{'form.text'}; }
if ($env{'form.subject'}) { $dissub=$env{'form.subject'}; }
if ($hasfloat) {
- $r->print($broadcast_js.'');
+ if ($env{'environment.wysiwygeditor'} eq 'on') {
+ $r->print($broadcast_js);
+ } else {
+ $r->print($broadcast_js.'
');
+ }
$onsubmit = ' onsubmit="javascript:courseRecipients();" ';
}
$r->print(
@@ -1617,7 +1630,9 @@ ENDUPLOAD
}
$r->print('');
if ($hasfloat) {
- $r->print('
');
+ unless($env{'environment.wysiwygeditor'} eq 'on') {
+ $r->print('
');
+ }
}
$r->print(&generate_preview_form);
}
@@ -1667,7 +1682,7 @@ sub additional_rec_row {
+ |
| $bcc | |
ENDADD
return $output;
}
@@ -3504,7 +3519,7 @@ sub handler {
&Apache::loncommunicate::menu($r);
&disall($r,$showfolder,$msgstatus);
} else {
- &printheader($r,'','Display All Messages');
+ &printheader($r,'','Display all Messages');
&Apache::loncommunicate::menu($r);
&disall($r,($folder?$folder:$dismode),$msgstatus);
}