| Key: | '); if ($navmap->{LAST_CHECK}) { - $r->print(' '.
+ ' New discussion since '.
+ strftime("%A, %b %e at %I:%M %P", localtime($navmap->{LAST_CHECK})).
+ ' | '.
+ ' New message (click to open)'. + ' | ');
+ } else {
+ $r->print(' '.
+ ' Discussions | '.
+ ' New message (click to open)'.
+ ' | ');
+ }
+ $r->print('
Discussions'.
- ' New message (click to open)'); + $r->print('Open All Folders'); } - #if (($currenturl=~/^\/res/) && - # ($currenturl!~/^\/res\/adm/)) { - # $r->print('Current Location
');
- #}
+
+ $r->print('
');
+ $r->rflush();
+
+ # Now that we've displayed some stuff to the user, init the navmap
+ $navmap->init();
# Check that it's defined
if (!($navmap->courseMapDefined())) {
@@ -880,7 +897,7 @@ sub new_handle {
$res->NOTHING_SET => '' );
# And a special case in the nav map; what to do when the assignment
# is not yet done and due in less then 24 hours
- my $hurryUpColor = "#FFCCCC";
+ my $hurryUpColor = "#FF0000";
my %statusIconMap =
( $res->NETWORK_FAILURE => '',
@@ -894,7 +911,7 @@ sub new_handle {
$res->TRIES_LEFT => 'navmap.open.gif',
$res->INCORRECT => 'navmap.wrong.gif',
$res->OPEN => 'navmap.open.gif',
- $res->ATTEMPTED => '' );
+ $res->ATTEMPTED => 'navmap.open.gif' );
my %iconAltTags =
( 'navmap.correct.gif' => 'Correct',
@@ -914,23 +931,85 @@ sub new_handle {
}
}
+ # Is this a new-style course? If so, we want to suppress showing the top-level
+ # maps in their own folders, in favor of "inlining" them.
+ my $topResource = $navmap->getById("0.0");
+ my $inlineTopLevelMaps = $topResource->src() =~ m|^/uploaded/.*default\.sequence$|;
+
my $currenturl = $ENV{'form.postdata'};
$currenturl=~s/^http\:\/\///;
$currenturl=~s/^[^\/]+//;
- my $queryAdd = "postdata=" . &Apache::lonnet::escape($currenturl);
-
- $r->print('Show All Resources
');
+ # alreadyHere allows us to only open the maps necessary to view
+ # the current location once, while at the same time remembering
+ # the current location. Without that check, the user would never
+ # be able to close those maps; the user would close it, and the
+ # currenturl scan would re-open it.
+ my $queryAdd = "postdata=" . &Apache::lonnet::escape($currenturl) .
+ "&alreadyHere=1";
# Begin the HTML table
# four cols: resource + indent, chat+feedback, icon, text string
- $r->print('
![\"\"](\"/adm/lonIcons/whitespace1.gif\")
";
@@ -938,14 +1017,36 @@ sub new_handle {
my $isNewBranch = 0;
my $now = time();
my $in24Hours = $now + 24 * 60 * 60;
- my $depth = 1;
-
+ my $displayedHereMarker = 0;
+
# We know the first thing is a BEGIN_MAP (see "$self->{STARTED}"
# code in iterator->next), so ignore the first one
+ $mapIterator = $navmap->getIterator(undef, undef, \%filterHash,
+ $condition);
$mapIterator->next();
- my $curRes = $mapIterator->next();
+ $curRes = $mapIterator->next();
+ my $deltadepth = 0;
+ $depth = 1;
+
+ my @backgroundColors = ("#FFFFFF", "#F6F6F6");
+ my $rowNum = 0;
+
+ $counter = 0;
while ($depth > 0) {
+ # If we're in a new style course, and this is a BEGIN_MAP, END_MAP, or
+ # map resource and the stack depth is only one, just plain ignore this resource
+ # entirely. (This has the effect of inlining the resources in that map
+ # in the nav map.)
+ if ($inlineTopLevelMaps && scalar(@{$mapIterator->getStack()}) == 1 &&
+ ref($curRes) && $curRes->is_map()) {
+ # We let the normal depth stuff occur, but we need to shift everything
+ # over by one to the left to make it look right.
+ $deltadepth = -1;
+ $curRes = $mapIterator->next();
+ next;
+ }
+
if ($curRes == $mapIterator->BEGIN_MAP() ||
$curRes == $mapIterator->BEGIN_BRANCH()) {
$indentLevel++;
@@ -957,12 +1058,13 @@ sub new_handle {
if ($curRes == $mapIterator->BEGIN_BRANCH()) {
$isNewBranch = 1;
}
- if ($curRes == $mapIterator->BEGIN_MAP()) {
- $depth++;
- }
- if ($curRes == $mapIterator->END_MAP()) {
- $depth--;
- }
+ if ($curRes == $mapIterator->BEGIN_MAP()) { $depth++; }
+ if ($curRes == $mapIterator->END_MAP()) { $depth--; }
+
+ if (ref($curRes)) { $counter++; }
+
+ if ($depth == 1) { $deltadepth = 0; } # we're done shifting, because we're
+ # out of the inlined map
# Is this resource being blotted out?
if (ref($curRes) && !advancedUser() && $curRes->randomout()) {
@@ -1034,9 +1136,16 @@ sub new_handle {
}
} else {
- @parts[0] = "0"; # this is to get past foreach loop below
+ $parts[0] = "0"; # this is to get past foreach loop below
# you can consider a non-problem resource as a resource
- # with only one part without loss
+ # with only one part without loss
+ }
+
+ # Is it a multipart problem with a single part, now in
+ # @parts with "0" filtered out? If so, forget it's a multi-part
+ # problem and treat it like a single-part problem.
+ if ( scalar(@parts) == 1 ) {
+ $multipart = 0;
}
# Display one part, in event of network error.
@@ -1063,6 +1172,10 @@ sub new_handle {
'symb='.&Apache::lonnet::escape($curRes->symb()).
'"';
my $title = $curRes->title();
+ if (!$title) {
+ $title = $curRes->src();
+ $title = substr ($title, rindex($title, "/") + 1);
+ }
my $partLabel = "";
my $newBranchText = "";
@@ -1090,9 +1203,10 @@ sub new_handle {
# Display the correct icon, link to open or shut map
if ($curRes->is_map()) {
my $mapId = $curRes->map_pc();
- my $nowOpen = !defined($filterHash{$mapId});
+ my $nowOpen = (!defined($filterHash{$mapId}));
+ if ($condition) {$nowOpen = !$nowOpen;}
$icon = $nowOpen ?
- "folder_closed.gif" : "folder_opened.gif";
+ "navmap.folder.closed.gif" : "navmap.folder.open.gif";
$icon = "