--- loncom/interface/lonnavmaps.pm	2006/05/30 20:13:45	1.385
+++ loncom/interface/lonnavmaps.pm	2006/07/25 00:57:51	1.390
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.385 2006/05/30 20:13:45 raeburn Exp $
+# $Id: lonnavmaps.pm,v 1.390 2006/07/25 00:57:51 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -250,7 +250,6 @@ MENU
 # ----------------------------------------------------- Force menu registration
     my $body_only='';
     my $js;
-    my $crstype = $env{'course.'.$env{'request.course.id'}.'.type'};
     if ($env{'environment.remotenavmap'} eq 'on') {
 	$js='<script type="text/javascript">
                 function collapse() {
@@ -261,8 +260,10 @@ MENU
     }
 
     # Header
-    $r->print(&Apache::loncommon::start_page(&mt('Navigate [_1] Contents',
-                                                 $crstype),$js,
+    my $course_type = &Apache::loncommon::course_type();
+    $r->print(&Apache::loncommon::start_page('Navigate '.$course_type.
+					     ' Contents',
+					     $js,
 					     {'only_body'       => $body_only,
 					      'force_register'  =>
 						  $env{'form.register'},}));
@@ -272,9 +273,9 @@ MENU
 
     # Check that it's defined
     if (!($navmap->courseMapDefined())) {
-	$r->print(&Apache::loncommon::help_open_menu('','Navigation Screen','Navigation_Screen','',undef,'RAT'));
-        $r->print('<font size="+2" color="red">'.&mt('Coursemap undefined.').
-		  '</font>' .
+	$r->print(&Apache::loncommon::help_open_menu('Navigation Screen','Navigation_Screen',undef,'RAT'));
+        $r->print('<span class="LC_error">'.&mt('Coursemap undefined.').
+		  '</span>' .
                   &Apache::loncommon::end_page());
         return OK;
     }
@@ -1095,7 +1096,13 @@ sub render_resource {
     
     if ($resource->is_problem()) {
         if ($part eq '0' || $params->{'condensed'}) {
-            $icon ='<img src="'.$location.'/problem.gif" alt="'.&mt('Problem').'" border="0" />';
+	    $icon = '<img src="'.$location.'/';
+	    if ($resource->is_task()) {
+		$icon .= 'task.gif" alt="'.&mt('Task');
+	    } else {
+		$icon .= 'problem.gif" alt="'.&mt('Problem');
+	    }
+	    $icon .='" border="0" />';
         } else {
             $icon = $params->{'indentString'};
         }
@@ -1473,7 +1480,7 @@ sub render {
             $navmap = Apache::lonnavmaps::navmap->new();
 	    if (!defined($navmap)) {
 		# no londer in course
-		return '<font color="red">'.&mt('No course selected').'</font><br />
+		return '<span class="LC_error">'.&mt('No course selected').'</span><br />
                         <a href="/adm/roles">'.&mt('Select a course').'</a><br />';
 	    }
 	}
@@ -1662,7 +1669,7 @@ END
 
     if ($args->{'caller'} eq 'navmapsdisplay') {
         $result .= '<table><tr><td>'.
-                   &Apache::loncommon::help_open_menu('','Navigation Screen','Navigation_Screen','',undef,'RAT').'</td>';
+                   &Apache::loncommon::help_open_menu('Navigation Screen','Navigation_Screen',undef,'RAT').'</td>';
 	if ($env{'environment.remotenavmap'} ne 'on') {
 	    $result .= '<td>&nbsp;</td>'; 
         } else {
@@ -4039,7 +4046,7 @@ sub duedate {
     my $date;
     my $interval=$self->parmval("interval", $part);
     my $due_date=$self->parmval("duedate", $part);
-    if (defined($interval)) {
+    if ($interval =~ /\d+/) {
 	my $first_access=&Apache::lonnet::get_first_access('map',$self->symb);
 	if (defined($first_access)) {
 	    $interval = $first_access+$interval;