--- loncom/interface/lonnavmaps.pm	2002/10/11 18:39:55	1.73
+++ loncom/interface/lonnavmaps.pm	2002/10/14 17:34:10	1.78
@@ -2,7 +2,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.73 2002/10/11 18:39:55 bowersj2 Exp $
+# $Id: lonnavmaps.pm,v 1.78 2002/10/14 17:34:10 bowersj2 Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -917,7 +917,13 @@ sub new_handle {
     my $currenturl = $ENV{'form.postdata'};
     $currenturl=~s/^http\:\/\///;
     $currenturl=~s/^[^\/]+//;
-    my $queryAdd = "postdata=" . &Apache::lonnet::escape($currenturl);
+    # 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";
 
     $r->print('<a href="navmaps?condition=1&filter=">Show All Resources</a><br /><br />');
 
@@ -930,7 +936,39 @@ sub new_handle {
         $condition = 1;
     }
 
-    my $mapIterator = $navmap->getIterator(undef, undef, \%filterHash, $condition);
+    # This needs to be updated to use symbs from the remote, 
+    # instead of uris. The changes to this and the main rendering
+    # loop should be obvious.
+    # Here's a simple example of the iterator.
+    # If there is a current resource
+    if ($currenturl && !$ENV{'form.alreadyHere'}) {
+        # Give me every resource...
+        my $mapIterator = $navmap->getIterator(undef, undef, {}, 1);
+        my $found != 0;
+        my $depth = 1;
+        $mapIterator->next(); # discard the first BEGIN_MAP
+        my $curRes = $mapIterator->next();
+        
+        while ($depth > 0 && !$found) {
+            if (ref($curRes) && $curRes->src() eq $currenturl) {
+                # If this is the correct resource, be sure to 
+                # show it by making sure the containing maps
+                # are open.
+
+                my $mapStack = $mapIterator->getStack();
+                for my $map (@{$mapStack}) {
+                    if ($condition) {
+                        undef $filterHash{$map->map_pc()};
+                    } else {
+                        $filterHash{$map->map_pc()} = 1;
+                    }
+                }
+                $found = 1;
+            }
+            $curRes = $mapIterator->next();
+        }
+    }
+
     undef $res; # so we don't accidentally use it later
     my $indentLevel = 0;
     my $indentString = "<img src=\"/adm/lonIcons/whitespace1.gif\" width=\"25\" height=\"1\" alt=\"\" border=\"0\" />";
@@ -939,9 +977,12 @@ sub new_handle {
     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
+    my $mapIterator = $navmap->getIterator(undef, undef, \%filterHash,
+                                           $condition);
     $mapIterator->next();
     my $curRes = $mapIterator->next();
 
@@ -1036,7 +1077,7 @@ sub new_handle {
             } else {
                 @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
             }
 
             # Display one part, in event of network error.
@@ -1092,7 +1133,7 @@ sub new_handle {
                     my $mapId = $curRes->map_pc();
                     my $nowOpen = !defined($filterHash{$mapId});
                     $icon = $nowOpen ?
-                        "folder_closed.gif" : "folder_opened.gif";
+                        "navmap.folder.closed.gif" : "navmap.folder.open.gif";
                     $icon = "<img src=\"/adm/lonIcons/$icon\" alt=\"\" border=\"0\" />";
                     $linkopen = "<a href=\"/adm/navmaps?filter=";
                     $linkopen .= ($nowOpen xor $condition) ? 
@@ -1107,6 +1148,14 @@ sub new_handle {
                 if ($curRes->is_problem()) {
                     my $status = $curRes->status($part);
                     my $color = $colormap{$status};
+
+                    # Special case in the navmaps: If in less then
+                    # 24 hours, give it a bit of urgency
+                    if ($status == $curRes->OPEN() && $curRes->duedate() &&
+                        $curRes->duedate() < time()+(24*60*60) && 
+                        $curRes->duedate() > time()) {
+                        $color = $hurryUpColor;
+                    }
                     if ($color ne "") {
                         $colorizer = "bgcolor=\"$color\"";
                     }
@@ -1117,7 +1166,7 @@ sub new_handle {
                 }
 
                 # FIRST COL: The resource indentation, branch icon, and name
-                $r->print("  <tr><td align=\"left\" valign=\"bottom\">\n");
+                $r->print("  <tr><td align=\"left\" valign=\"center\">\n");
 
                 # print indentation
                 for (my $i = 0; $i < $indentLevel - $deltalevel; $i++) {
@@ -1126,6 +1175,16 @@ sub new_handle {
 
                 $r->print("  ${newBranchText}${linkopen}$icon${linkclose}\n");
 
+                my $curMarkerBegin = "";
+                my $curMarkerEnd = "";
+
+                # Is this the current resource?
+                if ($curRes->src() eq $currenturl && !$displayedHereMarker) {
+                    $curMarkerBegin = '<a name="curloc" /><font color="red" size="+2">&gt; </font>';
+                    $curMarkerEnd = '<font color="red" size="+2"> &lt;</font>';
+                    $displayedHereMarker = 1;
+                }
+
                 if ($curRes->is_problem() && $part ne "0" && !$condensed) { 
                     $partLabel = " (Part $part)"; 
                     $title = "";
@@ -1134,7 +1193,7 @@ sub new_handle {
                     $nonLinkedText .= ' (' . $curRes->countParts() . ' parts)';
                 }
 
-                $r->print("  <a href=\"$link\">$title$partLabel</a> $nonLinkedText");
+                $r->print("  $curMarkerBegin<a href=\"$link\">$title$partLabel</a> $curMarkerEnd $nonLinkedText");
 
                 if ($curRes->{RESOURCE_ERROR}) {
                     $r->print(&Apache::loncommon::help_open_topic ("Navmap_Host_Down",
@@ -1162,7 +1221,7 @@ sub new_handle {
                     }
                 }
 
-                $r->print("<td align=\"left\" valign=\"bottom\">$discussionHTML$feedbackHTML</td>");
+                $r->print("<td align=\"left\" valign=\"center\">$discussionHTML$feedbackHTML</td>");
 
                 # Is this the first displayed part of a multi-part problem
                 # that has not been condensed, so we should suppress these two
@@ -1175,7 +1234,7 @@ sub new_handle {
                     my $icon = $statusIconMap{$curRes->status($part)};
                     my $alt = $iconAltTags{$icon};
                     if ($icon) {
-                        $r->print("<td valign=\"bottom\" width=\"50\" align=\"right\">$linkopen<img src=\"/adm/lonIcons/$icon\" border=\"0\" alt=\"$alt\" />$linkclose</td>\n");
+                        $r->print("<td valign=\"center\" width=\"50\" align=\"right\">$linkopen<img src=\"/adm/lonIcons/$icon\" border=\"0\" alt=\"$alt\" />$linkclose</td>\n");
                     } else {
                         $r->print("<td></td>\n");
                     }
@@ -1184,7 +1243,7 @@ sub new_handle {
                 }
 
                 # FOURTH COL: Text description
-                $r->print("<td $colorizer align=\"right\" valign=\"bottom\">\n");
+                $r->print("<td $colorizer align=\"right\" valign=\"center\">\n");
                 
                 if ($curRes->kind() eq "res" &&
                     $curRes->is_problem() &&