--- loncom/interface/lonnavmaps.pm	2010/05/18 20:30:08	1.444.2.1
+++ loncom/interface/lonnavmaps.pm	2010/06/24 14:21:39	1.449
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.444.2.1 2010/05/18 20:30:08 raeburn Exp $
+# $Id: lonnavmaps.pm,v 1.449 2010/06/24 14:21:39 bisitz Exp $
 
 #
 # Copyright Michigan State University Board of Trustees
@@ -538,35 +538,6 @@ my $hurryUpColor = "#FF0000";
 my $future_slots_checked = 0;
 my $future_slots = 0;
 
-sub close {
-    if ($env{'environment.remotenavmap'} ne 'on') { return ''; }
-    return(<<ENDCLOSE);
-<script type="text/javascript">
-window.status='Accessing Nav Control';
-menu=window.open("/adm/rat/empty.html","loncapanav",
-                 "height=600,width=400,scrollbars=1");
-window.status='Closing Nav Control';
-menu.close();
-window.status='Done.';
-</script>
-ENDCLOSE
-}
-
-sub update {
-    if ($env{'environment.remotenavmap'} ne 'on') { return ''; }
-    if (!$env{'request.course.id'}) { return ''; }
-    if ($ENV{'REQUEST_URI'}=~m|^/adm/navmaps|) { return ''; }
-    return(<<ENDUPDATE);
-<form name="navform"></form>
-<script type="text/javascript">
-this.document.navform.action='/adm/navmaps#curloc';
-this.document.navform.target='loncapanav';
-this.document.navform.submit();
-</script>
-ENDUPDATE
-}
-
-
 sub addToFilter {
     my $hashIn = shift;
     my $addition = shift;
@@ -1015,12 +986,8 @@ sub render_resource {
         $nonLinkedText .= ' ('.&mt('[_1] parts', $resource->countParts()).')';
     }
 
-    my $target;
-    if ($env{'environment.remotenavmap'} eq 'on') {
-	$target=' target="loncapaclient" ';
-    }
     if (!$params->{'resource_nolink'} && !$resource->is_sequence() && !$resource->is_empty_sequence) {
-        $result .= "$curMarkerBegin<a $target href=\"$link\">$title$partLabel</a>$curMarkerEnd$nonLinkedText</td>";
+        $result .= "$curMarkerBegin<a href=\"$link\">$title$partLabel</a>$curMarkerEnd$nonLinkedText</td>";
     } else {
         $result .= "$curMarkerBegin$linkopen$title$partLabel</a>$curMarkerEnd$nonLinkedText</td>";
     }
@@ -1033,11 +1000,7 @@ sub render_communication_status {
     my $discussionHTML = ""; my $feedbackHTML = ""; my $errorHTML = "";
 
     my $link = $params->{"resourceLink"};
-    my $target;
-    if ($env{'environment.remotenavmap'} eq 'on') {
-	$target=' target="loncapaclient" ';
-    }
-    my $linkopen = "<a $target href=\"$link\">";
+    my $linkopen = "<a href=\"$link\">";
     my $linkclose = "</a>";
     my $location=&Apache::loncommon::lonhttpdurl("/adm/lonMisc");
     if ($resource->hasDiscussion()) {
@@ -1050,7 +1013,7 @@ sub render_communication_status {
         my $feedback = $resource->getFeedback();
         foreach my $msgid (split(/\,/, $feedback)) {
             if ($msgid) {
-                $feedbackHTML .= '&nbsp;<a '.$target.' href="/adm/email?display='
+                $feedbackHTML .= '&nbsp;<a href="/adm/email?display='
                     . &escape($msgid) . '">'
                     . '<img alt="'.&mt('New E-mail').'" src="'.$location.'/feedback.gif" title="'.&mt('New E-mail').'"/></a>';
             }
@@ -1064,7 +1027,7 @@ sub render_communication_status {
             last if ($errorcount>=10); # Only output 10 bombs maximum
             if ($msgid) {
                 $errorcount++;
-                $errorHTML .= '&nbsp;<a '.$target.' href="/adm/email?display='
+                $errorHTML .= '&nbsp;<a href="/adm/email?display='
                     . &escape($msgid) . '">'
                     . '<img alt="'.&mt('New Error').'" src="'.$location.'/bomb.gif" title="'.&mt('New Error').'"/></a>';
             }
@@ -1084,11 +1047,7 @@ sub render_quick_status {
         $params->{'multipart'} && $part eq "0";
 
     my $link = $params->{"resourceLink"};
-    my $target;
-    if ($env{'environment.remotenavmap'} eq 'on') {
-	$target=' target="loncapaclient" ';
-    }
-    my $linkopen = "<a $target href=\"$link\">";
+    my $linkopen = "<a href=\"$link\">";
     my $linkclose = "</a>";
 	
 	$result .= '<td class="LC_middle">';
@@ -1442,11 +1401,11 @@ sub render {
 	my ($link,$text);
         if ($condition) {
 	    $link='navmaps?condition=0&amp;filter=&amp;'.$queryString.
-		'&here='.&escape($here);
+		'&amp;here='.&escape($here);
 	    $text='Close all folders';
         } else {
 	    $link='navmaps?condition=1&amp;filter=&amp;'.$queryString.
-		'&here='.&escape($here);
+		'&amp;here='.&escape($here);
 	    $text='Open all folders';
         }
         if ($env{'form.register'}) {
@@ -1454,9 +1413,9 @@ sub render {
         }
 	if ($args->{'caller'} eq 'navmapsdisplay') {
 	    &add_linkitem($args->{'linkitems'},'changefolder',
-                          "location.href='$link'",$text);
+			  "location.href='$link'",$text);
 	} else {
-            $result.= '<a href="'.$link.'">'.&mt($text).'</a>';
+	    $result.= '<a href="'.$link.'">'.&mt($text).'</a>';
 	}
         $result .= "\n";
     }
@@ -1499,22 +1458,13 @@ END
     if ($args->{'caller'} eq 'navmapsdisplay') {
         $result .= '<table><tr><td>'.
                    &Apache::loncommon::help_open_menu('Navigation Screen','Navigation_Screen',undef,'RAT').'</td>';
-	if ($env{'environment.remotenavmap'} ne 'on') {
 	    $result .= '<td>&nbsp;</td>'; 
-        } else {
-	    $result .= '</tr><tr>'; 
-        }
-        $result.='<td class="LC_middle">'.&mt('Tools:').'</td>';
+	$result.='<td class="LC_middle">'.&mt('Tools:').'</td>';
 	$result.=&show_linkitems_toolbar($args->{'linkitems'});
         if ($args->{'sort_html'}) {
-	    if ($env{'environment.remotenavmap'} ne 'on') {
-		$result.='<td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td>'.
-		    '<td align="right">'.$args->{'sort_html'}.'</td></tr>';
-	    } else {
-		$result.='</tr><tr><td align="left"><br />'.
-		    $args->{'sort_html'}.'</td></tr>';
-	    }
-	}
+            $result.='<td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td>'.
+                '<td align="right">'.$args->{'sort_html'}.'</td></tr>';
+        }
         $result .= '</table>';
     } elsif ($args->{'sort_html'}) { 
         $result.=$args->{'sort_html'}; 
@@ -1765,7 +1715,7 @@ END
 	    if (defined($anchor)) { $anchor='#'.$anchor; }
 	    my $srcHasQuestion = $src =~ /\?/;
 	    $args->{"resourceLink"} = $src.
-		($srcHasQuestion?'&':'?') .
+		($srcHasQuestion?'&amp;':'?') .
 		'symb=' . &escape($symb).$anchor;
 	}
         # Now, we've decided what parts to show. Loop through them and
@@ -1827,12 +1777,11 @@ END
     # it's quite likely this might fix other browsers, too, and 
     # certainly won't hurt anything.
     if ($displayedJumpMarker) {
-        $result .= "
-<script>
+        $result .= &Apache::lonhtmlcommon::scripttag("
 if (location.href.indexOf('#curloc')==-1) {
     setTimeout(\"location += '#curloc';\", 0)
 }
-</script>";
+");
     }
 
     $result.=&Apache::loncommon::end_data_table();
@@ -1854,9 +1803,9 @@ sub add_linkitem {
 
 sub show_linkitems_toolbar {
     my ($linkitems,$condition)=@_;
-    my @linkorder = ("launchnav","closenav","firsthomework",
-		     "everything","uncompleted","changefolder","clearbubbles");
-    my $result .='<td align="left">'."\n".
+    my @linkorder = ('firsthomework','everything','uncompleted',
+                     'changefolder','clearbubbles');
+    my $result .='<td align="left">'."\n". 
                  '<span class="LC_nobreak">'."\n".
                  '<ul id="LC_toolbar">';
     foreach my $link (@linkorder) {
@@ -2354,7 +2303,7 @@ resource object.
 Based on the symb of the resource, get a resource object for that
 resource. This is one of the proper ways to get a resource object.
 
-=item * B<getMapByMapPc>(map_pc):
+=item * B<getByMapPc>(map_pc):
 
 Based on the map_pc of the resource, get a resource object for
 the given map. This is one of the proper ways to get a resource object.
@@ -2624,7 +2573,7 @@ in the filter function.
 Retrieves version infomation for a url. Returns the version (a number, or 
 the string "mostrecent") for resources which have version information in  
 the big hash.
-    
+
 =cut
 
 
@@ -3890,6 +3839,12 @@ resource of the map.
 
 Returns a string with the type of the map in it.
 
+=item *B<map_hierarchy>:
+
+Returns a string with a comma-separated ordered list of map_pc IDs
+for the hierarchy of maps containing a map, with the top level
+map first, then descending to deeper levels, with the enclosing map last.
+
 =back
 
 =cut
@@ -3920,6 +3875,11 @@ sub map_type {
     my $pc = $self->map_pc();
     return $self->navHash("map_type_$pc", 0);
 }
+sub map_hierarchy {
+    my $self = shift;
+    my $pc = $self->map_pc();
+    return $self->navHash("map_hierarchy_$pc", 0);
+}
 
 #####
 # Property queries