--- loncom/interface/londocs.pm	2004/04/08 21:10:25	1.117
+++ loncom/interface/londocs.pm	2004/04/24 23:03:49	1.119
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.117 2004/04/08 21:10:25 albertel Exp $
+# $Id: londocs.pm,v 1.119 2004/04/24 23:03:49 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -448,7 +448,8 @@ sub entryline {
     my $line='<tr>';
 # Edit commands
     if ($allowed) {
-	my %lt=('up' => 'Move Up',
+	my %lt=&Apache::lonlocal::texthash(
+                'up' => 'Move Up',
 		'dw' => 'Move Down',
 		'rm' => 'Remove',
 		'rn' => 'Rename');
@@ -485,9 +486,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/)) {
@@ -502,16 +501,26 @@ END
 	$url=&Apache::lonnet::clutter($url);
 	$url.=(($url=~/\?/)?'&':'?').'symb='.&Apache::lonnet::escape($symb);
     }
+    my $parameterset='';
     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='';
     }
     $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) {
+	my %lt=&Apache::lonlocal::texthash(
+			      'hd' => 'Hidden',
+			      'ec' => 'URL hidden',
+			      'rp' => 'Randomly Pick Number of Resources',
+			      'sp' => 'Store Parameters');
+    }
+    $line.="</tr>";
     return $line;
 }
 
@@ -1128,6 +1137,15 @@ 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" />
@@ -1136,7 +1154,7 @@ ENDNEWSCRIPT
 </form>
 <form name="simpleedit" method="post" action="/adm/coursedocs">
 <input type=hidden name="importdetail" value="">
-<input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" />
+<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">
@@ -1301,7 +1319,7 @@ onClick="javascript:makeabout();" />
 </nobr>
 </form>
 <form action="/adm/imsimportdocs" method="post" name="ims">
-<input type="hidden" name="folder" value="$ENV{'form.folder'}" />
+<input type="hidden" name="folder" value="$folder" />
 <input name="imsimport" type="button" value="$lt{'imsf'}" onClick="javascript:makeims();" />
 </nobr>
 </form>