--- loncom/interface/lonnavmaps.pm	2011/05/22 14:55:30	1.460
+++ loncom/interface/lonnavmaps.pm	2011/09/15 01:06:41	1.463
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.460 2011/05/22 14:55:30 foxr Exp $
+# $Id: lonnavmaps.pm,v 1.463 2011/09/15 01:06:41 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',
      );
@@ -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";
@@ -1090,10 +1090,9 @@ sub render_long_status {
         }
     }
     
-    if (($resource->kind() eq "res" &&
-        ($resource->is_problem() || $resource->is_practice()) &&
-        !$firstDisplayed) &&
-        $resource->is_raw_problem()) {
+    if ($resource->kind() eq "res" &&
+        $resource->is_raw_problem() &&
+        !$firstDisplayed) {
         if ($color) {$result .= "<font color=\"$color\"><b>"; }
         $result .= getDescription($resource, $part);
         if ($color) {$result .= "</b></font>"; }
@@ -3993,7 +3992,6 @@ Get the weight for the problem.
 
 sub printable {
 
-    &Apache::lonnet::logthis("Printable");
     my ($self, $part) = @_;
 
     # Get the print open/close dates for the resource.
@@ -4008,28 +4006,16 @@ sub printable {
     #  - both defined: printable if start <= now <= end
     #
     my $now  = time();
-    &Apache::lonnet::logthis("now: $now, Opens at $start Closes at $end");
 
     my $startok = 1;
     my $endok   = 1;
 
     if ((defined $start) && ($start ne '')) {
-	&Apache::lonnet::logthis("checking start time.");
 	$startok = $start <= $now;
-	if (!$startok) {
-	    &Apache::lonnet::logthis("Start date is after now");
-	}
     }
     if ((defined $end) && ($end != '')) {
-	&Apache::lonnet::logthis("checkin end time");
 	$endok = $end >= $now;
-	if (!$endok) {
-	    &Apache::lonnet::logthis("End date is prior to now");
-	}
     }
-    if (!($startok && $endok)) {
-	&Apache::lonnet::logthis("Resource not printable due to open/close date");
-   }
     return $startok && $endok;
 }
 
@@ -4042,20 +4028,15 @@ sub resprintable {
     my @parts    = @$partsref;
 
     if ((!defined(@parts)) || (scalar(@parts) == 0)) {
-	&Apache::lonnet::logthis("resprintable - no parts trying part 0");
 	return $self->printable(0);
     } else {
-	&Apache::lonnet::logthis("resprintable - have " . scalar(@parts) . "  parts require all to be good");
 	foreach my $part  (@parts) {
 	    if (!$self->printable($part)) { 
-		&Apache::lonnet::logthis("resprintable - one of the parts failed date check");
 		return 0; 
 	    }
 	}
-	&Apache::lonnet::logthis("resprintable - All parts passed date check");
 	return 1;
     }
-    &Apache::lonnet::logthis("resprintable - should not have gotten here?");
 }
 
 sub acc {