--- loncom/interface/lonwhatsnew.pm 2006/01/06 21:52:19 1.44 +++ loncom/interface/lonwhatsnew.pm 2008/03/18 22:00:28 1.76 @@ -1,5 +1,5 @@ # -# $Id: lonwhatsnew.pm,v 1.44 2006/01/06 21:52:19 albertel Exp $ +# $Id: lonwhatsnew.pm,v 1.76 2008/03/18 22:00:28 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -39,6 +39,8 @@ use Apache::lonuserstate; use Apache::Constants qw(:common :http); use Time::Local; use GDBM_File; +use lib '/home/httpd/lib/perl/'; +use LONCAPA; #---------------------------- # handler @@ -97,31 +99,36 @@ sub handler { text=>"Display Action Items"}); if (($command eq 'chgthreshold') && $checkallowed{'abovethreshold'}) { &Apache::lonhtmlcommon::add_breadcrumb - ({href=>'/adm/whatsnew?command=chgthreshold&refpage='.$refpage, + ({href=>'/adm/whatsnew?command=chgthreshold&refpage='.$refpage, text=>"Change thresholds"}); $r->print(&Apache::lonhtmlcommon::breadcrumbs - (undef,"What's New?",'Course_Action_Items_Thresholds')); + ("What's New?",#'Course_Action_Items_Thresholds' + )); } elsif (($command eq 'chginterval') && $checkallowed{'versionchanges'} ) { &Apache::lonhtmlcommon::add_breadcrumb - ({href=>'/adm/whatsnew?command=chginterval&refpage='.$refpage, + ({href=>'/adm/whatsnew?command=chginterval&refpage='.$refpage, text=>"Change interval"}); $r->print(&Apache::lonhtmlcommon::breadcrumbs - (undef,"What's New?",'Course_Action_Items_Intervals')); + ("What's New?",#'Course_Action_Items_Intervals' + )); } elsif (($command eq 'chgdisc') && $checkallowed{'coursediscussion'}) { &Apache::lonhtmlcommon::add_breadcrumb - ({href=>'/adm/whatsnew?command=chgdisc&refpage='.$refpage, + ({href=>'/adm/whatsnew?command=chgdisc&refpage='.$refpage, text=>"Change discussion display"}); $r->print(&Apache::lonhtmlcommon::breadcrumbs - (undef,"What's New?",'Course_Action_Items_Intervals')); + ("What's New?",#'Course_Action_Items_Intervals' + )); } elsif ($command eq 'courseinit') { &Apache::lonhtmlcommon::add_breadcrumb - ({href=>'/adm/whatsnew?command=courseinit&refpage='.$refpage, + ({href=>'/adm/whatsnew?command=courseinit&refpage='.$refpage, text=>"Course initialization preference"}); $r->print(&Apache::lonhtmlcommon::breadcrumbs - (undef,"What's New?",'Course_Action_Items_Initialization')); + ("What's New?",#'Course_Action_Items_Initialization' + )); } else { $r->print(&Apache::lonhtmlcommon::breadcrumbs - (undef,"What's New?",'Course_Action_Items_Display')); + ("What's New?",#'Course_Action_Items_Display' + )); } &display_main_box($r,$command,$refpage,\%checkallowed); return OK; @@ -137,7 +144,7 @@ sub display_main_box { my ($r,$command,$refpage,$checkallowed) = @_; my $domain=&Apache::loncommon::determinedomain(); my $function = &Apache::loncommon::get_users_function(); - my $tabbg=&Apache::loncommon::designparm($function.'.tabbg',$domain); + my $lctype = lc(&Apache::loncommon::course_type()); $r->print('<table width="100%" border="0" cellpadding="5" cellspacing="0"><tr><td width="100%">'); my %threshold_titles = &Apache::lonlocal::texthash ( @@ -147,24 +154,24 @@ sub display_main_box { ); my %interval_titles = &Apache::lonlocal::texthash ( - -1 => 'since start of course', + -1 => "since start of $lctype", 2592000 => 'since last month', 604800 => 'since last week', 86400 => 'since yesterday', ); my %initpage = &Apache::lonlocal::texthash ( - firstres => 'first resource in the course', + firstres => "first resource in the $lctype", whatsnew => "what's new? page", userpref => 'your general user preferences', - coursespecific => 'specific setting for this course', + coursespecific => "specific setting for this $lctype", ); my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; my $crs = $env{'course.'.$env{'request.course.id'}.'.num'}; if (($command eq 'chgthreshold') && $checkallowed->{'abovethreshold'}) { - &display_threshold_config($r,$refpage,$tabbg,\%threshold_titles, + &display_threshold_config($r,$refpage,\%threshold_titles, $cdom,$crs); } elsif (($command eq 'chginterval') && $checkallowed->{'versionchanges'}) { @@ -175,15 +182,15 @@ sub display_main_box { } elsif ($command eq 'courseinit') { &courseinit_config($r,$refpage,\%initpage); } else { - &display_actions_box($r,$tabbg,$command,$refpage,\%threshold_titles, + &display_actions_box($r,$command,$refpage,\%threshold_titles, \%interval_titles,\%initpage,$cdom,$crs,$checkallowed); } + my $end_page = &Apache::loncommon::end_page(); $r->print(<<END_OF_BLOCK); </td> </tr> </table><br /> -</body> -</html> +$end_page END_OF_BLOCK } @@ -196,8 +203,7 @@ END_OF_BLOCK sub display_header { my ($command,$checkallowed) = @_; - my $html=&Apache::lonxml::xmlbegin(); - my $bodytag=&Apache::loncommon::bodytag('Course Action Items'); + my $scripttag; unless ($command eq 'chgthreshold' || $command eq 'chginterval') { $scripttag = <<"END"; @@ -221,14 +227,9 @@ END </script> '; } - return(<<ENDHEAD); -$html -<head> -<title>Course Action Items</title> -$scripttag -</head> -$bodytag -ENDHEAD + my $course_type=&Apache::loncommon::course_type(); + return &Apache::loncommon::start_page($course_type.' Action Items', + $scripttag); } #------------------------------- @@ -239,19 +240,20 @@ ENDHEAD #------------------------------- sub display_actions_box { - my ($r,$tabbg,$command,$refpage,$threshold_titles,$interval_titles, - $initpage,$cdom,$crs,$checkallowed) = @_; - my $rowColor1 = "#ffffff"; - my $rowColor2 = "#eeeeee"; - + my ($r,$command,$refpage,$threshold_titles,$interval_titles,$initpage, + $cdom,$crs,$checkallowed) = @_; my $udom = $env{'user.domain'}; my $uname = $env{'user.name'}; my $cid = $env{'request.course.id'}; - + my $crstype = &Apache::loncommon::course_type(); + my $lctype = lc($crstype); + my %stulabel = ( + 'Course' => 'students', + 'Group' => 'members', + ); my %lt = &Apache::lonlocal::texthash( - 'yacc' => 'You are accessing an invalid course.', + 'yacc' => 'You are accessing an invalid course', 'gtfr' => 'Go to first resource', - 'pgse' => 'Page set to be displayed after you have selected a role in this course?', 'hial' => 'Hide all', 'shal' => 'Show all', ); @@ -280,16 +282,12 @@ sub display_actions_box { $result = &store_courseinit_setting($uname,$udom,$cid,$initpage); } - my %threshold = ( - av_attempts => 2, - degdiff => 0.5, - numstudents => 2, - ); + my %threshold = (); my %pagedesc = &Apache::lonlocal::texthash ( firstres => 'First resource', whatsnew => "What's New? page", userpref => 'user preference', - coursespecific => 'course only', + coursespecific => $lctype.' only', default => 'default', ); @@ -297,7 +295,7 @@ sub display_actions_box { my $currinit = $pagedesc{$initdisp}.' ('.$pagedesc{$initcontrol}.')'; unless ($cid) { - $r->print('<br /><b><center>'.$lt{'yacc'}.'</center></b><br /><br />'); + $r->print('<p><span style="text-align: center; font-weight: bold;">'.$lt{'yacc'}.'</span></p>'); return; } @@ -306,17 +304,23 @@ sub display_actions_box { &GDBM_READER(),0640)) { my $furl=$bighash{'first_url'}; untie(%bighash); - $r->print('<font size="+1"><a href="'.$furl.'">'.$lt{'gtfr'}. - '</a></font><br />'); + $r->print('<span style="font-size: larger;"><a href="'.$furl.'">'.$lt{'gtfr'}. + '</a></span><br />'); } } - $r->print($lt{'pgse'}.' '.&mt('Currently: [_1]','<i>'.$currinit.'</i>'). - '<nobr> '.&mt('[_1] for just [_2]','<b>Change</b>', - '<a href="/adm/whatsnew?command=courseinit&refpage='.$refpage. - '">this course</a>').' '.&mt('or for all [_1].', - '<a href="/adm/preferences?action=changecourseinit&refpage='. - $refpage.'">your courses</a>').'</nobr><br /><hr />'); - + $r->print(&mt('Page set to be displayed after you have selected a role in this '.$lctype).'.' + .' <span class="LC_nobreak">' + .&mt('Currently: <i>[_1]</i>',$currinit) + .'. ' +# &mt('<b>Change</b> for just <a href="/adm/whatsnew?command=courseinit&refpage=[_1]">this '.$lctype.'</a>',$refpage).' '. +# &mt('or for all <a href="/adm/preferences?action=changecourseinit&refpage=[_1]">your courses</a>.',$refpage).'</span><br /><hr />'); + .&mt('<b>Change</b> for just [_1]this course[_2]' + .' or for all [_3]your courses[_2].' + ,'<a href="/adm/whatsnew?command=courseinit&refpage='.$refpage.'">' + ,'</a>' + ,'<a href="/adm/preferences?action=changecourseinit&refpage='.$refpage.'">') + .' </span><br /><hr />'); + if ($command eq 'reset') { $result = &process_reset($cdom,$crs); } elsif ($command eq 'update') { @@ -330,9 +334,9 @@ sub display_actions_box { my $store_result=&store_display_settings($uname,$udom,$cid,$checkallowed); unless ($store_result eq 'ok') { - &Apache::lonnet::logthis('Error storing whatsnew settings: '. - $store_result.' for '.'user '.$uname.':'.$udom.' in course '.$cid); - $result .= &mt('Unable to store visibility settings due to [_1]', + &Apache::lonnet::logthis('Error saving whatsnew settings: '. + $store_result.' for '.'user '.$uname.':'.$udom.' in '.$lctype.' '.$cid); + $result .= &mt('Unable to save visibility settings due to [_1]', $store_result); } @@ -357,19 +361,22 @@ sub display_actions_box { } my %headings = &Apache::lonlocal::texthash( - coursediscussion => 'Unread course discussion posts', + coursediscussion => 'Unread '.$lctype.' discussion posts', handgrading => 'Problems requiring handgrading', haserrors => 'Problems with errors', - versionchanges => 'Resources in course with version changes '.$interval, - coursenormalmail => 'New course messages', - coursecritmail => 'New critical messages in course', + versionchanges => 'Resources in '.$lctype.' with version changes '.$interval, + coursenormalmail => 'New '.$lctype.' messages', + coursecritmail => 'New critical messages in '.$lctype, ); if ($$checkallowed{'abovethreshold'}) { &get_curr_thresholds(\%threshold,$uname,$udom,$cid,$cdom,$crs); } - $headings{'abovethreshold'} = &mt('Problems with av. attempts').' ≥ '.$threshold{'av_attempts'}.' '.&mt('or deg. difficulty').' ≥ '.$threshold{'degdiff'}.'<br /> '.&mt('and total number of students with submissions').' ≥ '.$threshold{'numstudents'}; + $headings{'abovethreshold'} = + &mt('Problems with av. attempts ≥ [_1] or deg. difficulty ≥ [_2] <br /> and total number of '.$stulabel{$crstype}.' with submissions ≥ [_3]', + $threshold{'av_attempts'},$threshold{'degdiff'}, + $threshold{'numstudents'}); my @actionorder = ('handgrading','haserrors','abovethreshold','versionchanges','coursediscussion','coursenormalmail','coursecritmail'); @@ -393,13 +400,13 @@ sub display_actions_box { } if ($needitems) { - &getitems(\%unread,\%ungraded,\%bombed,\%triggered,\%changed,\@newdiscussions,\@tograde,\@bombs,\@warnings,$rowColor1,$rowColor2,\%threshold,$cdom,$crs,\%res_title,\%show,$starttime,$countunread); + &getitems(\%unread,\%ungraded,\%bombed,\%triggered,\%changed,\@newdiscussions,\@tograde,\@bombs,\@warnings,\%threshold,$cdom,$crs,\%res_title,\%show,$starttime,$countunread); } if ($show{'coursenormalmail'}) { - &getnormalmail(\@newmsgs); + $msgcount = &getnormalmail(\@newmsgs); } if ($show{'coursecritmail'}) { - &getcritmail(\@critmsgs); + $critmsgcount = &getcritmail(\@critmsgs); } $r->print(qq|<a href="javascript:changeAll('hide');">$lt{'hial'}</a> @@ -412,7 +419,7 @@ sub display_actions_box { } } - $r->print('<input type="hidden" name="refpage" value="'.$refpage.'"></form><br /><table border="0" width="100%" cellpadding="2" cellspacing="4"><tr><td align="left" valign="top" width="45%">'); + $r->print('<input type="hidden" name="refpage" value="'.$refpage.'" /></form><table class="LC_double_column"><tr><td class="LC_left_col">'); my $displayed = 0; my $totalboxes = 0; @@ -427,20 +434,17 @@ sub display_actions_box { foreach my $actionitem (@actionorder) { if ($$checkallowed{$actionitem}) { if ($displayed == $halfway) { - $r->print('</td><td width="6%"> </td><td align="left" valign="top" width="47%">'); + $r->print('</td><td> </td><td class="LC_right_col" >'); } - &display_launcher($r,$actionitem,$refpage,$checkallowed,$tabbg,$rowColor1,$rowColor2,\%show,\%headings,\%res_title,\@tograde,\%ungraded,\@bombs,\%bombed,\%changed,\@warnings,\%triggered,\@newdiscussions,\%unread,$msgcount,\@newmsgs,$critmsgcount,\@critmsgs,$interval,$countunread); + &display_launcher($r,$actionitem,$refpage,$checkallowed,\%show,\%headings,\%res_title,\@tograde,\%ungraded,\@bombs,\%bombed,\%changed,\@warnings,\%triggered,\@newdiscussions,\%unread,$msgcount,\@newmsgs,$critmsgcount,\@critmsgs,$interval,$countunread); $displayed ++; } } $r->print(' - </table> - </td> - </tr> - </table> </td> </tr> - </table>'); + </table> +'); } #------------------------------- @@ -451,7 +455,7 @@ sub display_actions_box { #------------------------------- sub display_threshold_config { - my ($r,$refpage,$tabbg,$threshold_titles,$cdom,$crs) = @_; + my ($r,$refpage,$threshold_titles,$cdom,$crs) = @_; my $uname = $env{'user.name'}; my $udom = $env{'user.dom'}; my $cid = $env{'request.course.id'}; @@ -461,9 +465,6 @@ sub display_threshold_config { my $rowColor; my @thresholditems = ("av_attempts","degdiff","numstudents"); - foreach my $item (@thresholditems) { - $threshold{$item} = ''; - } my %threshold_titles = &Apache::lonlocal::texthash( av_attempts => 'Average number of attempts', degdiff => 'Degree of difficulty', @@ -471,48 +472,31 @@ sub display_threshold_config { ); &get_curr_thresholds(\%threshold,$uname,$udom,$cid,$cdom,$crs); - $r->print('<br /><form name="thresholdform" method="post" action="/adm/whatsnew"> - <table border="0" cellpadding="2" cellspacing="4"> - <tr> - <td align="left" valign="top" width="45%"> - <table border="0" cellpadding="0" cellspacing="0" bgcolor="#000000"> - <tr> - <td> - <table border="0" cellpadding="1" cellspacing="1" bgcolor="#000000"> - <tr> - <td bgcolor="#ffffff"> - <table cellspacing="0" cellpadding="4" border="0"> - <tr bgcolor="'.$tabbg.'"> - <th>Threshold Name</th> - <th>Current value</th> - <th>Change?</th> - </tr>'); - my $rowNum =0; + $r->print('<br /><form name="thresholdform" method="post" action="/adm/whatsnew">'. + &Apache::loncommon::start_data_table(). + &Apache::loncommon::start_data_table_header_row(). + '<th>'.&mt('Threshold Name').'</th>'."\n". + '<th>'.&mt('Current value').'</th>'."\n". + '<th>'.&mt('Change?').'</th>'."\n". + &Apache::loncommon::end_data_table_header_row()); foreach my $type (@thresholditems) { my $parameter = $env{'request.course.id'}.':threshold_'.$type; # onchange is javascript to automatically check the 'Set' button. my $onchange = 'onFocus="javascript:window.document.forms'. "['thresholdform'].elements['".$parameter."_setparmval']". '.checked=true;"'; - if ($rowNum %2 == 1) { - $rowColor = $rowColor1; - } else { - $rowColor = $rowColor2; - } - $r->print(' - <tr bgcolor="'.$rowColor.'"> - <td>'.$threshold_titles{$type}.'</td> - <td>'.&Apache::lonhtmlcommon::textbox($parameter.'_value', + $r->print(&Apache::loncommon::start_data_table_row()."\n". + '<td>'.$threshold_titles{$type}.'</td>'."\n". + '<td>'.&Apache::lonhtmlcommon::textbox($parameter.'_value', $threshold{$type}, - 10,$onchange).'</td> - <td>' - .&Apache::lonhtmlcommon::checkbox($parameter.'_setparmval'). - '</td> - </tr>'); - $rowNum ++; + 10,$onchange).'</td>'."\n". + '<td>'. + &Apache::lonhtmlcommon::checkbox($parameter.'_setparmval'). + '</td>'."\n". + &Apache::loncommon::end_data_table_row()); } - $r->print('</table></td></tr></table></td></tr></table> - <br /><input type="submit" name="threshold" value="Make changes" /> + $r->print(&Apache::loncommon::end_data_table()."\n". + '<br /><input type="submit" name="threshold" value="'.&mt('Make changes').'" /> <input type="hidden" name="command" value="update" /> <input type="hidden" name="refpage" value="'.$refpage.'" /> </form>'); @@ -527,12 +511,13 @@ sub display_threshold_config { sub display_interval_config { my ($r,$refpage,$interval_titles) = @_; + my $lctype = lc(&Apache::loncommon::course_type()); my $current = &get_current($env{'user.name'},$env{'user.domain'}, $env{'request.course.id'},'interval'); - $r->print('<br />'.&mt('Choose the time window to use for display of version changes for resources in the course.')); + $r->print('<br />'.&mt('Choose the time window to use for display of version changes for resources in the '.$lctype.'.').'<br />'); unless ($current eq '') { - $r->print(' '.&mt('Current value is [_1]','<b>'. - $$interval_titles{$current}.'</b>.')); + $r->print(' '.&mt('Current value is [_1].','<b>'. + $$interval_titles{$current}.'</b>')); } $r->print('<br /><br /> <form method="post" name="intervalswitch" action="/adm/whatsnew"> @@ -541,7 +526,7 @@ sub display_interval_config { <select name="interval"> '); foreach my $key (reverse sort ({$a cmp $b} (keys(%{$interval_titles})))) { - $r->print('<option value="'.$key.'">Version changes '.$$interval_titles{$key}. + $r->print('<option value="'.$key.'">'.&mt('Version changes').' '.$$interval_titles{$key}. '</option>'."\n"); } $r->print('</select> @@ -564,24 +549,34 @@ sub display_discussion_config { if ($current eq '') { $current = 'on'; } - my %status = ( - on => 'checked="checked"', - off => 'checked="checked"', - ); - $status{$current} = ''; - $r->print('<br />'.&mt('Choose whether or not to display a count of the number of new posts for each resource or bulletin board which has unread posts.').'<br />'.&mt('This can increase the time taken to gather data for the [_1] page by a few seconds.',"<i>What's New?</i>").' '.&mt('Currently set to [_1] .'),"<b>$current</b>."); + my %opposite = ( + 'on' => 'off', + 'off' => 'on', + ); + $r->print('<script type="text/javascript"> +function toggle_countunread(choice) { + if (choice == "unchanged") { + document.discussionswitch.command.value = ""; + } + document.discussionswitch.submit(); +} +</script>'); + $r->print('<br />'.&mt('Choose whether or not to display a count of the number of new posts for each resource or bulletin board which has unread posts.').'<br />'.&mt("This can increase the time taken to gather data for the '<i>What's New?</i>' page by a few seconds.").' '.&mt("Currently set to <b>$current</b>.")); $r->print('<br /><br /> -<form method="post" name="discussionswitch" action="/adm/whatsnew">'. -&mt('Display of unread post counts?').' +<form method="post" name="discussionswitch" action="/adm/whatsnew"> <input type="hidden" name="command" value="newdiscconf" /> <input type="hidden" name="refpage" value="'.$refpage.'" /> -<input type ="radio" '.$status{'on'}.' name="countunread" value="on">on - -<input type ="radio" '.$status{'off'}.' name="countunread" value="off">off +<input type="hidden" name="countunread" value="'.$opposite{$current}.'" /> '); - $r->print('<br/><br /> - <input type="submit" name="display" value="'. - &mt('Make changes').'" /></form>'); + $r->print('<br/> + <input type="button" name="display" value="'. + &mt('Change to [_1]',&mt($opposite{$current})).'" + onclick="javascript:toggle_countunread('."'change'".')" /> +   + <input type="button" name="nochange" value="'. + &mt("No change").'" + onclick="javascript:toggle_countunread('."'unchanged'".')" /> + </form>'); return; } @@ -598,13 +593,14 @@ sub courseinit_config { my ($control,$current) = &curr_courseinit(); my @chgstate = ('userpref','coursespecific'); my @chgentry = ('firstres','whatsnew'); + my $lctype = lc(&Apache::loncommon::course_type()); my %lt = &Apache::lonlocal::texthash( - 'chwp' => 'Choose which page will be displayed when you enter this course after selecting a role.', + 'chwp' => "Choose which page will be displayed when you enter this $lctype after selecting a role.", 'cuva' => 'Current value is determined by', 'anis' => 'and is set to display', 'padc' => 'Page display controlled by', - 'chce' => 'Choose course entry', - 'moce' => 'Modify course entry', + 'chce' => 'Choose '.$lctype.' entry', + 'moce' => 'Modify '.$lctype.' entry', ); $r->print(<<"END"); <br />$lt{'chwp'} @@ -614,17 +610,27 @@ $$initpage{$current}</b>.<br /><br /> <form method="post" name="courseinitswitch" action="/adm/whatsnew"> <input type="hidden" name="command" value="newcourseinit" /> <input type="hidden" name="refpage" value="$refpage" /> -$lt{'padc'} +$lt{'padc'}: END foreach my $choice (@chgstate) { - $r->print('<nobr><input type="radio" name="courseinit_control" value="'. - $choice.'"/>'.$$initpage{$choice}.' </nobr>'); + my $chkstring; + if ($choice eq $control) { + $chkstring = ' checked="checked" '; + } + $r->print('<span class="LC_nobreak"><label><input type="radio" name="courseinit_control" value="'. + $choice.'"'.$chkstring.'/>'.$$initpage{$choice}. + ' </label></span>'); } $r->print('<br /><br />'.&mt('If').' '.$$initpage{'coursespecific'}. - '<br />'.$lt{'chce'}." \n"); + ' - <br />'.$lt{'chce'}.": \n"); foreach my $choice (@chgentry) { - $r->print('<nobr><input type="radio" name="courseinit_page" value="'. - $choice.'"/>'.$$initpage{$choice}.' </nobr>'); + my $chkstring; + if (($choice eq $current) && ($control eq 'coursespecific')) { + $chkstring = ' checked="checked" '; + } + $r->print('<span class="LC_nobreak"><label><input type="radio" name="courseinit_page" value="'. + $choice.'"'.$chkstring.'/>'.$$initpage{$choice}. + ' </label></span>'); } $r->print('<br /><br /><input type="submit" name="display" value="'. $lt{'moce'}.'" /></form>'); @@ -652,36 +658,30 @@ sub curr_courseinit { } sub display_launcher { - my ($r,$action,$refpage,$checkallowed,$tabbg,$rowColor1,$rowColor2,$show, - $headings,$res_title,$tograde,$ungraded,$bombs,$bombed,$changed, - $warnings,$triggered,$newdiscussions,$unread,$msgcount,$newmsgs, - $critmsgcount,$critmsgs,$interval,$countunread) = @_; + my ($r,$action,$refpage,$checkallowed,$show,$headings,$res_title, + $tograde,$ungraded,$bombs,$bombed,$changed,$warnings,$triggered, + $newdiscussions,$unread,$msgcount,$newmsgs,$critmsgcount,$critmsgs, + $interval,$countunread) = @_; if ($$checkallowed{$action}) { - &start_box($r,$tabbg,$show,$headings,$action,$refpage); + &start_box($r,$show,$headings,$action,$refpage,$action); if ($$show{$action}) { if ($action eq 'handgrading') { # UNGRADED ITEMS - &display_handgrade($r,$tograde,$rowColor1,$rowColor2, - $ungraded); + &display_handgrade($r,$tograde,$ungraded); } elsif ($action eq 'haserrors') { # BOMBS - &display_haserrors($r,$bombs,$rowColor1,$rowColor2,$bombed, - $res_title); + &display_haserrors($r,$bombs,$bombed,$res_title); } elsif ($action eq 'versionchanges') { # VERSION CHANGES - &display_versionchanges($r,$changed,$res_title,$rowColor1, - $rowColor2,$interval); - + &display_versionchanges($r,$changed,$res_title,$interval); } elsif ($action eq 'abovethreshold') { # DEGDIFF/AV. TRIES TRIGGERS &display_abovethreshold($r,$refpage,$warnings,$triggered, - $res_title,$rowColor1,$rowColor2); + $res_title); } elsif ($action eq 'coursediscussion') { # UNREAD COURSE DISCUSSION &display_coursediscussion($r,$newdiscussions,$unread, - $countunread,$res_title,$rowColor1,$rowColor2); + $countunread,$res_title); } elsif ($action eq 'coursenormalmail') { # NORMAL MESSAGES - &display_coursenormalmail($r,$msgcount,$newmsgs,$rowColor1, - $rowColor2); + &display_coursenormalmail($r,$msgcount,$newmsgs); } elsif ($action eq 'coursecritmail') { # CRITICAL MESSAGES - &display_coursecritmail($r,$critmsgcount,$critmsgs,$rowColor1, - $rowColor2); + &display_coursecritmail($r,$critmsgcount,$critmsgs); } } &end_box($r); @@ -691,13 +691,12 @@ sub display_launcher { sub getitems { my ($unread,$ungraded,$bombed,$triggered,$changed,$newdiscussions, - $tograde,$bombs,$warnings,$rowColor1,$rowColor2,$threshold,$cdom,$crs, - $res_title,$show,$starttime,$countunread) = @_; + $tograde,$bombs,$warnings,$threshold,$cdom,$crs,$res_title,$show, + $starttime,$countunread) = @_; my $navmap = Apache::lonnavmaps::navmap->new(); # force retrieve Resource to seed the part id cache we'll need it later my @allres=$navmap->retrieveResources(undef, sub {if ($_[0]->is_problem) { $_[0]->parts();} return 1;}); - my %lastreadtime; my %resourcetracker; my $discussiontime; @@ -706,23 +705,11 @@ sub getitems { &checkversions($cdom,$crs,$navmap,$changed,$starttime); } - if ($$show{'coursediscussion'}) { - my %lastread = &Apache::lonnet::dump('nohist_'. - $env{'request.course.id'}.'_discuss', - $env{'user.domain'},$env{'user.name'},'lastread'); - foreach my $key (keys(%lastread)) { - my $newkey = $key; - $newkey =~ s/_lastread$//; - $lastreadtime{$newkey} = $lastread{$key}; - } - } - if ($$show{'abovethreshold'}) { %resourcetracker = &Apache::lonnet::dump('nohist_resourcetracker', $cdom,$crs); } - my $warningnum = 0; foreach my $resource (@allres) { my $result = ''; my $applies = 0; @@ -731,14 +718,18 @@ sub getitems { %{$$ungraded{$symb}} = (); %{$$triggered{$symb}} = (); $$triggered{$symb}{numparts} = 0; + if ($resource->encrypted()) { + $$triggered{$symb}{'enclink'} = $resource->link(); + $$triggered{$symb}{'encsymb'} = $resource->shown_symb(); + } my $title = $resource->compTitle(); $$res_title{$symb} = $title; my $ressymb = $resource->wrap_symb(); # Check if there are unread discussion postings if ($$show{'coursediscussion'}) { - &check_discussions($cdom,$crs,$resource,$symb,$ressymb,$title, - $newdiscussions,$unread); + &check_discussions($resource,$symb,$ressymb,$title, + $newdiscussions,$unread,$countunread); } # Check for ungraded problems @@ -756,78 +747,36 @@ sub getitems { # Maxtries and degree of difficulty for problem parts, unless handgradeable if ($$show{'abovethreshold'}) { - &check_thresholds($resource,$symb,\%resourcetracker,$triggered, - $threshold,$warnings,$warningnum,$rowColor1,$rowColor2); + &check_thresholds($resource,$symb,\%resourcetracker, + $triggered,$threshold,$warnings); } } - my $hasdiscussion = @{$newdiscussions}; - if ($$show{'coursediscussion'} && $hasdiscussion) { # Get time of last post; - $discussiontime = $navmap->{DISCUSSION_TIME}; - foreach my $ressymb (@{$newdiscussions}) { - $$unread{$ressymb}{'lastpost'} = $$discussiontime{$ressymb}; - } - if ($countunread eq 'on') { #Get count of unread postings for each resource - my $discussiondata = $navmap->get_discussion_data(); - foreach my $ressymb (@{$newdiscussions}) { - &get_discussions($cdom,$crs,$discussiondata,$ressymb, - $unread,\%lastreadtime); - } - } - } } sub check_discussions { - my ($cdom,$crs,$resource,$symb,$ressymb,$title,$newdiscussions, - $unread) = @_; - if ($resource->hasDiscussion()) { - %{$$unread{$ressymb}} = (); - $$unread{$ressymb}{'title'} = $title; - $$unread{$ressymb}{'symb'} = $symb; - push(@{$newdiscussions}, $ressymb); - } -} + my ($resource,$symb,$ressymb,$title,$newdiscussions,$unread, + $countunread) = @_; -sub get_discussions { - my ($cdom,$crs,$discussiondata,$ressymb,$unread,$lastreadtime) = @_; - my $prevread = 0; - my $unreadcount = 0; - if (defined($$lastreadtime{$ressymb})) { - $prevread = $$lastreadtime{$ressymb}; - } - my $version = $$discussiondata{'version:'.$ressymb}; - if ($version) { - my $hiddenflag = 0; - my $deletedflag = 0; - my ($hidden,$deleted); - for (my $id=$version; $id>0; $id--) { - my $vkeys=$$discussiondata{$id.':keys:'.$ressymb}; - my @keys=split(/:/,$vkeys); - if (grep/^hidden$/,@keys) { - unless ($hiddenflag) { - $hidden = $$discussiondata{$id.':'.$ressymb.':hidden'}; - $hiddenflag = 1; - } - } elsif (grep/^deleted$/,@keys) { - unless ($deletedflag) { - $deleted = $$discussiondata{$id.':'.$ressymb.':deleted'}; - $deletedflag = 1; - } - } else { - unless (($hidden =~/\.$id\./) || ($deleted =~/\.$id\./)) { - if ($prevread <$$discussiondata{$id.':'.$ressymb.':timestamp'}) { - $unreadcount ++; - $$unread{$ressymb}{$unreadcount} = $id.': '. - $$discussiondata{$id.':'.$ressymb.':subject'}; - } - } - } - } - $$unread{$ressymb}{'unreadcount'} = $unreadcount; + if (!$resource->hasDiscussion()) { return; } + + %{$$unread{$ressymb}} = (); + $$unread{$ressymb}{'title'} = $title; + $$unread{$ressymb}{'symb'} = $symb; + if ($resource->encrypted()) { + $$unread{$ressymb}{'enclink'} = $resource->link(); + $$unread{$ressymb}{'encsymb'} = $resource->shown_symb(); + } + push(@{$newdiscussions}, $ressymb); + + $$unread{$ressymb}{'lastpost'} = $resource->last_post_time(); + + if ($countunread eq 'on') { + $$unread{$ressymb}{'unreadcount'} = + $resource->discussion_info('unread'); } } - sub check_handgraded { my ($resource,$symb,$title,$cdom,$cnum,$ungraded,$tograde) = @_; if ($resource->is_problem()) { @@ -845,7 +794,11 @@ sub check_handgraded { if (@ungraded > 0) { $$ungraded{$symb}{count} = scalar(@ungraded); $$ungraded{$symb}{title} = $title; - push(@{$tograde}, $symb); + if ($resource->encrypted()) { + $$ungraded{$symb}{'enclink'} = $resource->link(); + $$ungraded{$symb}{'encsymb'} = $resource->shown_symb(); + } + push(@{$tograde},$symb); } } } @@ -859,7 +812,7 @@ sub check_bombed { my @bombs = split(/,/, $errors); my $errorcount = scalar(@bombs); my $errorlink = '<a href="/adm/email?display='. - &Apache::lonnet::escape($bombs[0]).'">'. + &escape($bombs[0]).'">'. $title.'</a>'; $$bombed{$symb}{errorcount} = $errorcount; $$bombed{$symb}{errorlink} = $errorlink; @@ -868,18 +821,19 @@ sub check_bombed { } sub check_thresholds { - my ($resource,$symb,$resourcetracker,$triggered,$threshold,$warnings, - $warningnum,$rowColor1,$rowColor2) = @_; + my ($resource,$symb,$resourcetracker,$triggered,$threshold,$warnings) = @_; # Compile maxtries and degree of difficulty for problem parts, unless handgradeable my @parts = @{$resource->parts()}; my %stats; my %lastreset = (); my $warning = 0; - my $rowColor; foreach my $part (@parts) { if ($resource->handgrade($part) eq 'yes') { next; } + if ($resource->is_survey($part)) { + next; + } %{$stats{$part}} = (); my ($attempts,$users,$corrects,$degdiff,$av_attempts); if (exists($$resourcetracker{$symb."\0".$part."\0attempts"})) { @@ -911,44 +865,42 @@ sub check_thresholds { } } if ($warning) { - if ($warningnum %2 == 1) { - $rowColor = $rowColor1; - } else { - $rowColor = $rowColor2; - } $$triggered{$symb}{title} = $resource->title; + my $partcount = 0; + @{$$triggered{$symb}{text}} = (); foreach my $part (@parts) { if (exists($stats{$part}{users})) { - my $resetname = 'reset_'.&Apache::lonnet::escape($symb."\0".$part); - my $resettitle = 'title_'.&Apache::lonnet::escape($symb."\0".$part); - if ($$triggered{$symb}{numparts}) { - $$triggered{$symb}{text} .= '<tr bgcolor="'.$rowColor.'">'."\n"; - } + my $resetname = 'reset_'.&escape($symb."\0".$part); + my $resettitle = 'title_'.&escape($symb."\0".$part); if (@parts > 1) { - $$triggered{$symb}{text} .= ' - <td align="right"><small>part - '.$part.'<small></td>'; + $$triggered{$symb}{text}[$partcount] = ' + <td>'.&mt('part - ').$part.'</td>'; } else { - $$triggered{$symb}{text} .= ' - <td align="right"><small>single part</small></td>'; + $$triggered{$symb}{text}[$partcount] = ' + <td>'.&mt('single part').'</td>'; } - $$triggered{$symb}{text} .= ' - <td align="right"><small>'.$stats{$part}{users}.'</small></td> - <td align="right"><small>'.$stats{$part}{attempts}.'</small></td> - <td align="right"><small>'.$stats{$part}{degdiff}.'</small></td> - <td align="right"><small>'.$lastreset{$part}.'</small></td> - <td align="right"><small><input type="checkbox" name="'.$resetname.'" /><input type="hidden" name="'.$resettitle.'" value="'.&Apache::lonnet::escape($$triggered{$symb}{title}).'" /></td> - </tr>'; - $$triggered{$symb}{numparts} ++; + $$triggered{$symb}{text}[$partcount] .= ' + <td>'.$stats{$part}{users}.'</td> + <td>'.$stats{$part}{attempts}.'</td> + <td>'.$stats{$part}{degdiff}.'</td> + <td>'.$lastreset{$part}.'</td> + <td><input type="checkbox" name="'.$resetname.'" /><input type="hidden" name="'.$resettitle.'" value="'.&escape($$triggered{$symb}{title}).'" /></td>'; + $partcount ++; } + $$triggered{$symb}{numparts} = $partcount; } push(@{$warnings},$symb); - $warningnum ++; } } sub get_curr_thresholds { my ($threshold,$uname,$udom,$cid,$cdom,$crs) = @_; + # set default values + %$threshold = (av_attempts => 2, + degdiff => 0.5, + numstudents => 2 + ); my %thresholdsettings = &Apache::lonnet::dump('nohist_whatsnew',$udom, $uname,$cid.':threshold'); my $thresholdcount = 0; @@ -1007,8 +959,8 @@ sub process_reset { my %titles = (); foreach my $key (keys(%env)) { next if ($key !~ /^form\.reset_(.+)$/); - my $title = &Apache::lonnet::unescape($env{'form.title_'.$1}); - my $reset_item = &Apache::lonnet::unescape($1); + my $title = &unescape($env{'form.title_'.$1}); + my $reset_item = &unescape($1); my %curr_aggregates = &Apache::lonnet::dump('nohist_resourcetracker',$dom,$crs,$reset_item); my %aggregates = (); my ($symb,$part) = split(/\0/,$reset_item); @@ -1035,12 +987,12 @@ sub process_reset { sub process_update { my ($uname,$udom,$threshold_titles) = @_; - my $setoutput = '<b>Changes to threshold(s) for problem tracking:</b><br />'; + my $setoutput = '<b>'.&mt('Changes to threshold(s) for problem tracking:').'</b><br />'; foreach (keys %env) { next if ($_!~/^form\.(.+)\_setparmval$/); my $name = $1; my $value = $env{'form.'.$name.'_value'}; - if ($name && defined($value)) { + if ($name && defined($value) && ($value ne '')) { my $put_result = &Apache::lonnet::put('nohist_whatsnew', {$name=>$value},$udom,$uname); @@ -1066,7 +1018,7 @@ sub getnormalmail { my @messages = sort(&Apache::lonnet::getkeys('nohist_email')); foreach my $message (@messages) { - my $msgid=&Apache::lonnet::escape($message); + my $msgid=&escape($message); my ($sendtime,$shortsubj,$fromname,$fromdom,$status,$fromcid)= &Apache::lonmsg::unpackmsgid($msgid); if (($fromcid) && ($fromcid eq $env{'request.course.id'})) { @@ -1078,7 +1030,6 @@ sub getnormalmail { if ($shortsubj eq '') { $shortsubj = &mt('No subject'); } - $shortsubj = &Apache::lonnet::unescape($shortsubj); push(@{$newmsgs}, { msgid => $msgid, sendtime => $sendtime, @@ -1110,7 +1061,6 @@ sub getcritmail { if ($shortsubj eq '') { $shortsubj = &mt('No subject'); } - $shortsubj = &Apache::lonnet::unescape($shortsubj); push(@{$critmsgs}, { msgid => $msgid, sendtime => $sendtime, @@ -1166,63 +1116,62 @@ sub checkversions { } sub display_handgrade { - my ($r,$tograde,$rowColor1,$rowColor2,$ungraded) = @_; - my $rowColor; + my ($r,$tograde,$ungraded) = @_; my %lt = &Apache::lonlocal::texthash( 'prna' => 'Problem Name', 'nmun' => 'Number ungraded', 'nopr' => 'No problems require handgrading', ); if (@{$tograde} > 0) { - $r->print('<tr bgcolor="#cccccc"><td><b><small>'.$lt{'prna'}.'</small></b></td><td align="right"><b><small>'.$lt{'nmun'}.'</small></b></td></tr>'); + $r->print('<tr class="LC_info_row"><td class="LC_left_item">'. + $lt{'prna'}.'</td><td class="LC_right_item">'. + $lt{'nmun'}.'</td></tr>'); my $rowNum = 0; foreach my $res (@{$tograde}) { - if ($rowNum %2 == 1) { - $rowColor = $rowColor1; - } else { - $rowColor = $rowColor2; - } + $rowNum ++; + my $css_class = $rowNum%2?' class="LC_odd_row"':''; my ($map,$id,$url)=&Apache::lonnet::decode_symb($res); my $linkurl=&Apache::lonnet::clutter($url); - $linkurl .= '?symb='.&Apache::lonnet::escape($res); - - $r->print('<tr bgcolor="'.$rowColor.'"><td><a href="'.$linkurl.'"><small>'.$$ungraded{$res}{title}.'</small></a></td><td align="right"><small>'.$$ungraded{$res}{count}.'</small></td></tr>'); - $rowNum ++; + $linkurl .= '?symb='.&escape($res); + if ($$ungraded{$res}{'enclink'}) { + $linkurl = + $$ungraded{$res}{'enclink'}.'?symb='.$$ungraded{$res}{'encsymb'}; + } + $r->print('<tr'.$css_class.'><td><a href="'.$linkurl.'">'.$$ungraded{$res}{title}.'</a></td><td class="LC_right_item">'.$$ungraded{$res}{count}.'</td></tr>'); } } else { - $r->print('<tr><td bgcolor="#ffffff"><br><center><i><b><small> '.$lt{'nopr'}.' </small><br><br></b></i></td></tr>'); + $r->print('<tr class="LC_empty_row"><td>'.$lt{'nopr'}.'</td></tr>'); } } sub display_haserrors { - my ($r,$bombs,$rowColor1,$rowColor2,$bombed,$res_title) = @_; + my ($r,$bombs,$bombed,$res_title) = @_; my $bombnum = 0; - my $rowColor; my %lt = &Apache::lonlocal::texthash( reso => 'Resource', nmer => 'Number of errors', noer => 'No problems with errors', ); if (@{$bombs} > 0) { - $r->print('<tr bgcolor="#cccccc"><td><b><small>'.$lt{'reso'}.'</small></b></td><td align="right"><b><small>'.$lt{'nmer'}.'</small></b></td></tr>'); + $r->print('<tr class="LC_info_row"><td class="LC_left_item">'. + $lt{'reso'}.'</td><td class="LC_right_item">'. + $lt{'nmer'}.'</td></tr>'); @{$bombs} = sort { &cmp_title($a,$b,$res_title) } @{$bombs}; foreach my $bomb (@{$bombs}) { - if ($bombnum %2 == 1) { - $rowColor = $rowColor1; - } else { - $rowColor = $rowColor2; - } - $r->print('<tr bgcolor="'.$rowColor.'"><td><small>'.$$bombed{$bomb}{errorlink}.'</small></td><td align="right"><small>'.$$bombed{$bomb}{errorcount}.'</small></td></tr>'); $bombnum ++; + my $css_class = $bombnum%2?' class="LC_odd_row"':''; + $r->print('<tr'.$css_class.'><td>'.$$bombed{$bomb}{errorlink}. + '</td><td class="LC_right_item">'. + $$bombed{$bomb}{errorcount}.'</td></tr>'); } } else { - $r->print('<tr><td bgcolor="#ffffff"><br /><center><b><i><small>'.$lt{'noer'}.'</small></i></b></center><br /></td></tr>'); + $r->print('<tr class="LC_empty_row"><td>'.$lt{'noer'}.'</td></tr>'); } return; } sub display_abovethreshold { - my ($r,$refpage,$warnings,$triggered,$res_title,$rowColor1,$rowColor2) = @_; + my ($r,$refpage,$warnings,$triggered,$res_title) = @_; my %lt = &Apache::lonlocal::texthash( reso => 'Resource', part => 'Part', @@ -1234,39 +1183,57 @@ sub display_abovethreshold { rese => 'Reset counters to 0', nopr => 'No problems satisfy threshold criteria', ); - my $rowColor; - my $warningnum = 0; if (@{$warnings} > 0) { @{$warnings} = sort { &cmp_title($a,$b,$res_title) } @{$warnings}; $r->print('<form name="reset_tracking" method="post" action="/adm/whatsnew">'. ' <input type="hidden" name="command" value="reset" />'."\n". ' <input type="hidden" name="refpage" value="'.$refpage.'" />'. "\n"); - $r->print('<tr bgcolor="#cccccc"><td><b><small>'.$lt{'reso'}.'</small></b></td><td align="right"><b><small>'.$lt{'part'}.'</small></b></td><td align="right"><b><small>'.$lt{'nust'}.'</small></b></td><td align="right"><b><small>'.$lt{'avat'}.'</small></b></td><td align="right"><b><small>'.$lt{'dedi'}.'</small></b></td><td align="right"><b><small>'.$lt{'lare'}.'</small></b></td><td align="right"><b><small>'.$lt{'reco'}.'</small></b></td></tr>'); + $r->print('<tr class="LC_info_row">'. + '<td class="LC_left_item">'.$lt{'reso'}.'</td>'. + '<td>'.$lt{'part'}.'</td><td>'.$lt{'nust'}.'</td>'. + '<td>'.$lt{'avat'}.'</td><td>'.$lt{'dedi'}.'</td>'. + '<td>'.$lt{'lare'}.'</td><td class="LC_right_item">'. + $lt{'reco'}.'</td></tr>'); + my $row; foreach my $res (@{$warnings}) { - if ($warningnum %2 == 1) { - $rowColor = $rowColor1; - } else { - $rowColor = $rowColor2; - } + $row++; my ($map,$id,$url)=&Apache::lonnet::decode_symb($res); my $linkurl=&Apache::lonnet::clutter($url); my $rowspan; if ($$triggered{$res}{numparts} > 1) { $rowspan = 'rowspan="'.$$triggered{$res}{numparts}.'"'; } - $linkurl .= '?symb='.&Apache::lonnet::escape($res); - $r->print('<tr bgcolor="'.$rowColor.'"><td '.$rowspan.'><a href="'.$linkurl.'"><small>'.$$triggered{$res}{title}.'</small></a></td>'.$$triggered{$res}{text}); - $warningnum ++; + $linkurl .= '?symb='.&escape($res); + if ($$triggered{$res}{'enclink'}) { + $linkurl = + $$triggered{$res}{'enclink'}.'?symb='.$$triggered{$res}{'encsymb'}; + } + my $css_class = $row%2?' class="LC_odd_row"':''; + $r->print('<tr'.$css_class.'>'. + '<td class="LC_first_item" '.$rowspan.'><a href="'.$linkurl.'">'. + $$triggered{$res}{title}.'</a></td>'); + if (ref($$triggered{$res}{text}) eq 'ARRAY') { + $r->print($$triggered{$res}{text}[0]); + } + $r->print('</tr>'); + if (ref($$triggered{$res}{text}) eq 'ARRAY') { + if (@{$$triggered{$res}{text}} > 1) { + for (my $i=1; $i<@{$$triggered{$res}{text}}; $i++) { + $r->print('<tr class="'.$css_class.'">'. + $$triggered{$res}{text}[$i].'</tr>'); + } + } + } } - $r->print('<tr bgcolor="#cccccc"><td colspan="7" align="right"><br /><b><small><input type="submit" name="counters" value="'.$lt{'rese'}.'" /></form>'); + $r->print('<tr class="LC_info_row"><td colspan="7" class="LC_right_item"><br /><input type="submit" name="counters" value="'.$lt{'rese'}.'" /></td></tr></form>'); } else { - $r->print('<tr><td bgcolor="#ffffff"><br /><center><b><i><small>'.$lt{'nopr'}.'</small></i></b></center><br /></td></tr>'); + $r->print('<tr class="LC_empty_row"><td>'.$lt{'nopr'}.'</td></tr>'); } } sub display_versionchanges { - my ($r,$changed,$res_title,$rowColor1,$rowColor2,$interval) = @_; + my ($r,$changed,$res_title,$interval) = @_; my %lt = &Apache::lonlocal::texthash( 'reso' => 'Resource', 'revd' => 'Last revised', @@ -1274,131 +1241,134 @@ sub display_versionchanges { 'veru' => 'Version used', 'noup' => 'No updated versions', ); - my $rowColor; if (keys(%{$changed}) > 0) { - $r->print('<tr bgcolor="#cccccc"><td><b><small>'.$lt{'reso'}.'</small></b></td><td><b><small>'.$lt{'revd'}.'</small></b></td><td><b><small>'.$lt{'newv'}.'</small></b></td><td><b><small>'.$lt{'veru'}.'</small></b></td></tr>'); - - + $r->print('<tr class="LC_info_row"><td class="LC_left_item">'. + $lt{'reso'}.'</td><td>'.$lt{'revd'}.'</td><td>'. + $lt{'newv'}.'</td><td class="LC_right_item">'. + $lt{'veru'}.'</td></tr>'); my @changes = sort { &cmp_title($a,$b,$res_title) } keys(%{$changed}); my $changenum = 0; foreach my $item (@changes) { - if ($changenum %2 == 1) { - $rowColor = $rowColor1; - } else { - $rowColor = $rowColor2; - } + $changenum ++; + my $css_class = $changenum%2?' class="LC_odd_row"':''; my ($map,$id,$url)=&Apache::lonnet::decode_symb($item); my $linkurl=&Apache::lonnet::clutter($url); - $linkurl .= '?symb='.&Apache::lonnet::escape($item); + $linkurl .= '?symb='.&escape($item); - $r->print('<tr bgcolor="'.$rowColor.'"><td><small><a href="'.$linkurl.'">'.$$res_title{$item}.'</a></small></td><td><small>'.$$changed{$item}{'revdate'}.'</small></td><td><small>'.$$changed{$item}{'current'}.'</small></td><td><small>'.$$changed{$item}{'version'}.'</small></td></tr>'); - $changenum ++; + $r->print('<tr'.$css_class.'><td><a href="'.$linkurl.'">'. + $$res_title{$item}.'</a></td><td>'. + $$changed{$item}{'revdate'}.'</td><td>'. + $$changed{$item}{'current'}.'</td><td>'. + $$changed{$item}{'version'}.'</td></tr>'); } } else { - $r->print('<tr><td bgcolor="#ffffff"><br /><center><b><i><small>'.$lt{'noup'}.' '.$interval.'</small></i></b></center><br /></td></tr>'); + $r->print('<tr class="LC_empty_row"><td>'.$lt{'noup'}. + ' '.$interval.'</td></tr>'); } return; } sub display_coursediscussion { - my ($r,$newdiscussions,$unread,$countunread,$res_title,$rowColor1, - $rowColor2) = @_; + my ($r,$newdiscussions,$unread,$countunread,$res_title) = @_; + my $lctype = lc(&Apache::loncommon::course_type()); my %lt = &Apache::lonlocal::texthash( 'loca' => 'Location', 'type' => 'Type', 'numn' => 'Number of new posts', - 'noun' => 'No unread posts in course discussions', + 'noun' => 'No unread posts in '.$lctype.' discussions', 'tmlp' => 'Time of last post', ); - my $rowColor; if (@{$newdiscussions} > 0) { - $r->print('<tr bgcolor="#cccccc"><td><b><small>'.$lt{'loca'}. - '</small></b></td><td><b><small>'.$lt{'type'}. - '</small></b>'); + $r->print('<tr class="LC_info_row"><td class="LC_left_item">'. + $lt{'loca'}.'</td><td>'. + $lt{'type'}.'</td>'); if ($countunread eq 'on') { - $r->print('<td><b><small>'.$lt{'tmlp'}.'</small></b></td>'. - '<td align="right"><b><small>'.$lt{'numn'}. - '</small></b></td>'); + $r->print('<td>'.$lt{'tmlp'}.'</td>'. + '<td class="LC_right_item">'.$lt{'numn'}.'</td>'); } else { - $r->print('<td align="right"><b><small>'.$lt{'tmlp'}. - '</small></b></td>'); + $r->print('<td class="LC_right_item">'.$lt{'tmlp'}.'</td>'); } $r->print("</tr>\n"); @{$newdiscussions} = sort { &cmp_title($a,$b,$res_title) } @{$newdiscussions}; my $rowNum = 0; foreach my $ressymb (@{$newdiscussions}) { + $rowNum ++; my $forum_title = $$unread{$ressymb}{'title'}; my $type = 'Resource'; my $feedurl=&Apache::lonfeedback::get_feedurl($ressymb); + my $disclink = $feedurl.'?symb='.$$unread{$ressymb}{symb}; if ($feedurl =~ /bulletinboard/) { $type = 'Bulletin Board'; } - if ($rowNum %2 == 1) { - $rowColor = $rowColor1; - } else { - $rowColor = $rowColor2; + if ($$unread{$ressymb}{'enclink'}) { + $disclink = $$unread{$ressymb}{'enclink'}.'?symb='.$$unread{$ressymb}{'encsymb'}; } + my $css_class = $rowNum%2?' class="LC_odd_row"':''; my $lastpost = &Apache::lonnavmaps::timeToHumanString( $$unread{$ressymb}{'lastpost'}); - $r->print('<tr bgcolor="'.$rowColor.'"><td><small><a href="'.$feedurl.'?symb='.$$unread{$ressymb}{symb}.'">'.$forum_title.'</a> </td><td><small>'.$type.' </small></td>'); + $r->print('<tr'.$css_class.'><td><a href="'.$disclink.'">'.$forum_title.'</a> </td><td>'.&mt($type).' </td>'); if ($countunread eq 'on') { my $unreadnum = $$unread{$ressymb}{'unreadcount'}; - $r->print('<td><small>'.$lastpost.'<small></td><td align="right">'. - '<small>',$unreadnum.' </small></td>'); + $r->print('<td>'.$lastpost.'</td><td class="LC_right_item">'. + $unreadnum.' </td>'); } else { - $r->print('<td align="right"><small>'.$lastpost.'</small></td>'); + $r->print('<td class="LC_right_item">'.$lastpost.'</td>'); } $r->print("</tr>\n"); - $rowNum ++; } } else { - $r->print('<tr><td bgcolor="#ffffff"><br><center> <i><b><small>'. - $lt{'noun'}.'</small></b></i><br><br></td></tr>'); + $r->print('<tr class="LC_empty_row"><td>'.$lt{'noun'}.'</td></tr>'); } } sub display_coursenormalmail { - my ($r,$msgcount,$newmsgs,$rowColor1,$rowColor2) = @_; - my $rowColor; + my ($r,$msgcount,$newmsgs) = @_; + my $lctype = lc(&Apache::loncommon::course_type()); if ($msgcount > 0) { - $r->print('<tr bgcolor="#cccccc"><td><b><small>'.&mt('Number').'</small></b></td><td><b><small>'.&mt('Subject').'</small></b></td><td><b><small>'.&mt('Sender').'</small></b></td><td><b><small>'.&mt('Date/Time').'</small></b></td></tr>'); - my $rowNum = 0; - my $mailcount = 1; + $r->print('<tr class="LC_info_row"><td class="LC_left_item">'. + &mt('Number').'</td><td>'.&mt('Subject').'</td><td>'. + &mt('Sender').'</td><td class="LC_right_item">'. + &mt('Date/Time').'</td></tr>'); + my $mailcount = 0; foreach my $msg (@{$newmsgs}) { - if ($rowNum %2 == 1) { - $rowColor = $rowColor1; - } else { - $rowColor = $rowColor2; - } - $r->print('<tr bgcolor="'.$rowColor.'"><td valign="top"><small>'.$mailcount.'. </small></td><td valign="top"><small><a href="/adm/communicate">'.$msg->{'shortsub'}.'</a> </small></td><td valign="top"><small> '.$msg->{'from'}.'@'.$msg->{'fromdom'}.' </small></td><td valign="top"><small>'.$msg->{'sendtime'}.'</small></td></tr>'); - $rowNum ++; $mailcount ++; + my $css_class = $mailcount%2?' class="LC_odd_row"':''; + $r->print('<tr'.$css_class.'><td>'.$mailcount + .'. </td><td><a href="/adm/email?display=' + .$msg->{'msgid'}.'">' + .$msg->{'shortsub'}.'</a> </td><td> ' + .$msg->{'from'}.':'.$msg->{'fromdom'}.' </td><td>' + .$msg->{'sendtime'}.'</td></tr>'); } } else { - $r->print('<tr><td bgcolor="#ffffff" width="100%"><center><br /><b><i><small>'.&mt('No new course messages').'</small></i></b><br /><br /></center></td></tr>'); + $r->print('<tr class="LC_empty_row"><td>'. + &mt('No new '.$lctype.' messages').'</td></tr>'); } } sub display_coursecritmail { - my ($r,$critmsgcount,$critmsgs,$rowColor1,$rowColor2) = @_; - my $rowColor; + my ($r,$critmsgcount,$critmsgs) = @_; + my $lctype = lc(&Apache::loncommon::course_type()); if ($critmsgcount > 0) { - $r->print('<tr bgcolor="#cccccc"><td><b><small>'.&mt('Number').'</small></b></td><td><b><small>'.&mt('Subject').'</small></b></td><td><b><small>'.&mt('Sender').'</small></b></td><td><b><small>'.&mt('Date/Time').'</small></b></td></tr>'); - my $rowNum = 0; - my $mailcount = 1; + $r->print('<tr class="LC_info_row"><td class="LC_left_item">'. + &mt('Number').'</td><td>'.&mt('Subject').'</td><td>'. + &mt('Sender').'</td><td class="LC_right_item">'. + &mt('Date/Time').'</td></tr>'); + my $mailcount = 0; foreach my $msg (@{$critmsgs}) { - if ($rowNum %2 == 1) { - $rowColor = $rowColor1; - } else { - $rowColor = $rowColor2; - } - $r->print('<tr bgcolor="'.$rowColor.'"><td valign="top"><small>'.$mailcount.'. <small></td><td valign="top"><small><a href="/adm/email?folder=critical">'.$msg->{'shortsub'}.'</a> </small></td><td valign="top"><small> '.$msg->{'from'}.'@'.$msg->{'fromdom'}.' </small></td><td valign="top"><small>'.$msg->{'sendtime'}.'</small></td></tr>'); - $rowNum ++; $mailcount ++; + my $css_class = $mailcount%2?' class="LC_odd_row"':''; + $r->print('<tr'.$css_class.'><td>'.$mailcount. + '. </td><td><a href="/adm/email?folder=critical">'. + $msg->{'shortsub'}.'</a> </td><td> '. + $msg->{'from'}.':'.$msg->{'fromdom'}.' </td><td>'. + $msg->{'sendtime'}.'</td></tr>'); } } else { - $r->print('<tr><td bgcolor="#ffffff" width="100%"><center><br /><b><i><small>'.&mt('No unread critical messages in course').'</small></i></b><br /><br /></center></td></tr>'); + $r->print('<tr class="LC_empty_row"><td>'. + &mt('No unread critical messages in '.$lctype). + '</td></tr>'); } } @@ -1417,8 +1387,9 @@ sub get_display_settings { if ($tmp=~ /^(con_lost|error|no_such_host)/i) { %settings = (); unless ($tmp =~ /^error: 2 /) { + my $lctype = lc(&Apache::loncommon::course_type()); &Apache::lonnet::logthis('Error retrieving whatsnew settings: '. - $tmp.' for '.$uname.':'.$udom.' for course: '.$cid); + $tmp.' for '.$uname.':'.$udom.' for '.$lctype.': '.$cid); } } return %settings; @@ -1455,11 +1426,12 @@ sub store_interval_setting { \%interval_settings,$udom,$uname); if ($outcome eq 'ok') { $result = &mt('Interval set to version changes [_1]', - '<b>'.$$interval_titles{$env{'form.interval'}}.'</b><br />'); + '<b>'.$$interval_titles{$env{'form.interval'}}.'</b>').'<br />'; } else { - &Apache::lonnet::logthis('Error storing whatsnew interval setting'. - ' '.$outcome.' for '.$uname.':'.$udom.' in course '.$cid); + my $lctype = lc(&Apache::loncommon::course_type()); + &Apache::lonnet::logthis('Error saving whatsnew interval setting'. + ' '.$outcome.' for '.$uname.':'.$udom.' in '.$lctype.' '.$cid); $result = &mt('Unable to set interval to [_1] due to [_2].', '<b>'.$$interval_titles{$env{'form.interval'}}.'</b>', '<tt>'.$outcome.'</tt>.<br />'); @@ -1478,14 +1450,15 @@ sub store_discussion_setting { \%discussion_settings,$udom,$uname); if ($outcome eq 'ok') { $result = &mt('Count unread posts in discussions display set to [_1]', - '<b>'.$env{'form.countunread'}.'</b><br />'); + '<b>'.&mt($env{'form.countunread'}).'</b>').'<br />'; } else { - &Apache::lonnet::logthis('Error storing whatsnew countunread setting'. - ' '.$outcome.' for '.$uname.':'.$udom.' in course '.$cid); + my $lctype = lc(&Apache::loncommon::course_type()); + &Apache::lonnet::logthis('Error saving whatsnew countunread setting'. + ' '.$outcome.' for '.$uname.':'.$udom.' in '.$lctype.' '.$cid); $result = &mt('Unable to set "number unread posts display" to [_1]'. ' due to [_2].', - '<b>'.$env{'form.countunread'}.'</b>', + '<b>'.&mt($env{'form.countunread'}).'</b>', '<tt>'.$outcome.'</tt>.<br />'); } } @@ -1509,27 +1482,27 @@ sub store_courseinit_setting { } } if ($page_control) { + my $lctype = lc(&Apache::loncommon::course_type()); my $outcome = &Apache::lonnet::put('nohist_whatsnew', \%courseinit_settings,$udom,$uname); if ($outcome eq 'ok') { if ($page_control eq 'global preferences') { - $result = &mt('Page displayed after role selection in course now set by [_1]',"<b>user's global preferences</b>."); + $result = &mt("Page displayed after role selection in $lctype now set by <b>user's global preferences</b>."); } else { - $result = &mt('Page displayed after role selection in this course set to [_1]','<b>'.$$initpage{$env{'form.courseinit_page'}}.'</b>.'); + $result = &mt('Page displayed after role selection in this '.$lctype.' set to <b>[_2]</b>',$lctype,$$initpage{$env{'form.courseinit_page'}}); } } else { - &Apache::lonnet::logthis('Error storing whatsnew courseinit '. + &Apache::lonnet::logthis('Error saving whatsnew courseinit '. 'setting: '.$outcome.' for '.$uname. - ':'.$udom.' in course '.$cid); + ':'.$udom.' in '.$lctype.' '.$cid); if ($page_control eq 'global preferences') { $result = &mt('Unable to set control of page display to [_1]'. ' due to [_2].', '<b>'.$page_control.'</b>', '<tt>'.$outcome.'</tt>.<br />'); } else { - $result = &mt('Unable to set page display, after role selection, for this course to [_1] due to [_2].', - '<b>'.$$initpage{$env{'form.courseinit_page'}}.'</b>', - '<tt>'.$outcome.'</tt>.<br />'); + $result = &mt('Unable to set page display, after role selection, for this '.$lctype.' to <b>[_2]</b> due to <tt>[_3]</tt>.<br />', + $$initpage{$env{'form.courseinit_page'}},$outcome); } } } @@ -1538,7 +1511,7 @@ sub store_courseinit_setting { } sub start_box { - my ($r,$tabbg,$show,$heading,$caller,$refpage) = @_; + my ($r,$show,$heading,$caller,$refpage) = @_; my %lt = &Apache::lonlocal::texthash( chth => 'Change thresholds?', chin => 'Change interval?', @@ -1547,54 +1520,47 @@ sub start_box { my $showhide; if ($$show{$caller}) { $showhide = '<b><a href="javascript:change_display(document.visible.'. - 'display_'.$caller.",'hide'".');">Hide</a></b>'; + 'display_'.$caller.",'hide'".');">'. + &mt('Hide').'</a></b>'; } else { $showhide = '<b><a href="javascript:change_display(document.visible.'. - 'display_'.$caller.",'show'".');">Show</a></b>'; + 'display_'.$caller.",'show'".');">'. + &mt('Show').'</a></b>'; } $r->print(' - <table border="0" cellpadding="0" cellspacing="0" bgcolor="#000000" width="100%"> + <table class="LC_nested_outer"> <tr> - <td> - <table border="0" cellpadding="1" cellspacing="1" bgcolor="#000000" width="100%"> - <tr> - <td bgcolor="'.$tabbg.'"> - <table width="100%" border="0" cellspacing="0" cellpadding="0"> - <tr> - <td><b>'.$$heading{$caller}.'</b></td> - <td valign="top" align="right">'.$showhide.'</td> - </tr> - </table> - </td> - </tr>'); + <th class="LC_left_item">'.$$heading{$caller}.'</th> + <th class="LC_right_item">'.$showhide.'</th> + </tr>'); if (($caller eq 'abovethreshold') && ($$show{$caller})) { if ($$show{$caller}) { $r->print(' <tr> - <td bgcolor="'.$tabbg.'" align="right"><a href="/adm/whatsnew?command=chgthreshold&refpage='.$refpage.'"><b><small>'.$lt{'chth'}.'</small></b></a></td> + <td class="LC_subheader" colspan="2"><a href="/adm/whatsnew?command=chgthreshold&refpage='.$refpage.'">'.$lt{'chth'}.'</a></td> </tr>'); } } elsif (($caller eq 'versionchanges') && ($$show{$caller})) { if ($$show{$caller}) { $r->print(' <tr> - <td bgcolor="'.$tabbg.'" align="right"><a href="/adm/whatsnew?command=chginterval&refpage='.$refpage.'"><b><small>'.$lt{'chin'}.'</small></b></a></td> + <td class="LC_subheader" colspan="2"><a href="/adm/whatsnew?command=chginterval&refpage='.$refpage.'">'.$lt{'chin'}.'</a></td> </tr>'); } } elsif ($caller eq 'coursediscussion') { if ($$show{$caller}) { $r->print(' <tr> - <td bgcolor="'.$tabbg.'" align="right"><a href="/adm/whatsnew?command=chgdisc&refpage='.$refpage.'"><b><small>'.$lt{'chop'}.'</small></b></a></td> + <td class="LC_subheader" colspan="2"><a href="/adm/whatsnew?command=chgdisc&refpage='.$refpage.'">'.$lt{'chop'}.'</a></td> </tr>'); } } - $r->print(' + $r->print(' <tr> - <td bgcolor="#ffffff"> - <table cellpadding="2" cellspacing="0" border="0" width="100%"> + <td colspan="2"> + <table class="LC_nested"> '); return; } @@ -1602,9 +1568,6 @@ sub start_box { sub end_box { my ($r) = shift; $r->print(' - </table> - </td> - </tr> </table> </td> </tr>