--- loncom/interface/lonnavmaps.pm	2006/10/10 20:16:26	1.391
+++ loncom/interface/lonnavmaps.pm	2006/10/23 22:48:27	1.392
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.391 2006/10/10 20:16:26 albertel Exp $
+# $Id: lonnavmaps.pm,v 1.392 2006/10/23 22:48:27 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -803,16 +803,16 @@ sub render_resource {
 		($nowOpen ? &mt('Open Folder') : &mt('Close Folder')).' '.$title."\" border='0' />";
 
             $linkopen = "<a href=\"" . $params->{'url'} . '?' . 
-                $params->{'queryString'} . '&filter=';
+                $params->{'queryString'} . '&amp;filter=';
             $linkopen .= ($nowOpen xor $it->{CONDITION}) ?
                 addToFilter($filter, $mapId) :
                 removeFromFilter($filter, $mapId);
-            $linkopen .= "&condition=" . $it->{CONDITION} . '&hereType='
-                . $params->{'hereType'} . '&here=' .
+            $linkopen .= "&amp;condition=" . $it->{CONDITION} . '&amp;hereType='
+                . $params->{'hereType'} . '&amp;here=' .
                 &escape($params->{'here'}) . 
-                '&jump=' .
+                '&amp;jump=' .
                 &escape($resource->symb()) . 
-                "&folderManip=1\">";
+                "&amp;folderManip=1\">";
 
         } else {
             # Don't allow users to manipulate folder
@@ -834,7 +834,7 @@ sub render_resource {
     }
     
     # We're done preparing and finally ready to start the rendering
-    my $result = "<td align='left' valign='center'>";
+    my $result = "<td align='left' valign='middle'>";
 
     my $indentLevel = $params->{'indentLevel'};
     if ($newBranchText) { $indentLevel--; }
@@ -898,7 +898,7 @@ sub render_communication_status {
     my $location=&Apache::loncommon::lonhttpdurl("/adm/lonMisc");
     if ($resource->hasDiscussion()) {
         $discussionHTML = $linkopen .
-            '<img border="0" src="'.$location.'/chat.gif" />' .
+            '<img alt="'.&mt('New Discussion').'" border="0" src="'.$location.'/chat.gif" />' .
             $linkclose;
     }
     
@@ -908,7 +908,7 @@ sub render_communication_status {
             if ($_) {
                 $feedbackHTML .= '&nbsp;<a '.$target.' href="/adm/email?display='
                     . &escape($_) . '">'
-                    . '<img src="'.$location.'/feedback.gif" '
+                    . '<img alt="'.&mt('New Email').'" src="'.$location.'/feedback.gif" '
                     . 'border="0" /></a>';
             }
         }
@@ -923,7 +923,7 @@ sub render_communication_status {
                 $errorcount++;
                 $errorHTML .= '&nbsp;<a '.$target.' href="/adm/email?display='
                     . &escape($_) . '">'
-                    . '<img src="'.$location.'/bomb.gif" '
+                    . '<img alt="'.&mt('New Error').'" src="'.$location.'/bomb.gif" '
                     . 'border="0" /></a>';
             }
         }
@@ -933,7 +933,7 @@ sub render_communication_status {
 	$discussionHTML = $feedbackHTML = $errorHTML = '';
     }
 
-    return "<td width=\"75\" align=\"left\" valign=\"center\">$discussionHTML$feedbackHTML$errorHTML&nbsp;</td>";
+    return "<td width=\"75\" align=\"left\" valign=\"middle\">$discussionHTML$feedbackHTML$errorHTML&nbsp;</td>";
 
 }
 sub render_quick_status {
@@ -958,7 +958,7 @@ sub render_quick_status {
         if ($icon) {
 	    my $location=
 		&Apache::loncommon::lonhttpdurl("/adm/lonIcons/$icon");
-            $result .= "<td width='30' valign='center' width='50' align='right'>$linkopen<img width='25' height='25' src='$location' border='0' alt='$alt' />$linkclose</td>\n";
+            $result .= "<td valign='middle' width='50' align='right'>$linkopen<img width='25' height='25' src='$location' border='0' alt='$alt' />$linkclose</td>\n";
         } else {
             $result .= "<td width='30'>&nbsp;</td>\n";
         }
@@ -970,7 +970,7 @@ sub render_quick_status {
 }
 sub render_long_status {
     my ($resource, $part, $params) = @_;
-    my $result = "<td align='right' valign='center'>\n";
+    my $result = "<td align='right' valign='middle'>\n";
     my $firstDisplayed = !$params->{'condensed'} && 
         $params->{'multipart'} && $part eq "0";
                 
@@ -1294,11 +1294,11 @@ sub render {
     if ($printCloseAll && !$args->{'resource_no_folder_link'}) {
 	my ($link,$text);
         if ($condition) {
-	    $link='"navmaps?condition=0&filter=&'.$queryString.
+	    $link='"navmaps?condition=0&amp;filter=&amp;'.$queryString.
 		'&here='.&escape($here).'"';
 	    $text='Close all folders';
         } else {
-	    $link='"navmaps?condition=1&filter=&'.$queryString.
+	    $link='"navmaps?condition=1&amp;filter=&amp;'.$queryString.
 		'&here='.&escape($here).'"';
 	    $text='Open all folders';
         }