--- loncom/interface/lonhelper.pm	2003/12/08 19:19:19	1.62
+++ loncom/interface/lonhelper.pm	2004/03/24 22:22:04	1.66
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # .helper XML handler to implement the LON-CAPA helper
 #
-# $Id: lonhelper.pm,v 1.62 2003/12/08 19:19:19 matthew Exp $
+# $Id: lonhelper.pm,v 1.66 2004/03/24 22:22:04 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -230,7 +230,7 @@ my $paramHash;
 # In the debugger, this means that breakpoints are ignored until you step into
 # a function and get out of what must be a "faked up scope" in the Apache->
 # mod_perl connection. In this code, it was manifesting itself in the existence
-# of two seperate file-scoped $helper variables, one set to the value of the
+# of two separate file-scoped $helper variables, one set to the value of the
 # helper in the helper constructor, and one referenced by the handler on the
 # "$helper->process()" line. Using the debugger, one could actually
 # see the two different $helper variables, as hashes at completely
@@ -1777,6 +1777,7 @@ sub start_resource {
     $paramHash->{'suppressEmptySequences'} = $token->[2]{'suppressEmptySequences'};
     $paramHash->{'toponly'} = $token->[2]{'toponly'};
     $paramHash->{'addstatus'} = $token->[2]{'addstatus'};
+    $paramHash->{'closeallpages'} = $token->[2]{'closeallpages'};
     return '';
 }
 
@@ -1962,6 +1963,7 @@ BUTTONS
                                        'showParts' => 0,
                                        'filterFunc' => $filterFunc,
                                        'resource_no_folder_link' => 1,
+				       'closeAllPages' => $self->{'closeallpages'},
                                        'suppressEmptySequences' => $self->{'suppressEmptySequences'},
                                        'iterator_map' => $mapUrl }
                                        );
@@ -2999,6 +3001,11 @@ sub render {
 
     if ($self->{'restartCourse'}) {
 	my $targetURL = '/adm/menu';
+	if ($ENV{'course.'.$ENV{'request.course.id'}.'.url'}=~/^uploaded/) {
+	    $targetURL = '/adm/coursedocs';
+	} else {
+	    $targetURL = '/adm/navmaps';
+	}
 	if ($ENV{'course.'.$ENV{'request.course.id'}.'.clonedfrom'}) {
 	    $targetURL = '/adm/parmset?overview=1';
 	}
@@ -3011,7 +3018,7 @@ sub render {
             "<input type='hidden' name='selectrole' value='1' />\n" .
             "<input type='hidden' name='" . $ENV{'request.role'} . 
             "' value='1' />\n<input type='submit' value='" .
-	    &mt('Finish Course Initialization') . " />\n" .
+	    &mt('Finish Course Initialization') . "' />\n" .
             "</form></center>";
     }