--- loncom/interface/lonmsgdisplay.pm 2009/10/12 08:01:08 1.136 +++ loncom/interface/lonmsgdisplay.pm 2010/11/20 13:06:58 1.155 @@ -1,7 +1,7 @@ -# The LearningOnline Network with CAPA +# $textareaclass The LearningOnline Network with CAPA # Routines for messaging display # -# $Id: lonmsgdisplay.pm,v 1.136 2009/10/12 08:01:08 amueller Exp $ +# $Id: lonmsgdisplay.pm,v 1.155 2010/11/20 13:06:58 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -146,7 +146,7 @@ sub folderlist { ); $actions{'select_form_order'} = ['view','rename','delete']; - my %statushash = &get_msgstatus_types(); + my %statushash = &Apache::lonlocal::texthash(&get_msgstatus_types()); $statushash{'select_form_order'} = ['','new','read','replied','forwarded']; @@ -219,43 +219,38 @@ function folder_choice(targetform,caller |; my %show = ('select_form_order' => [10,20,50,100,200], map {$_=>$_} (10,20,50,100,200)); - - + $output .= '
- - - - - -
- +
- - + - -
'.$lt{'fold'}.'
'."\n". - &Apache::loncommon::select_form($folder,'folder',%formhash).' +
'.$lt{'fold'}.'
'."\n". + &Apache::loncommon::select_form($folder,'folder',\%formhash).'
'.$lt{'show'}.'
'."\n". +
'.$lt{'show'}.'
'."\n". &Apache::loncommon::select_form($env{'form.interdis'},'interdis', - %show).' + \%show).' +
'.$lt{'status'}.'
'."\n". + &Apache::loncommon::select_form($msgstatus,'msgstatus',\%statushash).'
'.$lt{'status'}.'
'."\n". - &Apache::loncommon::select_form($msgstatus,'msgstatus',%statushash).' +
'.$lt{'actn'}.'
'."\n".' + '. + &Apache::loncommon::select_form('view','folderaction',\%actions). + ' +
'.$lt{'actn'}.'
'. - &Apache::loncommon::select_form('view','folderaction',%actions).' -

'. - ' +
'.&mt('New Folder').'
'."\n".' + + + +
-
     - '. - '

