--- loncom/homework/inputtags.pm	2007/10/17 00:22:51	1.233
+++ loncom/homework/inputtags.pm	2008/07/26 19:11:23	1.244
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # input  definitons
 #
-# $Id: inputtags.pm,v 1.233 2007/10/17 00:22:51 albertel Exp $
+# $Id: inputtags.pm,v 1.244 2008/07/26 19:11:23 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -306,7 +306,9 @@ sub start_textline {
 		$oldresponse = $oldresponse->[$#Apache::inputtags::inputlist];
 	    }
 	    $oldresponse = &HTML::Entities::encode($oldresponse,'<>&"');
-
+            $oldresponse =~ s/^\s+//;
+            $oldresponse =~ s/\s+$//;
+            $oldresponse =~ s/\s+/ /g;
 	    if ($Apache::lonhomework::type ne 'exam') {
 		my $addchars=&Apache::lonxml::get_param('addchars',$parstack,$safeeval);
 		$result='';
@@ -636,8 +638,8 @@ sub decideoutput {
 	  );
 
     my $part = $Apache::inputtags::part;
-    my $handgrade = 
-	('yes' eq lc(&Apache::lonnet::EXT("resource.$part.handgrade")));
+    my $tohandgrade = &Apache::lonnet::EXT("resource.$part.handgrade");
+    my $handgrade = ('yes' eq lc($tohandgrade)); 
     
     my $computer = ($handgrade)? ''
 	                       : " ".&mt("Computer's answer now shown above.");
@@ -667,14 +669,18 @@ sub decideoutput {
 		$message.= $computer;
 	    }
 	    $added_computer_text=1;
-	    my ($symb) = &Apache::lonnet::whichuser();
-	    if (($symb ne '') 
-		&&
-		($env{'course.'.$env{'request.course.id'}.
-			    '.disable_receipt_display'} ne 'yes')) { 
-		$message.=(($target eq 'web')?'<br />':' ').
-		    &mt('Your receipt is').' '.&Apache::lonnet::receipt($Apache::inputtags::part).
-		    (($target eq 'web')?&Apache::loncommon::help_open_topic('Receipt'):'');
+	    if ($awarded > 0) {
+		my ($symb) = &Apache::lonnet::whichuser();
+		if (($symb ne '') 
+		    &&
+		    ($env{'course.'.$env{'request.course.id'}.
+			      '.disable_receipt_display'} ne 'yes') &&
+                    ($Apache::lonhomework::type ne 'practice')) { 
+		    $message.=(($target eq 'web')?'<br />':' ').
+			&mt('Your receipt is [_1]',
+			    (&Apache::lonnet::receipt($Apache::inputtags::part).
+			     (($target eq 'web')?&Apache::loncommon::help_open_topic('Receipt'):'')));
+		}
 	    }
 	}
 	$button=0;
@@ -701,12 +707,14 @@ sub decideoutput {
 		$message.= $computer;
 	    }
 	    $added_computer_text=1;
-	    unless ($env{'course.'.
+	    if  ($awarded > 0 
+		 && $env{'course.'.
 			     $env{'request.course.id'}.
-			     '.disable_receipt_display'} eq 'yes') { 
+			     '.disable_receipt_display'} ne 'yes') { 
 		$message.=(($target eq 'web')?'<br />':' ').
-		    'Your receipt is '.&Apache::lonnet::receipt($Apache::inputtags::part).
-		    (($target eq 'web')?&Apache::loncommon::help_open_topic('Receipt'):'');
+		    &mt('Your receipt is [_1]',
+			(&Apache::lonnet::receipt($Apache::inputtags::part).
+			 (($target eq 'web')?&Apache::loncommon::help_open_topic('Receipt'):'')));
 	    }
 	    $css_class=$possible_class{'correct'};
 	    $button=0;
@@ -721,7 +729,7 @@ sub decideoutput {
 	$css_class=$possible_class{'not_charged_try'};
 	$button = 1;
     } elsif ($award eq 'MISSING_ANSWER') {
-	$message = &mt('Some items were not submitted.');
+	$message = &mt('Some items were not submitted.').&Apache::loncommon::help_open_topic('Some_Items_Were_Not_Submitted');
 	$css_class=$possible_class{'not_charged_try'};
 	$button = 1;
     } elsif ($award eq 'ERROR') {
@@ -737,10 +745,10 @@ sub decideoutput {
 	$css_class=$possible_class{'not_charged_try'};
 	$button=1;
     } elsif ($award eq 'MISORDERED_RANK') {
-	$message = &mt('You have provided an invalid ranking');
-	if ($target ne 'tex') {
-	    $message.=', '.&mt('please refer to').' '.&Apache::loncommon::help_open_topic('Ranking_Problems','help on ranking problems');
-	}
+        $message = &mt('You have provided an invalid ranking.');
+        if ($target ne 'tex') {
+            $message.=' '.&mt('Please refer to [_1]',&Apache::loncommon::help_open_topic('Ranking_Problems',&mt('help on ranking problems')));
+        }
 	$css_class=$possible_class{'not_charged_try'};
 	$button=1;
     } elsif ($award eq 'INVALID_FILETYPE') {
@@ -782,7 +790,8 @@ sub decideoutput {
 	$css_class=$possible_class{'not_charged_try'};
 	$button=1;
     } elsif ($award eq 'BAD_FORMULA') {
-	$message = &mt("Unable to understand formula");
+	$message = &mt("Unable to understand formula").'.';
+        if ($target ne 'tex') {$message.=&Apache::loncommon::help_open_topic('Formula_Answers')};
 	$css_class=$possible_class{'not_charged_try'};
 	$button=1;
     } elsif ($award eq 'INCORRECT') {
@@ -839,6 +848,15 @@ sub decideoutput {
 	$message.= $computer;
 	$added_computer_text=1;
     }
+    if ($Apache::lonhomework::type eq 'practice') {
+       if ($target eq 'web') {
+           $message .= '<br />';
+       } else {
+           $message .= ' ';      
+       }
+       $message.=&mt('Submissions to practice problems are not permanently recorded.');
+    }
+
     return ($button,$css_class,$message,$previousmsg);
 }
 
@@ -1068,7 +1086,7 @@ sub grade {
 	    my ($match) =
 		&previous_match(\@Apache::inputtags::previous_version,
 				scalar(@Apache::inputtags::response));
-	    
+
 	    if ($match) {
 		$previously_used = 'PREVIOUSLY_LAST';
 		foreach my $value (@Apache::inputtags::previous) {
@@ -1246,11 +1264,11 @@ sub previous_tries {
 		&& $Apache::lonhomework::history{"$prefix.solved"} =~/^correct/
 		) {
 		
+                my $txt_correct = &mt('Correct');
 		$message =~ s{(<td.*?>)(.*?)(</td>)}
-		             {$1 <strong>Correct</strong>. $3}s;
+                             {$1 <strong>$txt_correct</strong>. $3}s;
 	    }
-	    my $trystr = "(Try ".
-		$Apache::lonhomework::history{"$prefix.tries"}.')';
+            my $trystr = "(".&mt('Try [_1]',$Apache::lonhomework::history{"$prefix.tries"}).")";
 	    $message =~ s{(</td>)}{ $trystr $1};
 	}
 	my ($class) = ($message =~ m{<td.*class="([^"]*)"}); #"
@@ -1299,7 +1317,7 @@ sub previous_tries {
     my $prefix = $env{'form.request.prefix'};
     $prefix =~ tr{.}{_};
     my $function_name = "LONCAPA_previous_tries_".$prefix.
-	$Apache::lonxml::curdepth;
+	$Apache::lonxml::curdepth.'_'.$env{'form.counter'};
     my $result ="<script type=\"text/javascript\">
 // <![CDATA[
     function $function_name() {newWindow=open('','new_W','width=500,height=500,scrollbars=1,resizable=yes');newWindow.$windowopen;newWindow.document.writeln('$start_page $output $end_page');newWindow.document.close();newWindow.focus()}