--- loncom/interface/londocs.pm	2004/04/07 21:40:21	1.115
+++ loncom/interface/londocs.pm	2004/04/08 21:10:25	1.117
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.115 2004/04/07 21:40:21 albertel Exp $
+# $Id: londocs.pm,v 1.117 2004/04/08 21:10:25 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -261,45 +261,25 @@ sub group_import {
 sub breadcrumbs {
     my ($where)=@_;
     &Apache::lonhtmlcommon::clear_breadcrumbs();
-    if ($where =~ /^default/) {
-	&Apache::lonhtmlcommon::add_breadcrumb({'href'=>'/adm/coursedocs',
-				    'title'=>'Main Course Documents',
-				    'text' =>'Main Course Documents'});
-    } elsif ($where =~ /^supplemental/) {
-	&Apache::lonhtmlcommon::add_breadcrumb({'href'=>'/adm/coursedocs',
-				    'title'=>'Supplemental Course Documents',
-				    'text' =>'Supplemental Course Documents'});
-
-    } else {
-	&Apache::lonhtmlcommon::add_breadcrumb({'href'=>'/adm/coursedocs',
-						'title'=>$where,
-						'text' =>$where});
-    }
-    if ($ENV{'form.foldername'}) {
-	my @folders;
-	if (defined($ENV{'form.folders'})) {
-	    @folders=@{$ENV{'form.folders'}};
-	}
-	@folders=(@folders,$ENV{'form.folder'},
-		  &Apache::lonnet::escape($ENV{'form.foldername'}));
-
-	my $folderpath;
-	while (@folders) {
-	    my $folder=shift(@folders);
-	    my $foldername=shift(@folders);
-	    if ($folderpath) {$folderpath.='&';}
-	    $folderpath.=$folder.'&'.$foldername;
-	    my $url='/adm/coursedocs?folderpath='.
-		&Apache::lonnet::escape($folderpath);
+    my (@folders)=split('&',$ENV{'form.folderpath'});
+    my $folderpath;
+    while (@folders) {
+	my $folder=shift(@folders);
+	my $foldername=shift(@folders);
+	if ($folderpath) {$folderpath.='&';}
+	$folderpath.=$folder.'&'.$foldername;
+	my $url='/adm/coursedocs?folderpath='.
+	    &Apache::lonnet::escape($folderpath);
 	    &Apache::lonhtmlcommon::add_breadcrumb(
 		      {'href'=>$url,
 		       'title'=>&Apache::lonnet::unescape($foldername),
-		       'text'=>&Apache::lonnet::unescape($foldername)});
+		       'text'=>'<font size="+1">'.
+			   &Apache::lonnet::unescape($foldername).'</font>'
+		       });
 		       
 						 
-	}
     }
-    return &Apache::lonhtmlcommon::breadcrumbs();
+    return &Apache::lonhtmlcommon::breadcrumbs(undef,undef,undef,undef,undef,0);
 }
 
 sub editor {
@@ -896,7 +876,9 @@ sub changewarning {
     $r->print(
 '<script>function reinit(tf) { tf.submit();'.$postexec.' }</script>'. 
 '<form method="post" action="/adm/roles" target="loncapaclient">'.
-'<input type="hidden" name="orgurl" value="/adm/coursedocs" /><input type="hidden" name="selectrole" value="1" /><h3><font color="red">'.
+'<input type="hidden" name="orgurl" value="/adm/coursedocs?folderpath='.
+&Apache::lonnet::escape($ENV{'form.folderpath'}).
+'" /><input type="hidden" name="selectrole" value="1" /><h3><font color="red">'.
 &mt('Changes will become active for your current session after').
 ' <input type="hidden" name="'.
 $ENV{'request.role'}.'" value="1" /><input type="button" value="'.
@@ -954,8 +936,7 @@ sub handler {
 	my (@folderpath)=split('&',$ENV{'form.folderpath'});
 	$ENV{'form.foldername'}=&Apache::lonnet::unescape(pop(@folderpath));
 	$ENV{'form.folder'}=pop(@folderpath);
-	$ENV{'form.folders'}=\@folderpath;
-    }
+    } 
     if ($r->uri=~/^\/adm\/coursedocs\/showdoc\/(.*)$/) {
        $showdoc=$1;
     }
@@ -1171,20 +1152,21 @@ ENDCOURSEVERIFY
 		     &mt('Editing the Table of Contents for your Course')));
     }
 # --------------------------------------------------------- Standard documents
-    #my $htmlfoldername=&HTML::Entities::encode($ENV{'form.foldername'},'<>&"');
     $r->print('<table border=2 cellspacing=4 cellpadding=4>');
     if (($standard) && ($allowed) && (!$forcesupplement)) {
-       $r->print('<tr><td bgcolor="#BBBBBB"><h2>'.&mt('Main Course Documents').
-  ($allowed?' '.$help{'Main_Course_Documents'}:'').'</h2>');
+	$r->print('<tr><td bgcolor="#BBBBBB">');
+#  '<h2>'.&mt('Main Course Documents').
+#  ($allowed?' '.$help{'Main_Course_Documents'}:'').'</h2>');
        my $folder=$ENV{'form.folder'};
-       if ($folder eq '') {
+       if ($folder eq '' || $folder eq 'supplemental') {
            $folder='default';
+	   $ENV{'form.folderpath'}='default&'.&Apache::lonnet::escape(&mt('Main Course Documents'));
        }
        my $postexec='';
        if ($folder eq 'default') {
 	   $r->print('<script>this.window.name="loncapaclient";</script>');
        } else {
-           $postexec='self.close();';
+           #$postexec='self.close();';
        }
        $hadchanges=0;
        &editor($r,$coursenum,$coursedom,$folder,$allowed);
@@ -1330,11 +1312,18 @@ ENDFORM
     }
 # ----------------------------------------------------- Supplemental documents
     if (!$forcestandard) {
-       $r->print(
-  '<tr><td bgcolor="#BBBBBB"><h2>'.&mt('Supplemental Course Documents').
-  ($allowed?' '.$help{'Supplemental'}:'').'</h2>');
+       $r->print('<tr><td bgcolor="#BBBBBB">');
+# '<h2>'.&mt('Supplemental Course Documents').
+#  ($allowed?' '.$help{'Supplemental'}:'').'</h2>');
        my $folder=$ENV{'form.folder'};
-       unless ($folder=~/supplemental/) { $folder='supplemental'; }
+       unless ($folder=~/^supplemental/) {
+	   $folder='supplemental';
+       }
+       if ($folder =~ /^supplemental$/ &&
+	   $ENV{'form.folderpath'} =~ /^default\&/) {
+	   $ENV{'form.folderpath'}='supplemental&'.
+	       &Apache::lonnet::escape(&mt('Supplemental Course Documents'));
+       }
        &editor($r,$coursenum,$coursedom,$folder,$allowed);
        if ($allowed) {
        my $folderseq=