--- loncom/interface/lonnavmaps.pm	2004/09/21 20:33:49	1.296
+++ loncom/interface/lonnavmaps.pm	2004/10/04 21:35:52	1.299
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.296 2004/09/21 20:33:49 albertel Exp $
+# $Id: lonnavmaps.pm,v 1.299 2004/10/04 21:35:52 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1035,10 +1035,10 @@ sub render_resource {
 
     my $partLabel = "";
     my $newBranchText = "";
-    
+    my $location=&Apache::loncommon::lonhttpdurl("/adm/lonIcons");
     # If this is a new branch, label it so
     if ($params->{'isNewBranch'}) {
-        $newBranchText = "<img src='/adm/lonIcons/branch.gif' border='0' />";
+        $newBranchText = "<img src='$location/branch.gif' border='0' />";
     }
 
     # links to open and close the folder
@@ -1046,17 +1046,16 @@ sub render_resource {
     my $linkclose = "</a>";
 
     # Default icon: unknown page
-    my $icon = "<img src='/adm/lonIcons/unknown.gif' alt='' border='0' />";
+    my $icon = "<img src='$location/unknown.gif' alt='' border='0' />";
     
     if ($resource->is_problem()) {
         if ($part eq '0' || $params->{'condensed'}) {
-            $icon = '<img src="/adm/lonIcons/problem.gif" alt="" border="0" />';
+            $icon ='<img src="'.$location.'/problem.gif" alt="" border="0" />';
         } else {
             $icon = $params->{'indentString'};
         }
     } else {
-	$icon = "<img src='".&Apache::loncommon::icon($resource->src).
-	    "' alt='' border='0' />";
+	$icon = "<img src='".&Apache::loncommon::lonhttpdurl(&Apache::loncommon::icon($resource->src))."' alt='' border='0' />";
     }
 
     # Display the correct map icon to open or shut map
@@ -1071,7 +1070,7 @@ sub render_resource {
 
         if (!$params->{'resource_no_folder_link'}) {
             $icon = "navmap.$folderType." . ($nowOpen ? 'closed' : 'open') . '.gif';
-            $icon = "<img src='/adm/lonIcons/$icon' alt='' border='0' />";
+            $icon = "<img src='$location/$icon' alt='' border='0' />";
 
             $linkopen = "<a href='" . $params->{'url'} . '?' . 
                 $params->{'queryString'} . '&filter=';
@@ -1088,7 +1087,7 @@ sub render_resource {
             # Don't allow users to manipulate folder
             $icon = "navmap.$folderType." . ($nowOpen ? 'closed' : 'open') .
                 '.nomanip.gif';
-            $icon = "<img src='/adm/lonIcons/$icon' alt='' border='0' />";
+            $icon = "<img src='$location/$icon' alt='' border='0' />";
 
             $linkopen = "";
             $linkclose = "";
@@ -1156,10 +1155,10 @@ sub render_communication_status {
     my $link = $params->{"resourceLink"};
     my $linkopen = "<a href='$link'>";
     my $linkclose = "</a>";
-
+    my $location=&Apache::loncommon::lonhttpdurl("/adm/lonMisc");
     if ($resource->hasDiscussion()) {
         $discussionHTML = $linkopen .
-            '<img border="0" src="/adm/lonMisc/chat.gif" />' .
+            '<img border="0" src="'.$location.'/chat.gif" />' .
             $linkclose;
     }
     
@@ -1169,7 +1168,7 @@ sub render_communication_status {
             if ($_) {
                 $feedbackHTML .= '&nbsp;<a href="/adm/email?display='
                     . &Apache::lonnet::escape($_) . '">'
-                    . '<img src="/adm/lonMisc/feedback.gif" '
+                    . '<img src="'.$location.'/feedback.gif" '
                     . 'border="0" /></a>';
             }
         }
@@ -1184,7 +1183,7 @@ sub render_communication_status {
                 $errorcount++;
                 $errorHTML .= '&nbsp;<a href="/adm/email?display='
                     . &Apache::lonnet::escape($_) . '">'
-                    . '<img src="/adm/lonMisc/bomb.gif" '
+                    . '<img src="'.$location.'/bomb.gif" '
                     . 'border="0" /></a>';
             }
         }
@@ -1213,7 +1212,9 @@ sub render_quick_status {
         my $icon = $statusIconMap{$resource->simpleStatus($part)};
         my $alt = $iconAltTags{$icon};
         if ($icon) {
-            $result .= "<td width='30' valign='center' width='50' align='right'>$linkopen<img width='25' height='25' src='/adm/lonIcons/$icon' border='0' alt='$alt' />$linkclose</td>\n";
+	    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";
         } else {
             $result .= "<td width='30'>&nbsp;</td>\n";
         }
@@ -1355,7 +1356,6 @@ sub render {
     my $args = shift;
     &Apache::loncommon::get_unprocessed_cgi($ENV{QUERY_STRING});
     my $result = '';
-
     # Configure the renderer.
     my $cols = $args->{'cols'};
     if (!defined($cols)) {
@@ -1512,23 +1512,24 @@ sub render {
     my $printKey = $args->{'printKey'};
     my $printCloseAll = $args->{'printCloseAll'};
     if (!defined($printCloseAll)) { $printCloseAll = 1; }
-    
+
     # Print key?
     if ($printKey) {
         $result .= '<table border="0" cellpadding="2" cellspacing="0">';
         my $date=localtime;
         $result.='<tr><td align="right" valign="bottom">Key:&nbsp;&nbsp;</td>';
+	my $location=&Apache::loncommon::lonhttpdurl("/adm/lonMisc");
         if ($navmap->{LAST_CHECK}) {
             $result .= 
-                '<img src="/adm/lonMisc/chat.gif"> '.&mt('New discussion since').' '.
+                '<img src="'.$location.'/chat.gif"> '.&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="/adm/lonMisc/feedback.gif"> '.&mt('New message (click to open)').'<p>'.
+                '<img src="'.$location.'/feedback.gif"> '.&mt('New message (click to open)').'<p>'.
                 '</td>'; 
         } else {
             $result .= '<td align="center" valign="bottom">&nbsp;&nbsp;'.
-                '<img src="/adm/lonMisc/chat.gif"> '.&mt('Discussions').'</td><td align="center" valign="bottom">'.
-                '&nbsp;&nbsp;<img src="/adm/lonMisc/feedback.gif"> '.&mt('New message (click to open)').
+                '<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)').
                 '</td>'; 
         }
 
@@ -1560,9 +1561,11 @@ sub render {
 	&add_linkitem($args->{'linkitems'},'clearbubbles',
 		      'document.clearbubbles.submit()',
 		      'Mark all posts read');
+	my $time=time;
 	$result .= (<<END);
     <form name="clearbubbles" method="post" action="/adm/feedback">
 	<input type="hidden" name="navurl" value="$ENV{'QUERY_STRING'}" />
+	<input type="hidden" name="navtime" value="$time" />
 END
         if ($args->{'sort'} eq 'discussion') { 
 	    my $totdisc = 0;
@@ -1582,19 +1585,13 @@ END
 	    }
 	    if ($totdisc > 0) {
 		$haveDisc =~ s/:$//;
-		my $navurl = $ENV{'QUERY_STRING'};
 		$result .= (<<END);
 	<input type="hidden" name="navmaps" value="$haveDisc" />
     </form>
 END
             }
-	} else {
-	    my $time=time;
-	    $result .= (<<END);
-	<input type="hidden" name="navtime" value="$time" />
-    </form>
-END
-        }
+	}
+	$result.='</form>';
     }
 
     if ($args->{'caller'} eq 'navmapsdisplay') {
@@ -1642,7 +1639,9 @@ END
     $args->{'indentLevel'} = 0;
     $args->{'isNewBranch'} = 0;
     $args->{'condensed'} = 0;    
-    $args->{'indentString'} = setDefault($args->{'indentString'}, "<img src='/adm/lonIcons/whitespace1.gif' width='25' height='1' alt='' border='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->{'displayedHereMarker'} = 0;
 
     # If we're suppressing empty sequences, look for them here. Use DFS for speed,
@@ -1982,6 +1981,7 @@ ENDBLOCK
     $result .= '</select>&nbsp;<input type="button" name="chgnav"
                    value="Go" onClick="javascript:changeNavDisplay()" />
                 </nobr></form></td>'."\n";
+	
     return $result;
 }