--- loncom/interface/lonnavmaps.pm	2011/10/07 15:10:12	1.444.2.6
+++ loncom/interface/lonnavmaps.pm	2012/02/17 19:42:10	1.444.2.7.2.1
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.444.2.6 2011/10/07 15:10:12 raeburn Exp $
+# $Id: lonnavmaps.pm,v 1.444.2.7.2.1 2012/02/17 19:42:10 raeburn Exp $
 
 #
 # Copyright Michigan State University Board of Trustees
@@ -509,7 +509,7 @@ my %statusIconMap =
 my %iconAltTags =   #texthash does not work here
     ( 'navmap.correct.gif'  => 'Correct',
       'navmap.wrong.gif'    => 'Incorrect',
-      'navmap.open.gif'     => 'Open',
+      'navmap.open.gif'     => 'Is Open',
       'navmap.partial.gif'  => 'Partially Correct',
       'navmap.ellipsis.gif' => 'Attempted',
      );
@@ -641,7 +641,7 @@ sub getDescription {
         return &mt("Not currently assigned.");
     }
     if ($status == $res->OPEN_LATER) {
-        return &mt("Open ") .timeToHumanString($open,'start');
+        return &mt("Open [_1]",&timeToHumanString($open,'start'));
     }
     if ($res->simpleStatus($part) == $res->OPEN) {
         unless (&Apache::lonnet::allowed('mgr',$env{'request.course.id'})) {
@@ -675,22 +675,22 @@ sub getDescription {
     if ($status == $res->OPEN) {
         if ($due) {
 	    if ($res->is_practice()) {
-		return &mt("Closes ")."  " .timeToHumanString($due,'start');
+		return &mt("Closes [_1]",&timeToHumanString($due,'start'));
 	    } else {
-		return &mt("Due")."  " .timeToHumanString($due,'end');
+		return &mt("Due [_1]",&timeToHumanString($due,'end'));
 	    }
         } else {
             return &mt("Open, no due date");
         }
     }
     if ($status == $res->PAST_DUE_ANSWER_LATER) {
-        return &mt("Answer open")." " .timeToHumanString($answer,'start');
+        return &mt("Answer open [_1]",&timeToHumanString($answer,'start'));
     }
     if ($status == $res->PAST_DUE_NO_ANSWER) {
 	if ($res->is_practice()) {
-	    return &mt("Closed")." " . timeToHumanString($due,'start');
+	    return &mt("Closed [_1]",&timeToHumanString($due,'start'));
 	} else {
-	    return &mt("Was due")." " . timeToHumanString($due,'end');
+	    return &mt("Was due [_1]",&timeToHumanString($due,'end'));
 	}
     }
     if (($status == $res->ANSWER_OPEN || $status == $res->PARTIALLY_CORRECT)
@@ -723,7 +723,7 @@ sub getDescription {
             }
         }
         if ($due) {
-            return &mt("Due")." " . timeToHumanString($due,'end') .
+            return &mt("Due [_1]",&timeToHumanString($due,'end')) .
                 " $triesString";
         } else {
             return &mt("No due date")." $triesString";
@@ -1006,10 +1006,10 @@ sub render_resource {
     }
 
     if ($resource->randomout()) {
-        $nonLinkedText .= ' <i>('.&mt('hidden').')</i> ';
+        $nonLinkedText .= ' <span class="LC_warning">('.&mt('hidden').')</span> ';
     }
     if (!$resource->condval()) {
-        $nonLinkedText .= ' <i>('.&mt('conditionally hidden').')</i> ';
+        $nonLinkedText .= ' <span class="LC_info">('.&mt('conditionally hidden').')</span> ';
     }
     if (($resource->is_practice()) && ($resource->is_raw_problem())) {
         $nonLinkedText .=' <font color="green"><b>'.&mt('not graded').'</b></font>';
@@ -3526,6 +3526,8 @@ sub new {
     $self->{NAV_MAP}->{RESOURCE_CACHE}->{$self->{ID}} = $self;
     $self->{RESOURCE_ERROR} = 0;
 
+    $self->{DUEDATE_CACHE} = undef;
+
     # A hash that can be used by two-pass algorithms to store data
     # about this resource in. Not used by the resource object
     # directly.
@@ -4103,6 +4105,9 @@ sub checkedin {
 # this should work exactly like the copy in lonhomework.pm
 sub duedate {
     (my $self, my $part) = @_;
+    if (defined ($self->{DUEDATE_CACHE}->{$part})) {
+        return $self->{DUEDATE_CACHE}->{$part};
+    }
     my $date;
     my @interval=$self->parmval("interval", $part);
     my $due_date=$self->parmval("duedate", $part);
@@ -4119,6 +4124,7 @@ sub duedate {
     } else {
 	$date = $due_date;
     }
+    $self->{DUEDATE_CACHE}->{$part} = $date;
     return $date;
 }
 sub handgrade {