--- loncom/interface/londocs.pm	2004/05/06 18:28:16	1.124
+++ loncom/interface/londocs.pm	2004/06/15 15:50:03	1.130
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.124 2004/05/06 18:28:16 www Exp $
+# $Id: londocs.pm,v 1.130 2004/06/15 15:50:03 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -121,7 +121,8 @@ sub dumpbutton {
     if ($home) {
 	return '</td><td bgcolor="#DDDDCC">'.
 	    '<input type="submit" name="dumpcourse" value="'.
-	    &mt('Dump Course DOCS to Construction Space').'" />';
+	    &mt('Dump Course DOCS to Construction Space').'" />'.
+	    &Apache::loncommon::help_open_topic('Docs_Dump_Course_Docs');
     } else {
 	return'</td><td bgcolor="#DDDDCC">'.
      &mt('Dump Course DOCS to Construction Space: available on other servers');
@@ -326,7 +327,34 @@ sub editor {
 
 		    my $newpos=$ENV{'form.newpos'}-1;
 		    my $currentpos=$ENV{'form.currentpos'}-1;
-		    $r->print('Sorting '.$idx.': '.$currentpos.' -> '.$newpos);
+		    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
 
@@ -344,7 +372,7 @@ sub editor {
 	    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;
@@ -372,6 +400,10 @@ sub editor {
 	    if ($ENV{'form.cmd'}) {
                 my ($cmd,$idx)=split(/\_/,$ENV{'form.cmd'});
                 if ($cmd eq 'del') {
+		    my (undef,$url)=split(':',$Apache::lonratedt::resources[$Apache::lonratedt::order[$idx]]);
+		    if ($url=~m|/+uploaded/\Q$coursedom\E/\Q$coursenum\E/|) {
+			&Apache::lonnet::removeuploadedurl($url);
+		    }
 		    for (my $i=$idx;$i<$#Apache::lonratedt::order;$i++) {
                         $Apache::lonratedt::order[$i]=
                           $Apache::lonratedt::order[$i+1];
@@ -558,6 +590,17 @@ END
 	   &Apache::lonnet::declutter($url));
 	(undef,undef,$url)=&Apache::lonnet::decode_symb($symb);
 	$url=&Apache::lonnet::clutter($url);
+	if ($url=~/^\/*uploaded\//) {
+	    $url=~/\.(\w+)$/;
+	    my $embstyle=&Apache::loncommon::fileembstyle($1);
+	    if (($embstyle eq 'img') || ($embstyle eq 'emb')) {
+		$url='/adm/wrapper'.$url;
+	    } elsif ($embstyle eq 'ssi') {
+		#do nothing with these
+	    } elsif ($url!~/\.(sequence|page)$/) {
+		$url='/adm/coursedocs/showdoc'.$url;
+	    }
+	}
 	$url.=(($url=~/\?/)?'&':'?').'symb='.&Apache::lonnet::escape($symb);
     }
     my $parameterset='&nbsp;';
@@ -981,7 +1024,8 @@ sub handler {
            'Adding_External_Resource','Navigate_Content',
            'Adding_Folders','Docs_Overview', 'Load_Map',
            'Supplemental', 'Score_Upload_Form',
-           'Importing_LON-CAPA_Resource','Uploading_From_Harddrive') {
+           'Importing_LON-CAPA_Resource','Uploading_From_Harddrive',
+	   'Check_Resource_Versions','Verify_Content') {
       $help{$_}=&Apache::loncommon::help_open_topic('Docs_'.$_);
   }
     # Composite help files
@@ -1021,7 +1065,7 @@ sub handler {
 	$ENV{'form.folder'}=pop(@folderpath);
     } 
     if ($r->uri=~/^\/adm\/coursedocs\/showdoc\/(.*)$/) {
-       $showdoc=$1;
+       $showdoc='/'.$1;
     }
     unless ($showdoc) { # got called from remote
        $forcestandard=($ENV{'form.folder'}=~/^default_/);
@@ -1234,9 +1278,9 @@ ENDNEWSCRIPT
 <form action="/adm/coursedocs" method="post" name="courseverify">
 <table bgcolor="#AAAAAA" width="100%" cellspacing="4" cellpadding="4">
 <tr><td bgcolor="#DDDDCC">
-<input type="submit" name="verify" value="$lt{'vc'}" />
+<input type="submit" name="verify" value="$lt{'vc'}" />$help{'Verify_Content'}
 </td><td bgcolor="#DDDDCC">
-<input type="submit" name="versions" value="$lt{'cv'}" />
+    <input type="submit" name="versions" value="$lt{'cv'}" />$help{'Check_Resource_Versions'}
 $dumpbut
 </td></tr></table>
 </form>
@@ -1283,8 +1327,8 @@ $lt{'title'}:<br />
 <input type="text" size="50" name="comment">
 <input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" />
 <input type="hidden" name="cmd" value="upload_default">
-<input type="submit" value="$lt{'upld'}">
 <nobr>
+<input type="submit" value="$lt{'upld'}">
  $help{'Uploading_From_Harddrive'}
 </nobr>
 </form>