--- loncom/homework/inputtags.pm 2003/06/19 21:41:02 1.105
+++ loncom/homework/inputtags.pm 2003/08/01 18:04:10 1.111
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# input definitons
#
-# $Id: inputtags.pm,v 1.105 2003/06/19 21:41:02 albertel Exp $
+# $Id: inputtags.pm,v 1.111 2003/08/01 18:04:10 sakharuk Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -144,6 +144,7 @@ sub start_textfield {
} else {
$result=$token->[4];
}
+ my $bodytext=&Apache::lonxml::get_all_text("/textfield",$parser);
$result.=&Apache::edit::modifiedfield();
} elsif ($target eq 'tex') {
my $number_of_lines = &Apache::lonxml::get_param('rows',$parstack,$safeeval);
@@ -342,13 +343,23 @@ sub decideoutput {
} else {
$message = "You are correct.";
}
- $message.=' Your receipt is '.&Apache::lonnet::receipt;
+ unless ($ENV{'course.'.
+ $ENV{'request.course.id'}.
+ '.disable_receipt_display'} eq 'yes') {
+ $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='';
@@ -358,8 +369,14 @@ sub decideoutput {
$bgcolor=$possiblecolors{'charged_try'};
$button=1;
} else {
- $message = "You are correct. Your receipt is ".
- &Apache::lonnet::receipt;
+ $message = "You are correct.";
+ unless ($ENV{'course.'.
+ $ENV{'request.course.id'}.
+ '.disable_receipt_display'} eq 'yes') {
+ $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='';
@@ -373,7 +390,7 @@ sub decideoutput {
$bgcolor=$possiblecolors{'not_charged_try'};
$button = 1;
} elsif ($award eq 'ERROR') {
- $message = 'An error occured while trying to grade answer.';
+ $message = 'An error occured while grading your answer.';
$bgcolor=$possiblecolors{'not_charged_try'};
$button = 1;
} elsif ($award eq 'TOO_LONG') {