--- loncom/homework/bridgetask.pm	2006/11/27 20:42:42	1.208
+++ loncom/homework/bridgetask.pm	2006/11/28 16:43:51	1.212
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: bridgetask.pm,v 1.208 2006/11/27 20:42:42 albertel Exp $
+# $Id: bridgetask.pm,v 1.212 2006/11/28 16:43:51 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1285,7 +1285,12 @@ DONEBUTTON
 					     [@_]);
 		$criteria = &layout_webgrade_Criteria($dim,$id,$criteria);
 		my $internal_location=&internal_location($id);
-		$result=~s/\Q$internal_location\E/$criteria/;
+		if ($result =~ m/\Q$internal_location\E/) {
+		    $result=~s/\Q$internal_location\E/$criteria/;
+		} else {
+		    $result.=$criteria;
+		}
+
 	    }
 	}
         $result.="</div>";
@@ -2065,7 +2070,7 @@ sub start_Setup {
     my $dim = &get_id($parstack,$safeeval);
     push(@Apache::bridgetask::dimension,$dim);
     &Apache::lonxml::startredirection();
-    return &internal_location($dim);
+    return;# &internal_location($dim);
 }
 
 {
@@ -2245,13 +2250,15 @@ sub end_Dimension {
 		}
 		my $dim_info=
 		    "\n<div class='LC_$dim_status LC_question_grade'>\n\t";
-		my $question = ('sub' x $dimension{$dim}{'depth'}).'question';
-		$question =~ s/^(.)/uc($1)/e;
+		my $ucquestion = 
+		    my $question = 
+		    ('sub' x $dimension{$dim}{'depth'}).'question';
+		$ucquestion =~ s/^(.)/uc($1)/e;
 		if ($dim_status eq 'pass') {
-		    $dim_info.='<h3>'.$question.' : you passed the above '.$mandatory.' question</h3>';
+		    $dim_info.='<h3>'.$ucquestion.' : you passed the above '.$mandatory.' '.$question.'</h3>';
 		}
 		if ($dim_status eq 'fail') {
-		    $dim_info.='<h3>'.$question.' : you did not pass the above '.$mandatory.' question</h3>';
+		    $dim_info.='<h3>'.$ucquestion.' : you did not pass the above '.$mandatory.' '.$question.'</h3>';
 		}
 		my %counts = &get_counts($dim,$instance,$parstack,
 					 $safeeval);
@@ -2289,8 +2296,20 @@ sub end_Dimension {
 	    }
 	}
 	if ($result !~ /^\s*$/s) {
-	    $result = "\n".'<div class="LC_question">'.
-		"\n".$result."\n</div>\n";
+	    # FIXME? this maybe unneccssary in the future, (CSE101 BT
+	    # from Fall 2006 geenrate a div that attempts to hide some
+	    # of the output in an odd way, this is a workaround so
+	    # those old ones will continue to work.  # It puts the
+	    # LC_question div to come after any starting closie div
+	    # that the dimension produces
+	    if ($result =~ m{^\s*</div>}) {
+		$result =~ s{^(\s*</div>)}
+		            {$1\n<div id="$dim" class="LC_question">};
+	    } else {
+		$result = "\n".'<div id="'.$dim.'" class="LC_question">'.
+		    "\n".$result;
+	    }
+	    $result .= "\n</div>\n";
 	}
     } elsif ($target eq 'webgrade') {
 	# in case of any side effects that we need
@@ -2314,7 +2333,11 @@ sub end_Dimension {
 					     [@_]);
 		$criteria = &layout_webgrade_Criteria($dim,$id,$criteria);
 		my $internal_location=&internal_location($id);
-		$result=~s/\Q$internal_location\E/$criteria/;
+		if ($result =~ m/\Q$internal_location\E/) {
+		    $result =~ s/\Q$internal_location\E/$criteria/;
+		} else {
+		    $result.=$criteria ;
+		}
 	    }
 	}
 	if (&nest()) {