--- loncom/homework/lonhomework.pm 2011/11/29 13:24:38 1.331 +++ loncom/homework/lonhomework.pm 2011/12/15 01:21:28 1.333 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # The LON-CAPA Homework handler # -# $Id: lonhomework.pm,v 1.331 2011/11/29 13:24:38 raeburn Exp $ +# $Id: lonhomework.pm,v 1.333 2011/12/15 01:21:28 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -444,8 +444,8 @@ sub check_access { # if (correct and show prob status) or excused then CANNOT_ANSWER if ( ($Apache::lonhomework::history{"resource.$id.solved"}=~/^correct/) && (&show_problem_status()) ) { - if (&Apache::inputtags::grading_is_nonlenient($id) || - $Apache::lonhomework::history{"resource.$id.awarded"} == 1) { + if (($Apache::lonhomework::history{"resource.$id.awarded"} >= 1) || + (&Apache::lonnet::EXT("resource.$id.retrypartial") !~/^1|on|yes$/i)) { $status = 'CANNOT_ANSWER'; } } elsif ($Apache::lonhomework::history{"resource.$id.solved"}=~/^excused/) { @@ -1125,7 +1125,7 @@ sub get_template_list { my $filename=$file->[0]; $filename=~s{^\Q$londocroot\E}{}; $result.=' ' - .''.&mt('Example').'' + .&Apache::loncommon::modal_link($filename.'?inhibitmenu=yes',&mt('Example'),600,420,'sample') .'
'."\n"; $count ++; }