--- loncom/interface/lonhtmlcommon.pm	2004/01/27 16:35:37	1.42
+++ loncom/interface/lonhtmlcommon.pm	2004/02/03 21:31:52	1.44
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common html routines
 #
-# $Id: lonhtmlcommon.pm,v 1.42 2004/01/27 16:35:37 www Exp $
+# $Id: lonhtmlcommon.pm,v 1.44 2004/02/03 21:31:52 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -827,7 +827,9 @@ Returns: none
 sub Create_PrgWin {
     my ($r, $title, $heading, $number_to_do)=@_;
     $r->print('<script>'.
-    "popwin=open(\'\',\'popwin\',\'width=400,height=100\');".
+    "var popwin;
+     function openpopwin () {
+     popwin=open(\'\',\'popwin\',\'width=400,height=100\');".
     "popwin.document.writeln(\'<html><head><title>$title</title></head>".
 	      "<body bgcolor=\"#88DDFF\">".
               "<h4>$heading</h4>".
@@ -835,8 +837,8 @@ sub Create_PrgWin {
               '<input type="text" size="55" name="remaining" value="'.
 	      &mt('Starting').'"></form>'.
               "</body></html>\');".
-    "popwin.document.close();".
-    "</script>");
+    "popwin.document.close();}".
+    "\nwindow.setTimeout(openpopwin,0)</script>");
 
     my %prog_state;
     $prog_state{'done'}=0;
@@ -924,13 +926,14 @@ sub crumbs {
     my ($uri,$target,$prefix,$form)=@_;
     my $output='<br /><tt><b><font size="+2">'.$prefix.'/';
     if ($ENV{'user.adv'}) {
-	my $path=$prefix;
+	my $path=$prefix.'/';
 	foreach (split('/',$uri)) {
 	    unless ($_) { next; }
-	    $path.='/'.$_;
+	    $path.=$_;
+	    unless ($path eq $uri) { $path.='/'; }
 	    my $linkpath=$path;
 	    if ($form) {
-		$linkpath="javascript:$form.action='$path/';$form.submit();";
+		$linkpath="javascript:$form.action='$path';$form.submit();";
 	    }
 	    $output.='<a href="'.$linkpath.'"'.($target?' target="'.$target.'"':'').'>'.$_.'</a>/';
 	}
