--- loncom/interface/lonnavmaps.pm	2002/10/11 21:34:42	1.75
+++ loncom/interface/lonnavmaps.pm	2002/10/14 18:41:02	1.80
@@ -2,7 +2,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.75 2002/10/11 21:34:42 bowersj2 Exp $
+# $Id: lonnavmaps.pm,v 1.80 2002/10/14 18:41:02 bowersj2 Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -823,7 +823,7 @@ sub new_handle {
     # Initialize the nav map
     my $navmap = Apache::lonnavmaps::navmap->new(
                         $ENV{"request.course.fn"}.".db",
-                        $ENV{"request.course.fn"}."_parms.db", 1);
+                        $ENV{"request.course.fn"}."_parms.db", 1, 1);
 
 
     if (!defined($navmap)) {
@@ -977,6 +977,7 @@ 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
@@ -1076,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.
@@ -1132,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) ? 
@@ -1150,8 +1151,17 @@ sub new_handle {
 
                     # Special case in the navmaps: If in less then
                     # 24 hours, give it a bit of urgency
-                    if ($status == $curRes->OPEN() &&
-                        $curRes->duedate() < time()+(24*60*60)) {
+                    if ($status == $curRes->OPEN() && $curRes->duedate() &&
+                        $curRes->duedate() < time()+(24*60*60) && 
+                        $curRes->duedate() > time()) {
+                        $color = $hurryUpColor;
+                    }
+                    # Special case: If this is the last try, and there is
+                    # more then one available, give a bit of urgency
+                    my $tries = $curRes->tries($part);
+                    my $maxtries = $curRes->maxtries($part);
+                    if ($tries && $maxtries && $maxtries > 1 &&
+                        $maxtries - $tries == 1) {
                         $color = $hurryUpColor;
                     }
                     if ($color ne "") {
@@ -1164,7 +1174,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++) {
@@ -1177,9 +1187,10 @@ sub new_handle {
                 my $curMarkerEnd = "";
 
                 # Is this the current resource?
-                if ($curRes->src() eq $currenturl) {
+                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) { 
@@ -1218,7 +1229,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
@@ -1231,7 +1242,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");
                     }
@@ -1240,7 +1251,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() &&
@@ -1329,7 +1340,7 @@ sub getDescription {
         return "Open " . timeToHumanString($res->opendate($part));
     }
     if ($status == $res->OPEN) {
-        if ($res->duedate()) {
+        if ($res->duedate($part)) {
             return "Due " . timeToHumanString($res->duedate($part));
         } else {
             return "Open, no due date";
@@ -1351,9 +1362,15 @@ sub getDescription {
         return "Not yet graded.";
     }
     if ($status == $res->TRIES_LEFT) {
-        my $tries = $res->tries();
-        my $maxtries = $res->maxtries();
-        my $triesString = "($tries of $maxtries tries used)";
+        my $tries = $res->tries($part);
+        my $maxtries = $res->maxtries($part);
+        my $triesString = "";
+        if ($tries && $maxtries) {
+            $triesString = "<font size=\"-1\"><i>($tries of $maxtries tries used)</i></font>";
+            if ($maxtries > 1 && $maxtries - $tries == 1) {
+                $triesString = "<b>$triesString</b>";
+            }
+        }
         if ($res->duedate()) {
             return "Due " . timeToHumanString($res->duedate($part)) .
                 " $triesString";
@@ -2827,7 +2844,7 @@ sub status {
     # If it's WRONG...
     if ($completionStatus == INCORRECT || $completionStatus == INCORRECT_BY_OVERRIDE) {
         # and there are TRIES LEFT:
-        if ($self->tries() < $self->maxtries()) {
+        if ($self->tries($part) < $self->maxtries($part) || !$self->maxtries($part)) {
             return TRIES_LEFT;
         }
         return INCORRECT; # otherwise, return orange; student can't fix this