--- loncom/interface/lonmsgdisplay.pm 2009/01/06 21:38:43 1.108
+++ loncom/interface/lonmsgdisplay.pm 2009/05/11 16:51:27 1.124
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Routines for messaging display
#
-# $Id: lonmsgdisplay.pm,v 1.108 2009/01/06 21:38:43 raeburn Exp $
+# $Id: lonmsgdisplay.pm,v 1.124 2009/05/11 16:51:27 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -136,6 +136,9 @@ sub folderlist {
);
+ # set se lastvisit for the new mail check in the toplevel menu
+ &Apache::lonnet::appenv({'user.mailcheck.lastvisit'=>time});
+
my %actions = &Apache::lonlocal::texthash(
view => 'View Folder',
rename => 'Rename Folder',
@@ -583,7 +586,9 @@ sub disgroup {
return;
} else {
$hasfloat = 1;
- $r->print('
');
+ unless($env{'environment.wysiwygeditor'} eq 'on') {
+ $r->print('
');
+ }
my %Sortby = (
active => {},
previous => {},
@@ -651,10 +656,13 @@ sub disgroup {
}
}
$r->print(&Apache::loncommon::end_data_table().''.
- '
');
+ '
');
}
}
}
+ unless($env{'environment.wysiwygeditor'} eq 'on') {
+ $r->print('
');
+ }
}
return $hasfloat;
}
@@ -754,7 +762,7 @@ sub discrit {
.''
.&mt('Access to other pages will be prevented until you have moved all critical messages to your inbox.')
.'
'
- .'');
+ $r->print('');
if ($numblocked > 0) {
$r->print(&blocked_in_folder($numblocked,$startblock,$endblock,
\%setters));
@@ -1319,7 +1329,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 +1425,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(
@@ -1520,7 +1538,7 @@ ENDREPSCRIPT
$r->print(&recipient_input_row($defdom,%lt));
}
}
- my $latexHelp = &Apache::loncommon::helpLatexCheatsheet();
+ my $latexHelp = &Apache::loncommon::helpLatexCheatsheet(undef,undef,1);
my $wysiwyglink=&Apache::lonhtmlcommon::htmlareaselectactive('message').'
';
my $subj_size;
if ($multiforward) {
@@ -1563,7 +1581,7 @@ $wysiwyglink);
$r->print(<<"ENDCOMP");
$attachrow
-$latexHelp
+$latexHelp
$wysiwyglink
$sendmode
@@ -1617,7 +1635,9 @@ ENDUPLOAD
}
$r->print('');
if ($hasfloat) {
- $r->print('
');
+ unless($env{'environment.wysiwygeditor'} eq 'on') {
+ $r->print('
');
+ }
}
$r->print(&generate_preview_form);
}
@@ -1667,7 +1687,7 @@ sub additional_rec_row {
+ |
| $bcc | |
ENDADD
return $output;
}
@@ -1870,21 +1890,23 @@ sub facetoface {
'subm' => 'Retrieve discussion and message records',
'newr' => 'New Record (record is visible to '.lc($crstype).' '.$leaders.')',
'post' => 'Post this Record');
- $r->print(<<"ENDTREC");
-$lt{'head'}
-
-ENDTREC
+
+ $r->print(''.$lt{'head'}.'
'
+ .'