--- loncom/homework/bridgetask.pm	2006/11/09 17:50:51	1.197
+++ loncom/homework/bridgetask.pm	2006/11/09 20:42:43	1.199
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: bridgetask.pm,v 1.197 2006/11/09 17:50:51 albertel Exp $
+# $Id: bridgetask.pm,v 1.199 2006/11/09 20:42:43 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1009,7 +1009,12 @@ sub end_Task {
 		if (!$previous && $status ne 'SHOW_ANSWER' &&
 		    &show_task($status,$previous)) {
 		    $result.=&Apache::inputtags::gradestatus('0');
-		    $result.='</form>';
+		}
+		
+		$result.='</form>';
+
+		if (!$previous && $status ne 'SHOW_ANSWER' &&
+		    &show_task($status,$previous)) {
 		    my $action = &Apache::lonenc::check_encrypt($env{'request.uri'});
 		    $result.=<<DONEBUTTON;
 <form name="done" method="post" action="$action">
@@ -1055,10 +1060,8 @@ DONEBUTTON
 		    my %counts = &get_counts($dim,undef,$parstack,
 					     $safeeval);
 		    $status.="\n<div class='LC_$bt_status LC_criteria LC_task_overall_status'><p>".
-			&mt('You needed to pass all of the [_1] mandatory components and [_2] of the [_3] optional components, of which you passed [_4].',
-			    $counts{'man'},$counts{'opt_req'},
-			    $counts{'opt'},$counts{'opt_passed'}).
-			    "</p></div>\n";
+			&question_status_message(\%counts,-1).
+			"</p></div>\n";
 		    
 
 		    foreach my $id (@{$dimension{$dim}{'criterias'}}) {
@@ -2351,7 +2354,7 @@ sub end_Dimension {
     return $result;
 }
 
-sub status_message {
+sub question_status_message {
     my ($counts,$depth) = @_;
     my %req  = ('man' => 'mandatory',
 		'opt' => 'optional',);