--- loncom/interface/lonwhatsnew.pm 2016/10/23 21:52:26 1.105.2.12 +++ loncom/interface/lonwhatsnew.pm 2016/10/16 23:19:59 1.119 @@ -1,5 +1,5 @@ # -# $Id: lonwhatsnew.pm,v 1.105.2.12 2016/10/23 21:52:26 raeburn Exp $ +# $Id: lonwhatsnew.pm,v 1.119 2016/10/16 23:19:59 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -1145,8 +1145,8 @@ sub check_thresholds { '.$stats{$part}{attempts}.' '.$stats{$part}{degdiff}.' '.$lastreset{$part}.''; - if ($checkallowed->{'resetcounters'}) { - $$triggered{$symb}{text}[$partcount] .= + if ($checkallowed->{'resetcounters'}) { + $$triggered{$symb}{text}[$partcount] .= ''. ''; } @@ -1214,7 +1214,7 @@ sub process_reset { my ($dom,$crs,$checkallowed) = @_; if (!$checkallowed->{'resetcounters'}) { return ''.&mt('You do not the required privileges to reset counters'). - '
'; + '
'; } my $result = ''.&mt('Counters reset for following problems (and parts):'). '
'; @@ -1304,7 +1304,7 @@ sub getnormalmail { if (defined($sendtime) && $sendtime!~/error/) { if (($emailstatus{$msgid} eq 'new') || ($status eq 'new')) { $sendtime = &Apache::lonlocal::locallocaltime($sendtime); - $msgcount ++; + $msgcount ++; if ($shortsubj eq '') { $shortsubj = &mt('No subject'); } @@ -1641,13 +1641,13 @@ sub display_handgrade { foreach my $res (@{$tograde}) { $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='.&escape($res); + my $linkurl='/adm/grades'; if ($$ungraded{$res}{'enclink'}) { - $linkurl = - $$ungraded{$res}{'enclink'}.'?symb='.$$ungraded{$res}{'encsymb'}; + $linkurl.='?symb='.$$ungraded{$res}{'encsymb'}; + } else { + $linkurl.='?symb='.&escape($res); } + $linkurl.='&command=ungraded'; $r->print(''.$$ungraded{$res}{title}.''.$$ungraded{$res}{count}.''); } } elsif ($itemserror) { @@ -1741,7 +1741,7 @@ sub display_abovethreshold { } } } - if ($checkallowed->{'resetcounters'}) { + if ($checkallowed->{'resetcounters'}) { $r->print('
'); } } elsif ($itemserror) { @@ -1974,7 +1974,7 @@ sub display_coursediscussion { my $forum_title = $$unread{$ressymb}{'title'}; my $type = 'Resource'; my $feedurl=&Apache::lonfeedback::get_feedurl($ressymb); - my $disclink = $feedurl.'?symb='.&escape($$unread{$ressymb}{symb}); + my $disclink = $feedurl.'?symb='. &escape($$unread{$ressymb}{symb}); if ($feedurl =~ /bulletinboard/) { $type = 'Discussion Board'; }