--- loncom/interface/lonmsgdisplay.pm 2009/01/15 17:21:25 1.110 +++ loncom/interface/lonmsgdisplay.pm 2009/10/12 08:01:08 1.136 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Routines for messaging display # -# $Id: lonmsgdisplay.pm,v 1.110 2009/01/15 17:21:25 raeburn Exp $ +# $Id: lonmsgdisplay.pm,v 1.136 2009/10/12 08:01:08 amueller Exp $ # # Copyright Michigan State University Board of Trustees # @@ -113,8 +113,8 @@ use lib '/home/httpd/lib/perl/'; use LONCAPA; # Querystring component with sorting type -my $sqs; -my $startdis; +my $sqs=''; +my $startdis=''; # ============================================================ List all folders @@ -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', @@ -170,6 +173,7 @@ sub folderlist { $formhash{'select_form_order'} = ['','critical',@userorder,'sent','trash']; my $output = qq||; my %show = ('select_form_order' => [10,20,50,100,200], map {$_=>$_} (10,20,50,100,200)); @@ -236,7 +241,7 @@ function folder_choice(targetform,caller '.$lt{'actn'}.'
'. &Apache::loncommon::select_form('view','folderaction',%actions).'
'. - ' + ' @@ -244,7 +249,7 @@ function folder_choice(targetform,caller '. + '" onclick="javascript:folder_choice(this.form,'."'new'".');" />'. '

'.&mt('Name').'
'. '
@@ -292,11 +297,11 @@ sub scrollbuttons { } return ''.&mt('Page').': '. - ''. - ''. - ' of '.$maxdis. - ''. - '
'. + ''. + ''. + ' / '.$maxdis.' '. + ''. + '
'. &mt('[_1] messages: showing messages [_2] through [_3] of [_4].',$status,$first,$finish,$total).''; } # =============================================================== Status Change @@ -519,7 +524,10 @@ sub discourse { \%defaultUsers, 1,"selectedusers",1,'email') ) { - $result .= '
'.&mt('Bcc: course members with current access').'
'; + $result .= '
' + .&mt('Bcc: course members with current access') + .'' + .''; $result .= $tmptext.'

'; if (ref($statushash) eq 'HASH') { $statushash->{'active'} = 1; @@ -531,7 +539,10 @@ sub discourse { \%defaultUsers, 1, "selectedusers",0,'email') ) { - $result .= '
'.&mt('Bcc: course members with expired access').'
'; + $result .= '
' + .&mt('Bcc: course members with expired access') + .'' + .''; $result .= $tmptext.'

'; if (ref($statushash) eq 'HASH') { $statushash->{'previous'} = 1; @@ -544,7 +555,10 @@ sub discourse { \%defaultUsers, 1, "selectedusers",0,'email') ) { - $result .= '
'.&mt('Bcc: course members with future access').'
'; + $result .= '
' + .&mt('Bcc: course members with future access') + .'' + .''; $result .= $tmptext.'
'; if (ref($statushash) eq 'HASH') { $statushash->{'future'} = 1; @@ -619,8 +633,9 @@ sub disgroup { if (ref($access_status) eq 'HASH') { $access_status->{$status} = $$numitems{$status}; } - $r->print('
'.$lt{$status}. - '
'. + $r->print('
'. + ''.$lt{$status}.''. + ''. ''. ''. @@ -667,6 +682,7 @@ sub disgroup { sub group_check_uncheck { my $output = qq| |; } @@ -759,7 +776,7 @@ sub discrit { .'
' .&mt('Access to other pages will be prevented until you have moved all critical messages to your inbox.') .'

