--- loncom/interface/lonnavmaps.pm	2005/04/15 22:03:23	1.326
+++ loncom/interface/lonnavmaps.pm	2005/06/17 21:17:09	1.329
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.326 2005/04/15 22:03:23 albertel Exp $
+# $Id: lonnavmaps.pm,v 1.329 2005/06/17 21:17:09 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1039,7 +1039,7 @@ sub render_resource {
     my $location=&Apache::loncommon::lonhttpdurl("/adm/lonIcons");
     # If this is a new branch, label it so
     if ($params->{'isNewBranch'}) {
-        $newBranchText = "<img src='$location/branch.gif' border='0' />";
+        $newBranchText = "<img src='$location/branch.gif' border='0' alt='Branch' />";
     }
 
     # links to open and close the folder
@@ -1051,16 +1051,16 @@ sub render_resource {
     my $linkclose = "</a>";
 
     # Default icon: unknown page
-    my $icon = "<img src='$location/unknown.gif' alt='' border='0' />";
+    my $icon = "<img src='$location/unknown.gif' alt='' border='0' alt='&nbsp;&nbsp;' ' />";
     
     if ($resource->is_problem()) {
         if ($part eq '0' || $params->{'condensed'}) {
-            $icon ='<img src="'.$location.'/problem.gif" alt="" border="0" />';
+            $icon ='<img src="'.$location.'/problem.gif" alt="&nbsp;&nbsp;" border="0" />';
         } else {
             $icon = $params->{'indentString'};
         }
     } else {
-	$icon = "<img src='".&Apache::loncommon::icon($resource->src)."' alt='' border='0' />";
+	$icon = "<img src='".&Apache::loncommon::icon($resource->src)."' alt='&nbsp;&nbsp;' border='0' />";
     }
 
     # Display the correct map icon to open or shut map
@@ -1075,7 +1075,8 @@ sub render_resource {
 
         if (!$params->{'resource_no_folder_link'}) {
             $icon = "navmap.$folderType." . ($nowOpen ? 'closed' : 'open') . '.gif';
-            $icon = "<img src='$location/$icon' alt='' border='0' />";
+	    $icon = "<img src='$location/$icon' alt='".
+		($nowOpen ? 'Open Folder' : 'Close Folder')."' border='0' />";
 
             $linkopen = "<a href='" . $params->{'url'} . '?' . 
                 $params->{'queryString'} . '&filter=';
@@ -1093,7 +1094,8 @@ sub render_resource {
             # Don't allow users to manipulate folder
             $icon = "navmap.$folderType." . ($nowOpen ? 'closed' : 'open') .
                 '.nomanip.gif';
-            $icon = "<img src='$location/$icon' alt='' border='0' />";
+            $icon = "<img src='$location/$icon' alt='".
+		($nowOpen ? 'Open Folder' : 'Close Folder')."' border='0' />";
 
             $linkopen = "";
             $linkclose = "";
@@ -1650,7 +1652,7 @@ END
     $args->{'condensed'} = 0;    
     my $location=
 	&Apache::loncommon::lonhttpdurl("/adm/lonIcons/whitespace1.gif");
-    $args->{'indentString'} = setDefault($args->{'indentString'}, "<img src='$location' width='25' height='1' alt='' border='0' />");
+    $args->{'indentString'} = setDefault($args->{'indentString'}, "<img src='$location' width='25' height='1' alt='&nbsp;&nbsp;' border='0' />");
     $args->{'displayedHereMarker'} = 0;
 
     # If we're suppressing empty sequences, look for them here. Use DFS for speed,
@@ -2116,8 +2118,6 @@ sub generate_course_user_opt {
     my $cdom=$env{'course.'.$cid.'.domain'};
     my $cnum=$env{'course.'.$cid.'.num'};
     
-    my $useropt; my $courseopt;
-
 # ------------------------------------------------- Get coursedata (if present)
     my $courseopt=&Apache::lonnet::get_courseresdata($cnum,$cdom);
     # Check for network failure
@@ -3502,6 +3502,15 @@ sub shown_symb {
     if ($self->encrypted()) {return &Apache::lonenc::encrypted($self->symb());}
     return $self->symb();
 }
+sub id {
+    my $self=shift;
+    return $self->{ID};
+}
+sub enclosing_map_src {
+    my $self=shift;
+    (my $first, my $second) = $self->{ID} =~ /(\d+).(\d+)/;
+    return $self->navHash('map_id_'.$first);
+}
 sub symb {
     my $self=shift;
     (my $first, my $second) = $self->{ID} =~ /(\d+).(\d+)/;