--- loncom/interface/lonnavmaps.pm	2011/05/18 11:26:44	1.459
+++ loncom/interface/lonnavmaps.pm	2011/07/18 11:56:23	1.462
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.459 2011/05/18 11:26:44 foxr Exp $
+# $Id: lonnavmaps.pm,v 1.462 2011/07/18 11:56:23 christianto 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',
      );
@@ -612,7 +612,7 @@ sub getDescription {
         return &Apache::lonhtmlcommon::direct_parm_link(&mt("Not currently assigned.",$res->symb(),'opendate'),$part);
     }
     if ($status == $res->OPEN_LATER) {
-        return &mt("Open ") .&Apache::lonhtmlcommon::direct_parm_link(&timeToHumanString($open,'start'),$res->symb(),'opendate',$part);
+        return &mt("Open [_1]",&Apache::lonhtmlcommon::direct_parm_link(&timeToHumanString($open,'start')),$res->symb(),'opendate',$part);
     }
     if ($res->simpleStatus($part) == $res->OPEN) {
         unless (&Apache::lonnet::allowed('mgr',$env{'request.course.id'})) {
@@ -646,22 +646,22 @@ sub getDescription {
     if ($status == $res->OPEN) {
         if ($due) {
 	    if ($res->is_practice()) {
-		return &mt("Closes ")."  " .&Apache::lonhtmlcommon::direct_parm_link(&timeToHumanString($due,'start'),$res->symb(),'duedate',$part);
+		return &mt("Closes [_1]",&Apache::lonhtmlcommon::direct_parm_link(&timeToHumanString($due,'start')),$res->symb(),'duedate',$part);
 	    } else {
-		return &mt("Due")."  " .&Apache::lonhtmlcommon::direct_parm_link(&timeToHumanString($due,'end'),$res->symb(),'duedate',$part);
+		return &mt("Due [_1]",&Apache::lonhtmlcommon::direct_parm_link(&timeToHumanString($due,'end')),$res->symb(),'duedate',$part);
 	    }
         } else {
             return &Apache::lonhtmlcommon::direct_parm_link(&mt("Open, no due date"),$res->symb(),'duedate',$part);
         }
     }
     if ($status == $res->PAST_DUE_ANSWER_LATER) {
-        return &mt("Answer open")." " .&Apache::lonhtmlcommon::direct_parm_link(&timeToHumanString($answer,'start'),$res->symb(),'answerdate',$part);
+        return &mt("Answer open [_1]",&Apache::lonhtmlcommon::direct_parm_link(&timeToHumanString($answer,'start')),$res->symb(),'answerdate',$part);
     }
     if ($status == $res->PAST_DUE_NO_ANSWER) {
 	if ($res->is_practice()) {
-	    return &mt("Closed")." " . &Apache::lonhtmlcommon::direct_parm_link(&timeToHumanString($due,'start'),$res->symb(),'answerdate,duedate',$part);
+	    return &mt("Closed [_1]",&Apache::lonhtmlcommon::direct_parm_link(&timeToHumanString($due,'start')),$res->symb(),'answerdate,duedate',$part);
 	} else {
-	    return &mt("Was due")." " .&Apache::lonhtmlcommon::direct_parm_link(&timeToHumanString($due,'end'),$res->symb(),'answerdate,duedate',$part);
+	    return &mt("Was due [_1]",&Apache::lonhtmlcommon::direct_parm_link(&timeToHumanString($due,'end')),$res->symb(),'answerdate,duedate',$part);
 	}
     }
     if (($status == $res->ANSWER_OPEN || $status == $res->PARTIALLY_CORRECT)
@@ -694,7 +694,7 @@ sub getDescription {
             }
         }
         if ($due) {
-            return &mt("Due")." " . &Apache::lonhtmlcommon::direct_parm_link(&timeToHumanString($due,'end'),$res->symb(),'duedate',$part) .
+            return &mt("Due [_1]",&Apache::lonhtmlcommon::direct_parm_link(&timeToHumanString($due,'end')),$res->symb(),'duedate',$part) .
                 " $triesString";
         } else {
             return &Apache::lonhtmlcommon::direct_parm_link(&mt("No due date"),$res->symb(),'duedate',$part)." $triesString";
@@ -2414,7 +2414,6 @@ sub parmval {
         }
     }
     my $result = $self->parmval_real($what, $symb, $recurse);
-    my $dumper = Data::Dumper->new([$result]);
     $self->{PARM_CACHE}->{$hashkey} = $result;
     if (wantarray) {
         return @{$result};
@@ -3994,15 +3993,12 @@ Get the weight for the problem.
 
 sub printable {
 
-    &Apache::lonnet::logthis("Printable");
     my ($self, $part) = @_;
 
     # Get the print open/close dates for the resource.
 
-    my $start = $self->parmval("printopendate", $part);
-    my $end   = $self->parmval("printclosedate", $part);
-    my $dumper = Data::Dumper->new([$self, $part, $start, $end]);
-    &Apache::lonnet::logthis("Start for " . $dumper->Dump);
+    my $start = $self->parmval("prinstartdate", $part);
+    my $end   = $self->parmval("printenddate", $part);
 
     #  The following cases apply:
     #  - No dates set: Printable.
@@ -4015,10 +4011,10 @@ sub printable {
     my $startok = 1;
     my $endok   = 1;
 
-    if ($start ne '') {
+    if ((defined $start) && ($start ne '')) {
 	$startok = $start <= $now;
     }
-    if ($end  ne '') {
+    if ((defined $end) && ($end != '')) {
 	$endok = $end >= $now;
     }
     return $startok && $endok;
@@ -4029,12 +4025,16 @@ sub resprintable {
 
     # get parts...or realize there are no parts.
 
-    my $parts = $self->parts();
-    if ($parts == 0) {
+    my $partsref = $self->parts();
+    my @parts    = @$partsref;
+
+    if ((!defined(@parts)) || (scalar(@parts) == 0)) {
 	return $self->printable(0);
     } else {
-	foreach my $part  (@$parts) {
-	    if (!$self->printable($part)) { return 0; }
+	foreach my $part  (@parts) {
+	    if (!$self->printable($part)) { 
+		return 0; 
+	    }
 	}
 	return 1;
     }