--- loncom/homework/bridgetask.pm	2007/01/13 06:11:17	1.219
+++ loncom/homework/bridgetask.pm	2007/01/23 05:02:16	1.222
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: bridgetask.pm,v 1.219 2007/01/13 06:11:17 albertel Exp $
+# $Id: bridgetask.pm,v 1.222 2007/01/23 05:02:16 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2245,7 +2245,6 @@ sub end_Dimension {
     my $result=&Apache::lonxml::endredirection();
     my $dim=&get_id($parstack,$safeeval);
     if (&skip_dimension_parsing($dim)) {
-	&disable_dimension_parsing($dim);
 	pop(@Apache::bridgetask::dimension);
 	return;
     }
@@ -2290,10 +2289,10 @@ sub end_Dimension {
 		    ('sub' x $dimension{$dim}{'depth'}).'question';
 		$ucquestion =~ s/^(.)/uc($1)/e;
 		if ($dim_status eq 'pass') {
-		    $dim_info.='<h3>'.$ucquestion.' : you passed the above '.$mandatory.' '.$question.'</h3>';
+		    $dim_info.='<h3>'.$ucquestion.' : you passed this '.$mandatory.' '.$question.'</h3>';
 		}
 		if ($dim_status eq 'fail') {
-		    $dim_info.='<h3>'.$ucquestion.' : you did not pass the above '.$mandatory.' '.$question.'</h3>';
+		    $dim_info.='<h3>'.$ucquestion.' : you did not pass this '.$mandatory.' '.$question.'</h3>';
 		}
 		my %counts = &get_counts($dim,$instance,$parstack,
 					 $safeeval);
@@ -2486,13 +2485,13 @@ sub question_status_message {
     $status .= '.';
     if ($counts->{'opt'}) {
 	$status .= ' You were required to pass '.$counts->{'opt_req'}.
-	    'optional ';
+	    ' optional ';
 	if ($counts->{'opt_dim'} + $counts->{'man_dim'} < 1) {
 	    $status .=
-		' component'.($counts->{'opt_req'} == 1?'':'s');
+		($counts->{'opt_req'} == 1?'criterion':'criteria');
 	} else {
 	    $status .=
-		($counts->{'opt_req'} == 1?'criterion':'criteria');
+		'component'.($counts->{'opt_req'} == 1?'':'s');
 	}
 	$status .= '.';
     }