--- loncom/interface/lonmsgdisplay.pm 2009/06/16 16:49:11 1.127 +++ loncom/interface/lonmsgdisplay.pm 2010/01/25 18:09:42 1.145 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Routines for messaging display # -# $Id: lonmsgdisplay.pm,v 1.127 2009/06/16 16:49:11 bisitz Exp $ +# $Id: lonmsgdisplay.pm,v 1.145 2010/01/25 18:09:42 raeburn 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 @@ -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,8 +219,7 @@ function folder_choice(targetform,caller |; my %show = ('select_form_order' => [10,20,50,100,200], map {$_=>$_} (10,20,50,100,200)); - - + $output .= '
@@ -273,12 +272,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 +291,30 @@ 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 @@ -509,6 +521,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 +537,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 +558,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,10 +580,17 @@ 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.'
'; if (ref($statushash) eq 'HASH') { $statushash->{'future'} = 1; @@ -730,10 +762,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 +866,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); @@ -1032,18 +1073,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); @@ -1060,44 +1103,44 @@ 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 = 0; + my $count = $firstdis; for (my $n=$firstdis;$n<=$lastdis;$n++) { my ($sendtime,$shortsubj,$fromname,$fromdomain,$status,$origID, $description,$recv_name,$recv_domain)= @@ -1218,8 +1261,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; } @@ -1264,8 +1311,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[_1] [quant,_2,message] [_3]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.').'
'); @@ -1310,22 +1358,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.='
'; } } @@ -1781,8 +1843,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 '') { + $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'}. @@ -1794,11 +1858,13 @@ 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 ''); - &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,9 +1924,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 { @@ -1886,8 +1954,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"); @@ -1973,12 +2041,18 @@ sub examblock { $r->print('Not allowed'); return; } - my $usertype = (&Apache::loncommon::course_type() eq 'Group') ? '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', @@ -2155,7 +2229,7 @@ sub display_blocker_status { - + END foreach my $record (sort(keys(%{$records}))) { @@ -2175,7 +2249,7 @@ END $setuname,$setudom); $r->print(&Apache::loncommon::start_data_table_row()); $r->print(<<"END"); - + - - + END $r->print(&Apache::loncommon::start_data_table_row()); @@ -2240,7 +2319,9 @@ END } $r->print(<<"END"); - + END $r->print(&Apache::loncommon::end_data_table_row()); $r->print(&Apache::loncommon::end_data_table()); @@ -2275,8 +2356,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 '') { @@ -2828,10 +2911,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 @@ -3189,10 +3272,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); } @@ -3202,8 +3286,10 @@ 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); } } } @@ -3241,7 +3327,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 @@ -3322,9 +3408,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); @@ -3346,7 +3433,10 @@ sub handler { $total ++; } &printheader($r,'','Marked Messages Read'); - $r->print(&mt('Marked [_1] message(s) 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') { @@ -3357,7 +3447,10 @@ sub handler { $total ++; } &printheader($r,'','Marked Messages Unread'); - $r->print(&mt('Marked [_1] message(s) 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') { @@ -3380,15 +3473,17 @@ sub handler { push(@failed_msg,$msg); } } - if ($failed) { - $r->print('

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

'); - $r->print('

'. - join("

\n

",@failed_msg). - "

\n"); - } - $r->print(&mt('Moved [_1] message(s)',$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); @@ -3406,15 +3501,17 @@ sub handler { } } &printheader($r,'','Deleted Messages'); + my $message = ''; if ($failed) { - $r->print('

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

'); - $r->print('

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

'. join("

\n

",@failed_msg). - "

\n"); + "

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

'); + $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'}) { @@ -3470,19 +3567,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 { @@ -3506,10 +3603,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); @@ -3521,10 +3621,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); @@ -3534,9 +3638,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);

 '); 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').'
$ltext->{'setb'} $ltext->{'even'} $ltext->{'blck'}$ltext->{'actn'}?$ltext->{'actn'}
$ltext->{'star'}: $startform
$ltext->{'endd'}:  $endform		$ltext->{'star'}: $startform
$ltext->{'endd'}:  $endform		 $settername @@ -2189,7 +2263,12 @@ END } $r->print(<<"END");
+
+ END $r->print(&Apache::loncommon::end_data_table_row()); $parmcount++; @@ -2226,7 +2305,7 @@ END 		$ltext->{'dura'} $ltext->{'even'} $lt{'exam'} $ltext->{'blck'}$ltext->{'actn'}?$ltext->{'actn'}