' - .'' + .'' .''; my %what=&Apache::lonnet::dump('critical'); my $result = ''; @@ -838,6 +855,7 @@ sub sortedmessages { } foreach my $msgid (@messages) { + next if ($msgid eq ''); my $esc_msgid=&escape($msgid); my ($sendtime,$shortsubj,$fromname,$fromdomain,$status,$fromcid,$processid,$symb,$error) = &Apache::lonmsg::unpackmsgid($esc_msgid,$folder,undef, @@ -977,6 +995,7 @@ sub disfolder { my $jscript = &Apache::loncommon::check_uncheck_jscript(); $r->print(< +// ENDDISHEADER - my $fsqs='&folder='.$folder; + my $fsqs='&folder='.$folder; my @temp=&sortedmessages(\%blocked,$startblock,$endblock,\$numblocked,$folder,$msgstatus); my $totalnumber=$#temp+1; if ($totalnumber < 1) { @@ -1041,48 +1060,50 @@ ENDDISHEADER $r->print(''. ''); + $r->print(''.&mt('Date').''); } else { - $r->print(''.&mt('Date').''); + $r->print(''.&mt('Date').''); } $r->print(''); + $r->print(''.&mt('Status').''); } else { - $r->print(''.&mt('Status').''); + $r->print(''.&mt('Status').''); } $r->print("\n"); my $suffix = &Apache::lonmsg::foldersuffix($folder); + my $count = $firstdis; for (my $n=$firstdis;$n<=$lastdis;$n++) { my ($sendtime,$shortsubj,$fromname,$fromdomain,$status,$origID, $description,$recv_name,$recv_domain)= @{$temp[$n]}; if (($status ne 'deleted') && defined($sendtime) && $sendtime!~/error/) { + $count ++; if ($status eq 'new') { $r->print(''); } elsif ($status eq 'read') { @@ -1114,7 +1135,6 @@ ENDDISHEADER } } my $localsenttime = &Apache::lonlocal::locallocaltime($sendtime); - my $count = $n +1; $r->print(''); + $item.(($status eq 'new')?'':'').''); } my $showstatus; my %statushash = &get_msgstatus_types(); @@ -1185,7 +1205,7 @@ ENDDISHEADER '" onclick="javascript:validate_checkedaction()"/>'."\n". '
 '); if ($env{'form.sortedby'} eq "revdate") { - $r->print(''.&mt('Date').''); if ($env{'form.sortedby'} eq "revuser") { - $r->print(''.&mt('Username').''); + $r->print(''.&mt('Username').''); } else { - $r->print(''.&mt('Username').''); + $r->print(''.&mt('Username').''); } $r->print(''); if ($env{'form.sortedby'} eq "revdomain") { - $r->print(''.&mt('Domain').''); + $r->print(''.&mt('Domain').''); } else { - $r->print(''.&mt('Domain').''); + $r->print(''.&mt('Domain').''); } $r->print(''); if ($env{'form.sortedby'} eq "revsubject") { - $r->print(''.&mt('Subject').''); + $r->print(''.&mt('Subject').''); } else { - $r->print(''.&mt('Subject').''); + $r->print(''.&mt('Subject').''); } $r->print(''); if ($env{'form.sortedby'} eq "revcourse") { - $r->print(''.&mt('Course').''); + $r->print(''.&mt('Course').''); } else { - $r->print(''.&mt('Course').''); + $r->print(''.&mt('Course').''); } $r->print(''); if ($env{'form.sortedby'} eq "revstatus") { - $r->print(''.&mt('Status').'
