--- loncom/interface/lonmsgdisplay.pm 2009/01/12 04:11:25 1.109
+++ loncom/interface/lonmsgdisplay.pm 2009/02/10 09:30:16 1.113
@@ -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.113 2009/02/10 09:30:16 schafran 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;
}
@@ -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;
}
@@ -3468,7 +3483,7 @@ sub handler {
my $showfolder = $env{'form.newfolder'};
my ($makeresult,$warning) = &makefolder($env{'form.newfolder'});
if ($makeresult eq 'ok') {
- $r->print(&mt('Mail folder "[_1]" created.',$showfolder).'
');
+ $r->print(&mt('Folder "[_1]" created.',$showfolder).'
');
} else {
$r->print(&mt('Creation failed.').' '.$makeresult.'
'.
$warning);
@@ -3483,7 +3498,7 @@ sub handler {
my $showfolder = '';
my $delresult = &deletefolder($folder);
if ($delresult eq 'ok') {
- $r->print(&mt('Mail folder "[_1]" deleted.',$folder).'
');
+ $r->print(&mt('Folder "[_1]" deleted.',$folder).'
');
$env{'form.folder'} = '';
} else {
$r->print(&mt('Deletion failed.').' '.$delresult.'
');
@@ -3496,7 +3511,7 @@ sub handler {
my $showfolder = $env{'form.renamed'};
my $renresult = &renamefolder($folder);
if ($renresult eq 'ok') {
- $r->print(&mt('Mail folder "[_1]" renamed "[_2]".',$folder,$showfolder).'
');
+ $r->print(&mt('Folder "[_1]" renamed to "[_2]".',$folder,$showfolder).'
');
} else {
$r->print(&mt('Renaming failed.').' '.$renresult.'
');
$showfolder = $folder;