--- loncom/interface/lonmsgdisplay.pm 2010/01/13 16:39:19 1.140 +++ loncom/interface/lonmsgdisplay.pm 2010/06/06 02:40:30 1.153 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Routines for messaging display # -# $Id: lonmsgdisplay.pm,v 1.140 2010/01/13 16:39:19 bisitz Exp $ +# $Id: lonmsgdisplay.pm,v 1.153 2010/06/06 02:40:30 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,7 +287,7 @@ 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}; } @@ -308,10 +304,11 @@ sub scrollbuttons { ''; } $output .= - '
' + '

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

' .''; return $output; @@ -381,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})) { @@ -866,8 +863,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); @@ -1027,7 +1027,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(); @@ -1070,18 +1070,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); @@ -1096,7 +1098,9 @@ ENDDISHEADER if ($lastdis>$#temp) { $lastdis=$#temp; } $r->print(&scrollbuttons($startdis,$number,$firstdis,$lastdis,$totalnumber,$msgstatus)); $r->print('
'. - ''); } else { @@ -1126,7 +1130,7 @@ ENDDISHEADER } else { $r->print(''.&mt('Course').''); } - $r->print(''); } else { @@ -1140,17 +1144,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)) { @@ -1182,6 +1188,7 @@ ENDDISHEADER ''. $item.(($status eq 'new')?'':'').''); } + # Description and Status my $showstatus; my %statushash = &get_msgstatus_types(); if ($status eq '') { @@ -1189,25 +1196,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(''. '
'); @@ -1306,9 +1328,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.').'
'); @@ -1839,9 +1861,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'}. @@ -1987,6 +2009,7 @@ sub facetoface { .&Apache::lonhtmlcommon::end_pick_box() .'
' .'' + .'
' ); if (($stage ne 'query') && @@ -2224,7 +2247,7 @@ sub display_blocker_status { $ltext->{'setb'} $ltext->{'even'} $ltext->{'blck'} - $ltext->{'actn'}? + $ltext->{'actn'} END foreach my $record (sort(keys(%{$records}))) { @@ -2244,7 +2267,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 @@ -2254,11 +2277,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++; @@ -2295,7 +2323,7 @@ END $ltext->{'dura'} $ltext->{'even'} $lt{'exam'} $ltext->{'blck'} - $ltext->{'actn'}? + $ltext->{'actn'} END $r->print(&Apache::loncommon::start_data_table_row()); @@ -2305,11 +2333,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()); @@ -3155,7 +3185,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') { @@ -3260,10 +3290,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); } @@ -3273,10 +3304,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; } @@ -3393,9 +3429,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); @@ -3417,7 +3454,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') { @@ -3428,7 +3468,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') { @@ -3437,7 +3480,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'); @@ -3451,18 +3494,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); @@ -3480,18 +3522,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'}) { @@ -3547,19 +3588,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 { @@ -3583,14 +3624,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); @@ -3602,14 +3642,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); @@ -3619,13 +3659,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);