'.(($status eq 'new')?'':''). $count.'.'.(($status eq 'new')?'':'').' '. 'print(''.(($status eq 'new')?'':''). ''. - $item.(($status eq 'new')?'':'').'
'); my $postedstartdis=$startdis+1; - $r->print(''); + $r->print(''); if ($numblocked > 0) { $r->print(&blocked_in_folder($numblocked,$startblock,$endblock, \%setters)); @@ -1198,8 +1218,12 @@ sub blocked_in_folder { my $finishblock = &Apache::lonlocal::locallocaltime($endblock); my $output = '

'. &mt('[quant,_1,message is, messages are] not viewable because display of LON-CAPA messages sent to you by other students between [_2] and [_3] is currently being blocked because of online exams.',$numblocked,$beginblock,$finishblock); - $output .= &Apache::loncommon::build_block_table($startblock,$endblock, - $setters); + #$output .= &Apache::loncommon::build_block_table($startblock,$endblock, + # $setters); + + my ($blocked, $blocktext) = &Apache::loncommon::blocking_status("com"); + $output .="

".$blocktext; + return $output; } @@ -1244,8 +1268,9 @@ sub compout { &printheader($r,'/adm/email?compose=multiforward', 'Forwarding Multiple Messages'); if ($multiforward > 1) { - $r->print(&mt('Each of the [quant,_1,message] you checked' - .' will be forwarded to the recipient(s) you select below.',$multiforward) + $r->print(&mt('Each of the [quant,_1,message] you checked' + .' will be forwarded to the recipient(s) you select below.' + ,''.$multiforward.'') .'
'); } else { $r->print(&mt('The message you checked will be forwarded to the recipient(s) you select below.').'
'); @@ -1341,6 +1366,7 @@ sub compout { $sendmode = ''."\n"; $broadcast_js = qq| |; @@ -1410,7 +1437,9 @@ function courseRecipients() { my $jscript = &Apache::loncommon::check_uncheck_jscript(); $r->print(<<"ENDREPSCRIPT"); ENDREPSCRIPT } @@ -1576,7 +1605,7 @@ $wysiwyglink); $r->print(<<"ENDCOMP"); $attachrow
-$latexHelp +$latexHelp
$wysiwyglink $sendmode @@ -1679,7 +1708,7 @@ sub additional_rec_row { my $bcc = &mt('Bcc:'); my $exmpl = &mt('username:domain,username:domain,...'); my $output = <<"ENDADD"; -
$lt->{'ad'} ($exmpl): + @@ -1757,8 +1786,10 @@ sub retrieve_instructor_comments { } sub disfacetoface { - my ($r,$user,$domain)=@_; - my $target=$env{'form.grade_target'}; + my ($r,$user,$domain,$target)=@_; + if ($target eq '') { + my $target=$env{'form.grade_target'}; + } unless ($env{'request.course.id'}) { return; } if (!&Apache::lonnet::allowed('dff',$env{'request.course.id'}) && ! &Apache::lonnet::allowed('dff',$env{'request.course.id'}. @@ -1770,7 +1801,7 @@ sub disfacetoface { $env{'course.'.$env{'request.course.id'}.'.domain'}, $env{'course.'.$env{'request.course.id'}.'.num'}, '%255b'.$user.'%253a'.$domain.'%255d'); - my $result=''; + my $result='
'; foreach my $key (sort(keys(%records))) { my %content=&Apache::lonmsg::unpackagemsg($records{$key}); next if ($content{'senderdomain'} eq ''); @@ -1827,6 +1858,7 @@ $content{'sendername'}.':'. ''; } # Check to see if there were any messages. + &Apache::lonnet::logthis("lonmsgdisplay ..later ... target -- $target"); if ($result eq '') { my $lctype = &mt(lc(&Apache::loncommon::course_type())); if ($target ne 'tex') { @@ -1834,9 +1866,11 @@ $content{'sendername'}.':'. } else { $r->print('\textbf{'.&mt('No notes, face-to-face discussion records, critical messages or broadcast messages in this [_1].',$lctype).'}\\\\'); } + } elsif ($target ne 'tex') { + $r->print($result.'
'); } else { - $r->print($result); - } + $r->print(&Apache::lonxml::xmlparse($r, 'tex', $result)); + } } sub general_message { @@ -1862,8 +1896,8 @@ sub facetoface { return; } my $crstype = &Apache::loncommon::course_type(); - my $leaders = ($crstype eq 'Group') ? 'coordinators and leaders' - : 'faculty and staff'; + my $leaders = ($crstype eq 'Community') ? 'coordinators and leaders' + : 'faculty and staff'; &printheader($r, '/adm/email?recordftf=query', "User Notes, Face-to-Face, Critical Messages, Broadcast Messages, Archived Messages"); @@ -1885,21 +1919,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'}

- - -
$lt->{'ad'} ($exmpl)
 $lt->{'to'}
 $cc
 $bcc
- - - - - -
$lt{'user'}: -$stdbrws -
$lt{'dom'}:$domform
- -ENDTREC + + $r->print('

'.$lt{'head'}.'

' + .'
' + .'' + .&Apache::lonhtmlcommon::start_pick_box() + .&Apache::lonhtmlcommon::row_title($lt{'user'}) + .'' + .' '.$stdbrws + .&Apache::lonhtmlcommon::row_closure() + .&Apache::lonhtmlcommon::row_title($lt{'dom'}) + .$domform + .&Apache::lonhtmlcommon::row_closure(1) + .&Apache::lonhtmlcommon::end_pick_box() + .'
' + .'' + ); + if (($stage ne 'query') && ($env{'form.recdomain'}) && ($env{'form.recuname'})) { chomp($env{'form.newrecord'}); @@ -1908,8 +1944,17 @@ ENDTREC $env{'form.recuname'}, $env{'form.recdomain'}); } - $r->print('

'.&Apache::loncommon::plainname($env{'form.recuname'}, - $env{'form.recdomain'}).'

'); + my $aboutmelink=&Apache::loncommon::aboutmewrapper( + &Apache::loncommon::plainname($env{'form.recuname'} + ,$env{'form.recdomain'}) + ,$env{'form.recuname'},$env{'form.recdomain'}); + $r->print('
' + .'

' + .&mt('Discussion and message records for [_1] ([_2])' + ,$aboutmelink + ,$env{'form.recuname'}.':'.$env{'form.recdomain'}) + .'

' + ); &disfacetoface($r,$env{'form.recuname'},$env{'form.recdomain'}); $r->print(< @@ -1938,8 +1983,8 @@ sub examblock { $r->print('Not allowed'); return; } - my $usertype = (&Apache::loncommon::course_type() eq 'Group') ? 'members' - : 'students'; + my $usertype = (&Apache::loncommon::course_type() eq 'Community') ? 'members' + : 'students'; my %lt=&Apache::lonlocal::texthash( 'comb' => 'Communication Blocking', 'cbds' => 'Communication blocking during scheduled exams', @@ -2148,7 +2193,7 @@ END foreach my $block (@{$typeorder}) { my $blockstatus = ''; if ($blocks->{$block} eq 'on') { - $blockstatus = 'checked="true"'; + $blockstatus = 'checked="checked"'; } $r->print('
'); } @@ -2215,7 +2260,7 @@ END sub blocktype_text { my %types = &Apache::lonlocal::texthash( 'com' => 'Messaging', - 'chat' => 'Chat', + 'chat' => 'Chat Room', 'boards' => 'Discussion', 'port' => 'Portfolio', 'groups' => 'Groups', @@ -2240,8 +2285,10 @@ sub displaymessage { my @messages=&sortedmessages(\%blocked,$startblock,$endblock,\$numblocked,$folder,$msgstatus); if ( $blocked{$msgid} eq 'ON' ) { &printheader($r,'/adm/email',&mt('Display a Message')); - $r->print(&mt('You attempted to display a message that is currently blocked because you are enrolled in one or more courses for which there is an ongoing online exam.')); - &build_block_table($r,$startblock,$endblock,\%setters); + #$r->print(&mt('You attempted to display a message that is currently blocked because you are enrolled in one or more courses for which there is an ongoing online exam.')); + #&build_block_table($r,$startblock,$endblock,\%setters); + my($blocked, $blocktext) = &Apache::loncommon::blocking_status("com"); + $r->print("
".$blocktext); return; } if ($msgstatus eq '') { @@ -2278,63 +2325,35 @@ sub displaymessage { &printheader($r,'/adm/email?display='.&escape($msgid),'Display a Message','',$content{'baseurl'}); my %courseinfo=&Apache::lonnet::coursedescription($content{'courseid'}); -# Functions and Actions - my $li_start='• '; - my $li_end=' '; - # Prepare available functions - my $functionlist=''; + my @functionlist; if (!$content{'noreplies'}) { - $functionlist.=$li_start - .'' + push(@functionlist,'' .&mt('Reply') - .'' - .$li_end; + .''); } - $functionlist.=$li_start - .'' + push(@functionlist,'' .&mt('Forward') - .'' - .$li_end; - $functionlist.=$li_start - .'' + .''); + push(@functionlist,'' .&mt('Mark Unread') - .'' - .$li_end; - $functionlist.=$li_start - .'' + .''); + push(@functionlist,'' .&mt('Delete') - .'' - .$li_end; - $functionlist.=$li_start - .'' + .''); + push(@functionlist,'' .&mt('Back to Folder Display') - .'' - .$li_end; + .''); if ($counter > 0){ - $functionlist.=$li_start - .'' - .&mt('Previous') - .'' - .$li_end; + push(@functionlist,'' + .&mt('Previous') + .''); } if ($counter < $number_of_messages - 1){ - $functionlist.=$li_start - .'' - .&mt('Next') - .'' - .$li_end; - } -# Print functions - $r->print('
' - .'
' - .'' - .&mt('Functions') - .'' - .$functionlist - .'
' - .'
' - ); + push(@functionlist,'' + .&mt('Next') + .''); + } # Prepare available actions my $symb; @@ -2343,42 +2362,58 @@ sub displaymessage { } elsif (defined($content{'baseurl'})) { $symb=&Apache::lonnet::symbread($content{'baseurl'}); } + my @actionlist; if ($env{'user.adv'}) { - my $actionlist=''; if (&Apache::lonnet::allowed('vgr',$env{'request.course.id'})) { - $actionlist.=$li_start - .&Apache::loncommon::track_student_link( - &mt('View recent activity'),$content{'sendername'},$content{'senderdomain'},'check') - .$li_end; + push(@actionlist,&Apache::loncommon::track_student_link( + &mt('View recent activity') + ,$content{'sendername'} + ,$content{'senderdomain'} + ,'check')); } if (&Apache::lonnet::allowed('opa',$env{'request.course.id'}) && $symb) { - $actionlist.=$li_start - .&Apache::loncommon::pprmlink( - &mt('Set/Change parameters'),$content{'sendername'},$content{'senderdomain'},$symb,'check') - .$li_end; + push(@actionlist,&Apache::loncommon::pprmlink( + &mt('Set/Change parameters') + ,$content{'sendername'} + ,$content{'senderdomain'} + ,$symb + ,'check')); } if (&Apache::lonnet::allowed('mgr',$env{'request.course.id'}) && $symb) { - $actionlist.=$li_start - .&Apache::loncommon::pgrdlink( - &mt('Set/Change grades'),$content{'sendername'},$content{'senderdomain'},$symb,'check') - .$li_end; - } - -# Print actions - if ($actionlist) { - $r->print('
' - .'
' - .'' - .&mt('[_1]Currently available actions[_2] (will open extra window):','','') - .'' - .$actionlist - .'
' - .'
' - ); - } + push(@actionlist,&Apache::loncommon::pgrdlink( + &mt('Set/Change grades') + ,$content{'sendername'} + ,$content{'senderdomain'} + ,$symb + ,'check')); + } } +# Print functionlist and actionlist in page header + my $functions='
'; + + # Functionlist + $functions.=&Apache::lonhtmlcommon::start_funclist(); + foreach my $item (@functionlist) { + $functions.=&Apache::lonhtmlcommon::add_item_funclist($item); + } + $functions .= &Apache::lonhtmlcommon::end_funclist(); + + # Actionlist + if (@actionlist) { + my $legendtext=&mt('Currently available actions (will open extra window)'); + $functions.=&Apache::lonhtmlcommon::start_funclist($legendtext); + foreach my $item (@actionlist) { + $functions.=&Apache::lonhtmlcommon::add_item_funclist($item); + } + $functions.=&Apache::lonhtmlcommon::end_funclist(); + } + + $functions.='
'; + $r->print(&Apache::loncommon::head_subbox($functions)); + + my ($tonum,$tolist,$cclist,$bcclist,$groupcclist,%recipients); if ($content{'recipid'}) { $tonum = &retrieve_recips('display',\%content,\%recipients); @@ -2724,6 +2759,7 @@ sub recipients_link { $body =~ s{\n}{}g; $r->print(< +// ENDJS @@ -2800,15 +2836,14 @@ sub displayresource { sub header { my ($r,$title,$baseurl)=@_; - my $extra = &Apache::loncommon::studentbrowser_javascript(); if ($baseurl) { $extra .= ""; } - $r->print(&Apache::loncommon::start_page('Communication and Messages', + $r->print(&Apache::loncommon::start_page('Communication', $extra)); $r->print(&Apache::lonhtmlcommon::breadcrumbs - (($title?$title:'Communication and Messages'))); + (($title?$title:'Send and Receive Messages'))); } # ---------------------------------------------------------------- Print header @@ -3179,7 +3214,7 @@ sub sendoffmail { &Apache::loncommunicate::menu($r); } } else { - $r->print('

'.&mt('Could not deliver message').' '. + $r->print('

'.&Apache::lonhtmlcommon::confirm_success(&mt('Could not deliver message'),1).'
'. &mt('Please use the browser "Back" button and correct the recipient addresses ([_1]).',$sendstatus).'

'); } } @@ -3206,7 +3241,7 @@ sub handler { 'recordftf','sortedby','block','folder','startdis','interdis', 'showcommentbaseurl','dismode','group','subject','text','ref', 'msgstatus']); - $sqs='&sortedby='.$env{'form.sortedby'}; + $sqs='&sortedby='.$env{'form.sortedby'}; # ------------------------------------------------------ They checked for email unless ($env{'form.block'}) { @@ -3227,7 +3262,7 @@ sub handler { unless ($folder) { $folder=''; } else { - $sqs.='&folder='.&escape($folder); + $sqs.='&folder='.&escape($folder); } # ------------------------------------------------------------ Get Display Mode @@ -3259,7 +3294,7 @@ sub handler { $startdis++; } my $postedstartdis=$startdis+1; - $sqs.='&startdis='.$postedstartdis; + $sqs.='&startdis='.$postedstartdis; # --------------------------------------------------------------- Render Output @@ -3323,7 +3358,7 @@ sub handler { $total ++; } &printheader($r,'','Marked Messages Read'); - $r->print(&mt('Marked [_1] message(s) read',$total).'

'); + $r->print(&mt('Marked [quant,_1,message] read',$total).'

'); &Apache::loncommunicate::menu($r); &disall($r,($folder?$folder:$dismode),$msgstatus); } elsif ($env{'form.markedaction'} eq 'markedunread') { @@ -3334,7 +3369,7 @@ sub handler { $total ++; } &printheader($r,'','Marked Messages Unread'); - $r->print(&mt('Marked [_1] message(s) unread',$total).'

'); + $r->print(&mt('Marked [quant,_1,message] unread',$total).'

'); &Apache::loncommunicate::menu($r); &disall($r,($folder?$folder:$dismode),$msgstatus); } elsif ($env{'form.markedaction'} eq 'markedmove') { @@ -3358,14 +3393,17 @@ sub handler { } } if ($failed) { - $r->print('

- '.&mt('Failed to move [_1] message(s)',$failed). - '

'); + $r->print('

' + .&mt('Failed to move [quant,_1,message]',$failed) + .'

'); $r->print('

'. join("

\n

",@failed_msg). "

\n"); } - $r->print(&mt('Moved [_1] message(s)',$total).'

'); + $r->print('

' + .&mt('Moved [quant,_1,message]',$total) + .'

' + .'

'); } &Apache::loncommunicate::menu($r); &disall($r,($folder?$folder:$dismode),$msgstatus); @@ -3384,14 +3422,17 @@ sub handler { } &printheader($r,'','Deleted Messages'); if ($failed) { - $r->print('

- '.&mt('Failed to delete [_1] message(s)',$failed). - '

'); + $r->print('

' + .&mt('Failed to delete [quant,_1,message]',$failed) + .'

'); $r->print('

'. join("

\n

",@failed_msg). "

\n"); } - $r->print(&mt('Deleted [_1] message(s)',$total).'

'); + $r->print('

' + .&mt('Deleted [quant,_1,message]',$total) + .'

' + .'

'); &Apache::loncommunicate::menu($r); &disall($r,($folder?$folder:$dismode),$msgstatus); } elsif ($env{'form.markunread'}) { @@ -3483,10 +3524,14 @@ 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); + $r->print('

' + .&mt('Creation failed.').' '.$makeresult.'
' + .$warning + .'

'); $showfolder = $folder; } &Apache::loncommunicate::menu($r); @@ -3498,10 +3543,14 @@ 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.'
'); + $r->print('

' + .&mt('Deletion failed.').' '.$delresult + .'

'); $showfolder = $folder; } &Apache::loncommunicate::menu($r); @@ -3511,9 +3560,13 @@ 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.'
'); + $r->print('

' + .&mt('Renaming failed.').' '.$renresult + .'

'); $showfolder = $folder; } &Apache::loncommunicate::menu($r);