--- loncom/interface/lonmsgdisplay.pm 2019/08/06 17:53:56 1.181.2.2 +++ loncom/interface/lonmsgdisplay.pm 2025/01/29 09:11:10 1.202 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Routines for messaging display # -# $Id: lonmsgdisplay.pm,v 1.181.2.2 2019/08/06 17:53:56 raeburn Exp $ +# $Id: lonmsgdisplay.pm,v 1.202 2025/01/29 09:11:10 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -111,6 +111,7 @@ use Apache::loncommunicate; use Apache::lonfeedback; use Apache::lonrss(); use Apache::lonselstudent(); +use Apache::lonenc(); use lib '/home/httpd/lib/perl/'; use LONCAPA qw(:DEFAULT :match); @@ -228,41 +229,39 @@ function folder_choice(targetform,caller
':''); + ''; return $output; } @@ -782,25 +781,29 @@ sub groupmail_header { if ($grouppagelink) { &Apache::lonhtmlcommon::add_breadcrumb ({href=>$grouppagelink, - text=>"Group: $description", - title=>"Go to group's home page"},); + text=>&mt('Group').": $description", + title=>&mt("Go to group's home page"), + no_mt=>1, + },); } else { &Apache::lonhtmlcommon::add_breadcrumb - ({text=>"Group: $description",}); + ({text=>&mt('Group').": $description", + no_mt=>1,}); } - &Apache::lonhtmlcommon::add_breadcrumb - ({href=>"/adm/email?compose=group&group=". - "$env{'form.group'}&$refarg", - text=>"Send a Message in a Group", - title=>"Compose Group Message"},); + &Apache::lonhtmlcommon::add_breadcrumb + ({href=>"/adm/email?compose=group&group=". + "$env{'form.group'}&$refarg", + text=>"Send a Message in a Group", + title=>"Compose Group Message"},); if ($action eq 'sending') { &Apache::lonhtmlcommon::add_breadcrumb ({text=>"Messages being sent.", title=>"E-mails sent"},); } my $groupheader = &Apache::loncommon::start_page('Group Message'); - $groupheader .= &Apache::lonhtmlcommon::breadcrumbs - ('Group - '.$env{'form.group'}.' Email'); + $groupheader .= &Apache::lonhtmlcommon::breadcrumbs( + &mt('Group messages - [_1]',$description), + undef,undef,undef,undef,1); return $groupheader; } @@ -861,7 +864,7 @@ sub discrit { .&Apache::lonhtmlcommon::row_closure(1); } $result .= &Apache::lonhtmlcommon::row_title(&mt('Message'),undef,'LC_evenrow_value') - .''.&Apache::lontexconvert::msgtexconverted($content{'message'}).'' + .'
'.&Apache::lontexconvert::msgtexconverted($content{'message'}).'' .&Apache::lonhtmlcommon::row_closure() .&Apache::lonhtmlcommon::row_title('',undef,'LC_oddrow_value') .'
'); @@ -1124,9 +1130,10 @@ ENDDISHEADER } $r->print('
'); if ($numblocked > 0) { - $r->print(&blocked_in_folder($numblocked,$startblock,$endblock, + $r->print(&blocked_in_folder($numblocked,$startblock,$endblock,$by_ip,$clientip,$blockdom, \%setters)); } + $r->print(''); return; } my $interdis = $env{'form.interdis'}; @@ -1144,7 +1151,7 @@ ENDDISHEADER $r->print('