--- loncom/interface/londocs.pm	2004/04/26 16:56:26	1.121
+++ loncom/interface/londocs.pm	2004/05/06 20:34:06	1.125
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.121 2004/04/26 16:56:26 www Exp $
+# $Id: londocs.pm,v 1.125 2004/05/06 20:34:06 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -301,31 +301,70 @@ sub editor {
 
 # ---------------- if they are for this folder and user allowed to make changes
 	if (($allowed) && ($ENV{'form.folder'} eq $folder)) {
-# set parameters
+# 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,'randompick',$ENV{'form.randpick_'.$idx},'int_pos');
+		    &Apache::lonratedt::storeparameter($idx,'parameter_randompick',$ENV{'form.randpick_'.$idx},'int_pos');
 		} else {
-		    &Apache::lonratedt::delparameter($idx,'randompick');
+		    &Apache::lonratedt::delparameter($idx,'parameter_randompick');
 		}
 		if ($ENV{'form.hidprs_'.$idx}) {
-		    &Apache::lonratedt::storeparameter($idx,'hiddenresource','yes','string_yesno');
+		    &Apache::lonratedt::storeparameter($idx,'parameter_hiddenresource','yes','string_yesno');
 		} else {
-		    &Apache::lonratedt::delparameter($idx,'hiddenresource');
+		    &Apache::lonratedt::delparameter($idx,'parameter_hiddenresource');
 		}
 		if ($ENV{'form.encprs_'.$idx}) {
-		    &Apache::lonratedt::storeparameter($idx,'encrypturl','yes','string_yesno');
+		    &Apache::lonratedt::storeparameter($idx,'parameter_encrypturl','yes','string_yesno');
 		} else {
-		    &Apache::lonratedt::delparameter($idx,'encrypturl');
+		    &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+)/)) {
@@ -463,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;
@@ -479,6 +519,21 @@ sub entryline {
 	# $htmlfoldername=&HTML::Entities::encode($ENV{'form.foldername'},'<>&"');
     }
     if ($allowed) {
+	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',
@@ -487,7 +542,7 @@ sub entryline {
 	$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="$index" />
+<input type="hidden" name="setparms" value="$orderidx" />
 <td><table border='0' cellspacing='2' cellpadding='0'>
 <tr><td bgcolor="#DDDDDD">
 <a href='/adm/coursedocs?cmd=up_$index&folderpath=$folderpath'>
@@ -495,7 +550,9 @@ sub entryline {
 <tr><td bgcolor="#DDDDDD">
 <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">
+</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("$folderpath","$index","$renametitle");'>
@@ -538,8 +595,8 @@ END
 	$folderpath.=$folderarg.'&'.$foldername;
 	$url.='folderpath='.&Apache::lonnet::escape($folderpath);
 	$parameterset=&mt('Randomly Pick: ').
-	    '<input type="text" size="4" name="randpick_'.$index.'" value="'.
-	    &Apache::lonratedt::getparameter($index,'randompick').'" />';
+	    '<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>'.
@@ -549,11 +606,15 @@ END
  			      '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_$index" /> $lt{'hd'}</td>
+<input type="checkbox" name="hidprs_$orderidx" $hidtext/> $lt{'hd'}</td>
 <td bgcolor="#BBBBFF"><font size='-2'>
-<input type="checkbox" name="encprs_$index" /> $lt{'ec'}</td>
+<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'}" />