--- loncom/interface/lonmsg.pm 2005/05/20 17:00:40 1.143 +++ loncom/interface/lonmsg.pm 2005/06/06 20:31:24 1.147 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Routines for messaging # -# $Id: lonmsg.pm,v 1.143 2005/05/20 17:00:40 albertel Exp $ +# $Id: lonmsg.pm,v 1.147 2005/06/06 20:31:24 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -1173,7 +1173,7 @@ ENDREC $lt{'sb'}: $latexHelp -


$dispcrit $disbase @@ -1192,7 +1192,7 @@ ENDCOMP Subject:

General message text
-

The file format for the uploaded portion of the message is: @@ -1214,7 +1214,8 @@ ENDUPLOAD if ($broadcast eq 'group') { &discourse; } - $r->print(''); + $r->print(''. + &Apache::lonhtmlcommon::htmlareaselectactive('message')); } # ---------------------------------------------------- Display all face to face @@ -1235,8 +1236,8 @@ sub retrieve_instructor_comments { my %content=&unpackagemsg($records{$_}); next if ($content{'senderdomain'} eq ''); next if ($content{'subject'} !~ /^Record/); - # $content{'message'}=~s/\n/\/g; - $result.='Recorded by '. + # &Apache::lonfeedback::newline_to_br(\$content{'message'}); + $result.='Recorded by '. $content{'sendername'}.'@'.$content{'senderdomain'}."\n"; $result.= &Apache::lontexconvert::msgtexconverted($content{'message'})."\n"; @@ -1259,7 +1260,7 @@ sub disfacetoface { foreach (sort keys %records) { my %content=&unpackagemsg($records{$_}); next if ($content{'senderdomain'} eq ''); - $content{'message'}=~s/\n/\/g; + &Apache::lonfeedback::newline_to_br(\$content{'message'}); if ($content{'subject'}=~/^Record/) { $result.='

'.&mt('Record').'

'; } elsif ($content{'subject'}=~/^Broadcast/) { @@ -1789,6 +1790,22 @@ sub displaymessage { '">'.&mt('Next').''); } $r->print(''); + if ($env{'user.adv'}) { + $r->print(''); + + if (&Apache::lonnet::allowed('vgr',$env{'request.course.id'})) { + $r->print(''); + } + if (&Apache::lonnet::allowed('opa',$env{'request.course.id'})) { + my $symb=&Apache::lonnet::symbread($content{'baseurl'}); + $r->print(''); + } + if (&Apache::lonnet::allowed('mgr',$env{'request.course.id'})) { + my $symb=&Apache::lonnet::symbread($content{'baseurl'}); + $r->print(''); + } + $r->print('
'.&mt('Currently available actions (will open extra window)').':'.&Apache::loncommon::track_student_link(&mt('View recent activity'),$content{'sendername'},$content{'senderdomain'},'check').''.&Apache::loncommon::pprmlink(&mt('Set/Change parameters'),$content{'sendername'},$content{'senderdomain'},$symb,'check').''.&Apache::loncommon::pgrdlink(&mt('Set/Change grades'),$content{'sendername'},$content{'senderdomain'},$symb,'check').'
'); + } $r->print('
'.&mt('Subject').': '.$content{'subject'}. ($folder ne 'sent'?'
'.&mt('From').': '. &Apache::loncommon::aboutmewrapper( @@ -1852,7 +1869,8 @@ sub header { my ($r,$title,$baseurl)=@_; $r->print(&Apache::lonxml::xmlbegin(). ''.&Apache::lonxml::fontsettings(). - 'Communication and Messages'); + 'Communication and Messages'. + &Apache::lonhtmlcommon::htmlareaheaders()); if ($baseurl) { $r->print(""); }