--- loncom/interface/lonhelper.pm	2003/10/09 19:07:33	1.59
+++ 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.59 2003/10/09 19:07:33 bowersj2 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 }
                                        );
@@ -2177,7 +2179,7 @@ BUTTONS
     $result .= "<tr><td></td><td align='center'><b>$name</b></td>".
         "<td align='center'><b>" . &mt('Section') . "</b></td>" . 
 	"<td align='center'><b>Status</b></td>" . 
-	"<td align='center'><b>" . &mt("Role") . "</b></td></tr>";
+	"<td align='center'><b>" . &mt("Role") . "</b></td></tr>" .
 	"<td align='center'><b>Username:Domain</b></td></tr>";
 
     my $checked = 0;
@@ -2905,7 +2907,7 @@ the old values taking effect.
 no strict;
 @ISA = ("Apache::lonhelper::element");
 use strict;
-
+use Apache::lonlocal;
 BEGIN {
     &Apache::lonhelper::register('Apache::lonhelper::final',
                                  ('final', 'exitpage'));
@@ -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>";
     }
 
@@ -3114,7 +3121,7 @@ sub render {
     }
 
     my $result = "<form name='helpform' method='get' action='/adm/parmset#$affectedResourceId&$parm_name&$level'>\n";
-    $result .= '<p>Confirm that this information is correct, then click &quot;Finish Wizard&quot; to complete setting the parameter.<ul>';
+    $result .= '<p>Confirm that this information is correct, then click &quot;Finish Helper&quot; to complete setting the parameter.<ul>';
     
     # Print the type of manipulation:
     $result .= '<li>Setting the <b>' . $dateTypeHash{$vars->{ACTION_TYPE}} . '</b>';