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

[raeburn]

raeburn		Wed Apr  6 00:34:13 2016 EDT

  Modified files:              
    /loncom/homework	inputtags.pm 
  Log:
  - Bug 6770. "Computer's answer now shown above" message moved to left of
    award-related message.
  
  
Index: loncom/homework/inputtags.pm
diff -u loncom/homework/inputtags.pm:1.341 loncom/homework/inputtags.pm:1.342
--- loncom/homework/inputtags.pm:1.341	Mon Apr  4 21:50:32 2016
+++ loncom/homework/inputtags.pm	Wed Apr  6 00:34:12 2016
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # input  definitons
 #
-# $Id: inputtags.pm,v 1.341 2016/04/04 21:50:32 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 @@
 #
     
     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 @@
 		$message = '\textbf{'.$message.'}';
 	    } else {
 		$message = "<b>".$message."</b>";
-		$message.= $computer;
+                if ($computer) {
+                    $message = "$computer $message";
+                }
 	    }
 	    $added_computer_text=1;
 	    if ($awarded > 0) {
@@ -1127,7 +1129,9 @@
 		$message = '\textbf{'.&mt('You are correct.').'}';
 	    } else {
 		$message = "<b>".&mt('You are correct.')."</b>";
-		$message.= $computer;
+                if ($computer) {
+                    $message = "$computer $message";
+                }
 	    }
 	    $added_computer_text=1;
 	    if  ($awarded > 0 
@@ -1346,7 +1350,9 @@
     }
     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') {