--- loncom/interface/lonmsg.pm 2003/12/31 02:33:27 1.77
+++ loncom/interface/lonmsg.pm 2004/01/31 01:26:41 1.83
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Routines for messaging
#
-# $Id: lonmsg.pm,v 1.77 2003/12/31 02:33:27 www Exp $
+# $Id: lonmsg.pm,v 1.83 2004/01/31 01:26:41 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -396,7 +396,7 @@ sub user_crit_received {
my %contents=&unpackagemsg($message{$msgid},1);
my $status='rec: '.($contents{'sendback'}?
&user_normal_msg($contents{'sendername'},$contents{'senderdomain'},
- &mt('Receipt').': '.$ENV{'user.name'}.' at '.$ENV{'user.domain'},
+ &mt('Receipt').': '.$ENV{'user.name'}.' '.&mt('at').' '.$ENV{'user.domain'}.', '.$contents{'subject'},
&mt('User').' '.$ENV{'user.name'}.' '.&mt('at').' '.$ENV{'user.domain'}.
' acknowledged receipt of message'."\n".' "'.
$contents{'subject'}.'"'."\n".&mt('dated').' '.
@@ -1024,7 +1024,9 @@ sub handler {
if (!$ENV{'form.display'}) {
$r->print('
EMail and Messaging'.
&Apache::loncommon::studentbrowser_javascript().''.
- &Apache::loncommon::bodytag('EMail and Messages'));
+ &Apache::loncommon::bodytag('EMail and Messages').
+ &Apache::loncommon::help_open_faq(12).
+ &Apache::loncommon::help_open_bug('Communication Tools'));
}
if ($ENV{'form.display'}) {
my $msgid=$ENV{'form.display'};
@@ -1051,7 +1053,9 @@ sub handler {
}
$r->print(&Apache::loncommon::studentbrowser_javascript().
''.
- &Apache::loncommon::bodytag('EMail and Messages'));
+ &Apache::loncommon::bodytag('EMail and Messages').
+ &Apache::loncommon::help_open_faq(12).
+ &Apache::loncommon::help_open_bug('Communication Tools'));
$r->print(''.&mt('Subject').': '.$content{'subject'}.
'
'.&mt('From').': '.
&Apache::loncommon::aboutmewrapper(
@@ -1080,7 +1084,7 @@ $content{'sendername'},$content{'senderd
'">'.&mt('Next').'');
}
$r->print(''.
- &Apache::lontexconvert::msgtexconverted($content{'message'}).
+ &Apache::lontexconvert::msgtexconverted($content{'message'},1).
'
'.$content{'citation'});
} elsif ($ENV{'form.replyto'}) {
&comprep($r,$ENV{'form.replyto'});
@@ -1209,6 +1213,7 @@ $content{'sendername'},$content{'senderd
}
}
if ($sendstatus=~/^(\s*(?:ok|con_delayed)\s*)*$/) {
+ $r->print('
'.&mt('Completed.').'');
if ($ENV{'form.displayedcrit'}) {
&discrit($r);
} else {