version 1.208, 2006/11/27 20:42:42
|
version 1.209, 2006/11/27 23:24:36
|
Line 1285 DONEBUTTON
|
Line 1285 DONEBUTTON
|
[@_]); |
[@_]); |
$criteria = &layout_webgrade_Criteria($dim,$id,$criteria); |
$criteria = &layout_webgrade_Criteria($dim,$id,$criteria); |
my $internal_location=&internal_location($id); |
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>"; |
$result.="</div>"; |
Line 2065 sub start_Setup {
|
Line 2070 sub start_Setup {
|
my $dim = &get_id($parstack,$safeeval); |
my $dim = &get_id($parstack,$safeeval); |
push(@Apache::bridgetask::dimension,$dim); |
push(@Apache::bridgetask::dimension,$dim); |
&Apache::lonxml::startredirection(); |
&Apache::lonxml::startredirection(); |
return &internal_location($dim); |
return;# &internal_location($dim); |
} |
} |
|
|
{ |
{ |
Line 2289 sub end_Dimension {
|
Line 2294 sub end_Dimension {
|
} |
} |
} |
} |
if ($result !~ /^\s*$/s) { |
if ($result !~ /^\s*$/s) { |
$result = "\n".'<div class="LC_question">'. |
# FIXME? this maybe unneccssary in the future, (CSE101 BT |
"\n".$result."\n</div>\n"; |
# 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 class="LC_question">}; |
|
} else { |
|
$result = "\n".'<div class="LC_question">'. |
|
"\n".$result; |
|
} |
|
$result .= "\n</div>\n"; |
} |
} |
} elsif ($target eq 'webgrade') { |
} elsif ($target eq 'webgrade') { |
# in case of any side effects that we need |
# in case of any side effects that we need |
Line 2314 sub end_Dimension {
|
Line 2331 sub end_Dimension {
|
[@_]); |
[@_]); |
$criteria = &layout_webgrade_Criteria($dim,$id,$criteria); |
$criteria = &layout_webgrade_Criteria($dim,$id,$criteria); |
my $internal_location=&internal_location($id); |
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()) { |
if (&nest()) { |