--- loncom/interface/lonwhatsnew.pm 2006/09/06 19:20:04 1.61 +++ loncom/interface/lonwhatsnew.pm 2006/09/07 19:31:26 1.62 @@ -1,5 +1,5 @@ # -# $Id: lonwhatsnew.pm,v 1.61 2006/09/06 19:20:04 albertel Exp $ +# $Id: lonwhatsnew.pm,v 1.62 2006/09/07 19:31:26 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -883,29 +883,28 @@ sub check_thresholds { } if ($warning) { $$triggered{$symb}{title} = $resource->title; + my $partcount = 0; + @{$$triggered{$symb}{text}} = (); 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"; - } if (@parts > 1) { - $$triggered{$symb}{text} .= ' + $$triggered{$symb}{text}[$partcount] = ' part - '.$part.''; } else { - $$triggered{$symb}{text} .= ' + $$triggered{$symb}{text}[$partcount] = ' single part'; } - $$triggered{$symb}{text} .= ' + $$triggered{$symb}{text}[$partcount] .= ' '.$stats{$part}{users}.' '.$stats{$part}{attempts}.' '.$stats{$part}{degdiff}.' '.$lastreset{$part}.' - - '; - $$triggered{$symb}{numparts} ++; + '; + $partcount ++; } + $$triggered{$symb}{numparts} = $partcount; } push(@{$warnings},$symb); } @@ -1218,10 +1217,22 @@ sub display_abovethreshold { $rowspan = 'rowspan="'.$$triggered{$res}{numparts}.'"'; } $linkurl .= '?symb='.&escape($res); - $r->print(''. + my $css_class = $row%2?'LC_odd_row':''; + $r->print(''. ''. - $$triggered{$res}{title}.''. - $$triggered{$res}{text}); + $$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('
'); } else {