--- loncom/interface/lonwhatsnew.pm 2006/01/06 22:37:27 1.45 +++ loncom/interface/lonwhatsnew.pm 2006/11/23 00:15:56 1.65 @@ -1,5 +1,5 @@ # -# $Id: lonwhatsnew.pm,v 1.45 2006/01/06 22:37:27 albertel Exp $ +# $Id: lonwhatsnew.pm,v 1.65 2006/11/23 00:15:56 banghart 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 @@ -100,28 +102,33 @@ sub handler { ({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, 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, 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, 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; @@ -138,6 +145,7 @@ sub display_main_box { 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('
'); my %threshold_titles = &Apache::lonlocal::texthash ( @@ -147,17 +155,17 @@ 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'}; @@ -178,12 +186,12 @@ sub display_main_box { &display_actions_box($r,$tabbg,$command,$refpage,\%threshold_titles, \%interval_titles,\%initpage,$cdom,$crs,$checkallowed); } + my $end_page = &Apache::loncommon::end_page(); $r->print(<

- - +$end_page END_OF_BLOCK } @@ -196,8 +204,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 +228,9 @@ END '; } - return(< -Course Action Items -$scripttag - -$bodytag -ENDHEAD + my $course_type=&Apache::loncommon::course_type(); + return &Apache::loncommon::start_page($course_type.' Action Items', + $scripttag); } #------------------------------- @@ -247,11 +249,15 @@ sub display_actions_box { 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 +286,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', ); @@ -310,13 +312,11 @@ sub display_actions_box { '
'); } } - $r->print($lt{'pgse'}.' '.&mt('Currently: [_1]',''.$currinit.''). - '  '.&mt('[_1] for just [_2]','Change', - 'this course').' '.&mt('or for all [_1].', - 'your courses').'
'); - + $r->print(&mt('Page set to be displayed after you have selected a role in this '.$lctype). + '. '.&mt('Currently: [_1]',$currinit).'.  '. + &mt('Change for just this '.$lctype.'',$refpage).' '. + &mt('or for all your courses',$refpage).'
'); + if ($command eq 'reset') { $result = &process_reset($cdom,$crs); } elsif ($command eq 'update') { @@ -331,7 +331,7 @@ sub display_actions_box { unless ($store_result eq 'ok') { &Apache::lonnet::logthis('Error storing whatsnew settings: '. - $store_result.' for '.'user '.$uname.':'.$udom.' in course '.$cid); + $store_result.' for '.'user '.$uname.':'.$udom.' in '.$lctype.' '.$cid); $result .= &mt('Unable to store visibility settings due to [_1]', $store_result); } @@ -357,19 +357,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'}.'
'.&mt('and total number of students with submissions').' ≥ '.$threshold{'numstudents'}; + $headings{'abovethreshold'} = + &mt('Problems with av. attempts ≥ [_1] or deg. difficulty ≥ [_2]
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'); @@ -396,10 +399,10 @@ sub display_actions_box { &getitems(\%unread,\%ungraded,\%bombed,\%triggered,\%changed,\@newdiscussions,\@tograde,\@bombs,\@warnings,$rowColor1,$rowColor2,\%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|$lt{'hial'} @@ -461,9 +464,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', @@ -527,9 +527,10 @@ 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('
'.&mt('Choose the time window to use for display of version changes for resources in the course.')); + $r->print('
'.&mt('Choose the time window to use for display of version changes for resources in the '.$lctype.'.')); unless ($current eq '') { $r->print(' '.&mt('Current value is [_1]',''. $$interval_titles{$current}.'.')); @@ -564,24 +565,34 @@ sub display_discussion_config { if ($current eq '') { $current = 'on'; } - my %status = ( - on => 'checked="checked"', - off => 'checked="checked"', - ); - $status{$current} = ''; - $r->print('
'.&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.').'
'.&mt('This can increase the time taken to gather data for the [_1] page by a few seconds.',"What's New?").'  '.&mt('Currently set to [_1] .'),"$current."); + my %opposite = ( + 'on' => 'off', + 'off' => 'on', + ); + $r->print(''); + $r->print('
'.&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.').'
'.&mt('This can increase the time taken to gather data for the [_1] page by a few seconds.',"What's New?").'  '.&mt('Currently set to [_1].',''.$current.'')); $r->print('

-
'. -&mt('Display of unread post counts?').'  + - -    - + '); - $r->print('

-
'); + $r->print('
+ +         + + '); return; } @@ -598,13 +609,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");
$lt{'chwp'} @@ -614,17 +626,27 @@ $$initpage{$current}.

