--- loncom/homework/inputtags.pm	2005/06/20 21:31:07	1.169
+++ loncom/homework/inputtags.pm	2005/07/11 19:41:53	1.171
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # input  definitons
 #
-# $Id: inputtags.pm,v 1.169 2005/06/20 21:31:07 albertel Exp $
+# $Id: inputtags.pm,v 1.171 2005/07/11 19:41:53 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -418,21 +418,27 @@ sub decideoutput {
     
     if      ($solved =~ /^correct/) {
 	$bgcolor=$possiblecolors{'correct'};
-	if ($award eq 'ASSIGNED_SCORE') {
-	    $message = &mt("A score has been assigned.");
-	    if ($awarded < 1 && $awarded > 0) {
-		$bgcolor=$possiblecolors{'not_charged_try'};
-	    } elsif ($awarded < 1) {
-		$bgcolor=$possiblecolors{'charged_try'};
-	    }
+	$message=&mt('You are correct.');
+	if ($awarded < 1 && $awarded > 0) {
+	    $message=&mt('You are partially correct.');
+	    $bgcolor=$possiblecolors{'not_charged_try'};
+	} elsif ($awarded < 1) {
+	    $message=&mt('Incorrect.');
+	    $bgcolor=$possiblecolors{'charged_try'};
+	}
+	
+	if ($target eq 'tex') {
+	    $message = '\textbf{'.$message.'}';
 	} else {
-	    if ($target eq 'tex') {
-		$message = '\textbf{'.&mt('You are correct.').'}';
-	    } else {
-		$message = "<b>".&mt('You are correct.')."</b>";
+	    $message = "<b>".$message."</b>";
+	}
+	$added_computer_text=1;
+	
+	if ($env{'request.filename'} !~ 
+	    m|/res/lib/templates/examupload.problem$|) {
+	    if ($target ne 'tex') {
 		$message.=" ".&mt("Computer's answer now shown above.");
 	    }
-	    $added_computer_text=1;
 	    unless ($env{'course.'.
 			     $env{'request.course.id'}.
 			     '.disable_receipt_display'} eq 'yes') {