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

[albertel]

albertel		Wed Oct  8 14:25:19 2003 EDT

  Modified files:              
    /loncom/homework	grades.pm inputtags.pm 
  Log:
  - BUG#2253, preserver carriage returns in student's answer
  - BUG#2181, improving Sig Fig message
  
  
Index: loncom/homework/grades.pm
diff -u loncom/homework/grades.pm:1.142 loncom/homework/grades.pm:1.143
--- loncom/homework/grades.pm:1.142	Mon Sep 22 16:48:21 2003
+++ loncom/homework/grades.pm	Wed Oct  8 14:25:18 2003
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Grading handler
 #
-# $Id: grades.pm,v 1.142 2003/09/22 20:48:21 albertel Exp $
+# $Id: grades.pm,v 1.143 2003/10/08 18:25:18 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -185,7 +185,7 @@
 	    $ENV{'form.kwstyle'}  = $keyhash{$loginuser.'_kwstyle'} ne '' ? $keyhash{$loginuser.'_kwstyle'} : '';
 	    $ENV{'form.'.$symb} = 1; # so that we don't have to read it from disk for multiple sub of the same prob.
 	}
-	return '<br /><br /><blockquote>'.&keywords_highlight($answer).'</blockquote>';
+	return '<br /><br /><blockquote><pre>'.&keywords_highlight($answer).'</pre></blockquote>';
     }
     return $answer;
 }
Index: loncom/homework/inputtags.pm
diff -u loncom/homework/inputtags.pm:1.119 loncom/homework/inputtags.pm:1.120
--- loncom/homework/inputtags.pm:1.119	Tue Sep 23 11:59:53 2003
+++ loncom/homework/inputtags.pm	Wed Oct  8 14:25:18 2003
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # input  definitons
 #
-# $Id: inputtags.pm,v 1.119 2003/09/23 15:59:53 albertel Exp $
+# $Id: inputtags.pm,v 1.120 2003/10/08 18:25:18 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -112,7 +112,7 @@
 	if ( $cols eq '') { $cols = 80; }
 	my $rows = &Apache::lonxml::get_param('rows',$parstack,$safeeval);
 	if ( $rows eq '') { $rows = 10; }
-	$result= '<textarea name="HWVAL_'.$resid.'" '.
+	$result= '<textarea wrap="hard" name="HWVAL_'.$resid.'" '.
 	    "rows=\"$rows\" cols=\"$cols\">".$oldresponse;
 	if ($oldresponse ne '') {
 	    #get rid of any startup text if the user has already responded
@@ -414,7 +414,7 @@
       $bgcolor=$possiblecolors{'not_charged_try'};
       $button=1;
   } elsif ($award eq 'SIG_FAIL') {
-      $message = &mt("Please adjust significant figures.");# you provided %s significant figures";
+      $message = &mt("Significant figures are incorrect, submission was not graded.");# you provided %s significant figures";
       $bgcolor=$possiblecolors{'not_charged_try'};
       $button=1;
   } elsif ($award eq 'UNIT_FAIL') {