--- loncom/interface/lonnavmaps.pm 2003/09/08 22:44:36 1.225 +++ loncom/interface/lonnavmaps.pm 2003/09/17 17:30:41 1.228 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Navigate Maps Handler # -# $Id: lonnavmaps.pm,v 1.225 2003/09/08 22:44:36 bowersj2 Exp $ +# $Id: lonnavmaps.pm,v 1.228 2003/09/17 17:30:41 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -1093,13 +1093,16 @@ sub render_long_status { return $result; } +# Colors obtained by taking the icons, matching the colors, and +# possibly reducing the Value (HSV) of the color, if it's too bright +# for text, generally by one third or so. my %statusColors = ( $resObj->CLOSED => '#000000', - $resObj->OPEN => '#000000', - $resObj->CORRECT => '#000000', - $resObj->INCORRECT => '#000000', - $resObj->ATTEMPTED => '#000000', + $resObj->OPEN => '#998b13', + $resObj->CORRECT => '#26933f', + $resObj->INCORRECT => '#c48207', + $resObj->ATTEMPTED => '#a87510', $resObj->ERROR => '#000000' ); my %statusStrings = @@ -1144,7 +1147,7 @@ sub render_parts_summary_status { } } - return $td . join (', ', @counts) . $endtd; + return $td . $resource->countParts() . ' parts: ' . join (', ', @counts) . $endtd; } my @preparedColumns = (\&render_resource, \&render_communication_status, @@ -1972,7 +1975,7 @@ sub getById { sub getBySymb { my $self = shift; my $symb = shift; - my ($mapUrl, $id, $filename) = split (/___/, $symb); + my ($mapUrl, $id, $filename) = &Apache::lonnet::decode_symb($symb); my $map = $self->getResourceByUrl($mapUrl); return $self->getById($map->map_pc() . '.' . $id); } @@ -2048,7 +2051,7 @@ sub parmval_real { unless ($symb) { return ''; } my $result=''; - my ($mapname,$id,$fn)=split(/\_\_\_/,$symb); + my ($mapname,$id,$fn)=&Apache::lonnet::decode_symb($symb); # ----------------------------------------------------- Cascading lookup scheme my $rwhat=$what;