--- loncom/interface/londocs.pm	2004/09/18 17:04:03	1.145
+++ loncom/interface/londocs.pm	2004/12/10 19:21:21	1.150
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.145 2004/09/18 17:04:03 albertel Exp $
+# $Id: londocs.pm,v 1.150 2004/12/10 19:21:21 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -989,15 +989,17 @@ sub editor {
 # ---------------------------------------------------------------- End commands
 # ---------------------------------------------------------------- Print screen
         my $idx=0;
+	my $shown=0;
         $r->print('<table>');
         foreach (@Apache::lonratedt::order) {
            my ($name,$url)=split(/\:/,$Apache::lonratedt::resources[$_]);
            unless ($name) {  $name=(split(/\//,$url))[-1]; }
-           unless ($name) { next; }
+           unless ($name) { $idx++; next; }
            $r->print(&entryline($idx,$name,$url,$folder,$allowed,$_,$coursenum));
            $idx++;
+	   $shown++;
         }
-	unless ($idx) {
+	unless ($shown) {
 	    $r->print('<tr><td>'.&mt('Currently no documents.').'</td></tr>');
 	}
         $r->print('</table>');
@@ -1161,9 +1163,12 @@ END
 	if ($folderpath) { $folderpath.='&' };
 	$folderpath.=$folderarg.'&'.$foldername;
 	$url.='folderpath='.&Apache::lonnet::escape($folderpath);
-	$parameterset=&mt('Randomly Pick: ').
+	$parameterset='<label>'.&mt('Randomly Pick: ').
 	    '<input type="text" size="4" name="randpick_'.$orderidx.'" value="'.
-	    (&Apache::lonratedt::getparameter($orderidx,'parameter_randompick'))[0].'" />';
+	    (&Apache::lonratedt::getparameter($orderidx,
+                                              'parameter_randompick'))[0].
+                                              '" />'.'</label>';
+       
     }
     if ($ispage) {
         my $pagename=&Apache::lonnet::escape($pagetitle);
@@ -1187,9 +1192,9 @@ END
 	    ((&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>-->
+<nobr><label><input type="checkbox" name="hidprs_$orderidx" $hidtext/> $lt{'hd'}</label></nobr></td>
+<td bgcolor="#BBBBFF"><font size='-2'>
+<nobr><label><input type="checkbox" name="encprs_$orderidx" $enctext/> $lt{'ec'}</label></nobr></td>
 <td bgcolor="#BBBBFF"><font size="-2">$parameterset</font></td>
 <td bgcolor="#BBBBFF"><font size='-2'>
 <input type="submit" value="$lt{'sp'}" />
@@ -1205,24 +1210,33 @@ ENDPARMS
 sub tiehash {
     my ($mode)=@_;
     $hashtied=0;
+    &Apache::lonnet::logthis(" tiehash1 -- $hashtied ");
     if ($ENV{'request.course.fn'}) {
+	&Apache::lonnet::logthis(" tiehash2 -- $hashtied ");
 	if ($mode eq 'write') {
+	    &Apache::lonnet::logthis(" tiehash3 -- $hashtied ");
 	    if (tie(%hash,'GDBM_File',$ENV{'request.course.fn'}.".db",
 		    &GDBM_WRCREAT(),0640)) {
                 $hashtied=2;
+		&Apache::lonnet::logthis(" tiehash4 -- $hashtied ");
 	    }
 	} else {
+	    &Apache::lonnet::logthis(" tiehash5 -- $hashtied ");
 	    if (tie(%hash,'GDBM_File',$ENV{'request.course.fn'}.".db",
 		    &GDBM_READER(),0640)) {
                 $hashtied=1;
+		&Apache::lonnet::logthis(" tiehash6 -- $hashtied ");
 	    }
 	}
     }    
+    &Apache::lonnet::logthis(" tiehash7 -- $hashtied ");
 }
 
 sub untiehash {
+    &Apache::lonnet::logthis(" untiehash1 -- $hashtied ");
     if ($hashtied) { untie %hash; }
     $hashtied=0;
+    &Apache::lonnet::logthis(" untiehash2 -- $hashtied ");
 }
 
 # --------------------------------------------------------------- check on this
@@ -1578,14 +1592,21 @@ ENDHEADERS
 
 sub mark_hash_old {
     my $retie_hash=0;
+    &Apache::lonnet::logthis(" markold1 -- $hashtied $retie_hash ");
     if ($hashtied) {
 	$retie_hash=1;
+	&Apache::lonnet::logthis(" markold2 -- $hashtied $retie_hash ");
 	&untiehash();
+	&Apache::lonnet::logthis(" markold3 -- $hashtied $retie_hash ");
     }
     &tiehash('write');
+    &Apache::lonnet::logthis(" markold4 -- $hashtied $retie_hash ");
     $hash{'old'}=1;
+    &Apache::lonnet::logthis(" markold5 -- $hashtied $retie_hash ");    
     &untiehash();
+    &Apache::lonnet::logthis(" markold6 -- $hashtied $retie_hash ");
     if ($retie_hash) { &tiehash(); }
+    &Apache::lonnet::logthis(" markold7 -- $hashtied $retie_hash ");
 }
 
 sub is_hash_old {
@@ -1602,11 +1623,17 @@ sub is_hash_old {
 sub changewarning {
     my ($r,$postexec)=@_;
     if (!&is_hash_old()) { return; }
+    my $pathvar='folderpath';
+    my $path=&Apache::lonnet::escape($ENV{'form.folderpath'});
+    if (defined($ENV{'form.pagepath'})) {
+	$pathvar='pagepath';
+	$path=&Apache::lonnet::escape($ENV{'form.pagepath'});
+    }
     $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?folderpath='.
-&Apache::lonnet::escape($ENV{'form.folderpath'}).
+'<input type="hidden" name="orgurl" value="/adm/coursedocs?'.
+$pathvar.'='.$path.
 '" /><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="'.