--- loncom/interface/lonnavmaps.pm	2010/02/28 22:36:38	1.444
+++ loncom/interface/lonnavmaps.pm	2010/03/16 19:55:49	1.445
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.444 2010/02/28 22:36:38 raeburn Exp $
+# $Id: lonnavmaps.pm,v 1.445 2010/03/16 19:55:49 droeschl 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">';
@@ -1494,22 +1453,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.=&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'};