-$lt{'padc'}   +$lt{'padc'}:   END foreach my $choice (@chgstate) { + my $chkstring; + if ($choice eq $control) { + $chkstring = ' checked="checked" '; + } $r->print(''); + $choice.'"'.$chkstring.'/>'.$$initpage{$choice}. + '  '); } $r->print('

'.&mt('If').' '.$$initpage{'coursespecific'}. - '
'.$lt{'chce'}." \n"); + ' -
'.$lt{'chce'}.": \n"); foreach my $choice (@chgentry) { + my $chkstring; + if (($choice eq $current) && ($control eq 'coursespecific')) { + $chkstring = ' checked="checked" '; + } $r->print(''); + $choice.'"'.$chkstring.'/>'.$$initpage{$choice}. + '  '); } $r->print('

'); @@ -658,7 +680,7 @@ sub display_launcher { $critmsgcount,$critmsgs,$interval,$countunread) = @_; if ($$checkallowed{$action}) { - &start_box($r,$tabbg,$show,$headings,$action,$refpage); + &start_box($r,$tabbg,$show,$headings,$action,$refpage,$action); if ($$show{$action}) { if ($action eq 'handgrading') { # UNGRADED ITEMS &display_handgrade($r,$tograde,$rowColor1,$rowColor2, @@ -672,7 +694,7 @@ sub display_launcher { } 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); @@ -697,7 +719,6 @@ sub getitems { # 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 +727,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; @@ -737,8 +746,8 @@ sub getitems { # 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 +765,31 @@ 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; + push(@{$newdiscussions}, $ressymb); + + $$unread{$ressymb}{'lastpost'} = $resource->last_post_time(); + + if ($countunread eq 'on') { + $$unread{$ressymb}{'unreadcount'} = $resource->unread_discussion(); } } - sub check_handgraded { my ($resource,$symb,$title,$cdom,$cnum,$ungraded,$tograde) = @_; if ($resource->is_problem()) { @@ -859,7 +821,7 @@ sub check_bombed { my @bombs = split(/,/, $errors); my $errorcount = scalar(@bombs); my $errorlink = ''. + &escape($bombs[0]).'">'. $title.''; $$bombed{$symb}{errorcount} = $errorcount; $$bombed{$symb}{errorlink} = $errorlink; @@ -868,8 +830,7 @@ 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; @@ -880,6 +841,9 @@ sub check_thresholds { 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 +875,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} .= ''."\n"; - } + my $resetname = 'reset_'.&escape($symb."\0".$part); + my $resettitle = 'title_'.&escape($symb."\0".$part); if (@parts > 1) { - $$triggered{$symb}{text} .= ' - part - '.$part.''; + $$triggered{$symb}{text}[$partcount] = ' + part - '.$part.''; } else { - $$triggered{$symb}{text} .= ' - single part'; + $$triggered{$symb}{text}[$partcount] = ' + single part'; } - $$triggered{$symb}{text} .= ' - '.$stats{$part}{users}.' - '.$stats{$part}{attempts}.' - '.$stats{$part}{degdiff}.' - '.$lastreset{$part}.' - - '; - $$triggered{$symb}{numparts} ++; + $$triggered{$symb}{text}[$partcount] .= ' + '.$stats{$part}{users}.' + '.$stats{$part}{attempts}.' + '.$stats{$part}{degdiff}.' + '.$lastreset{$part}.' + '; + $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 +969,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); @@ -1040,7 +1002,7 @@ sub process_update { 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 +1028,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 +1040,6 @@ sub getnormalmail { if ($shortsubj eq '') { $shortsubj = &mt('No subject'); } - $shortsubj = &Apache::lonnet::unescape($shortsubj); push(@{$newmsgs}, { msgid => $msgid, sendtime => $sendtime, @@ -1110,7 +1071,6 @@ sub getcritmail { if ($shortsubj eq '') { $shortsubj = &mt('No subject'); } - $shortsubj = &Apache::lonnet::unescape($shortsubj); push(@{$critmsgs}, { msgid => $msgid, sendtime => $sendtime, @@ -1184,7 +1144,7 @@ sub display_handgrade { } my ($map,$id,$url)=&Apache::lonnet::decode_symb($res); my $linkurl=&Apache::lonnet::clutter($url); - $linkurl .= '?symb='.&Apache::lonnet::escape($res); + $linkurl .= '?symb='.&escape($res); $r->print(''.$$ungraded{$res}{title}.''.$$ungraded{$res}{count}.''); $rowNum ++; @@ -1222,7 +1182,7 @@ sub display_haserrors { } 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,34 +1194,47 @@ 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('
'. ' '."\n". ' '. "\n"); - $r->print(''.$lt{'reso'}.''.$lt{'part'}.''.$lt{'nust'}.''.$lt{'avat'}.''.$lt{'dedi'}.''.$lt{'lare'}.''.$lt{'reco'}.''); + $r->print(''. + ''.$lt{'reso'}.''. + ''.$lt{'part'}.''.$lt{'nust'}.''. + ''.$lt{'avat'}.''.$lt{'dedi'}.''. + ''.$lt{'lare'}.''.$lt{'reco'}.''); + 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(''.$$triggered{$res}{title}.''.$$triggered{$res}{text}); - $warningnum ++; + $linkurl .= '?symb='.&escape($res); + my $css_class = $row%2?'LC_odd_row':''; + $r->print(''. + ''. + $$triggered{$res}{title}.''); + if (ref($$triggered{$res}{text}) eq 'ARRAY') { + $r->print($$triggered{$res}{text}[0]); + } + $r->print(''); + if (ref($$triggered{$res}{text}) eq 'ARRAY') { + if (@{$$triggered{$res}{text}} > 1) { + for (my $i=1; $i<@{$$triggered{$res}{text}}; $i++) { + $r->print(''. + $$triggered{$res}{text}[$i].''); + } + } + } } - $r->print('
'); + $r->print('
'); } else { - $r->print('
'.$lt{'nopr'}.'

'); + $r->print(''.$lt{'nopr'}.''); } } @@ -1289,7 +1262,7 @@ sub display_versionchanges { } 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(''.$$res_title{$item}.''.$$changed{$item}{'revdate'}.''.$$changed{$item}{'current'}.''.$$changed{$item}{'version'}.''); $changenum ++; @@ -1303,11 +1276,12 @@ sub display_versionchanges { sub display_coursediscussion { my ($r,$newdiscussions,$unread,$countunread,$res_title,$rowColor1, $rowColor2) = @_; + 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; @@ -1361,6 +1335,7 @@ sub display_coursediscussion { sub display_coursenormalmail { my ($r,$msgcount,$newmsgs,$rowColor1,$rowColor2) = @_; my $rowColor; + my $lctype = lc(&Apache::loncommon::course_type()); if ($msgcount > 0) { $r->print(''.&mt('Number').''.&mt('Subject').''.&mt('Sender').''.&mt('Date/Time').''); my $rowNum = 0; @@ -1376,13 +1351,14 @@ sub display_coursenormalmail { $mailcount ++; } } else { - $r->print('

'.&mt('No new course messages').'

'); + $r->print('

'.&mt('No new '.$lctype.' messages').'

'); } } sub display_coursecritmail { my ($r,$critmsgcount,$critmsgs,$rowColor1,$rowColor2) = @_; my $rowColor; + my $lctype = lc(&Apache::loncommon::course_type()); if ($critmsgcount > 0) { $r->print(''.&mt('Number').''.&mt('Subject').''.&mt('Sender').''.&mt('Date/Time').''); my $rowNum = 0; @@ -1398,7 +1374,7 @@ sub display_coursecritmail { $mailcount ++; } } else { - $r->print('

'.&mt('No unread critical messages in course').'

'); + $r->print('

'.&mt('No unread critical messages in '.$lctype).'

'); } } @@ -1417,8 +1393,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; @@ -1458,8 +1435,9 @@ sub store_interval_setting { ''.$$interval_titles{$env{'form.interval'}}.'
'); } else { + my $lctype = lc(&Apache::loncommon::course_type()); &Apache::lonnet::logthis('Error storing whatsnew interval setting'. - ' '.$outcome.' for '.$uname.':'.$udom.' in course '.$cid); + ' '.$outcome.' for '.$uname.':'.$udom.' in '.$lctype.' '.$cid); $result = &mt('Unable to set interval to [_1] due to [_2].', ''.$$interval_titles{$env{'form.interval'}}.'', ''.$outcome.'.
'); @@ -1481,8 +1459,9 @@ sub store_discussion_setting { ''.$env{'form.countunread'}.'
'); } else { + my $lctype = lc(&Apache::loncommon::course_type()); &Apache::lonnet::logthis('Error storing whatsnew countunread setting'. - ' '.$outcome.' for '.$uname.':'.$udom.' in course '.$cid); + ' '.$outcome.' for '.$uname.':'.$udom.' in '.$lctype.' '.$cid); $result = &mt('Unable to set "number unread posts display" to [_1]'. ' due to [_2].', ''.$env{'form.countunread'}.'', @@ -1509,27 +1488,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]',"user's global preferences."); + $result = &mt("Page displayed after role selection in $lctype now set by user's global preferences."); } else { - $result = &mt('Page displayed after role selection in this course set to [_1]',''.$$initpage{$env{'form.courseinit_page'}}.'.'); + $result = &mt('Page displayed after role selection in this '.$lctype.' set to [_2]',$lctype,$$initpage{$env{'form.courseinit_page'}}); } } else { &Apache::lonnet::logthis('Error storing 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].', ''.$page_control.'', ''.$outcome.'.
'); } else { - $result = &mt('Unable to set page display, after role selection, for this course to [_1] due to [_2].', - ''.$$initpage{$env{'form.courseinit_page'}}.'', - ''.$outcome.'.
'); + $result = &mt('Unable to set page display, after role selection, for this '.$lctype.' to [_2] due to [_3].
', + $$initpage{$env{'form.courseinit_page'}},$outcome); } } } @@ -1544,7 +1523,7 @@ sub start_box { chin => 'Change interval?', chop => 'Change options?', ); - my $showhide; + my ($showhide,$class); if ($$show{$caller}) { $showhide = 'Hide'; @@ -1576,6 +1555,7 @@ sub start_box { '.$lt{'chth'}.' '); } + $class='class="LC_whatsnew"'; } elsif (($caller eq 'versionchanges') && ($$show{$caller})) { if ($$show{$caller}) { $r->print(' @@ -1591,10 +1571,10 @@ sub start_box { '); } } - $r->print(' + $r->print(' - +
'); return; }