--- loncom/interface/lonwhatsnew.pm 2006/07/19 22:01:37 1.60 +++ loncom/interface/lonwhatsnew.pm 2006/09/06 19:20:04 1.61 @@ -1,5 +1,5 @@ # -# $Id: lonwhatsnew.pm,v 1.60 2006/07/19 22:01:37 raeburn Exp $ +# $Id: lonwhatsnew.pm,v 1.61 2006/09/06 19:20:04 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -687,7 +687,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, @@ -701,7 +701,7 @@ sub display_launcher { } elsif ($action eq 'abovethreshold') { # DEGDIFF/AV. TRIES TRIGGERS &display_abovethreshold($r,$refpage,$warnings,$triggered, - $res_title); + $res_title); } elsif ($action eq 'coursediscussion') { # UNREAD COURSE DISCUSSION &display_coursediscussion($r,$newdiscussions,$unread, $countunread,$res_title,$rowColor1,$rowColor2); @@ -739,7 +739,6 @@ sub getitems { $cdom,$crs); } - my $warningnum = 0; foreach my $resource (@allres) { my $result = ''; my $applies = 0; @@ -773,9 +772,8 @@ sub getitems { # Maxtries and degree of difficulty for problem parts, unless handgradeable if ($$show{'abovethreshold'}) { - $warningnum = &check_thresholds($resource,$symb,\%resourcetracker, - $triggered,$threshold,$warnings, - $warningnum,$rowColor1,$rowColor2); + &check_thresholds($resource,$symb,\%resourcetracker, + $triggered,$threshold,$warnings); } } @@ -839,8 +837,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; @@ -885,41 +882,33 @@ sub check_thresholds { } } if ($warning) { - if ($warningnum%2 == 1) { - $rowColor = $rowColor1; - } else { - $rowColor = $rowColor2; - } - $$triggered{$symb}{rowColor} = $rowColor; $$triggered{$symb}{title} = $resource->title; foreach my $part (@parts) { if (exists($stats{$part}{users})) { my $resetname = 'reset_'.&escape($symb."\0".$part); my $resettitle = 'title_'.&escape($symb."\0".$part); if ($$triggered{$symb}{numparts}) { - $$triggered{$symb}{text} .= ''."\n"; + $$triggered{$symb}{text} .= ''."\n"; } if (@parts > 1) { $$triggered{$symb}{text} .= ' - part - '.$part.''; + part - '.$part.''; } else { $$triggered{$symb}{text} .= ' - single part'; + single part'; } $$triggered{$symb}{text} .= ' - '.$stats{$part}{users}.' - '.$stats{$part}{attempts}.' - '.$stats{$part}{degdiff}.' - '.$lastreset{$part}.' - + '.$stats{$part}{users}.' + '.$stats{$part}{attempts}.' + '.$stats{$part}{degdiff}.' + '.$lastreset{$part}.' + '; $$triggered{$symb}{numparts} ++; } } push(@{$warnings},$symb); - $warningnum ++; } - return $warningnum; } @@ -1214,8 +1203,14 @@ sub display_abovethreshold { ' '."\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}) { + $row++; my ($map,$id,$url)=&Apache::lonnet::decode_symb($res); my $linkurl=&Apache::lonnet::clutter($url); my $rowspan; @@ -1223,11 +1218,14 @@ sub display_abovethreshold { $rowspan = 'rowspan="'.$$triggered{$res}{numparts}.'"'; } $linkurl .= '?symb='.&escape($res); - $r->print(''.$$triggered{$res}{title}.''.$$triggered{$res}{text}); + $r->print(''. + ''. + $$triggered{$res}{title}.''. + $$triggered{$res}{text}); } - $r->print('
'); + $r->print('
'); } else { - $r->print('
'.$lt{'nopr'}.'

'); + $r->print('
'.$lt{'nopr'}.'
'); } } @@ -1516,7 +1514,7 @@ sub start_box { chin => 'Change interval?', chop => 'Change options?', ); - my $showhide; + my ($showhide,$class); if ($$show{$caller}) { $showhide = 'Hide'; @@ -1548,6 +1546,7 @@ sub start_box { '.$lt{'chth'}.' '); } + $class='class="LC_whatsnew"'; } elsif (($caller eq 'versionchanges') && ($$show{$caller})) { if ($$show{$caller}) { $r->print(' @@ -1563,10 +1562,10 @@ sub start_box { '); } } - $r->print(' + $r->print(' - +
'); return; }