--- loncom/homework/inputtags.pm 2003/07/15 21:26:23 1.109 +++ loncom/homework/inputtags.pm 2003/08/28 12:46:31 1.113 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # input definitons # -# $Id: inputtags.pm,v 1.109 2003/07/15 21:26:23 www Exp $ +# $Id: inputtags.pm,v 1.113 2003/08/28 12:46:31 sakharuk Exp $ # # Copyright Michigan State University Board of Trustees # @@ -346,15 +346,20 @@ sub decideoutput { unless ($ENV{'course.'. $ENV{'request.course.id'}. '.disable_receipt_display'} eq 'yes') { - $message.='
Your receipt is '.&Apache::lonnet::receipt(). - &Apache::loncommon::help_open_topic('Receipt'); + $message.=(($target eq 'web')?'
':' '). + 'Your receipt is '.&Apache::lonnet::receipt(). + (($target eq 'web')?&Apache::loncommon::help_open_topic('Receipt'):''); } } $bgcolor=$possiblecolors{'correct'}; $button=0; $previousmsg=''; } elsif ($solved =~ /^excused/) { - $message = "You are excused from the problem."; + if ($target eq 'tex') { + $message = ' \textbf{You are excused from the problem.} '; + } else { + $message = "You are excused from the problem."; + } $bgcolor=$possiblecolors{'charged_try'}; $button=0; $previousmsg=''; @@ -368,8 +373,9 @@ sub decideoutput { unless ($ENV{'course.'. $ENV{'request.course.id'}. '.disable_receipt_display'} eq 'yes') { - $message.='
Your receipt is '.&Apache::lonnet::receipt(). - &Apache::loncommon::help_open_topic('Receipt'); + $message.=(($target eq 'web')?'
':' '). + 'Your receipt is '.&Apache::lonnet::receipt(). + (($target eq 'web')?&Apache::loncommon::help_open_topic('Receipt'):''); } $bgcolor=$possiblecolors{'correct'}; $button=0; @@ -409,8 +415,8 @@ sub decideoutput { $bgcolor=$possiblecolors{'not_charged_try'}; $button=1; } elsif ($award eq 'UNIT_FAIL') { - $message = "Units incorrect. ". - &Apache::loncommon::help_open_topic('Physical_Units'); #Computer reads units as %s"; + $message = "Units incorrect. "; + if ($target ne 'tex') {$message.=&Apache::loncommon::help_open_topic('Physical_Units');} #Computer reads units as %s"; $bgcolor=$possiblecolors{'not_charged_try'}; $button=1; } elsif ($award eq 'UNIT_NOTNEEDED') { @@ -612,7 +618,7 @@ sub gradestatus { my $solved = $Apache::lonhomework::history{"resource.$id.solved"}; my $previous = $Apache::lonhomework::history{"resource.$id.previous"}; &Apache::lonxml::debug("Found Award |$award|$solved|"); - if ( $award ne '' ) { + if ( $award ne '' || $solved ne '') { &Apache::lonxml::debug('Getting message'); ($showbutton,$bgcolor,$message,$previousmsg) = &decideoutput($award,$solved,$previous,$target);