-
'.&mt('Name').'
'. - ' -
-
'."\n". +'."\n". ''. ''. ($folder=~/^critical/?'
':''); @@ -273,12 +268,13 @@ sub get_permanent_folders { } sub get_msgstatus_types { - my %statushash = &Apache::lonlocal::texthash( - '' => 'Any', - new => 'Unread', - read => 'Read', - replied => 'Replied to', - forwarded => 'Forwarded', + # Don't translate here! + my %statushash = ( + '' => 'Any', + 'new' => 'Unread', + 'read' => 'Read', + 'replied' => 'Replied to', + 'forwarded' => 'Forwarded', ); return %statushash; } @@ -291,18 +287,31 @@ sub scrollbuttons { my %statushash = &get_msgstatus_types(); my $status; if ($msgstatus eq '') { - $status = &mt('All'); + $status = 'All'; # Don't translate here! } else { $status = $statushash{$msgstatus}; } - return - ''.&mt('Page').': '. - ''. - ''. - ' / '.$maxdis.' '. - ''. - '
'. - &mt('[_1] messages: showing messages [_2] through [_3] of [_4].',$status,$first,$finish,$total).''; + my $output = ''.&mt('Page:').' '; + if ($maxdis == 1) { + # No buttons if only one page is displayed + $output .= '1/1'; + } else { + $output .= + ''. + ''. + ' / '.$maxdis.' '. + ''. + ''; + } + $output .= + '

' + .''.&mt($status.' messages:').' ' + .&mt('showing messages [_1] through [_2] of [_3].', + $first,$finish,$total) + .'

' + .''; + + return $output; } # =============================================================== Status Change @@ -369,7 +378,7 @@ sub deletefolder { my ($folder)=@_; my %permfolders = &get_permanent_folders(); if (defined($permfolders{$folder})) { - return &mt('The folder "[_1]" may not be deleted',$folder); + return &mt('The folder "[_1]" may not be deleted.',$folder); } my %userfolders = &Apache::lonmsg::get_user_folders(); if (!defined($userfolders{$folder})) { @@ -509,6 +518,7 @@ sub movemsg { sub discourse { my ($statushash) = @_; my ($result,$active,$previous,$future); + my $crstype = &Apache::loncommon::course_type(); my ($course_personnel, $current_members, $expired_members, @@ -524,8 +534,14 @@ sub discourse { \%defaultUsers, 1,"selectedusers",1,'email') ) { + my $bcc_curr_hdr; + if ($crstype eq 'Community') { + $bcc_curr_hdr = &mt('Bcc: community participants with current access'); + } else { + $bcc_curr_hdr = &mt('Bcc: course members with current access'); + } $result .= '
' - .&mt('Bcc: course members with current access') + .$bcc_curr_hdr .'' .'
'; $result .= $tmptext.'

'; @@ -539,8 +555,14 @@ sub discourse { \%defaultUsers, 1, "selectedusers",0,'email') ) { + my $bcc_prev_hdr; + if ($crstype eq 'Community') { + $bcc_prev_hdr = &mt('Bcc: community participants with expired access'); + } else { + $bcc_prev_hdr = &mt('Bcc: course members with expired access'); + } $result .= '
' - .&mt('Bcc: course members with expired access') + .$bcc_prev_hdr .'' .'
'; $result .= $tmptext.'

'; @@ -555,8 +577,15 @@ sub discourse { \%defaultUsers, 1, "selectedusers",0,'email') ) { + my $bcc_future_hdr; + if ($crstype eq 'Community') { + $bcc_future_hdr = &mt('Bcc: community participants with future access'); + } else { + $bcc_future_hdr = &mt('Bcc: course members with future access'); + } + $result .= '
' - .&mt('Bcc: course members with future access') + .$bcc_future_hdr .'' .'
'; $result .= $tmptext.'
'; @@ -597,9 +626,7 @@ sub disgroup { return; } else { $hasfloat = 1; - unless($env{'environment.wysiwygeditor'} eq 'on') { - $r->print('
'); - } + $r->print('
'); my %Sortby = ( active => {}, previous => {}, @@ -672,9 +699,7 @@ sub disgroup { } } } - unless($env{'environment.wysiwygeditor'} eq 'on') { - $r->print('
'); - } + $r->print('
'); } return $hasfloat; } @@ -730,10 +755,16 @@ sub groupmail_header { } &Apache::lonhtmlcommon::clear_breadcrumbs(); if ($refarg) { + my $brtitle; + if (&Apache::loncommon::course_type() eq 'Community') { + $brtitle = 'View community groups'; + } else { + $brtitle = 'View course groups'; + } &Apache::lonhtmlcommon::add_breadcrumb ({href=>"/adm/coursegroups", text=>"Groups", - title=>"View course groups"}); + title=>$brtitle}); } &Apache::lonhtmlcommon::add_breadcrumb ({href=>"/adm/$cdom/$cnum/$group/smppg?$refarg", @@ -828,8 +859,11 @@ sub discrit { } # Check to see if there were any messages. if ($result eq '') { - $result = "

".&mt('You have no critical messages.')."

". - ''.&mt('Select a course').'
'. + $result = + '

'. + &mt('You have no critical messages.'). + '

'. + ''.&mt('Select a course').'
'. ''.&mt('Communicate').''; } else { $r->print($header); @@ -989,7 +1023,7 @@ sub disfolder { my ($startblock,$endblock) = &Apache::loncommon::blockcheck(\%setters,'com'); my %lt = &Apache::lonlocal::texthash( sede => 'Select a destination folder to which the messages will be moved.', - nome => 'No messages have been selected to apply ths action to.', + nome => 'No messages have been selected to apply this action to.', chec => 'Check the checkbox for at least one message.', ); my $jscript = &Apache::loncommon::check_uncheck_jscript(); @@ -1032,18 +1066,20 @@ ENDDISHEADER my @temp=&sortedmessages(\%blocked,$startblock,$endblock,\$numblocked,$folder,$msgstatus); my $totalnumber=$#temp+1; if ($totalnumber < 1) { + $r->print('

'); if ($msgstatus eq '') { - $r->print('

'.&mt('Empty Folder').'

'); + $r->print(&mt('There are no messages in this folder.')); } elsif ($msgstatus eq 'replied') { - $r->print('

'.&mt('You have not replied to any messages in this folder.').'

'); - } else { - $r->print('

'.&mt('There are no '.lc($statushash{$msgstatus}).' messages in this folder.').'

'); + $r->print(&mt('You have not replied to any messages in this folder.')); + } else { + $r->print(&mt('There are no '.lc($statushash{$msgstatus}).' messages in this folder.')); } + $r->print('

'); if ($numblocked > 0) { $r->print(&blocked_in_folder($numblocked,$startblock,$endblock, \%setters)); } - return; + return; } my $interdis = $env{'form.interdis'}; my $number=int($totalnumber/$interdis); @@ -1058,7 +1094,9 @@ ENDDISHEADER if ($lastdis>$#temp) { $lastdis=$#temp; } $r->print(&scrollbuttons($startdis,$number,$firstdis,$lastdis,$totalnumber,$msgstatus)); $r->print('
'. - ''); } else { @@ -1088,7 +1126,7 @@ ENDDISHEADER } else { $r->print(''.&mt('Course').''); } - $r->print(''); } else { @@ -1102,17 +1140,19 @@ ENDDISHEADER my ($sendtime,$shortsubj,$fromname,$fromdomain,$status,$origID, $description,$recv_name,$recv_domain)= @{$temp[$n]}; - if (($status ne 'deleted') && defined($sendtime) && $sendtime!~/error/) { + if (($status ne 'deleted') && defined($sendtime) && $sendtime!~/error/) { + my $class_msgstatus = ''; $count ++; - if ($status eq 'new') { - $r->print(''); - } elsif ($status eq 'read') { - $r->print(''); - } elsif ($status eq 'replied') { - $r->print(''); - } else { - $r->print(''); - } + if ($status eq 'new') { + $class_msgstatus = 'LC_mail_new'; + } elsif ($status eq 'read') { + $class_msgstatus = 'LC_mail_read'; + } elsif ($status eq 'replied') { + $class_msgstatus = 'LC_mail_replied'; + } else { + $class_msgstatus = 'LC_mail_other'; + } + $r->print(&Apache::loncommon::start_data_table_row($class_msgstatus)); my ($dis_name,$dis_domain) = ($fromname,$fromdomain); if ($folder eq 'sent') { if (defined($recv_name) && defined($recv_domain)) { @@ -1144,6 +1184,7 @@ ENDDISHEADER ''. $item.(($status eq 'new')?'':'').''); } + # Description and Status my $showstatus; my %statushash = &get_msgstatus_types(); if ($status eq '') { @@ -1151,25 +1192,40 @@ ENDDISHEADER } else { $showstatus = $statushash{$status}; } - $r->print(''."\n"); - } elsif ($status eq 'deleted') { + $r->print(''); + $r->print(''. + ''); + + $r->print(&Apache::loncommon::end_data_table_row()); + + } elsif ($status eq 'deleted') { # purge - my ($result,$msg) = - &movemsg(&unescape($origID),$folder,'trash'); - - } + my ($result,$msg) = + &movemsg(&unescape($origID),$folder,'trash'); + } } - $r->print("
 '); + &Apache::loncommon::start_data_table(). + &Apache::loncommon::start_data_table_row(). + ' '); if ($env{'form.sortedby'} eq "revdate") { $r->print(''.&mt('Date').''); + $r->print(''); if ($env{'form.sortedby'} eq "revstatus") { $r->print(''.&mt('Status').'
'.(($status eq 'new')?'':'').$description. - (($status eq 'new')?'':'').''. - (($status eq 'new')?'':'').$showstatus. - (($status eq 'new')?'':'').'
'.(($status eq 'new')?'':'').$description. + (($status eq 'new')?'':''). + '  '. + (($status eq 'new')?'':'').&mt($showstatus). + (($status eq 'new')?'':''). + '
\n"); - $r->print(' + $r->print(&Apache::loncommon::end_data_table()); + + + # Bottom Functions + $r->print('
- '."\n". - ''."\n". + ''."\n"); if (keys(%gotfolders) > 0) { - $r->print(''); } - $r->print(''."\n". '
'. - '
'."\n". - ''."\n". - '
 '.&mt('Action').'
'."\n". +
+
+ '.&mt('Select').' + + '."\n". + ' '."\n". + ' + +
+
'.&mt('Action').'
'."\n". '
'.&mt('Destination folder').'
'); + $r->print('
'.&mt('Destination folder').'
'); my %userfolders; foreach my $key (keys(%gotfolders)) { $userfolders{$key} = $key; } $userfolders{''} = ""; - $r->print(&Apache::loncommon::select_form('','movetofolder',%userfolders). + $r->print(&Apache::loncommon::select_form('','movetofolder',\%userfolders). '
   '. + $r->print(''. '
'); @@ -1268,9 +1324,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' + $r->print(&mt('Each of the[_1] [quant,_2,message] [_3]you checked' .' will be forwarded to the recipient(s) you select below.' - ,''.$multiforward.'') + ,'',$multiforward,'') .'
'); } else { $r->print(&mt('The message you checked will be forwarded to the recipient(s) you select below.').'
'); @@ -1315,22 +1371,36 @@ sub compout { if (&Apache::lonnet::allowed('srm',$env{'request.course.id'}) || &Apache::lonnet::allowed('srm',$env{'request.course.id'}. '/'.$env{'request.course.sec'})) { + my $crstype = &Apache::loncommon::course_type(); my $crithelp = Apache::loncommon::help_open_topic("Course_Critical_Message"); + my $rsstxt; + if (&Apache::loncommon::course_type() eq 'Community') { + $rsstxt = &mt('Include in community RSS newsfeed'); + } else { + $rsstxt = &mt('Include in course RSS newsfeed'); + } $dispcrit= ''.$crithelp.'  '.&mt('Require return receipt?').'  
'. '
'. '
'; + $rsstxt.'
'; } if ($broadcast ne 'group') { if (&Apache::lonnet::allowed('dff',$env{'request.course.id'}) || &Apache::lonnet::allowed('dff',$env{'request.course.id'}. '/'.$env{'request.course.sec'})) { + my $rectxt; + if (&Apache::loncommon::course_type() eq 'Community') { + $rectxt = &mt("Include in community's 'User records' for recipient(s)"); + } else { + $rectxt = &mt("Include in course's 'User records' for recipient(s)"); + } + $dispcrit.='
'; } } @@ -1349,11 +1419,7 @@ sub compout { if ($group eq '') { my $studentsel = &discourse(\%access_status); if ($studentsel) { - if ($env{'environment.wysiwygeditor'} eq 'on') { - $r->print($studentsel); - } else { - $r->print('
'.$studentsel.'
'); - } + $r->print('
'.$studentsel.'
'); $hasfloat = 1; } } else { @@ -1449,11 +1515,7 @@ ENDREPSCRIPT if ($env{'form.text'}) { $dismsg=$env{'form.text'}; } if ($env{'form.subject'}) { $dissub=$env{'form.subject'}; } if ($hasfloat) { - if ($env{'environment.wysiwygeditor'} eq 'on') { - $r->print($broadcast_js); - } else { - $r->print($broadcast_js.'
'); - } + $r->print($broadcast_js.'
'); $onsubmit = ' onsubmit="javascript:courseRecipients();" '; } $r->print( @@ -1563,7 +1625,11 @@ ENDREPSCRIPT } } my $latexHelp = &Apache::loncommon::helpLatexCheatsheet(undef,undef,1); - my $wysiwyglink=&Apache::lonhtmlcommon::htmlareaselectactive('message').'
'; + my $textareaclass; + if (&Apache::lonhtmlcommon::htmlareabrowser()) { + $r->print(&Apache::lonhtmlcommon::htmlareaselectactive()); + $textareaclass = 'class="LC_richDefaultOff"'; + } my $subj_size; if ($multiforward) { $r->print(&additional_rec_row(\%lt)); @@ -1585,8 +1651,7 @@ ENDREPSCRIPT '."\n". $latexHelp."
\n". &mt("Any new text to display before the text of the original messages:").'
'."\n". -''. -$wysiwyglink); +''); my @to_forward = &Apache::loncommon::get_env_multiple('form.delmark'); foreach my $msg (@to_forward) { $r->print(''); @@ -1606,8 +1671,9 @@ $wysiwyglink); $attachrow
$latexHelp
-$wysiwyglink + +
$sendmode $dispcrit $disbase @@ -1632,8 +1698,8 @@ ENDCOMP Subject:

$lt{'gmt'}:
-$wysiwyglink

+

$lt{'tff'}: ENDBLOCK @@ -1659,9 +1725,7 @@ ENDUPLOAD } $r->print('

'); if ($hasfloat) { - unless($env{'environment.wysiwygeditor'} eq 'on') { - $r->print('
'); - } + $r->print('
'); } $r->print(&generate_preview_form); } @@ -1787,9 +1851,9 @@ sub retrieve_instructor_comments { sub disfacetoface { my ($r,$user,$domain,$target)=@_; - if ($target eq '') { - my $target=$env{'form.grade_target'}; - } + if ($target eq '') { + $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'}. @@ -1805,7 +1869,9 @@ sub disfacetoface { foreach my $key (sort(keys(%records))) { my %content=&Apache::lonmsg::unpackagemsg($records{$key}); next if ($content{'senderdomain'} eq ''); - &Apache::lonfeedback::newline_to_br(\$content{'message'}); + if (!&Apache::lonfeedback::contains_block_html($content{'message'})) { + &Apache::lonfeedback::newline_to_br(\$content{'message'}); + } if ($content{'subject'}=~/^Record/) { $result.='

'.&mt('Record').'

'; } elsif ($content{'subject'}=~/^Broadcast/) { @@ -1858,7 +1924,6 @@ $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') { @@ -1934,6 +1999,7 @@ sub facetoface { .&Apache::lonhtmlcommon::end_pick_box() .'
' .'' + .'' ); if (($stage ne 'query') && @@ -1983,12 +2049,18 @@ sub examblock { $r->print('Not allowed'); return; } - my $usertype = (&Apache::loncommon::course_type() eq 'Community') ? 'members' - : 'students'; + my $usertype; + my $crstype = &Apache::loncommon::course_type(); + if ($crstype eq 'Community') { + $usertype = 'members'; + } else { + $usertype = 'students'; + } + my $lctype = lc($crstype); my %lt=&Apache::lonlocal::texthash( 'comb' => 'Communication Blocking', 'cbds' => 'Communication blocking during scheduled exams', - 'desc' => "You can use communication blocking to prevent $usertype enrolled in this course from displaying LON-CAPA messages sent by other $usertype during an online exam. As blocking of communication could potentially interrupt legitimate communication between $usertype who are also both enrolled in a different LON-CAPA course, please be careful that you select the correct start and end times for your scheduled exam when setting or modifying these parameters.", + 'desc' => "You can use communication blocking to prevent $usertype enrolled in this $lctype from displaying LON-CAPA messages sent by other $usertype during an online exam. As blocking of communication could potentially interrupt legitimate communication between $usertype who are also both enrolled in a different LON-CAPA course or community, please be careful that you select the correct start and end times for your scheduled exam when setting or modifying these parameters.", 'mecb' => 'Modify existing communication blocking periods', 'ncbc' => 'No communication blocks currently saved', 'stor' => 'Save', @@ -2165,7 +2237,7 @@ sub display_blocker_status { $ltext->{'setb'} $ltext->{'even'} $ltext->{'blck'} - $ltext->{'actn'}? + $ltext->{'actn'} END foreach my $record (sort(keys(%{$records}))) { @@ -2185,7 +2257,7 @@ END $setuname,$setudom); $r->print(&Apache::loncommon::start_data_table_row()); $r->print(<<"END"); - $ltext->{'star'}: $startform
$ltext->{'endd'}:  $endform + $ltext->{'star'}: $startform
$ltext->{'endd'}:  $endform $settername @@ -2195,11 +2267,16 @@ END if ($blocks->{$block} eq 'on') { $blockstatus = 'checked="checked"'; } - $r->print('
'); + $r->print('
'); } $r->print(<<"END"); -
+
+ END $r->print(&Apache::loncommon::end_data_table_row()); $parmcount++; @@ -2236,7 +2313,7 @@ END $ltext->{'dura'} $ltext->{'even'} $lt{'exam'} $ltext->{'blck'} - $ltext->{'actn'}? + $ltext->{'actn'} END $r->print(&Apache::loncommon::start_data_table_row()); @@ -2246,11 +2323,13 @@ END END foreach my $block (@{$typeorder}) { - $r->print('
'); + $r->print('
'); } $r->print(<<"END"); - - + + END $r->print(&Apache::loncommon::end_data_table_row()); $r->print(&Apache::loncommon::end_data_table()); @@ -2567,12 +2646,14 @@ sub displaymessage { } if ($content{'group'} ne '') { if (&check_group_priv($content{'group'})) { - $groupcclist = join(', ',@{$recipients{'group_cc_broadcast'}}); - if ($groupcclist) { - $r->print(&Apache::lonhtmlcommon::row_title(&mt('Group Cc')) - .$groupcclist - .&Apache::lonhtmlcommon::row_closure() - ); + if (ref($recipients{'group_cc_broadcast'}) eq 'ARRAY') { + $groupcclist = join(', ',@{$recipients{'group_cc_broadcast'}}); + if ($groupcclist) { + $r->print(&Apache::lonhtmlcommon::row_title(&mt('Group Cc')) + .$groupcclist + .&Apache::lonhtmlcommon::row_closure() + ); + } } } } @@ -2840,10 +2921,10 @@ sub header { if ($baseurl) { $extra .= ""; } - $r->print(&Apache::loncommon::start_page('Communication', + $r->print(&Apache::loncommon::start_page('Messages', $extra)); $r->print(&Apache::lonhtmlcommon::breadcrumbs - (($title?$title:'Send and Receive Messages'))); + (($title?$title:'Send and display messages'))); } # ---------------------------------------------------------------- Print header @@ -3096,7 +3177,7 @@ sub sendoffmail { my ($recuname,$recdomain)=split(/\:/,$address); my $msgtxt = $savemsg; if ($toaddr{$address}) { - $msgtxt.='
'.$toaddr{$address}; + $msgtxt.="\n".'
'."\n".$toaddr{$address}; } my @thismsg; if ($msgtype eq 'critical') { @@ -3201,10 +3282,11 @@ sub sendoffmail { '','','','',$recipid); } } - if (!$env{'form.multiforward'}) { + if (!$env{'form.multiforward'}) { if ($sendstatus=~/^(\s*(?:ok|con_delayed)\s*)*$/) { - $r->print('
'.&mt('Completed.'). - ''); + my $message = &Apache::lonhtmlcommon::confirm_success(&mt('Completed.')); + $message = &Apache::loncommon::confirmwrapper($message); + $r->print($message); if ($env{'form.displayedcrit'}) { &discrit($r); } @@ -3214,10 +3296,15 @@ sub sendoffmail { &Apache::loncommunicate::menu($r); } } else { - $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).'

'); + my $message = &Apache::lonhtmlcommon::confirm_success(&mt('Could not deliver message'),1); + $message .= '
'.&mt('Please use the browser "Back" button and correct the recipient addresses ([_1]).',$sendstatus); + $message = &Apache::loncommon::confirmwrapper($message); + $r->print($message); } } + } else { + &printheader($r,'','Messages cancelled.'); + return 'cancelled'; } return $sendstatus; } @@ -3253,7 +3340,7 @@ sub handler { &Apache::lonhtmlcommon::clear_breadcrumbs(); &Apache::lonhtmlcommon::add_breadcrumb ({href=>"/adm/communicate", - text=>"Communication/Messages", + text=>"Messages", faq=>12,bug=>'Communication Tools',}); # ------------------------------------------------------------------ Get Folder @@ -3334,9 +3421,10 @@ sub handler { my ($result,$msg) = &statuschange($env{'form.markdel'},'deleted',$folder); if (!$result) { - $r->print('

'. - &mt('Failed to delete the message.').'

'. - '

'.$msg."

\n"); + my $message = &Apache::lonhtmlcommon::confirm_success(&mt('Failed to delete the message.'),1); + $message .= '

'.$msg.'

'; + $message = &Apache::loncommon::confirmwrapper($message); + $r->print($message); } &Apache::loncommunicate::menu($r); &disall($r,($folder?$folder:$dismode),$msgstatus); @@ -3358,7 +3446,10 @@ sub handler { $total ++; } &printheader($r,'','Marked Messages Read'); - $r->print(&mt('Marked [quant,_1,message] read',$total).'

'); + my $message = &Apache::lonhtmlcommon::confirm_success(&mt('Marked [quant,_1,message] read',$total)); + $message = &Apache::loncommon::confirmwrapper($message); + $r->print($message); + # $r->print('

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

'); + my $message = &Apache::lonhtmlcommon::confirm_success(&mt('Marked [quant,_1,message] unread',$total)); + $message = &Apache::loncommon::confirmwrapper($message); + $r->print($message); + # $r->print('

'); &Apache::loncommunicate::menu($r); &disall($r,($folder?$folder:$dismode),$msgstatus); } elsif ($env{'form.markedaction'} eq 'markedmove') { @@ -3378,7 +3472,7 @@ sub handler { &printheader($r,'','Moved Messages'); if (!defined($gotfolders{$destfolder})) { $r->print(&mt('Destination folder [_1] is not a valid folder', - $destfolder)); + ''.$destfolder.'')); } else { my ($total,$failed,@failed_msg)=(0,0); my @to_move = &Apache::loncommon::get_env_multiple('form.delmark'); @@ -3392,18 +3486,17 @@ sub handler { push(@failed_msg,$msg); } } - if ($failed) { - $r->print('

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

'); - $r->print('

'. - join("

\n

",@failed_msg). - "

\n"); - } - $r->print('

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

' - .'

'); + my $message = ''; + if ($failed) { + $message .= &Apache::lonhtmlcommon::confirm_success(&mt('Failed to move [quant,_1,message]',$failed),1); + $message .= '

'. + join("

\n

",@failed_msg). + "

\n"; + } + $message .= &Apache::lonhtmlcommon::confirm_success(&mt('Moved [quant,_1,message]',$total)); + $message = &Apache::loncommon::confirmwrapper($message); + $r->print($message); + # $r->print('

'); } &Apache::loncommunicate::menu($r); &disall($r,($folder?$folder:$dismode),$msgstatus); @@ -3421,18 +3514,17 @@ sub handler { } } &printheader($r,'','Deleted Messages'); + my $message = ''; if ($failed) { - $r->print('

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

'); - $r->print('

'. - join("

\n

",@failed_msg). - "

\n"); - } - $r->print('

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

' - .'

'); + $message .= &Apache::lonhtmlcommon::confirm_success(&mt('Failed to delete [quant,_1,message]',$failed),1); + $message .= '

'. + join("

\n

",@failed_msg). + "

\n"; + } + $message .= &Apache::lonhtmlcommon::confirm_success(&mt('Deleted [quant,_1,message]',$total)); + $message = &Apache::loncommon::confirmwrapper($message); + $r->print($message); + # $r->print('

'); &Apache::loncommunicate::menu($r); &disall($r,($folder?$folder:$dismode),$msgstatus); } elsif ($env{'form.markunread'}) { @@ -3488,19 +3580,19 @@ sub handler { } if (keys(%forwardok) > 0) { my $count = keys(%forwardok); - $r->print('
'. - &mt('[quant,_1,message] forwarded.',$count). - ''); + my $message = &Apache::lonhtmlcommon::confirm_success(&mt('[quant,_1,message] forwarded.',$count)); + $message = &Apache::loncommon::confirmwrapper($message); + $r->print($message); } if (keys(%forwardfail) > 0) { my $count = keys(%forwardfail); - $r->print('

'. - &mt('Could not forward [quant,_1,message].',$count). - ' '); + my $message = &Apache::lonhtmlcommon::confirm_success(&mt('Could not forward [quant,_1,message].',$count),1); foreach my $key (keys(%forwardfail)) { - $r->print(&mt('Could not deliver forwarded message.').' '. - &mt('The recipient addresses may need to be corrected').' ('.$forwardfail{$key}.').

'); + $message .= '
'.&mt('Could not deliver forwarded message.').' '. + &mt('The recipient addresses may need to be corrected').' ('.$forwardfail{$key}.')'; } + $message = &Apache::loncommon::confirmwrapper($message); + $r->print($message); } &Apache::loncommunicate::menu($r); } else { @@ -3524,14 +3616,13 @@ sub handler { my $showfolder = $env{'form.newfolder'}; my ($makeresult,$warning) = &makefolder($env{'form.newfolder'}); if ($makeresult eq 'ok') { - $r->print('

' - .&mt('Folder "[_1]" created.',$showfolder) - .'

'); + my $message = &Apache::lonhtmlcommon::confirm_success(&mt('Folder "[_1]" created.',$showfolder)); + $message = &Apache::loncommon::confirmwrapper($message); + $r->print($message); } else { - $r->print('

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

'); + my $message = &Apache::lonhtmlcommon::confirm_success(&mt('Creation failed.').' '.$makeresult.'
'.$warning,1); + $message = &Apache::loncommon::confirmwrapper($message); + $r->print($message); $showfolder = $folder; } &Apache::loncommunicate::menu($r); @@ -3543,14 +3634,14 @@ sub handler { my $showfolder = ''; my $delresult = &deletefolder($folder); if ($delresult eq 'ok') { - $r->print('

' - .&mt('Folder "[_1]" deleted.',$folder) - .'

'); + my $message = &Apache::lonhtmlcommon::confirm_success(&mt('Folder "[_1]" deleted.',$folder)); + $message = &Apache::loncommon::confirmwrapper($message); + $r->print($message); $env{'form.folder'} = ''; } else { - $r->print('

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

'); + my $message = &Apache::lonhtmlcommon::confirm_success(&mt('Deletion failed.').' '.$delresult,1); + $message = &Apache::loncommon::confirmwrapper($message); + $r->print($message); $showfolder = $folder; } &Apache::loncommunicate::menu($r); @@ -3560,13 +3651,13 @@ sub handler { my $showfolder = $env{'form.renamed'}; my $renresult = &renamefolder($folder); if ($renresult eq 'ok') { - $r->print('

' - .&mt('Folder "[_1]" renamed to "[_2]".',$folder,$showfolder) - .'

'); + my $message = &Apache::lonhtmlcommon::confirm_success(&mt('Folder "[_1]" renamed to "[_2]".',$folder,$showfolder)); + $message = &Apache::loncommon::confirmwrapper($message); + $r->print($message); } else { - $r->print('

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

'); + my $message = &Apache::lonhtmlcommon::confirm_success(&mt('Renaming failed.').' '.$renresult,1); + $message = &Apache::loncommon::confirmwrapper($message); + $r->print($message); $showfolder = $folder; } &Apache::loncommunicate::menu($r);