--- loncom/interface/lonnavmaps.pm	2005/06/28 21:41:43	1.332
+++ loncom/interface/lonnavmaps.pm	2005/09/23 22:18:26	1.339
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.332 2005/06/28 21:41:43 albertel Exp $
+# $Id: lonnavmaps.pm,v 1.339 2005/09/23 22:18:26 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -90,14 +90,20 @@ my %colormap =
 my $hurryUpColor = "#FF0000";
 
 sub launch_win {
-    my ($mode,$script,$toplinkitems)=@_;
+    my ($mode,$script,$toplinkitems,$firsttime)=@_;
     my $result;
     if ($script ne 'no') {
 	$result.='<script type="text/javascript">';
     }
-    $result.='function launch_navmapwin() {
+    if ($firsttime) {
+	$result.='function launch_navmapwin() {
+                 newWindow=open(\'/adm/navmaps?launchExternalRoles\',\'loncapanav\',\'width=400,height=600,scrollbars=1\');
+               }';
+    } else {
+	$result.='function launch_navmapwin() {
                  newWindow=open(\'/adm/navmaps?launchExternal\',\'loncapanav\',\'width=400,height=600,scrollbars=1\');
                }';
+    }
     if ($mode eq 'now') {
 	$result.="\nlaunch_navmapwin();\n";
     }
@@ -205,9 +211,23 @@ MENU
 ENDSUBM
         return;
     }
-    if ($ENV{QUERY_STRING} eq 'launchExternal') {
+    if ($ENV{QUERY_STRING} =~ /^launchExternal/) {
 	&Apache::lonnet::put('environment',{'remotenavmap' => 'on'});
 	&Apache::lonnet::appenv('environment.remotenavmap' => 'on');
+ 	my $menu=&Apache::lonmenu::reopenmenu();
+	my $navstatus=&Apache::lonmenu::get_nav_status();
+	if ($menu) {
+	    $r->print(<<MENU);
+             <script type="text/javascript">
+             swmenu=$menu
+             swmenu.clearTimeout(swmenu.menucltim);
+	     $navstatus
+             </script>
+MENU
+        }
+   }
+    if ($ENV{QUERY_STRING} eq 'turningOffExternal') {
+	$env{'environment.remotenavmap'}='off';
     }
 
     # Create the nav map
@@ -290,7 +310,7 @@ ENDSUBM
 
     if ($ENV{QUERY_STRING} eq 'launchExternal') {
 	$r->print('
-          <form name="returnwin" action="/adm/flip?postdata=return%3a" 
+          <form name="returnwin" action="/adm/flip?postdata=navlaunch%3a" 
                 method="post" target="loncapaclient">
           </form>');
 	$r->print('
@@ -660,7 +680,7 @@ sub timeToHumanString {
             my $timeStr = strftime("%A, %b %e at %I:%M %P", localtime($time));
             $timeStr =~ s/12:00 am/00:00/;
             $timeStr =~ s/12:00 pm/noon/;
-            return ($inPast ? "last " : "next ") .
+            return ($inPast ? "last " : "this ") .
                 $timeStr;
         }
         
@@ -1164,7 +1184,11 @@ sub render_communication_status {
     my $discussionHTML = ""; my $feedbackHTML = ""; my $errorHTML = "";
 
     my $link = $params->{"resourceLink"};
-    my $linkopen = "<a href='$link'>";
+    my $target;
+    if ($env{'environment.remotenavmap'} eq 'on') {
+	$target=' target="loncapaclient" ';
+    }
+    my $linkopen = "<a $target href='$link'>";
     my $linkclose = "</a>";
     my $location=&Apache::loncommon::lonhttpdurl("/adm/lonMisc");
     if ($resource->hasDiscussion()) {
@@ -1177,7 +1201,7 @@ sub render_communication_status {
         my $feedback = $resource->getFeedback();
         foreach (split(/\,/, $feedback)) {
             if ($_) {
-                $feedbackHTML .= '&nbsp;<a href="/adm/email?display='
+                $feedbackHTML .= '&nbsp;<a '.$target.' href="/adm/email?display='
                     . &Apache::lonnet::escape($_) . '">'
                     . '<img src="'.$location.'/feedback.gif" '
                     . 'border="0" /></a>';
@@ -1192,7 +1216,7 @@ sub render_communication_status {
             last if ($errorcount>=10); # Only output 10 bombs maximum
             if ($_) {
                 $errorcount++;
-                $errorHTML .= '&nbsp;<a href="/adm/email?display='
+                $errorHTML .= '&nbsp;<a '.$target.' href="/adm/email?display='
                     . &Apache::lonnet::escape($_) . '">'
                     . '<img src="'.$location.'/bomb.gif" '
                     . 'border="0" /></a>';
@@ -1214,7 +1238,11 @@ sub render_quick_status {
         $params->{'multipart'} && $part eq "0";
 
     my $link = $params->{"resourceLink"};
-    my $linkopen = "<a href='$link'>";
+    my $target;
+    if ($env{'environment.remotenavmap'} eq 'on') {
+	$target=' target="loncapaclient" ';
+    }
+    my $linkopen = "<a $target href='$link'>";
     my $linkclose = "</a>";
 
     if ($resource->is_problem() &&
@@ -1373,7 +1401,6 @@ sub render {
         # no columns, no nav maps.
         return '';
     }
-    my $mustCloseNavMap = 0;
     my $navmap;
     if (defined($args->{'navmap'})) {
         $navmap = $args->{'navmap'};
@@ -1422,7 +1449,6 @@ sub render {
         # Step 1: Check to see if we have a navmap
         if (!defined($navmap)) {
             $navmap = Apache::lonnavmaps::navmap->new();
-            $mustCloseNavMap = 1;
         }
 
         # Step two: Locate what kind of here marker is necessary
@@ -1487,7 +1513,6 @@ sub render {
         # Step 1: Check to see if we have a navmap
         if (!defined($navmap)) {
             $navmap = Apache::lonnavmaps::navmap->new();
-            $mustCloseNavMap = 1;
         }
 
         # See if we're being passed a specific map
@@ -3611,7 +3636,7 @@ sub is_page {
 sub is_problem {
     my $self=shift;
     my $src = $self->src();
-    return ($src =~ /\.(problem|exam|quiz|assess|survey|form|library)$/)
+    return ($src =~ /\.(problem|exam|quiz|assess|survey|form|library|task)$/)
 }
 sub contains_problem {
     my $self=shift;
@@ -3827,6 +3852,10 @@ sub duedate {
     }
     return $self->parmval("duedate", $part);
 }
+sub handgrade {
+    (my $self, my $part) = @_;
+    return $self->parmval("handgrade", $part);
+}
 sub maxtries {
     (my $self, my $part) = @_;
     return $self->parmval("maxtries", $part);
@@ -4111,7 +4140,7 @@ sub extractParts {
 		return;
 	    }
 	    foreach (split(/\,/,$metadata)) {
-		if ($_ =~ /^part_(.*)$/) {
+		if ($_ =~ /^(?:part|Task)_(.*)$/) {
 		    my $part = $1;
 		    # This floods the logs if it blows up
 		    if (defined($parts{$part})) {