--- loncom/interface/lonnavmaps.pm	2012/06/19 10:11:35	1.487
+++ loncom/interface/lonnavmaps.pm	2012/12/01 13:14:56	1.490
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.487 2012/06/19 10:11:35 foxr Exp $
+# $Id: lonnavmaps.pm,v 1.490 2012/12/01 13:14:56 raeburn Exp $
 
 #
 # Copyright Michigan State University Board of Trustees
@@ -692,7 +692,7 @@ sub getDescription {
         my $maxtries = $res->maxtries($part);
         my $triesString = "";
         if ($tries && $maxtries) {
-            $triesString = '<font size="-1"><i>('.&mt('[_1] of [quant,_2,try,tries] used',$tries,$maxtries).')</i></font>';
+            $triesString = '<span class="LC_fontsize_medium"><i>('.&mt('[_1] of [quant,_2,try,tries] used',$tries,$maxtries).')</i></span>';
             if ($maxtries > 1 && $maxtries - $tries == 1) {
                 $triesString = "<b>$triesString</b>";
             }
@@ -996,7 +996,7 @@ sub render_resource {
         $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>';
+        $nonLinkedText .=' <span class="LC_info"><b>'.&mt('not graded').'</b></span>';
     }
 
     # We're done preparing and finally ready to start the rendering
@@ -1040,7 +1040,7 @@ sub render_resource {
     }
 
     if (!$params->{'resource_nolink'} && !$resource->is_sequence() && !$resource->is_empty_sequence) {
-        $result .= "$curMarkerBegin<a href=\"$link\">$title$partLabel</a>$curMarkerEnd$nonLinkedText</td>";
+        $result .= "$curMarkerBegin<a href=\"$link\">$title$partLabel</a>$curMarkerEnd$editmapLink$nonLinkedText</td>";
     } else {
         $result .= "$curMarkerBegin$linkopen$title$partLabel</a>$curMarkerEnd$editmapLink$nonLinkedText</td>";
     }
@@ -1129,21 +1129,23 @@ sub render_long_status {
         $params->{'multipart'} && $part eq "0";
                 
     my $color;
+    my $info = '';
     if ($resource->is_problem() || $resource->is_practice()) {
         $color = $colormap{$resource->status};
         
         if (dueInLessThan24Hours($resource, $part) ||
             lastTry($resource, $part)) {
             $color = $hurryUpColor;
+            $info = ' title="'.&mt('Due in less than 24 hours!').'"';
         }
     }
     
     if ($resource->kind() eq "res" &&
         $resource->is_raw_problem() &&
         !$firstDisplayed) {
-        if ($color) {$result .= "<font color=\"$color\"><b>"; }
+        if ($color) {$result .= '<span style="color:'.$color.'"'.$info.'><b>'; }
         $result .= getDescription($resource, $part);
-        if ($color) {$result .= "</b></font>"; }
+        if ($color) {$result .= "</b></span>"; }
     }
     if ($resource->is_map() && &advancedUser() && $resource->randompick()) {
         $result .= &mt('(randomly select [_1])', $resource->randompick());
@@ -1225,11 +1227,11 @@ sub render_parts_summary_status {
     }
     $return.= $td . $totalParts . ' parts: ';
     foreach my $status (@statuses) {
-	if ($overallstatus{$status}) {
-	    $return.="<font color='" . $statusColors{$status} .
-		"'>" . $overallstatus{$status} . ' '
-		. $statusStrings{$status} . "</font>";
-	}
+        if ($overallstatus{$status}) {
+            $return.='<span style="color:' . $statusColors{$status}
+                   . '">' . $overallstatus{$status} . ' '
+                   . $statusStrings{$status} . '</span>';
+        }
     }
     $return.= $endtd;
     return $return;
@@ -4411,7 +4413,7 @@ sub resprintable {
     my $partsref = $self->parts();
     my @parts    = @$partsref;
 
-    if ((!defined(@parts)) || (scalar(@parts) == 0)) {
+    if (!@parts) {
 	return $self->printable(0);
     } else {
 	foreach my $part  (@parts) {