--- loncom/homework/inputtags.pm 2016/04/02 04:30:39 1.340 +++ loncom/homework/inputtags.pm 2016/04/06 00:34:12 1.342 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # input definitons # -# $Id: inputtags.pm,v 1.340 2016/04/02 04:30:39 raeburn Exp $ +# $Id: inputtags.pm,v 1.342 2016/04/06 00:34:12 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -1059,7 +1059,7 @@ sub decideoutput { # my $computer = ($handgrade || $nocorrect)? '' - : " ".&mt("Computer's answer now shown above."); + : &mt("Computer's answer now shown above."); &Apache::lonxml::debug("handgrade has :$handgrade:"); if ($previous) { $previousmsg=&mt('You have entered that answer before'); } @@ -1083,7 +1083,9 @@ sub decideoutput { $message = '\textbf{'.$message.'}'; } else { $message = "".$message.""; - $message.= $computer; + if ($computer) { + $message = "$computer $message"; + } } $added_computer_text=1; if ($awarded > 0) { @@ -1127,7 +1129,9 @@ sub decideoutput { $message = '\textbf{'.&mt('You are correct.').'}'; } else { $message = "".&mt('You are correct.').""; - $message.= $computer; + if ($computer) { + $message = "$computer $message"; + } } $added_computer_text=1; if ($awarded > 0 @@ -1346,7 +1350,9 @@ sub decideoutput { } if ($Apache::inputtags::status[-1] eq 'SHOW_ANSWER' && !$added_computer_text && $target ne 'tex') { - $message.= $computer; + if ($computer) { + $message = "$computer $message"; + } $added_computer_text=1; } if ($Apache::lonhomework::type eq 'practice') { @@ -1684,7 +1690,13 @@ sub get_grade_messages { $trial.="/".$Apache::inputtags::params{'maxtries'}; } } - $trystr = '
'.$button.' | '.$output; - if ((!$no_previous) && ($crstype ne 'Placement')) { + if ((!$no_previous) && + (($env{'course.'.$env{'request.course.id'}.'.type'} ne 'Placement') || + ($env{'request.role.adv'}))) { $output.=''.&previous_tries($id,$target).' | '; } $output.= '