--- loncom/interface/lonnavmaps.pm 2005/08/02 21:15:51 1.336
+++ loncom/interface/lonnavmaps.pm 2005/09/23 22:21:51 1.340
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Navigate Maps Handler
#
-# $Id: lonnavmaps.pm,v 1.336 2005/08/02 21:15:51 albertel Exp $
+# $Id: lonnavmaps.pm,v 1.340 2005/09/23 22:21:51 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1401,7 +1401,6 @@ sub render {
# no columns, no nav maps.
return '';
}
- my $mustCloseNavMap = 0;
my $navmap;
if (defined($args->{'navmap'})) {
$navmap = $args->{'navmap'};
@@ -1450,8 +1449,12 @@ sub render {
# Step 1: Check to see if we have a navmap
if (!defined($navmap)) {
$navmap = Apache::lonnavmaps::navmap->new();
- $mustCloseNavMap = 1;
- }
+ if (!defined($navmap)) {
+ # no londer in course
+ return 'No course selected
+ Select a course
';
+ }
+ }
# Step two: Locate what kind of here marker is necessary
# Determine where the "here" marker is and where the screen jumps to.
@@ -1515,7 +1518,6 @@ sub render {
# Step 1: Check to see if we have a navmap
if (!defined($navmap)) {
$navmap = Apache::lonnavmaps::navmap->new();
- $mustCloseNavMap = 1;
}
# See if we're being passed a specific map
@@ -3639,7 +3641,7 @@ sub is_page {
sub is_problem {
my $self=shift;
my $src = $self->src();
- return ($src =~ /\.(problem|exam|quiz|assess|survey|form|library)$/)
+ return ($src =~ /\.(problem|exam|quiz|assess|survey|form|library|task)$/)
}
sub contains_problem {
my $self=shift;
@@ -4143,7 +4145,7 @@ sub extractParts {
return;
}
foreach (split(/\,/,$metadata)) {
- if ($_ =~ /^part_(.*)$/) {
+ if ($_ =~ /^(?:part|Task)_(.*)$/) {
my $part = $1;
# This floods the logs if it blows up
if (defined($parts{$part})) {