[LON-CAPA-cvs] cvs: loncom /homework inputtags.pm

[albertel]

albertel		Mon Jul 11 15:41:57 2005 EDT

  Modified files:              
    /loncom/homework	inputtags.pm 
  Log:
  - BUG#4139 (again) 
  
  
Index: loncom/homework/inputtags.pm
diff -u loncom/homework/inputtags.pm:1.170 loncom/homework/inputtags.pm:1.171
--- loncom/homework/inputtags.pm:1.170	Tue Jun 28 17:41:08 2005
+++ loncom/homework/inputtags.pm	Mon Jul 11 15:41:53 2005
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # input  definitons
 #
-# $Id: inputtags.pm,v 1.170 2005/06/28 21:41:08 albertel Exp $
+# $Id: inputtags.pm,v 1.171 2005/07/11 19:41:53 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -426,16 +426,19 @@
 	    $message=&mt('Incorrect.');
 	    $bgcolor=$possiblecolors{'charged_try'};
 	}
-	if ($award eq 'ASSIGNED_SCORE') {
-	    $message = &mt("A score has been assigned.");
+	
+	if ($target eq 'tex') {
+	    $message = '\textbf{'.$message.'}';
 	} else {
-	    if ($target eq 'tex') {
-		$message = '\textbf{'.$message.'}';
-	    } else {
-		$message = "<b>".$message."</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') {