--- loncom/interface/lonnavmaps.pm	2009/03/27 02:39:59	1.432
+++ loncom/interface/lonnavmaps.pm	2009/10/22 03:04:21	1.436
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.432 2009/03/27 02:39:59 raeburn Exp $
+# $Id: lonnavmaps.pm,v 1.436 2009/10/22 03:04:21 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -31,7 +31,7 @@
 
 =head1 NAME
 
-Apache::lonnavmaps.pm
+Apache::lonnavmaps - Subroutines to handle and render the navigation
 
 =head1 SYNOPSIS
 
@@ -643,20 +643,20 @@ sub getDescription {
             if ($slot_status == $res->UNKNOWN) {
                 return &mt('Reservation status unknown');
             } elsif ($slot_status == $res->RESERVED) {
-                return &mt('Reserved - ends').' '.
-                       timeToHumanString($slot_time,'end');
+                return &mt('Reserved - ends [_1]',
+                           timeToHumanString($slot_time,'end'));
             } elsif ($slot_status == $res->RESERVED_LOCATION) {
-                return &mt('Reserved - specific location(s) - ends').' '.
-                       timeToHumanString($slot_time,'end');
+                return &mt('Reserved - specific location(s) - ends [_1]',
+                           timeToHumanString($slot_time,'end'));
             } elsif ($slot_status == $res->RESERVED_LATER) {
-                return &mt('Reserved - next open').' '.
-                       timeToHumanString($slot_time,'start');
+                return &mt('Reserved - next open [_1]',
+                           timeToHumanString($slot_time,'start'));
             } elsif ($slot_status == $res->RESERVABLE) {
-                return &mt('Reservable ending').' '.
-                       timeToHumanString($slot_time,'end');
+                return &mt('Reservable ending [_1]',
+                           timeToHumanString($slot_time,'end'));
             } elsif ($slot_status == $res->RESERVABLE_LATER) {
-                return &mt('Reservable starting').' '.
-                       timeToHumanString($slot_time,'start');
+                return &mt('Reservable starting [_1]',
+                           timeToHumanString($slot_time,'start'));
             } elsif ($slot_status == $res->NOT_IN_A_SLOT) {
                 return &mt('Reserve a time/place to work');
             } elsif ($slot_status == $res->NOTRESERVABLE) {
@@ -880,11 +880,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"};
@@ -1419,15 +1414,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>'; 
         }