--- loncom/interface/lonnavmaps.pm	2010/11/15 22:46:47	1.440.2.3
+++ loncom/interface/lonnavmaps.pm	2010/01/07 12:42:43	1.442
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.440.2.3 2010/11/15 22:46:47 raeburn Exp $
+# $Id: lonnavmaps.pm,v 1.442 2010/01/07 12:42:43 wenzelju Exp $
 
 #
 # Copyright Michigan State University Board of Trustees
@@ -699,11 +699,7 @@ sub getDescription {
         return &mt("Excused by instructor");
     }
     if ($status == $res->ATTEMPTED) {
-        if ($res->src() eq '/res/gci/gci/internal/submission.problem') {
-            return &mt('Question(s) submitted for review');
-        } else {
-            return &mt("Answer submitted, not yet graded");
-        }
+        return &mt("Answer submitted, not yet graded");
     }
     if ($status == $res->TRIES_LEFT) {
         my $tries = $res->tries($part);
@@ -723,11 +719,7 @@ sub getDescription {
         }
     }
     if ($status == $res->ANSWER_SUBMITTED) {
-        if ($res->src() eq '/res/gci/gci/internal/submission.problem') {
-            return &mt('Question(s) submitted for review');
-        } else {
-            return &mt('Answer submitted');
-        }
+        return &mt('Answer submitted');
     }
 }
 
@@ -1045,7 +1037,7 @@ sub render_communication_status {
     my $location=&Apache::loncommon::lonhttpdurl("/adm/lonMisc");
     if ($resource->hasDiscussion()) {
         $discussionHTML = $linkopen .
-            '<img alt="'.&mt('New Discussion').'" src="'.$location.'/chat.gif" />' .
+            '<img alt="'.&mt('New Discussion').'" src="'.$location.'/chat.gif" title="'.&mt('New Discussion').'"/>' .
             $linkclose;
     }
     
@@ -1055,7 +1047,7 @@ sub render_communication_status {
             if ($msgid) {
                 $feedbackHTML .= '&nbsp;<a '.$target.' href="/adm/email?display='
                     . &escape($msgid) . '">'
-                    . '<img alt="'.&mt('New E-mail').'" src="'.$location.'/feedback.gif" /></a>';
+                    . '<img alt="'.&mt('New E-mail').'" src="'.$location.'/feedback.gif" title="'.&mt('New E-mail').'"/></a>';
             }
         }
     }
@@ -1069,7 +1061,7 @@ sub render_communication_status {
                 $errorcount++;
                 $errorHTML .= '&nbsp;<a '.$target.' href="/adm/email?display='
                     . &escape($msgid) . '">'
-                    . '<img alt="'.&mt('New Error').'" src="'.$location.'/bomb.gif" /></a>';
+                    . '<img alt="'.&mt('New Error').'" src="'.$location.'/bomb.gif" title="'.&mt('New Error').'"/></a>';
             }
         }
     }
@@ -1496,7 +1488,12 @@ END
    
     if ($args->{'caller'} eq 'navmapsdisplay') {
         $result .= '<table><tr><td>'.
-                   &Apache::loncommon::help_open_menu('Navigation Screen','Navigation_Screen',undef,'RAT').'</td><td>&nbsp;</td>';
+                   &Apache::loncommon::help_open_menu('Navigation Screen','Navigation_Screen',undef,'RAT').'</td>';
+	if ($env{'environment.remotenavmap'} ne 'on') {
+	    $result .= '<td>&nbsp;</td>'; 
+        } else {
+	    $result .= '</tr><tr>'; 
+        }
 	$result.="<td class=\"LC_middle\">".mt('Tools:')."</td>";
 	$result.=&show_linkitems_toolbar($args->{'linkitems'});
         if ($args->{'sort_html'}) {
@@ -1504,7 +1501,7 @@ END
 		$result.='<td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td>'.
 		    '<td align="right">'.$args->{'sort_html'}.'</td></tr>';
 	    } else {
-		$result.='</tr><tr><td align="left" colspan="4"><br />'.
+		$result.='</tr><tr><td align="left"><br />'.
 		    $args->{'sort_html'}.'</td></tr>';
 	    }
 	}
@@ -1887,7 +1884,7 @@ sub show_linkitems_toolbar {
     my $result .=' 
               <td align="left">
                        <span class="LC_nobreak">'."\n<ul id=\"LC_toolbar\">";
-    foreach my $link (@linkorder) {
+	foreach my $link (@linkorder) {
         my $link_id = "LC_content_toolbar_".$link;
 	if (defined($linkitems->{$link})) {
 	    if ($linkitems->{$link}{'text'} ne '') {
@@ -1907,14 +1904,6 @@ sub show_linkitems_toolbar {
 	    }
 	}
     }
-    if ($env{'environment.remotenavmap'} eq 'on') {
-        if (&Apache::loncommon::needs_gci_custom()) {
-            if ($env{'request.course.id'} &&
-                &Apache::lonnet::allowed('mdc',$env{'request.course.id'})) {
-                $result .= '<li><a target="loncapaclient" href="/adm/menu" id="LC_content_toolbar_management" class="LC_toolbarItem" title="'.&mt('Test Management').'" /></a></li>';
-            }
-        }
-    }
     $result .= '</ul>';
     $result .= ' </span></td>'."\n";
 	
@@ -2388,7 +2377,7 @@ resource object.
 Based on the symb of the resource, get a resource object for that
 resource. This is one of the proper ways to get a resource object.
 
-=item * B<getByMapPc>(map_pc):
+=item * B<getMapByMapPc>(map_pc):
 
 Based on the map_pc of the resource, get a resource object for
 the given map. This is one of the proper ways to get a resource object.
@@ -3543,7 +3532,11 @@ sub navHash {
     my $self = shift;
     my $param = shift;
     my $id = shift;
-    return $self->{NAV_MAP}->navhash($param . ($id?$self->{ID}:""));
+    my $arg = $param . ($id?$self->{ID}:"");
+    if (defined($arg)) {
+        return $self->{NAV_MAP}->navhash($arg);
+    }
+    return;
 }
 
 =pod
@@ -3882,12 +3875,6 @@ resource of the map.
 
 Returns a string with the type of the map in it.
 
-=item *B<map_hierarchy>:
-
-Returns a string with a comma-separated ordered list of map_pc IDs
-for the hierarchy of maps containing a map, with the top level
-map first, then descending to deeper levels, with the enclosing map last.
-
 =back
 
 =cut
@@ -3918,11 +3905,6 @@ sub map_type {
     my $pc = $self->map_pc();
     return $self->navHash("map_type_$pc", 0);
 }
-sub map_hierarchy {
-    my $self = shift;
-    my $pc = $self->map_pc();
-    return $self->navHash("map_hierarchy_$pc", 0);
-}
 
 #####
 # Property queries