--- loncom/homework/bridgetask.pm 2006/11/27 23:24:36 1.209
+++ 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.209 2006/11/27 23:24:36 albertel Exp $
+# $Id: bridgetask.pm,v 1.212 2006/11/28 16:43:51 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -2250,13 +2250,15 @@ sub end_Dimension {
}
my $dim_info=
"\n
\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.='
'.$question.' : you passed the above '.$mandatory.' question
';
+ $dim_info.=''.$ucquestion.' : you passed the above '.$mandatory.' '.$question.'
';
}
if ($dim_status eq 'fail') {
- $dim_info.=''.$question.' : you did not pass the above '.$mandatory.' question
';
+ $dim_info.=''.$ucquestion.' : you did not pass the above '.$mandatory.' '.$question.'
';
}
my %counts = &get_counts($dim,$instance,$parstack,
$safeeval);
@@ -2300,11 +2302,11 @@ sub end_Dimension {
# 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*}) {
- $result =~ s{(\s*)}
- {$1\n};
+ if ($result =~ m{^\s*
}) {
+ $result =~ s{^(\s*)}
+ {$1\n};
} else {
- $result = "\n".'
'.
+ $result = "\n".'
'.
"\n".$result;
}
$result .= "\n
\n";