--- loncom/interface/lonnavmaps.pm	2009/03/27 11:33:19	1.433
+++ loncom/interface/lonnavmaps.pm	2009/11/02 12:10:34	1.438
@@ -1,7 +1,8 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.433 2009/03/27 11:33:19 bisitz Exp $
+# $Id: lonnavmaps.pm,v 1.438 2009/11/02 12:10:34 wenzelju Exp $
+
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -31,7 +32,7 @@
 
 =head1 NAME
 
-Apache::lonnavmaps.pm
+Apache::lonnavmaps - Subroutines to handle and render the navigation
 
 =head1 SYNOPSIS
 
@@ -48,7 +49,7 @@ described at http://www.lon-capa.org.
 
 =head1 OVERVIEW
 
-X<lonnavmaps, overview> When a user enters a course, LON-CAPA examines the
+X<lonnavmaps, overview When a user enters a course, LON-CAPA examines the
 course structure and caches it in what is often referred to as the
 "big hash" X<big hash>. You can see it if you are logged into
 LON-CAPA, in a course, by going to /adm/test. (You may need to
@@ -504,10 +505,11 @@ my %statusIconMap =
      $resObj->ERROR        => ''
      );
 
-my %iconAltTags = 
+my %iconAltTags =   #texthash does not work here
     ( 'navmap.correct.gif' => 'Correct',
       'navmap.wrong.gif'   => 'Incorrect',
-      'navmap.open.gif'    => 'Open' );
+      'navmap.open.gif'    => 'Open',
+      'navmap.partial.gif' => 'Partially Correct', );
 
 # Defines a status->color mapping, null string means don't color
 my %colormap = 
@@ -597,7 +599,7 @@ sub getLinkForResource {
 	    my ($map,$id,$src)=&Apache::lonnet::decode_symb($res->symb());
 	    if ($map=~/\.page$/) {
 		my $url=&Apache::lonnet::clutter($map);
-		$anchor=&escape($src->shown_symb());
+		$anchor=&escape($res->shown_symb());
 		return ($url,$res->shown_symb(),$anchor);
 	    }
         }
@@ -880,11 +882,6 @@ sub render_resource {
     my $link = $params->{"resourceLink"};
 
     #  The URL part is not escaped at this point, but the symb is... 
-    #  The stuff to the left of the ? must have ' replaced by \' since
-    #  it will be quoted with ' in the href.
-
-    my ($left,$right) = split(/\?/, $link);
-    $link = $left.'?'.$right;
 
     my $src = $resource->src();
     my $it = $params->{"iterator"};
@@ -1095,7 +1092,7 @@ sub render_quick_status {
         if ($icon) {
 	    my $location=
 		&Apache::loncommon::lonhttpdurl("/adm/lonIcons/$icon");
-            $result .= "$linkopen<img src='$location' alt='$alt' />$linkclose";
+		$result .= $linkopen.'<img src="'.$location.'" alt="'.&mt($alt).'" title="'.&mt($alt).'" />'.$linkclose;            
         } else {
             $result .= "&nbsp;";
         }
@@ -1419,15 +1416,15 @@ sub render {
 	my $location=&Apache::loncommon::lonhttpdurl("/adm/lonMisc");
         if ($navmap->{LAST_CHECK}) {
             $result .= 
-                '<img src="'.$location.'/chat.gif"> '.&mt('New discussion since').' '.
+                '<img src="'.$location.'/chat.gif" alt="" /> '.&mt('New discussion since').' '.
                 strftime("%A, %b %e at %I:%M %P", localtime($navmap->{LAST_CHECK})).
                 '</td><td align="center" valign="bottom">&nbsp;&nbsp;'.
-                '<img src="'.$location.'/feedback.gif"> '.&mt('New message (click to open)').'<p>'.
+                '<img src="'.$location.'/feedback.gif" alt="" /> '.&mt('New message (click to open)').'<p>'.
                 '</td>'; 
         } else {
             $result .= '<td align="center" valign="bottom">&nbsp;&nbsp;'.
-                '<img src="'.$location.'/chat.gif"> '.&mt('Discussions').'</td><td align="center" valign="bottom">'.
-                '&nbsp;&nbsp;<img src="'.$location.'/feedback.gif"> '.&mt('New message (click to open)').
+                '<img src="'.$location.'/chat.gif" alt="" /> '.&mt('Discussions').'</td><td align="center" valign="bottom">'.
+                '&nbsp;&nbsp;<img src="'.$location.'/feedback.gif" alt="" /> '.&mt('New message (click to open)').
                 '</td>'; 
         }