--- loncom/interface/londocs.pm	2004/04/07 22:32:18	1.116
+++ 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.116 2004/04/07 22:32:18 albertel Exp $
+# $Id: londocs.pm,v 1.119 2004/04/24 23:03:49 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -273,7 +273,9 @@ sub breadcrumbs {
 	    &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>'
+		       });
 		       
 						 
     }
@@ -446,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');
@@ -483,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/)) {
@@ -500,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;
 }
 
@@ -874,7 +885,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="'.
@@ -1124,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" />
@@ -1132,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">
@@ -1148,14 +1170,13 @@ 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>');
        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'));
        }
@@ -1163,7 +1184,7 @@ ENDCOURSEVERIFY
        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);
@@ -1298,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>
@@ -1313,9 +1334,13 @@ ENDFORM
 # '<h2>'.&mt('Supplemental Course Documents').
 #  ($allowed?' '.$help{'Supplemental'}:'').'</h2>');
        my $folder=$ENV{'form.folder'};
-       unless ($folder=~/supplemental/) {
+       unless ($folder=~/^supplemental/) {
 	   $folder='supplemental';
-	   $ENV{'form.folderpath'}='supplemental&'.&Apache::lonnet::escape(&mt('Supplemental Course Documents'));;
+       }
+       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) {