version 1.203, 2006/11/13 21:25:21
|
version 1.205, 2006/11/14 22:12:58
|
Line 2104 sub start_Dimension {
|
Line 2104 sub start_Dimension {
|
} |
} |
push(@Apache::bridgetask::dimension,$dim); |
push(@Apache::bridgetask::dimension,$dim); |
&Apache::lonxml::startredirection(); |
&Apache::lonxml::startredirection(); |
&enable_dimension_parsing($dim); |
if (!&skip_dimension_parsing($dim)) { |
|
&enable_dimension_parsing($dim); |
|
} |
return &internal_location($dim); |
return &internal_location($dim); |
} |
} |
|
|
Line 2247 sub end_Dimension {
|
Line 2249 sub end_Dimension {
|
@{$dimension{$dim}{'criterias'}}) { |
@{$dimension{$dim}{'criterias'}}) { |
my $type = $dimension{$dim}{'criteria.'.$id.'.type'}; |
my $type = $dimension{$dim}{'criteria.'.$id.'.type'}; |
if ($type eq 'dimension') { |
if ($type eq 'dimension') { |
$result.=$dimension{$id}{'result'}; |
if (defined($dimension{$id}{'result'})) { |
next; |
$result.=$dimension{$id}{'result'}; |
|
next; |
|
} else { |
|
$dim_info .= |
|
&nested_parse(\$dimension{$dim}{'criteria.'.$id}, |
|
[@_],{'set_dim_id' => $id}); |
|
} |
|
} else { |
|
my $criteria = |
|
&nested_parse(\$dimension{$dim}{'criteria.'.$id}, |
|
[@_]); |
|
$dim_info .= &layout_web_Criteria($dim,$id,$criteria); |
} |
} |
my $criteria = |
|
&nested_parse(\$dimension{$dim}{'criteria.'.$id}, |
|
[@_]); |
|
$dim_info .= &layout_web_Criteria($dim,$id,$criteria); |
|
} |
} |
# puts the results at the end of the dimension |
# puts the results at the end of the dimension |
$result .= $dim_info; |
$result .= $dim_info; |
Line 2638 sub layout_web_Criteria {
|
Line 2647 sub layout_web_Criteria {
|
$status_display=~s/^([a-z])/uc($1)/e; |
$status_display=~s/^([a-z])/uc($1)/e; |
my $criteria_info.= |
my $criteria_info.= |
'<div class="LC_'.$status.' LC_criteria">'."\n\t".'<h4>' |
'<div class="LC_'.$status.' LC_criteria">'."\n\t".'<h4>' |
.$mandatory.' Criteria</h4>'."\n\t".'<p class="LC_criteria_text>'."\n"; |
.$mandatory.' Criteria</h4>'."\n\t".'<p class="LC_criteria_text">' |
|
."\n"; |
$criteria =~ s/^\s*//s; |
$criteria =~ s/^\s*//s; |
$criteria =~ s/\s*$//s; |
$criteria =~ s/\s*$//s; |
$criteria_info.= $criteria; |
$criteria_info.= $criteria; |