--- loncom/interface/londocs.pm	2004/04/07 20:36:54	1.114
+++ loncom/interface/londocs.pm	2004/05/11 06:12:45	1.126
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.114 2004/04/07 20:36:54 albertel Exp $
+# $Id: londocs.pm,v 1.126 2004/05/11 06:12:45 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 {
@@ -318,15 +298,80 @@ sub editor {
 	   $r->print('<p><font color="red">'.$errtext.'</font></p>');
     } else {
 # ------------------------------------------------------------ Process commands
+
 # ---------------- if they are for this folder and user allowed to make changes
 	if (($allowed) && ($ENV{'form.folder'} eq $folder)) {
+# set parameters and change order
+	    if (defined($ENV{'form.setparms'})) {
+		my $idx=$ENV{'form.setparms'};
+# set parameters
+		if ($ENV{'form.randpick_'.$idx}) {
+		    &Apache::lonratedt::storeparameter($idx,'parameter_randompick',$ENV{'form.randpick_'.$idx},'int_pos');
+		} else {
+		    &Apache::lonratedt::delparameter($idx,'parameter_randompick');
+		}
+		if ($ENV{'form.hidprs_'.$idx}) {
+		    &Apache::lonratedt::storeparameter($idx,'parameter_hiddenresource','yes','string_yesno');
+		} else {
+		    &Apache::lonratedt::delparameter($idx,'parameter_hiddenresource');
+		}
+		if ($ENV{'form.encprs_'.$idx}) {
+		    &Apache::lonratedt::storeparameter($idx,'parameter_encrypturl','yes','string_yesno');
+		} else {
+		    &Apache::lonratedt::delparameter($idx,'parameter_encrypturl');
+		}
+
+		if ($ENV{'form.newpos'}) {
+# change order
+
+		    my $newpos=$ENV{'form.newpos'}-1;
+		    my $currentpos=$ENV{'form.currentpos'}-1;
+		    my $i;
+		    my @neworder=();
+		    if ($newpos>$currentpos) {
+# moving stuff up
+			for ($i=0;$i<$currentpos;$i++) {
+			    $neworder[$i]=$Apache::lonratedt::order[$i];
+			}
+			for ($i=$currentpos;$i<$newpos;$i++) {
+			    $neworder[$i]=$Apache::lonratedt::order[$i+1];
+			}
+                        $neworder[$newpos]=$Apache::lonratedt::order[$currentpos];
+			for ($i=$newpos+1;$i<=$#Apache::lonratedt::order;$i++) {
+			    $neworder[$i]=$Apache::lonratedt::order[$i];
+			}
+		    } else {
+# moving stuff down
+			for ($i=0;$i<$newpos;$i++) {
+			    $neworder[$i]=$Apache::lonratedt::order[$i];
+			}
+			$neworder[$newpos]=$Apache::lonratedt::order[$currentpos];
+			for ($i=$newpos+1;$i<$currentpos+1;$i++) {
+			    $neworder[$i]=$Apache::lonratedt::order[$i-1];
+			}
+			for ($i=$currentpos+1;$i<=$#Apache::lonratedt::order;$i++) {
+			    $neworder[$i]=$Apache::lonratedt::order[$i];
+			}
+		    }
+		    @Apache::lonratedt::order=@neworder;
+		}
+# store the changed version
+
+		($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.sequence');
+		if ($fatal) {
+		    $r->print('<p><font color="red">'.$errtext.'</font></p>');
+		    return;
+		}
+		
+	    }
+
 # upload a file, if present
            if (($ENV{'form.uploaddoc.filename'}) &&
                ($ENV{'form.cmd'}=~/^upload_(\w+)/)) {
 	    if ( ($folder=~/^$1/) || ($1 eq 'default') ) {
 # this is for a course, not a user, so set coursedoc flag
 # probably the only place in the system where this should be "1"
-	      my $url=&Apache::lonnet::userfileupload('uploaddoc',1);
+	      my $url=&Apache::lonnet::userfileupload('uploaddoc',1,'docs');
               my $ext='false';
               if ($url=~/^http\:\/\//) { $ext='true'; }
               $url=~s/\:/\&colon;/g;
@@ -457,6 +502,7 @@ sub entryline {
      &Apache::lonnet::unescape($title)),'"<>&\'');
     my $renametitle=$title;
     my $foldertitle=$title;
+    my $orderidx=$Apache::lonratedt::order[$index];
     if ($title=~ /^(\d+)___&amp;&amp;&amp;___(\w+)___&amp;&amp;&amp;___(\w+)___&amp;&amp;&amp;___(.*)$/	) { 
 	$foldertitle=&Apache::lontexconvert::msgtexconverted($4);
 	$renametitle=$4;
@@ -467,29 +513,49 @@ sub entryline {
     $renametitle=~s/\&quot\;/\\\"/g;
     my $line='<tr>';
 # Edit commands
+    my $folderpath;
+    if ($ENV{'form.folderpath'}) {
+	$folderpath=&Apache::lonnet::escape($ENV{'form.folderpath'});
+	# $htmlfoldername=&HTML::Entities::encode($ENV{'form.foldername'},'<>&"');
+    }
     if ($allowed) {
-	my %lt=('up' => 'Move Up',
+	my $incindex=$index+1;
+	my $selectbox='';
+	if ($folder!~/^supplemental/) {
+	    $selectbox=
+		'<input type="hidden" name="currentpos" value="'.$incindex.'" />'.
+		'<select name="newpos" onChange="this.form.submit()">';
+	    for (my $i=1;$i<=$#Apache::lonratedt::order+1;$i++) {
+		if ($i==$incindex) {
+		    $selectbox.='<option value="" selected="1">('.$i.')</option>';
+		} else {
+		    $selectbox.='<option value="'.$i.'">'.$i.'</option>';
+		}
+	    }
+	    $selectbox.='</select>';
+	}
+	my %lt=&Apache::lonlocal::texthash(
+                'up' => 'Move Up',
 		'dw' => 'Move Down',
 		'rm' => 'Remove',
 		'rn' => 'Rename');
-	my ($foldername,$htmlfoldername);
-	if ($ENV{'form.foldername'}) {
-	    $foldername='&foldername='.
-		&Apache::lonnet::escape($ENV{'form.foldername'});
-	    $htmlfoldername=&HTML::Entities::encode($ENV{'form.foldername'},'<>&"');
-	}
 	$line.=(<<END);
+<form name="entry_$index" action="/adm/coursedocs" method="post">
+<input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" />
+<input type="hidden" name="setparms" value="$orderidx" />
 <td><table border='0' cellspacing='2' cellpadding='0'>
 <tr><td bgcolor="#DDDDDD">
-<a href='/adm/coursedocs?folder=$folder&cmd=up_$index$foldername'>
+<a href='/adm/coursedocs?cmd=up_$index&folderpath=$folderpath'>
 <img src="${iconpath}move_up.gif" alt='$lt{'up'}' border='0' /></a></td></tr>
 <tr><td bgcolor="#DDDDDD">
-<a href='/adm/coursedocs?folder=$folder&cmd=down_$index$foldername'>
+<a href='/adm/coursedocs?cmd=down_$index&folderpath=$folderpath'>
 <img src="${iconpath}move_down.gif" alt='$lt{'dw'}' border='0' /></a></td></tr>
-</table></td><td bgcolor="#DDDDDD">
-<a href='javascript:removeres("$folder","$index","$renametitle","$htmlfoldername");'>
+</table></td>
+<td>$selectbox
+</td><td bgcolor="#DDDDDD">
+<a href='javascript:removeres("$folderpath","$index","$renametitle");'>
 <font size="-2" color="#990000">$lt{'rm'}</font></a>
-<a href='javascript:changename("$folder","$index","$renametitle","$htmlfoldername");'>
+<a href='javascript:changename("$folderpath","$index","$renametitle");'>
 <font size="-2" color="#009900">$lt{'rn'}</font></a></td>
 END
     }
@@ -506,9 +572,7 @@ END
           $url='/adm/coursedocs?';
 	  $folderarg=$1;
           $isfolder=1;
-       } else {
-	  $url=&Apache::lonnet::tokenwrapper($url);
-       } 
+       }
     }
     $url=~s/^http\&colon\;\/\//\/adm\/wrapper\/ext\//;
     if ((!$isfolder) && ($residx) && ($folder!~/supplemental/)) {
@@ -523,16 +587,41 @@ END
 	$url=&Apache::lonnet::clutter($url);
 	$url.=(($url=~/\?/)?'&':'?').'symb='.&Apache::lonnet::escape($symb);
     }
+    my $parameterset='&nbsp;';
     if ($isfolder) {
 	my $foldername=&Apache::lonnet::escape($foldertitle);
 	my $folderpath=$ENV{'form.folderpath'};
 	if ($folderpath) { $folderpath.='&' };
 	$folderpath.=$folderarg.'&'.$foldername;
 	$url.='folderpath='.&Apache::lonnet::escape($folderpath);
+	$parameterset=&mt('Randomly Pick: ').
+	    '<input type="text" size="4" name="randpick_'.$orderidx.'" value="'.
+	    (&Apache::lonratedt::getparameter($orderidx,'parameter_randompick'))[0].'" />';
     }
     $line.='<td bgcolor="#FFFFBB"><a href="'.$url.'"><img src="'.$icon.
 	'" border="0"></a></td>'.
-        "<td bgcolor='#FFFFBB'><a href='$url'>$title</a></td></tr>";
+        "<td bgcolor='#FFFFBB'><a href='$url'>$title</a></td>";
+    if (($allowed) && ($folder!~/^supplemental/)) {
+ 	my %lt=&Apache::lonlocal::texthash(
+ 			      'hd' => 'Hidden',
+ 			      'ec' => 'URL hidden',
+ 			      'sp' => 'Store Parameters');
+	my $enctext=
+	    ((&Apache::lonratedt::getparameter($orderidx,'parameter_encrypturl'))[0]=~/^yes$/i?' checked="1"':'');
+	my $hidtext=
+	    ((&Apache::lonratedt::getparameter($orderidx,'parameter_hiddenresource'))[0]=~/^yes$/i?' checked="1"':'');
+	$line.=(<<ENDPARMS);
+<td bgcolor="#BBBBFF"><font size='-2'>
+<input type="checkbox" name="hidprs_$orderidx" $hidtext/> $lt{'hd'}</td>
+<td bgcolor="#BBBBFF"><font size='-2'>
+<input type="checkbox" name="encprs_$orderidx" $enctext/> $lt{'ec'}</td>
+<td bgcolor="#BBBBFF"><font size="-2">$parameterset</font></td>
+<td bgcolor="#BBBBFF"><font size='-2'>
+<input type="submit" value="$lt{'sp'}" />
+</font></td>
+ENDPARMS
+    }
+    $line.="</form></tr>";
     return $line;
 }
 
@@ -696,7 +785,6 @@ sub checkversions {
 	foreach (keys %ENV) {
 	    if ($_=~/^form\.set_version_(.+)$/) {
 		my $src=$1;
-		&Apache::lonnet::logthis('Found: '.$1.' '.$ENV{$_});
 		if (($ENV{$_}) && ($ENV{$_} ne $setversions{$src})) {
 		    $newsetversions{$src}=$ENV{$_};
 		}
@@ -898,7 +986,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="'.
@@ -956,8 +1046,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;
     }
@@ -1088,25 +1177,24 @@ function finishpick() {
     '";this.document.forms.'+form+'.submit();');
 }
 
-function changename(folder,index,oldtitle,foldername) {
+function changename(folderpath,index,oldtitle) {
     var title=prompt('New Title',oldtitle);
     if (title) {
 	this.document.forms.renameform.title.value=title;
 	this.document.forms.renameform.cmd.value='rename_'+index;
-	this.document.forms.renameform.folder.value=folder;
-	this.document.forms.renameform.foldername.value=foldername;
+	this.document.forms.renameform.folderpath.value=folderpath;
         this.document.forms.renameform.submit();
     }
 }
 
-function removeres(folder,index,oldtitle,foldername) {
+function removeres(folderpath,index,oldtitle) {
     if (confirm('Remove "'+oldtitle+'"?')) {
 	this.document.forms.renameform.cmd.value='del_'+index;
-	this.document.forms.renameform.folder.value=folder;
-	this.document.forms.renameform.foldername.value=foldername;
+	this.document.forms.renameform.folderpath.value=folderpath;
         this.document.forms.renameform.submit();
     }
 }
+
 </script>
 
 ENDNEWSCRIPT
@@ -1151,17 +1239,24 @@ ENDNEWSCRIPT
 					 'vc' => 'Verify Content',
 					 'cv' => 'Check/Set Resource Versions',
 					  );
+
+       my $folderpath=$ENV{'form.folderpath'};
+       if (!$folderpath) {
+	   if ($ENV{'form.folder'} eq '' ||
+	       $ENV{'form.folder'} eq 'supplemental') {
+	       $folderpath='default&'.
+		   &Apache::lonnet::escape(&mt('Main Course Documents'));
+	   }
+       }
        $r->print(<<ENDCOURSEVERIFY);
 <form name="renameform" method="post" action="/adm/coursedocs">
 <input type="hidden" name="title" />
 <input type="hidden" name="cmd" />
-<input type="hidden" name="folder" />
-<input type="hidden" name="foldername" />
+<input type="hidden" name="folderpath" />
 </form>
 <form name="simpleedit" method="post" action="/adm/coursedocs">
 <input type=hidden name="importdetail" value="">
-<input type="hidden" name="folder" />
-<input type="hidden" name="foldername" value="$ENV{'form.foldername'}">
+<input type="hidden" name="folderpath" value="$folderpath" />
 </form>
 <form action="/adm/coursedocs" method="post" name="courseverify">
 <table bgcolor="#AAAAAA" width="100%" cellspacing="4" cellpadding="4">
@@ -1177,20 +1272,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);
@@ -1212,8 +1308,7 @@ $lt{'file'}:<br />
 <br />
 $lt{'title'}:<br />
 <input type="text" size="50" name="comment">
-<input type="hidden" name="folder" value="$folder">
-<input type="hidden" name="foldername" value="$htmlfoldername">
+<input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" />
 <input type="hidden" name="cmd" value="upload_default">
 <input type="submit" value="$lt{'upld'}">
 <nobr>
@@ -1223,13 +1318,10 @@ $lt{'title'}:<br />
 </td>
 <td bgcolor="#DDDDDD">
 <form action="/adm/coursedocs" method="post" name="simpleeditdefault">
-<input type="hidden" name="folder" value="$folder">
-<input type="hidden" name="foldername" value="$htmlfoldername">
-<input type=button onClick=
-"javascript:document.forms.simpleedit.folder.value='$folder';groupsearch()" value="$lt{'srch'}">
+<input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" />
+<input type=button onClick="javascript:groupsearch()" value="$lt{'srch'}">
 <nobr>
-<input type=button onClick=
-"javascript:document.forms.simpleedit.folder.value='$folder';groupimport();" value="$lt{'impo'}">
+<input type=button onClick="javascript:groupimport();" value="$lt{'impo'}">
 $help{'Importing_LON-CAPA_Resource'}
 </nobr>
 <p>
@@ -1243,8 +1335,7 @@ $help{'Load_Map'}</nobr>
 </form>
 </td><td bgcolor="#DDDDDD">
 <form action="/adm/coursedocs" method="post" name="newfolder">
-<input type="hidden" name="folder" value="$folder">
-<input type="hidden" name="foldername" value="$htmlfoldername">
+<input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" />
 <input type=hidden name="importdetail" value="">
 <nobr>
 <input name="newfolder" type="button"
@@ -1253,8 +1344,7 @@ value="$lt{'newf'}" />$help{'Adding_Fold
 </nobr>
 </form>
 <form action="/adm/coursedocs" method="post" name="newext">
-<input type="hidden" name="folder" value="$folder">
-<input type="hidden" name="foldername" value="$htmlfoldername">
+<input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" />
 <input type=hidden name="importdetail" value="">
 <nobr>
 <input name="newext" type="button" onClick="javascript:makenewext('newext');"
@@ -1262,8 +1352,7 @@ value="$lt{'extr'}" /> $help{'Adding_Ext
 </nobr>
 </form>
 <form action="/adm/coursedocs" method="post" name="newsyl">
-<input type="hidden" name="folder" value="$folder">
-<input type="hidden" name="foldername" value="$htmlfoldername">
+<input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" />
 <input type=hidden name="importdetail" 
 value="Syllabus=/public/$coursedom/$coursenum/syllabus">
 <nobr>
@@ -1272,8 +1361,7 @@ value="Syllabus=/public/$coursedom/$cour
 </nobr>
 </form>
 <form action="/adm/coursedocs" method="post" name="newnav">
-<input type="hidden" name="folder" value="$folder">
-<input type="hidden" name="foldername" value="$htmlfoldername">
+<input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" />
 <input type=hidden name="importdetail" 
 value="Navigate Content=/adm/navmaps">
 <nobr>
@@ -1282,8 +1370,7 @@ $help{'Navigate_Content'}
 </nobr>
 </form>
 <form action="/adm/coursedocs" method="post" name="newsmppg">
-<input type="hidden" name="folder" value="$folder">
-<input type="hidden" name="foldername" value="$htmlfoldername">
+<input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" />
 <input type=hidden name="importdetail" value="">
 <nobr>
 <input name="newsmppg" type="button" value="$lt{'sipa'}"
@@ -1291,8 +1378,7 @@ onClick="javascript:makesmppage();" /> $
 </nobr>
 </form>
 <form action="/adm/coursedocs" method="post" name="newsmpproblem">
-<input type="hidden" name="folder" value="$folder">
-<input type="hidden" name="foldername" value="$htmlfoldername">
+<input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" />
 <input type=hidden name="importdetail" value="">
 <nobr>
 <input name="newsmpproblem" type="button" value="$lt{'sipr'}"
@@ -1300,8 +1386,7 @@ onClick="javascript:makesmpproblem();" /
 </nobr>
 </form>
 <form action="/adm/coursedocs" method="post" name="newexamupload">
-<input type="hidden" name="folder" value="$folder">
-<input type="hidden" name="foldername" value="$htmlfoldername">
+<input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" />
 <input type=hidden name="importdetail" value="">
 <nobr>
 <input name="newexamupload" type="button" value="$lt{'scuf'}"
@@ -1310,8 +1395,7 @@ $help{'Score_Upload_Form'}
 </nobr>
 </form>
 <form action="/adm/coursedocs" method="post" name="newbul">
-<input type="hidden" name="folder" value="$folder">
-<input type="hidden" name="foldername" value="$htmlfoldername">
+<input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" />
 <input type=hidden name="importdetail" value="">
 <nobr>
 <input name="newbulletin" type="button" value="$lt{'bull'}"
@@ -1320,8 +1404,7 @@ $help{'Bulletin Board'}
 </nobr>
 </form>
 <form action="/adm/coursedocs" method="post" name="newaboutme">
-<input type="hidden" name="folder" value="$folder">
-<input type="hidden" name="foldername" value="$htmlfoldername">
+<input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" />
 <input type=hidden name="importdetail" 
 value="$plainname=/adm/$udom/$uname/aboutme">
 <nobr>
@@ -1330,8 +1413,7 @@ $help{'My Personal Info'}
 </nobr>
 </form>
 <form action="/adm/coursedocs" method="post" name="newaboutsomeone">
-<input type="hidden" name="folder" value="$folder">
-<input type="hidden" name="foldername" value="$htmlfoldername">
+<input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" />
 <input type=hidden name="importdetail" value="">
 <nobr>
 <input name="newaboutsomeone" type="button" value="$lt{'abou'}" 
@@ -1350,11 +1432,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=
@@ -1372,8 +1461,8 @@ ENDFORM
 <br />$lt{'comment'}:<br />
 <textarea cols=50 rows=4 name='comment'>
 </textarea>
-<input type="hidden" name="folder" value="$folder">
-<input type="hidden" name="foldername" value="$htmlfoldername">
+<br />
+<input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" />
 <input type="hidden" name="cmd" value="upload_supplemental">
 <nobr>
 <input type="submit" value="$lt{'upld'}">
@@ -1383,8 +1472,7 @@ ENDFORM
 </td>
 <td bgcolor="#DDDDDD">
 <form action="/adm/coursedocs" method="post" name="supnewfolder">
-<input type="hidden" name="folder" value="$folder">
-<input type="hidden" name="foldername" value="$htmlfoldername">
+<input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" />
 <input type=hidden name="importdetail" value="">
 <nobr>
 <input name="newfolder" type="button"
@@ -1393,8 +1481,7 @@ value="$lt{'newf'}" /> $help{'Adding_Fol
 </nobr>
 </form>
 <form action="/adm/coursedocs" method="post" name="supnewext">
-<input type="hidden" name="folder" value="$folder">
-<input type="hidden" name="foldername" value="$htmlfoldername">
+<input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" />
 <input type=hidden name="importdetail" value="">
 <nobr>
 <input name="newext" type="button" 
@@ -1403,8 +1490,7 @@ value="$lt{'extr'}" /> $help{'Adding_Ext
 </nobr>
 </form>
 <form action="/adm/coursedocs" method="post" name="supnewsyl">
-<input type="hidden" name="folder" value="$folder">
-<input type="hidden" name="foldername" value="$htmlfoldername">
+<input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" />
 <input type=hidden name="importdetail" 
 value="Syllabus=/public/$coursedom/$coursenum/syllabus">
 <nobr>
@@ -1413,8 +1499,7 @@ $help{'Syllabus'}
 </nobr>
 </form>
 <form action="/adm/coursedocs" method="post" name="subnewaboutme">
-<input type="hidden" name="folder" value="$folder">
-<input type="hidden" name="foldername" value="$htmlfoldername">
+<input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" />
 <input type=hidden name="importdetail" 
 value="$plainname=/adm/$udom/$uname/aboutme">
 <nobr>