--- loncom/interface/londocs.pm	2003/09/15 15:24:18	1.78
+++ loncom/interface/londocs.pm	2005/11/04 21:36:56	1.209
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.78 2003/09/15 15:24:18 www Exp $
+# $Id: londocs.pm,v 1.209 2005/11/04 21:36:56 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -30,14 +30,18 @@ package Apache::londocs;
 
 use strict;
 use Apache::Constants qw(:common :http);
+use Apache::imsexport;
 use Apache::lonnet;
 use Apache::loncommon;
 use Apache::lonratedt;
 use Apache::lonratsrv;
 use Apache::lonxml;
 use Apache::loncreatecourse;
+use Apache::lonnavmaps;
 use HTML::Entities;
 use GDBM_File;
+use Apache::lonlocal;
+use Cwd;
 
 my $iconpath;
 
@@ -67,10 +71,13 @@ sub mapread {
 
 sub storemap {
     my ($coursenum,$coursedom,$map)=@_;
-    $hadchanges=1;
-    return
+    my ($outtext,$errtext)=
       &Apache::lonratedt::storemap('/uploaded/'.$coursedom.'/'.$coursenum.'/'.
                                 $map,1);
+    if ($errtext) { return ($errtext,2); }
+    
+    $hadchanges=1;
+    return ($errtext,0);
 }
 
 # ----------------------------------------- Return hash with valid author names
@@ -79,27 +86,29 @@ sub authorhosts {
     my %outhash=();
     my $home=0;
     my $other=0;
-    foreach (keys %ENV) {
+    foreach (keys %env) {
 	if ($_=~/^user\.role\.(au|ca)\.(.+)$/) {
 	    my $role=$1;
 	    my $realm=$2;
-	    my ($start,$end)=split(/\./,$ENV{$_});
+	    my ($start,$end)=split(/\./,$env{$_});
 	    if (($start) && ($start>time)) { next; }
 	    if (($end) && (time>$end)) { next; }
 	    my $ca; my $cd;
 	    if ($1 eq 'au') {
-		$ca=$ENV{'user.name'};
-		$cd=$ENV{'user.domain'};
+		$ca=$env{'user.name'};
+		$cd=$env{'user.domain'};
 	    } else {
 		($cd,$ca)=($realm=~/^\/(\w+)\/(\w+)$/);
 	    }
-	    if (&Apache::lonnet::homeserver($ca,$cd) eq 
-		$Apache::lonnet::perlvar{'lonHostID'}) {
+	    my $allowed=0;
+	    my $myhome=&Apache::lonnet::homeserver($ca,$cd);
+	    my @ids=&Apache::lonnet::current_machine_ids();
+	    foreach my $id (@ids) { if ($id eq $myhome) { $allowed=1; } }
+	    if ($allowed) {
 		$home++;
 		$outhash{'home_'.$ca.'@'.$cd}=1;
 	    } else {
-		$outhash{'otherhome_'.$ca.'@'.$cd}=
-		    &Apache::lonnet::homeserver($ca,$cd);
+		$outhash{'otherhome_'.$ca.'@'.$cd}=$myhome;
 		$other++;
 	    }
 	}
@@ -114,35 +123,89 @@ sub dumpbutton {
     my $output='</td><td bgcolor="#DDDDCC">';
     if ($home) {
 	return '</td><td bgcolor="#DDDDCC">'.
-	    '<input type="submit" name="dumpcourse" value="Dump Course DOCS to Construction Space" />';
+	    '<input type="submit" name="dumpcourse" value="'.
+	    &mt('Dump Course DOCS to Construction Space').'" />'.
+	    &Apache::loncommon::help_open_topic('Docs_Dump_Course_Docs');
     } else {
 	return'</td><td bgcolor="#DDDDCC">'.
-      'Dump Course DOCS to Construction Space: available on other servers';
+     &mt('Dump Course DOCS to Construction Space: available on other servers');
     }
 }
 
+sub clean {
+    my ($title)=@_;
+    $title=~s/[^\w\/\!\$\%\^\*\-\_\=\+\;\:\,\\\|\`\~]+/\_/gs;
+    return $title;	
+}
 # -------------------------------------------------------- Actually dump course
 
 sub dumpcourse {
     my $r=shift;
-    $r->print('<html><head><title>Dump DOCS</title></head>'.
+    my $html=&Apache::lonxml::xmlbegin();
+    $r->print($html.'<head><title>Dump DOCS</title></head>'.
         &Apache::loncommon::bodytag('Dump Course DOCS to Construction Space').
 	      '<form name="dumpdoc" method="post">');
     my ($home,$other,%outhash)=&authorhosts();
     unless ($home) { return ''; }
-    my $origcrsid=$ENV{'request.course.id'};
+    my $origcrsid=$env{'request.course.id'};
     my %origcrsdata=&Apache::lonnet::coursedescription($origcrsid);
-    if (($ENV{'form.authorspace'}) && ($ENV{'form.authorfolder'}=~/\w/)) {
+    if (($env{'form.authorspace'}) && ($env{'form.authorfolder'}=~/\w/)) {
 # Do the dumping
-	unless ($outhash{'home_'.$ENV{'form.authorspace'}}) { return ''; }
-	my ($ca,$cd)=split(/\@/,$ENV{'form.authorspace'});
-	my $title=$ENV{'form.authorfolder'};
-
+	unless ($outhash{'home_'.$env{'form.authorspace'}}) { return ''; }
+	my ($ca,$cd)=split(/\@/,$env{'form.authorspace'});
+	$r->print('<h3>'.&mt('Copying Files').'</h3>');
+	my $title=$env{'form.authorfolder'};
+	$title=&clean($title);
+	my %replacehash=();
+	foreach (keys %env) {
+	    if ($_=~/^form\.namefor\_(.+)/) {
+		$replacehash{$1}=$env{$_};
+	    }
+	}
+	my $crs='/uploaded/'.$env{'request.course.id'}.'/';
+	$crs=~s/\_/\//g;
+	foreach (keys %replacehash) {
+	    my $newfilename=$title.'/'.$replacehash{$_};
+	    $newfilename=~s/\.(\w+)$//;
+	    my $ext=$1;
+	    $newfilename=&clean($newfilename);
+	    $newfilename.='.'.$ext;
+	    my @dirs=split(/\//,$newfilename);
+	    my $path='/home/'.$ca.'/public_html';
+	    my $makepath=$path;
+	    my $fail=0;
+	    for (my $i=0;$i<$#dirs;$i++) {
+		$makepath.='/'.$dirs[$i];
+		unless (-e $makepath) { 
+		    unless(mkdir($makepath,0777)) { $fail=1; } 
+		}
+	    }
+	    $r->print('<br /><tt>'.$_.'</tt> => <tt>'.$newfilename.'</tt>: ');
+	    if (my $fh=Apache::File->new('>'.$path.'/'.$newfilename)) {
+		if ($_=~/\.(sequence|page|html|htm|xml|xhtml)$/) {
+		    print $fh &Apache::loncreatecourse::rewritefile(
+         &Apache::loncreatecourse::readfile($env{'request.course.id'},$_),
+				     (%replacehash,$crs => '')
+								    );
+		} else {
+		    print $fh
+         &Apache::loncreatecourse::readfile($env{'request.course.id'},$_);
+		       }
+		$fh->close();
+	    } else {
+		$fail=1;
+	    }
+	    if ($fail) {
+		$r->print('<font color="red">fail</font>');
+	    } else {
+		$r->print('<font color="green">ok</font>');
+	    }
+	}
     } else {
 # Input form
 	unless ($home==1) {
 	    $r->print(
-		      '<h3>Select the Construction Space</h3><select name="authorspace">');
+		      '<h3>'.&mt('Select the Construction Space').'</h3><select name="authorspace">');
 	}
 	foreach (sort keys %outhash) {
 	    if ($_=~/^home_(.+)$/) {
@@ -150,7 +213,8 @@ sub dumpcourse {
 		    $r->print(
 		  '<input type="hidden" name="authorspace" value="'.$1.'" />');
 		} else {
-		    $r->print('<option value="'.$1.'">'.$_.'</option>');
+		    $r->print('<option value="'.$1.'">'.$1.' - '.
+			      &Apache::loncommon::plainname(split(/\@/,$1)).'</option>');
 		}
 	    }
 	}
@@ -159,31 +223,679 @@ sub dumpcourse {
 	}
 	my $title=$origcrsdata{'description'};
 	$title=~s/\s+/\_/gs;
-	$title=~s/\W//gs;
-	$r->print('<h3>Folder in Construction Space</h3><input type="text" size="50" name="authorfolder" value="'.$title.'" /><br />');
+	$title=&clean($title);
+	$r->print('<h3>'.&mt('Folder in Construction Space').'</h3><input type="text" size="50" name="authorfolder" value="'.$title.'" /><br />');
 	&tiehash();
-	$r->print('<h3>Filenames in Construction Space</h3><table border="2"><tr><th>Internal Filename</th><th>Title</th><th>Save as ...</th></tr>');
+	$r->print('<h3>'.&mt('Filenames in Construction Space').'</h3><table border="2"><tr><th>'.&mt('Internal Filename').'</th><th>'.&mt('Title').'</th><th>'.&mt('Save as ...').'</th></tr>');
 	foreach (&Apache::loncreatecourse::crsdirlist($origcrsid,'userfiles')) {
 	    $r->print('<tr><td>'.$_.'</td>');
 	    my ($ext)=($_=~/\.(\w+)$/);
 	    my $title=$hash{'title_'.$hash{
 		'ids_/uploaded/'.$origcrsdata{'domain'}.'/'.$origcrsdata{'num'}.'/'.$_}};
+	    $title=~s/&colon;/:/g;
 	    $r->print('<td>'.($title?$title:'&nbsp;').'</td>');
 	    unless ($title) {
 		$title=$_;
 	    }
 	    $title=~s/\.(\w+)$//;
-	    $title=~s/\W+/\_/gs;
+	    $title=&clean($title);
 	    $title.='.'.$ext;
-	    $r->print("\n<td><input type='text' size='60' name='".$_."' value='".$title."' /></td></tr>\n");
+	    $r->print("\n<td><input type='text' size='60' name='namefor_".$_."' value='".$title."' /></td></tr>\n");
 	}
 	$r->print("</table>\n");
 	&untiehash();
 	$r->print(
-  '<p><input type="submit" name="dumpcourse" value="Dump Course DOCS" /></p></form>');
+  '<p><input type="submit" name="dumpcourse" value="'.&mt('Dump Course DOCS').'" /></p></form>');
     }
 }
 
+# ------------------------------------------------------ Generate "export" button
+
+sub exportbutton {
+    return '</td><td bgcolor="#DDDDCC">'.
+            '<input type="submit" name="exportcourse" value="'.
+            &mt('Export Course to IMS').'" />'.
+    &Apache::loncommon::help_open_topic('Docs_Export_Course_Docs');
+}
+
+sub exportcourse {
+    my $r=shift;
+    my %discussiontime = &Apache::lonnet::dump('discussiontimes',
+                                               $env{'course.'.$env{'request.course.id'}.'.domain'}, $env{'course.'.$env{'request.course.id'}.'.num'});
+    my $numdisc = keys %discussiontime;
+    my $navmap = Apache::lonnavmaps::navmap->new();
+    my $it=$navmap->getIterator(undef,undef,undef,1,undef,undef);
+    my $curRes;
+    my $outcome;
+
+    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
+                                            ['finishexport']);
+    if ($env{'form.finishexport'}) {
+        &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
+                                            ['archive','discussion']);
+
+        my @exportitems = &Apache::loncommon::get_env_multiple('form.archive');
+        my @discussions = &Apache::loncommon::get_env_multiple('form.discussion');
+        if (@exportitems == 0 && @discussions == 0) {
+            $outcome = '<br />As you did not select any content items or discussions for export, an IMS package has not been created.  Please <a href="javascript:history.go(-1)">go back</a> to select either content items or discussions for export';
+        } else {
+            my $now = time;
+            my %symbs;
+            my $manifestok = 0;
+            my $imsresources;
+            my $tempexport;
+            my $copyresult;
+            my $ims_manifest = &create_ims_store($now,\$manifestok,\$outcome,\$tempexport);
+            if ($manifestok) {
+                &build_package($now,$navmap,\@exportitems,\@discussions,\$outcome,$tempexport,\$copyresult,$ims_manifest);
+                close($ims_manifest);
+
+#Create zip file in prtspool
+                my $imszipfile = '/prtspool/'.
+                $env{'user.name'}.'_'.$env{'user.domain'}.'_'.
+                   time.'_'.rand(1000000000).'.zip';
+                my $cwd = &Cwd::getcwd();
+                my $imszip = '/home/httpd/'.$imszipfile;
+                chdir $tempexport;
+                open(OUTPUT, "zip -r $imszip *  2> /dev/null |");
+                close(OUTPUT);
+                chdir $cwd;
+                $outcome .= 'Download the zip file from <a href="'.$imszipfile.'">IMS course archive</a><br />';
+                if ($copyresult) {
+                    $outcome .= 'The following errors occurred during export - '.$copyresult;
+                }
+            } else {
+                $outcome = '<br />Unfortunately you will not be able to retrieve an IMS archive of this posts at this time, because there was a problem creating a manifest file.<br />';
+            }
+        }
+	my $html=&Apache::lonxml::xmlbegin();
+        $r->print($html.'<head><title>Export Course</title></head>'.
+            &Apache::loncommon::bodytag('Export course to IMS content package'));
+        $r->print($outcome);
+        $r->print('</body></html>');
+    } else {
+        my $display;
+        $display = '<form name="exportdoc" method="post">'."\n";
+        $display .= 'Choose which items you wish to export from your course.<br /><br />';
+        $display .= '<table border="0" cellspacing="0" cellpadding="3">'.
+                    '<tr><td><fieldset><legend>&nbsp;<b>Content items</b></legend>'.
+                    '<input type="button" value="check all" '.
+                    'onclick="javascript:checkAll(document.exportdoc.archive)" />'.
+                    '&nbsp;&nbsp;<input type="button" value="uncheck all"'.
+                    ' onclick="javascript:uncheckAll(document.exportdoc.archive)" /></fieldset></td>'.
+                    '<td>&nbsp;</td><td>&nbsp;</td>'.
+                    '<td align="right"><fieldset><legend>&nbsp;<b>Discussion posts'.
+                    '</b></legend><input type="button" value="check all"'.
+                    ' onclick="javascript:checkAll(document.exportdoc.discussion)" />'.
+                    '&nbsp;&nbsp;<input type="button" value="uncheck all"'.
+                    ' onclick="javascript:uncheckAll(document.exportdoc.discussion)" /></fieldset></td>'.
+                    '</tr></table>';
+        my $curRes;
+        my $depth = 0;
+        my $count = 0;
+        my $boards = 0;
+        my $startcount = 5;
+        my %parent = ();
+        my %children = ();
+        my $lastcontainer = $startcount;
+        my @bgcolors = ('#F6F6F6','#FFFFFF');
+        $display .= '<table cellspacing="0"><tr>'.
+            '<td><b>Export content item?<br /></b></td><td>&nbsp;</td><td align="right">'."\n";
+        if ($numdisc > 0) {
+            $display.='<b>Export&nbsp;discussion posts?</b>'."\n";
+        }
+        $display.='&nbsp;</td></tr>';
+        while ($curRes = $it->next()) {
+            if (ref($curRes)) {
+                $count ++;
+            }
+            if ($curRes == $it->BEGIN_MAP()) {
+                $depth++;
+                $parent{$depth} = $lastcontainer;
+            }
+            if ($curRes == $it->END_MAP()) {
+                $depth--;
+                $lastcontainer = $parent{$depth};
+            }
+            if (ref($curRes)) {
+                my $symb = $curRes->symb();
+                my $ressymb = $symb;
+                if ($ressymb =~ m|adm/(\w+)/(\w+)/(\d+)/bulletinboard$|) {
+                    unless ($ressymb =~ m|adm/wrapper/adm|) {
+                        $ressymb = 'bulletin___'.$3.'___adm/wrapper/adm/'.$1.'/'.$2.'/'.$3.'/bulletinboard';
+                    }
+                }
+                my $color = $count%2;
+                $display .='<tr bgcolor='.$bgcolors[$color].'><td>'."\n".
+                    '<input type="checkbox" name="archive" value="'.$count.'" ';
+                if (($curRes->is_sequence()) || ($curRes->is_page())) {
+                    my $checkitem = $count + $boards + $startcount;
+                    $display .= 'onClick="javascript:propagateCheck('."'$checkitem'".')"';
+                }
+                $display .= ' />'."\n";
+                for (my $i=0; $i<$depth; $i++) {
+                    $display .= '<img src="/adm/lonIcons/whitespace1.gif" width="25" height="1" alt="" border="0" /><img src="/adm/lonIcons/whitespace1.gif" width="25" height="1" alt="" border="0" />'."\n";
+                }
+                if ($curRes->is_sequence()) {
+                    $display .= '<img src="/adm/lonIcons/navmap.folder.open.gif">&nbsp;'."\n";
+                    $lastcontainer = $count + $startcount + $boards;
+                } elsif ($curRes->is_page()) {
+                    $display .= '<img src="/adm/lonIcons/navmap.page.open.gif">&nbsp;'."\n";
+                    $lastcontainer = $count + $startcount + $boards;
+                }
+                my $currelem = $count+$boards+$startcount;
+                $children{$parent{$depth}} .= $currelem.':';
+                $display .= '&nbsp;'.$curRes->title().'</td>';
+                if ($discussiontime{$ressymb} > 0) {
+                    $boards ++;
+                    $currelem = $count+$boards+$startcount;
+                    $display .= '<td>&nbsp;</td><td align="right"><input type="checkbox" name="discussion" value="'.$count.'" />&nbsp;</td>'."\n";
+                } else {
+                    $display .= '<td colspan="2">&nbsp;</td>'."\n";
+                }
+            }
+        }
+        my $scripttag = qq|
+<script>
+
+function checkAll(field) {
+    if (field.length > 0) {
+        for (i = 0; i < field.length; i++) {
+            field[i].checked = true ;
+        }
+    } else {
+        field.checked = true
+    }
+}
+                                                                                
+function uncheckAll(field) {
+    if (field.length > 0) {
+        for (i = 0; i < field.length; i++) {
+            field[i].checked = false ;
+        }
+    } else {
+        field.checked = false ;
+    }
+}
+
+function propagateCheck(item) {
+    if (document.exportdoc.elements[item].checked == true) {
+        containerCheck(item)
+    }
+} 
+
+function containerCheck(item) {
+    document.exportdoc.elements[item].checked = true
+    var numitems = $count + $boards + $startcount
+    var parents = new Array(numitems)
+    for (var i=$startcount; i<numitems; i++) {
+        parents[i] = new Array
+    }
+        |;
+
+        foreach my $container (sort { $a <=> $b } keys %children) {
+            my @contents = split/:/,$children{$container};
+            for (my $i=0; $i<@contents; $i ++) {
+                $scripttag .= '    parents['.$container.']['.$i.'] = '.$contents[$i]."\n";
+            }
+        }
+
+        $scripttag .= qq|
+    if (parents[item].length > 0) {
+        for (var j=0; j<parents[item].length; j++) {
+            containerCheck(parents[item][j])
+        }
+     }   
+}
+
+</script>
+        |;
+	my $html=&Apache::lonxml::xmlbegin();
+        $r->print($html.'<head><title>Export Course</title>'.$scripttag.'</head>'.
+            &Apache::loncommon::bodytag('Export course to IMS content package'
+));
+
+        $r->print($display.'</table>'.
+                  '<p><input type="hidden" name="finishexport" value="1">'.
+                  '<input type="submit" name="exportcourse" value="'.
+                  &mt('Export Course DOCS').'" /></p></form></body></html>');
+    }
+}
+
+sub create_ims_store {
+    my ($now,$manifestok,$outcome,$tempexport) = @_;
+    $$tempexport = $Apache::lonnet::perlvar{'lonDaemons'}.'/tmp/ims_exports';
+    my $ims_manifest;
+    if (!-e $$tempexport) {
+        mkdir($$tempexport,0700);
+    }
+    $$tempexport .= '/'.$now;
+    if (!-e $$tempexport) {
+        mkdir($$tempexport,0700);
+    }
+    $$tempexport .= '/'.$env{'user.domain'}.'_'.$env{'user.name'};
+    if (!-e $$tempexport) {
+        mkdir($$tempexport,0700);
+    }
+    if (!-e "$$tempexport/resources") {
+        mkdir("$$tempexport/resources",0700);
+    }
+# open manifest file
+    my $manifest = '/imsmanifest.xml';
+    my $manifestfilename = $$tempexport.$manifest;
+    if ($ims_manifest = Apache::File->new('>'.$manifestfilename)) {
+        $$manifestok=1;
+        print $ims_manifest
+'<?xml version="1.0" encoding="UTF-8"?>'."\n".
+'<manifest xmlns="http://www.imsglobal.org/xsd/imscp_v1p1"'.
+' xmlns:imsmd="http://www.imsglobal.org/xsd/imsmd_v1p2"'.
+' xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"'.
+' identifier="MANIFEST-'.$env{'request.course.id'}.'-'.$now.'"'.
+'  xsi:schemaLocation="http://www.imsglobal.org/xsd/imscp_v1p1imscp_v1p1.xsd'.
+'  http://www.imsglobal.org/xsd/imsmd_v1p2 imsmd_v1p2p2.xsd">'."\n".
+'  <metadata>
+    <schema></schema>
+    <imsmd:lom>
+      <imsmd:general>
+        <imsmd:identifier>'.$env{'request.course.id'}.'</imsmd:identifier>
+        <imsmd:title>
+          <imsmd:langstring xml:lang="en">'.$env{'course.'.$env{'request.course.id'}.'.description'}.'</imsmd:langstring>
+        </imsmd:title>
+      </imsmd:general>
+    </imsmd:lom>
+  </metadata>'."\n".
+'  <organizations default="ORG-'.$env{'request.course.id'}.'-'.$now.'">'."\n".
+'    <organization identifier="ORG-'.$env{'request.course.id'}.'-'.$now.'"'.
+' structure="hierarchical">'."\n".
+'      <title>'.$env{'course.'.$env{'request.course.id'}.'.description'}.'</title>'
+    } else {
+        $$outcome .= 'An error occurred opening the IMS manifest file.<br />'
+;
+    }
+    return $ims_manifest;
+}
+
+sub build_package {
+    my ($now,$navmap,$exportitems,$discussions,$outcome,$tempexport,$copyresult,$ims_manifest) = @_;
+# first iterator to look for dependencies
+    my $it = $navmap->getIterator(undef,undef,undef,1,undef,undef);
+    my $curRes;
+    my $count = 0;
+    my $depth = 0;
+    my $lastcontainer = 0;
+    my %parent = ();
+    my @dependencies = ();
+    my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+    my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+    while ($curRes = $it->next()) {
+        if (ref($curRes)) {
+            $count ++;
+        }
+        if ($curRes == $it->BEGIN_MAP()) {
+            $depth++;
+            $parent{$depth} = $lastcontainer;
+        }
+        if ($curRes == $it->END_MAP()) {
+            $depth--;
+            $lastcontainer = $parent{$depth};
+        }
+        if (ref($curRes)) {
+            if ($curRes->is_sequence() || $curRes->is_page()) {
+                $lastcontainer = $count;
+            }
+            if (grep/^$count$/,@$exportitems) {
+                &get_dependencies($exportitems,\%parent,$depth,\@dependencies);
+            }
+        }
+    }
+# second iterator to build manifest and store resources
+    $it = $navmap->getIterator(undef,undef,undef,1,undef,undef);
+    $depth = 0;
+    my $prevdepth;
+    $count = 0;
+    my $imsresources;
+    my $pkgdepth;
+    while ($curRes = $it->next()) {
+        if ($curRes == $it->BEGIN_MAP()) {
+            $prevdepth = $depth;
+            $depth++;
+        }
+        if ($curRes == $it->END_MAP()) {
+            $prevdepth = $depth;
+            $depth--;
+        }
+
+        if (ref($curRes)) {
+            $count ++;
+            if ((grep/^$count$/,@$exportitems) || (grep/^$count$/,@dependencies)) {
+                my $symb = $curRes->symb();
+                my $isvisible = 'true';
+                my $resourceref;
+                if ($curRes->randomout()) {
+                    $isvisible = 'false';
+                }
+                unless ($curRes->is_sequence()) {
+                    $resourceref = 'identifierref="RES-'.$env{'request.course.id'}.'-'.$count.'"';
+                }
+                my $step = $prevdepth - $depth;
+                if (($step >= 0) && ($count > 1)) {
+                    while ($step >= 0) {
+                        print $ims_manifest "\n".'  </item>'."\n";
+                        $step --;
+                    }
+                }
+                $prevdepth = $depth;
+
+                my $itementry =
+              '<item identifier="ITEM-'.$env{'request.course.id'}.'-'.$count.
+              '" isvisible="'.$isvisible.'" '.$resourceref.'>'.
+              '<title>'.$curRes->title().'</title>';
+                print $ims_manifest "\n".$itementry;
+
+                unless ($curRes->is_sequence()) {
+                    my $content_file;
+                    my @hrefs = ();
+                    &process_content($count,$curRes,$cdom,$cnum,$symb,\$content_file,\@hrefs,$copyresult,$tempexport);
+                    if ($content_file) {
+                        $imsresources .= "\n".
+                     '   <resource identifier="RES-'.$env{'request.course.id'}.'-'.$count.
+                     '" type="webcontent" href="'.$content_file.'">'."\n".
+                     '       <file href="'.$content_file.'" />'."\n";
+                        foreach (@hrefs) {
+                            $imsresources .=
+                     '        <file href="'.$_.'" />'."\n";
+                        }
+                        if (grep/^$count$/,@$discussions) {
+                            my $ressymb = $symb;
+                            my $mode;
+                            if ($ressymb =~ m|adm/(\w+)/(\w+)/(\d+)/bulletinboard$|) {
+                                unless ($ressymb =~ m|adm/wrapper/adm|) {
+                                    $ressymb = 'bulletin___'.$3.'___adm/wrapper/adm/'.$1.'/'.$2.'/'.$3.'/bulletinboard';
+                                }
+                                $mode = 'board';
+                            }
+                            my %extras = (
+                                          caller => 'imsexport',
+                                          tempexport => $tempexport.'/resources',
+                                          count => $count
+                                         );
+                            my $discresult = &Apache::lonfeedback::list_discussion($mode,undef,$ressymb,\%extras);
+                        }
+                        $imsresources .= '    </resource>'."\n";
+                    }
+                }
+                $pkgdepth = $depth;
+            }
+        }
+    }
+    while ($pkgdepth > 0) {
+        print $ims_manifest "    </item>\n";
+        $pkgdepth --;
+    }
+    my $resource_text = qq|
+    </organization>
+  </organizations>
+  <resources>
+    $imsresources
+  </resources>
+</manifest>
+    |;
+    print $ims_manifest $resource_text;
+}
+
+sub get_dependencies {
+    my ($exportitems,$parent,$depth,$dependencies) = @_;
+    if ($depth > 1) {
+        if ((!grep/^$$parent{$depth}$/,@$exportitems) && (!grep/^$$parent{$depth}$/,@$dependencies)) {
+            push @$dependencies, $$parent{$depth};
+            if ($depth > 2) {
+                &get_dependencies($exportitems,$parent,$depth-1,$dependencies);
+            }
+        }
+    }
+}
+
+sub process_content {
+    my ($count,$curRes,$cdom,$cnum,$symb,$content_file,$href,$copyresult,$tempexport) = @_;
+    my $content_type;
+    my $message;
+    my @uploads = ();
+    if ($curRes->is_sequence()) {
+        $content_type = 'sequence';
+    } elsif ($curRes->is_page()) {
+        $content_type = 'page'; # need to handle individual items in pages.
+    } elsif ($symb =~ m-public/$cdom/$cnum/syllabus$-) {
+        $content_type = 'syllabus';
+        my $contents = &Apache::imsexport::templatedpage($content_type);
+        if ($contents) {
+            $$content_file = &store_template($contents,$tempexport,$count,$content_type);
+        }
+    } elsif ($symb =~ m-\.sequence___\d+___ext-) {
+        $content_type = 'external';
+        my $title = $curRes->title;
+        my $contents =  &Apache::imsexport::external($symb,$title);
+        if ($contents) {
+            $$content_file = &store_template($contents,$tempexport,$count,$content_type);
+        }
+    } elsif ($symb =~ m-adm/navmaps$-) {
+        $content_type =  'navmap';
+    } elsif ($symb =~ m-adm/[^/]+/[^/]+/(\d+)/smppg$-) {
+        $content_type = 'simplepage';
+        my $contents = &Apache::imsexport::templatedpage($content_type,$1,$count,\@uploads);
+        if ($contents) {
+            $$content_file = &store_template($contents,$tempexport,$count,$content_type);
+        }
+    } elsif ($symb =~ m-lib/templates/simpleproblem\.problem$-) {
+        $content_type = 'simpleproblem';
+        my $contents =  &Apache::imsexport::simpleproblem($symb);
+        if ($contents) {
+            $$content_file = &store_template($contents,$tempexport,$count,$content_type);
+        }
+    } elsif ($symb =~ m-lib/templates/examupload\.problem$-) {
+        $content_type = 'examupload';
+    } elsif ($symb =~ m-adm/(\w+)/(\w+)/(\d+)/bulletinboard$-) {
+        $content_type = 'bulletinboard';
+        my $contents =  &Apache::imsexport::templatedpage($content_type,$3,$count,\@uploads,$1,$2);
+        if ($contents) {
+            $$content_file = &store_template($contents,$tempexport,$count,$content_type);
+        }
+    } elsif ($symb =~ m-adm/([^/]+)/([^/]+)/aboutme$-) {
+        $content_type = 'aboutme';
+        my $contents =  &Apache::imsexport::templatedpage($content_type,undef,$count,\@uploads,$1,$2);
+        if ($contents) {
+            $$content_file = &store_template($contents,$tempexport,$count,$content_type);
+        }
+    } elsif ($symb =~ m-\.(sequence|page)___\d+___uploaded/$cdom/$cnum/-) {
+        $$content_file = &replicate_content($cdom,$cnum,$tempexport,$symb,$count,\$message,$href,'uploaded');
+    } elsif ($symb =~ m-\.(sequence|page)___\d+___([^/]+)/([^/]+)-) {
+        my $canedit = 0;
+        if ($2 eq $env{'user.domain'} && $3 eq $env{'user.name'})  {
+            $canedit= 1;
+        }
+# only include problem code where current user is author
+        if ($canedit) {
+            $$content_file = &replicate_content($cdom,$cnum,$tempexport,$symb,$count,\$message,$href,'resource');
+        } else {
+            $$content_file = &replicate_content($cdom,$cnum,$tempexport,$symb,$count,\$message,$href,'noedit');
+        }
+    } elsif ($symb =~ m-uploaded/$cdom/$cnum-) {
+        $$content_file = &replicate_content($cdom,$cnum,$tempexport,$symb,$count,\$message,$href,'uploaded');
+    }
+    if (@uploads > 0) {
+        foreach my $item (@uploads) {
+            my $uploadmsg = '';
+            &replicate_content($cdom,$cnum,$tempexport,$item,$count,\$uploadmsg,$href,'templateupload');
+            if ($uploadmsg) {
+                $$copyresult .= $uploadmsg."\n";
+            }
+        }
+    }
+    if ($message) {
+        $$copyresult .= $message."\n";
+    }
+}
+
+sub replicate_content {
+    my ($cdom,$cnum,$tempexport,$symb,$count,$message,$href,$caller) = @_;
+    my ($map,$ind,$url);
+    if ($caller eq 'templateupload') {
+        $url = $symb;
+        $url =~ s#//#/#g;
+    } else { 
+        ($map,$ind,$url)=&Apache::lonnet::decode_symb($symb);
+    }
+    my $content;
+    my $filename;
+    my $repstatus;
+    my $content_name;
+    if ($url =~ m-/([^/]+)$-) {
+        $filename = $1;
+        if (!-e $tempexport.'/resources') {
+            mkdir($tempexport.'/resources',0700);
+        }
+        if (!-e $tempexport.'/resources/'.$count) {
+            mkdir($tempexport.'/resources/'.$count,0700);
+        }
+        my $destination = $tempexport.'/resources/'.$count.'/'.$filename;
+        my $copiedfile;
+        if ($copiedfile = Apache::File->new('>'.$destination)) {
+            my $content;
+            if ($caller eq 'resource') {
+                my $respath =  $Apache::lonnet::perlvar{'lonDocRoot'}.'/res';
+                my $filepath = &Apache::lonnet::filelocation($respath,$url);
+                $content = &Apache::lonnet::getfile($filepath);
+                if ($content eq -1) {
+                    $$message = 'Could not copy file '.$filename;
+                } else {
+                    &extract_media($url,$cdom,$cnum,\$content,$count,$tempexport,$href,$message,'resource');
+                    $repstatus = 'ok';
+                }
+            } elsif ($caller eq 'uploaded' || $caller eq 'templateupload') {
+                my $rtncode;
+                $repstatus = &Apache::lonnet::getuploaded('GET',$url,$cdom,$cnum,\$content,$rtncode);
+                if ($repstatus eq 'ok') {
+                    if ($url =~ /\.html?$/i) {
+                        &extract_media($url,$cdom,$cnum,\$content,$count,$tempexport,$href,$message,'uploaded');
+                    }
+                } else {
+                    $$message = 'Could not render '.$url.' server message - '.$rtncode."<br />\n";
+                }
+            } elsif ($caller eq 'noedit') {
+# Need to render the resource without the LON-CAPA Internal header and the Post discussion footer, and then set $content equal to this. 
+                $repstatus = 'ok';
+                $content = 'Not the owner of this resource'; 
+            }
+            if ($repstatus eq 'ok') {
+                print $copiedfile $content;
+            }
+            close($copiedfile);
+        } else {
+            $$message = 'Could not open destination file for '.$filename."<br />\n";
+        }
+    } else {
+        $$message = 'Could not determine name of file for '.$symb."<br />\n";
+    }
+    if ($repstatus eq 'ok') {
+        $content_name = 'resources/'.$count.'/'.$filename;
+    }
+    return $content_name;
+}
+
+sub extract_media {
+    my ($url,$cdom,$cnum,$content,$count,$tempexport,$href,$message,$caller) = @_;
+    my ($dirpath,$container);
+    my %allfiles = ();
+    my %codebase = ();
+    if ($url =~ m-(.*/)([^/]+)$-) {
+        $dirpath = $1;
+        $container = $2;
+    } else {
+        $dirpath = $url;
+        $container = '';
+    }
+    &Apache::lonnet::extract_embedded_items(undef,undef,\%allfiles,\%codebase,$content);
+    foreach my $embed_file (keys(%allfiles)) {
+        my $filename;
+        if ($embed_file =~ m#([^/]+)$#) {
+            $filename = $1;
+        } else {
+            $filename = $embed_file;
+        }
+        my $newname = 'res/'.$filename;
+        my ($rtncode,$embed_content,$repstatus);
+        my $embed_url;
+        if ($embed_file =~ m-^/-) {
+            $embed_url = $embed_file;           # points to absolute path
+        } else {
+            if ($embed_file =~ m-https?://-) {
+                next;                           # points to url
+            } else {
+                $embed_url = $dirpath.$embed_file;  # points to relative path
+            }
+        }
+        if ($caller eq 'resource') {
+            my $respath =  $Apache::lonnet::perlvar{'lonDocRoot'}.'/res';  
+            my $embed_path = &Apache::lonnet::filelocation($respath,$embed_url); 
+            $embed_content = &Apache::lonnet::getfile($embed_path);
+            unless ($embed_content eq -1) {
+                $repstatus = 'ok';
+            }
+        } elsif ($caller eq 'uploaded') {
+            
+            $repstatus = &Apache::lonnet::getuploaded('GET',$embed_url,$cdom,$cnum,\$embed_content,$rtncode);
+        }
+        if ($repstatus eq 'ok') {
+            my $destination = $tempexport.'/resources/'.$count.'/res';
+            if (!-e "$destination") {
+                mkdir($destination,0755);
+            }
+            $destination .= '/'.$filename;
+            my $copiedfile;
+            if ($copiedfile = Apache::File->new('>'.$destination)) {
+                print $copiedfile $embed_content;
+                push @{$href}, 'resources/'.$count.'/res/'.$filename;
+                my $attrib_regexp = '';
+                if (@{$allfiles{$embed_file}} > 1) {
+                    $attrib_regexp = join('|',@{$allfiles{$embed_file}});
+                } else {
+                    $attrib_regexp = $allfiles{$embed_file}[0];
+                }
+                $$content =~ s#($attrib_regexp\s*=\s*['"]?)\Q$embed_file\E(['"]?)#$1$newname$2#gi;
+                if ($caller eq 'resource' && $container =~ /\.(problem|library)$/) {
+                    $$content =~ s#\Q$embed_file\E#$newname#gi;
+                }
+            }
+        } else {
+            $$message .= 'replication of embedded file - '.$embed_file.' in '.$url.' failed, reason -'.$rtncode."<br />\n";
+        }
+    }
+    return;
+}
+
+sub store_template {
+    my ($contents,$tempexport,$count,$content_type) = @_;
+    if ($contents) {
+        if ($tempexport) {
+            if (!-e $tempexport.'/resources') {
+                mkdir($tempexport.'/resources',0700);
+            }
+            if (!-e $tempexport.'/resources/'.$count) {
+                mkdir($tempexport.'/resources/'.$count,0700);
+            }
+            my $destination = $tempexport.'/resources/'.$count.'/'.$content_type.'.xml';
+            my $storetemplate;
+            if ($storetemplate = Apache::File->new('>'.$destination)) {
+                print $storetemplate $contents;
+                close($storetemplate);
+            }
+            if ($content_type eq 'external') {
+                return 'resources/'.$count.'/'.$content_type.'.html';
+            } else {
+                return 'resources/'.$count.'/'.$content_type.'.xml';
+            }
+        }
+    }
+}
 
 # Imports the given (name, url) resources into the course
 # coursenum, coursedom, and folder must precede the list
@@ -191,11 +903,32 @@ sub group_import {
     my $coursenum = shift;
     my $coursedom = shift;
     my $folder = shift;
+    my $container = shift;
+    my $caller = shift;
     while (@_) {
 	my $name = shift;
 	my $url = shift;
+        if (($url =~ m#^/uploaded/$coursedom/$coursenum/(default_\d+\.)(page|sequence)$#) && ($caller eq 'londocs')) {
+            my $errtext = '';
+            my $fatal = 0;
+            my $newmapstr = '<map>'."\n".
+                            '<resource id="1" src="" type="start"></resource>'."\n".
+                            '<link from="1" to="2" index="1"></link>'."\n".
+                            '<resource id="2" src="" type="finish"></resource>'."\n".
+                            '</map>';
+            $env{'form.output'}=$newmapstr;
+            my $result=&Apache::lonnet::finishuserfileupload($coursenum,$coursedom,
+                                                'output',$1.$2);
+            if ($result != m|^/uploaded/|) {
+                $errtext.='Map not saved: A network error occured when trying to save the new map. ';
+                $fatal = 2;
+            }
+            if ($fatal) {
+                return ($errtext,$fatal);
+            }
+        }
 	if ($url) {
-	    my $idx = $#Apache::lonratedt::resources + 1;
+	    my $idx = &Apache::lonratedt::getresidx($url);
 	    $Apache::lonratedt::order[$#Apache::lonratedt::order+1]=$idx;
 	    my $ext = 'false';
 	    if ($url=~/^http:\/\//) { $ext = 'true'; }
@@ -205,57 +938,195 @@ sub group_import {
 		join ':', ($name, $url, $ext, 'normal', 'res');
 	}
     }
-    &storemap($coursenum, $coursedom, $folder);
+    return &storemap($coursenum, $coursedom, $folder.'.'.$container);
 }
 
-sub editor {
-    my ($r,$coursenum,$coursedom,$folder,$allowed)=@_;
-    if ($ENV{'form.foldername'}) {
-	$r->print('<h3>Folder: '.$ENV{'form.foldername'}.'</h3>');
+sub breadcrumbs {
+    my ($where)=@_;
+    &Apache::lonhtmlcommon::clear_breadcrumbs();
+    my (@folders);
+    if ($env{'form.pagepath'}) {
+        @folders = split('&',$env{'form.pagepath'});
+    } else {
+        @folders=split('&',$env{'form.folderpath'});
+    }
+    my $folderpath;
+    my $cpinfo='';
+    if ($env{'form.markedcopy_url'}) {
+	&Apache::lonnet::logthis('Found '.$env{'form.markedcopy_url'});
+       $cpinfo='&markedcopy_url='.
+               &Apache::lonnet::escape($env{'form.markedcopy_url'}).
+               '&markedcopy_title='.
+               &Apache::lonnet::escape($env{'form.markedcopy_title'});
+    }
+    while (@folders) {
+	my $folder=shift(@folders);
+	my $foldername=shift(@folders);
+	if ($folderpath) {$folderpath.='&';}
+	$folderpath.=$folder.'&'.$foldername;
+	my $url='/adm/coursedocs?folderpath='.
+	    &Apache::lonnet::escape($folderpath);
+	    &Apache::lonhtmlcommon::add_breadcrumb(
+		      {'href'=>$url.$cpinfo,
+		       'title'=>&Apache::lonnet::unescape($foldername),
+		       'text'=>'<font size="+1">'.
+			   &Apache::lonnet::unescape($foldername).'</font>'
+		       });
+		       
+						 
     }
+    return &Apache::lonhtmlcommon::breadcrumbs(undef,undef,undef,undef,undef,
+					       0,'nohelp');
+}
+
+sub editor {
+    my ($r,$coursenum,$coursedom,$folder,$allowed,$upload_output)=@_;
     my $errtext='';
     my $fatal=0;
+    my $container='sequence';
+    if ($env{'form.pagepath'}) {
+        $container='page';
+    }
     ($errtext,$fatal)=
-          &mapread($coursenum,$coursedom,$folder.'.sequence');
+              &mapread($coursenum,$coursedom,$folder.'.'.$container);
     if ($#Apache::lonratedt::order<1) {
-       	$Apache::lonratedt::order[0]=1;
-        $Apache::lonratedt::resources[1]='';
+	my $idx=&Apache::lonratedt::getresidx();
+	if ($idx<=0) { $idx=1; }
+       	$Apache::lonratedt::order[0]=$idx;
+        $Apache::lonratedt::resources[$idx]='';
+    }
+    if (defined($env{'form.markcopy'})) {
+# Mark for copying
+	my ($title,$url)=split(':',$Apache::lonratedt::resources[$Apache::lonratedt::order[$env{'form.markcopy'}]]);
+	$env{'form.markedcopy_title'}=$title;
+	$env{'form.markedcopy_url'}=$url;
     }
+    $r->print(&breadcrumbs($folder));
     if ($fatal) {
 	   $r->print('<p><font color="red">'.$errtext.'</font></p>');
     } else {
 # ------------------------------------------------------------ Process commands
+
 # ---------------- if they are for this folder and user allowed to make changes
-	if (($allowed) && ($ENV{'form.folder'} eq $folder)) {
-# upload a file, if present
-           if (($ENV{'form.uploaddoc.filename'}) &&
-               ($ENV{'form.cmd'}=~/^upload_(\w+)/)) {
-	    if ($folder=~/^$1/) {
-# 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 $ext='false';
-              if ($url=~/^http\:\/\//) { $ext='true'; }
-              $url=~s/\:/\&colon;/g;
-	      my $comment=$ENV{'form.comment'};
-              $comment=~s/\</\&lt\;/g;
-              $comment=~s/\>/\&gt\;/g;
-              $comment=~s/\:/\&colon;/g;
-              if ($folder=~/^supplemental/) {
-		  $comment=time.'___&&&___'.$ENV{'user.name'}.'___&&&___'.
-		      $ENV{'user.domain'}.'___&&&___'.$comment;
-              }
-              my $newidx=$#Apache::lonratedt::resources+1;
-              $Apache::lonratedt::resources[$newidx]=
-                  $comment.':'.$url.':'.$ext.':normal:res';
-              $Apache::lonratedt::order[$#Apache::lonratedt::order+1]=
-                                                              $newidx;       
- 	      &storemap($coursenum,$coursedom,$folder.'.sequence');
-	     }
-            }
-	    if ($ENV{'form.cmd'}) {
-                my ($cmd,$idx)=split(/\_/,$ENV{'form.cmd'});
+	if (($allowed) && ($env{'form.folder'} eq $folder)) {
+# 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,'parameter_randompick',$env{'form.randpick_'.$idx},'int_pos');
+		} else {
+		    &Apache::lonratedt::delparameter($idx,'parameter_randompick');
+		}
+		if ($env{'form.hidprs_'.$idx}) {
+		    &Apache::lonratedt::storeparameter($idx,'parameter_hiddenresource','yes','string_yesno');
+		} else {
+		    &Apache::lonratedt::delparameter($idx,'parameter_hiddenresource');
+		}
+		if ($env{'form.encprs_'.$idx}) {
+		    &Apache::lonratedt::storeparameter($idx,'parameter_encrypturl','yes','string_yesno');
+		} else {
+		    &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.'.'.$container);
+		if ($fatal) {
+		    $r->print('<p><font color="red">'.$errtext.'</font></p>');
+		    return;
+		}
+		
+	    }
+	    if ($env{'form.pastemarked'}) {
+# paste resource to end of list
+                my $url=$env{'form.markedcopy_url'};
+		my $title=$env{'form.markedcopy_title'};
+# Maps need to be copied first
+		if (($url=~/\.(page|sequence)$/) || ($url=~/^\/uploaded\//)) {
+		    $title=&mt('Copy of').' '.$title;
+                    my $newid=$$.time;
+		    $url=~/^(.+)\.(\w+)$/;
+		    my $newurl=$1.$newid.'.'.$2;
+		    my $storefn=$newurl;
+                    $storefn=~s/^\/\w+\/\w+\/\w+\///;
+		    &Apache::loncreatecourse::writefile
+			($env{'request.course.id'},$storefn,
+			 &Apache::lonnet::getfile($url));
+		    $url=$newurl;
+		}
+		$title=~s/\</\&lt\;/g;
+		$title=~s/\>/\&gt\;/g;
+		$title=~s/\:/\&colon;/g;
+		my $ext='false';
+		if ($url=~/^http\:\/\//) { $ext='true'; }
+		$url=~s/\:/\&colon;/g;
+# Now insert the URL at the bottom
+                my $newidx=&Apache::lonratedt::getresidx($url);
+		$Apache::lonratedt::resources[$newidx]=
+		    $title.':'.$url.':'.$ext.':normal:res';
+		$Apache::lonratedt::order[1+$#Apache::lonratedt::order]=$newidx;
+# Store the result
+		($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container);
+		if ($fatal) {
+		    $r->print('<p><font color="red">'.$errtext.'</font></p>');
+		    return;
+		}
+
+	    }
+            $r->print($upload_output);
+	    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/|) &&
+			($url!~/\.(page|sequence|problem|exam|quiz|assess|survey|form|library|task)$/)) {
+			&Apache::lonnet::removeuploadedurl($url);
+		    } else {
+			&Apache::lonratedt::makezombie($Apache::lonratedt::order[$idx]);
+		    }
+		    for (my $i=$idx;$i<$#Apache::lonratedt::order;$i++) {
+                        $Apache::lonratedt::order[$i]=
+                          $Apache::lonratedt::order[$i+1];
+                    }
+                    $#Apache::lonratedt::order--;
+                } elsif ($cmd eq 'cut') {
+		    my (undef,$url)=split(':',$Apache::lonratedt::resources[$Apache::lonratedt::order[$idx]]);
+		    &Apache::lonratedt::makezombie($Apache::lonratedt::order[$idx]);
 		    for (my $i=$idx;$i<$#Apache::lonratedt::order;$i++) {
                         $Apache::lonratedt::order[$i]=
                           $Apache::lonratedt::order[$i+1];
@@ -276,26 +1147,33 @@ sub editor {
                     $Apache::lonratedt::order[$idx]=$i;
 		   }
                 } elsif ($cmd eq 'rename') {
+                    my $ratstr = $Apache::lonratedt::resources[$Apache::lonratedt::order[$idx]];
                     my ($rtitle,@rrest)=split(/\:/,
                        $Apache::lonratedt::resources[
 				       $Apache::lonratedt::order[$idx]]);
                     my $comment=
-                     &HTML::Entities::decode($ENV{'form.title'});
+                     &HTML::Entities::decode($env{'form.title'});
                     $comment=~s/\</\&lt\;/g;
                     $comment=~s/\>/\&gt\;/g;
                     $comment=~s/\:/\&colon;/g;
-                    $Apache::lonratedt::resources[
+		    if ($comment=~/\S/) {
+			$Apache::lonratedt::resources[
 				       $Apache::lonratedt::order[$idx]]=
-                             $comment.':'.join(':',@rrest);
-                    
+				            $comment.':'.join(':',@rrest);
+		    }
                 }
 # Store the changed version
-		&storemap($coursenum,$coursedom,$folder.'.sequence');
+		($errtext,$fatal)=&storemap($coursenum,$coursedom,
+					    $folder.'.'.$container);
+		if ($fatal) {
+		    $r->print('<p><font color="red">'.$errtext.'</font></p>');
+		    return;
+		}
             }
 # Group import/search
-	    if ($ENV{'form.importdetail'}) {
+	    if ($env{'form.importdetail'}) {
 		my @imports;
-		foreach (split(/\&/,$ENV{'form.importdetail'})) {
+		foreach (split(/\&/,$env{'form.importdetail'})) {
 		    if (defined($_)) {
 			my ($name,$url)=split(/\=/,$_);
 			$name=&Apache::lonnet::unescape($name);
@@ -304,122 +1182,463 @@ sub editor {
 		    }
 		}
 # Store the changed version
-		group_import($coursenum, $coursedom, $folder, @imports);
+		($errtext,$fatal)=group_import($coursenum, $coursedom, $folder,
+					       $container,'londocs',@imports);
+		if ($fatal) {
+		    $r->print('<p><font color="red">'.$errtext.'</font></p>');
+		    return;
+		}
             }
 # Loading a complete map
-	   if (($ENV{'form.importmap'}) && ($ENV{'form.loadmap'})) {
-              foreach
-(&Apache::lonsequence::attemptread(&Apache::lonnet::filelocation('',$ENV{'form.importmap'}))) {
-                   my $idx=$#Apache::lonratedt::resources;
-                   $idx++;
+	   if (($env{'form.importmap'}) && ($env{'form.loadmap'})) {
+	       foreach (&Apache::lonsequence::attemptread(&Apache::lonnet::filelocation('',$env{'form.importmap'}))) {
+		   my ($title,$url,$ext,$type)=split(/\:/,$_);
+                   my $idx=&Apache::lonratedt::getresidx($url);
                    $Apache::lonratedt::resources[$idx]=$_;
                    $Apache::lonratedt::order
-                            [$#Apache::lonratedt::order+1]=$idx;
-                }
+		       [$#Apache::lonratedt::order+1]=$idx;
+	       }
 
 # Store the changed version
-		&storemap($coursenum,$coursedom,$folder.'.sequence');
+	       ($errtext,$fatal)=&storemap($coursenum,$coursedom,
+					   $folder.'.'.$container);
+	       if ($fatal) {
+		   $r->print('<p><font color="red">'.$errtext.'</font></p>');
+		   return;
+	       }
            }
        }
 # ---------------------------------------------------------------- End commands
 # ---------------------------------------------------------------- Print screen
         my $idx=0;
+	my $shown=0;
         $r->print('<table>');
         foreach (@Apache::lonratedt::order) {
            my ($name,$url)=split(/\:/,$Apache::lonratedt::resources[$_]);
+	   $name=&Apache::lonratsrv::qtescape($name);
+	   $url=&Apache::lonratsrv::qtescape($url);
            unless ($name) {  $name=(split(/\//,$url))[-1]; }
-           unless ($name) { $name='NO RESOURCE'; $url='/adm/notfound.html'; }
-           $r->print(&entryline($idx,$name,$url,$folder,$allowed,$_));
+           unless ($name) { $idx++; next; }
+           $r->print(&entryline($idx,$name,$url,$folder,$allowed,$_,$coursenum));
            $idx++;
+	   $shown++;
+        }
+	unless ($shown) {
+	    $r->print('<tr><td>'.&mt('Currently no documents.').'</td></tr>');
+	}
+        $r->print("\n</table>\n");
+	if ($env{'form.markedcopy_url'}) {
+	    $r->print(<<ENDPASTE);
+<p><form name="pasteform" action="/adm/coursedocs" method="post">
+<input type="hidden" name="markedcopy_url" value="$env{'form.markedcopy_url'}" />
+<input type="hidden" name="markedcopy_title" value="$env{'form.markedcopy_title'}" />
+ENDPASTE
+            $r->print(
+	   '<input type="submit" name="pastemarked" value="'.&mt('Paste').
+		      '" /> '.&Apache::loncommon::filedescription(
+		(split(/\./,$env{'form.markedcopy_url'}))[-1]).': '.
+		      $env{'form.markedcopy_title'});
+            if ($container eq 'page') {
+		$r->print(<<PAGEINFO);
+<input type="hidden" name="pagepath" value="$env{'form.pagepath'}" />
+<input type="hidden" name="pagesymb" value="$env{'form.pagesymb'}" />
+PAGEINFO
+            } else {
+		$r->print(<<FOLDERINFO);
+<input type="hidden" name="folderpath" value="$env{'form.folderpath'}" />
+FOLDERINFO
+	    }
+	    $r->print('</form></p>');
+	}
+    }
+}
+
+sub process_file_upload {
+    my ($upload_output,$coursenum,$coursedom,$allfiles,$codebase,$uploadcmd) = @_;
+# upload a file, if present
+    my $parseaction;
+   if ($env{'form.parserflag'}) {
+        $parseaction = 'parse';
+    }
+    my $phase_status;
+    my $folder=$env{'form.folder'};
+    if ($folder eq '') {
+        $folder='default';
+    }
+    if ( ($folder=~/^$uploadcmd/) || ($uploadcmd eq 'default') ) {
+        my $errtext='';
+        my $fatal=0;
+        my $container='sequence';
+        if ($env{'form.pagepath'}) {
+            $container='page';
+        }
+        ($errtext,$fatal)=
+              &mapread($coursenum,$coursedom,$folder.'.'.$container);
+        if ($#Apache::lonratedt::order<1) {
+            $Apache::lonratedt::order[0]=1;
+            $Apache::lonratedt::resources[1]='';
         }
-        $r->print('</table>');
+        if ($fatal) {
+            return 'failed';
+        }
+        my $destination = 'docs/';
+        if ($folder =~ /^supplemental/) {
+            $destination = 'supplemental/';
+        }
+        if (($folder eq 'default') || ($folder eq 'supplemental')) {
+            $destination .= 'default/';
+        } elsif ($folder =~ /^(default|supplemental)_(\d+)$/) {
+            $destination .=  $2.'/';
+        }
+# 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 $newidx=&Apache::lonratedt::getresidx();
+        $destination .= $newidx;
+        my $url=&Apache::lonnet::userfileupload('uploaddoc',1,$destination,
+						$parseaction,$allfiles,
+						$codebase);
+        my $ext='false';
+        if ($url=~/^http\:\/\//) { $ext='true'; }
+        $url=~s/\:/\&colon;/g;
+        my $comment=$env{'form.comment'};
+        $comment=~s/\</\&lt\;/g;
+        $comment=~s/\>/\&gt\;/g;
+        $comment=~s/\:/\&colon;/g;
+        if ($folder=~/^supplemental/) {
+              $comment=time.'___&&&___'.$env{'user.name'}.'___&&&___'.
+                  $env{'user.domain'}.'___&&&___'.$comment;
+        }
+
+        $Apache::lonratedt::resources[$newidx]=
+                  $comment.':'.$url.':'.$ext.':normal:res';
+        $Apache::lonratedt::order[$#Apache::lonratedt::order+1]= $newidx;
+        ($errtext,$fatal)=&storemap($coursenum,$coursedom,
+				    $folder.'.'.$container);
+        if ($fatal) {
+            $$upload_output .= '<p><font color="red">'.$errtext.'</font></p>';
+            return 'failed';
+        } else {
+            if ($parseaction eq 'parse') {
+                my $total_embedded = keys(%{$allfiles});
+                if ($total_embedded > 0) {
+                    my $num = 0;
+                    $$upload_output .= 'This file contains embedded multimedia objects, which need to be uploaded to LON-CAPA.<br />
+   <form name="upload_embedded" action="/adm/coursedocs"
+                  method="post" enctype="multipart/form-data">
+   <input type="hidden" name="folderpath" value="'.$env{'form.folderpath'}.'" />   <input type="hidden" name="cmd" value="upload_embedded" />
+   <input type="hidden" name="newidx" value="'.$newidx.'" />
+   <input type="hidden" name="primaryurl" value="'.&Apache::lonnet::escape($url).'" />
+   <input type="hidden" name="phasetwo" value="'.$total_embedded.'" />';
+                    $$upload_output .= '<b>Upload embedded files</b>:<br />
+   <table>';
+                    foreach my $embed_file (keys(%{$allfiles})) {
+                        $$upload_output .= '<tr><td>'.$embed_file.
+          '<input name="embedded_item_'.$num.'" type="file" />
+           <input name="embedded_orig_'.$num.'" type="hidden" value="'.&Apache::lonnet::escape($embed_file).'" />';
+                        my $attrib;
+                        if (@{$$allfiles{$embed_file}} > 1) {
+                            $attrib = join(':',@{$$allfiles{$embed_file}});
+                        } else {
+                            $attrib = $$allfiles{$embed_file}[0];
+                        }
+                        $$upload_output .=
+           '<input name="embedded_attrib_'.$num.'" type="hidden" value="'.$attrib.'" />';
+                        if (exists($$codebase{$embed_file})) {
+                            $$upload_output .= 
+          '<input name="codebase_'.$num.'" type="hidden" value="'.&Apache::lonnet::escape($$codebase{$embed_file}).'" />';
+                        }
+                        $$upload_output .= '</td></tr>';
+                        $num ++;
+                    }
+                    $phase_status = 'phasetwo';
+                    $$upload_output .= '</table><br />
+   <input type ="submit" value="Complete upload" />
+   </form>';
+                } else {
+                    $$upload_output .= 'No embedded items identified<br />';
+                }
+            }
+        }
+    }
+    return $phase_status;
+}
+
+sub process_secondary_uploads {
+    my ($upload_output,$coursedom,$coursenum,$formname,$num,$newidx) = @_;
+    my $folder=$env{'form.folder'};
+    my $destination = 'docs/';
+    if ($folder =~ /^supplemental/) {
+        $destination = 'supplemental/';
     }
+    if (($folder eq 'default') || ($folder eq 'supplemental')) {
+        $destination .= 'default/';
+    } elsif ($folder =~ /^(default|supplemental)_(\d+)$/) {
+        $destination .=  $1.'/';
+    }
+    $destination .= $newidx;
+    my ($url,$filename);
+    $url=&Apache::lonnet::userfileupload($formname.$num,1,$destination);
+    ($filename) = ($url =~ m-^/uploaded/$coursedom/$coursenum/$destination/(.+)$-);
+    return $filename;
 }
 
 # --------------------------------------------------------------- An entry line
 
 sub entryline {
-    my ($index,$title,$url,$folder,$allowed,$residx)=@_;
+    my ($index,$title,$url,$folder,$allowed,$residx,$coursenum)=@_;
     $title=~s/\&colon\;/\:/g;
     $title=&HTML::Entities::encode(&HTML::Entities::decode(
-     &Apache::lonnet::unescape($title)),'\"\<\>\&\'');
+     &Apache::lonnet::unescape($title)),'"<>&\'');
     my $renametitle=$title;
     my $foldertitle=$title;
-    if ($title=~
- /^(\d+)\_\_\_\&amp\;\&amp\;\&amp\;\_\_\_(\w+)\_\_\_\&amp\;\&amp\;\&amp\;\_\_\_(\w+)\_\_\_\&amp\;\&amp\;\&amp\;\_\_\_(.*)$/
-	) { 
-            $foldertitle=&Apache::lontexconvert::msgtexconverted($4);
-            $renametitle=$4;
-            $title='<i>'.localtime($1).'</i> '.
-                &Apache::loncommon::plainname($2,$3).': <br>'.
-		$foldertitle;
-	}
+    my $pagetitle=$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;
+	$title='<i>'.&Apache::lonlocal::locallocaltime($1).'</i> '.
+	    &Apache::loncommon::plainname($2,$3).': <br />'.
+	    $foldertitle;
+    }
     $renametitle=~s/\&quot\;/\\\"/g;
     my $line='<tr>';
 # Edit commands
+    my $container;
+    my $folderpath;
+    if ($env{'form.folderpath'}) {
+        $container = 'sequence';
+	$folderpath=&Apache::lonnet::escape($env{'form.folderpath'});
+	# $htmlfoldername=&HTML::Entities::encode($env{'form.foldername'},'<>&"');
+    }
+    my ($pagepath,$pagesymb);
+    if ($env{'form.pagepath'}) {
+        $container = 'page';
+        $pagepath=&Apache::lonnet::escape($env{'form.pagepath'});
+        $pagesymb=&Apache::lonnet::escape($env{'form.pagesymb'});
+    }
+    my $cpinfo='';
+    if ($env{'form.markedcopy_url'}) {
+       $cpinfo='&markedcopy_url='.
+               &Apache::lonnet::escape($env{'form.markedcopy_url'}).
+               '&markedcopy_title='.
+               &Apache::lonnet::escape($env{'form.markedcopy_title'});
+    }
     if ($allowed) {
-       $line.=(<<END);
+	my $incindex=$index+1;
+	my $selectbox='';
+	if (($folder!~/^supplemental/) &&
+	    ($#Apache::lonratedt::order>0) && 
+	    ((split(/\:/,
+	     $Apache::lonratedt::resources[$Apache::lonratedt::order[0]]))[1] 
+	     ne '') && 
+	    ((split(/\:/,
+	     $Apache::lonratedt::resources[$Apache::lonratedt::order[1]]))[1] 
+	     ne '')) {
+	    $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',
+		'rm' => 'Remove',
+                'ct' => 'Cut',
+		'rn' => 'Rename',
+		'cp' => 'Copy');
+        if ($env{'form.pagepath'}) {
+            $line.=(<<END);
+<form name="entry_$index" action="/adm/coursedocs" method="post">
+<input type="hidden" name="pagepath" value="$env{'form.pagepath'}" />
+<input type="hidden" name="pagesymb" value="$env{'form.pagesymb'}" />
+<input type="hidden" name="markedcopy_url" value="$env{'form.markedcopy_url'}" />
+<input type="hidden" name="markedcopy_title" value="$env{'form.markedcopy_title'}" />
+<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&pagepath=$pagepath&pagesymb=$pagesymb$cpinfo'>
+<img src="${iconpath}move_up.gif" alt='$lt{'up'}' border='0' /></a></td></tr>
+<tr><td bgcolor="#DDDDDD">
+<a href='/adm/coursedocs?cmd=down_$index&pagepath=$pagepath&pagesymb=$pagesymb$cpinfo'>
+<img src="${iconpath}move_down.gif" alt='$lt{'dw'}' border='0' /></a></td></tr>
+</table></td>
+<td>$selectbox
+</td><td bgcolor="#DDDDDD">
+<a href='javascript:removeres("$pagepath","$index","$renametitle","page","$pagesymb");'>
+<font size="-2" color="#990000">$lt{'rm'}</font></a>
+<a href='javascript:cutres("$pagepath","$index","$renametitle","page","$pagesymb");'>
+<font size="-2" color="#550044">$lt{'ct'}</font></a>
+<a href='javascript:changename("$pagepath","$index","$renametitle","page","$pagesymb");'>
+<font size="-2" color="#009900">$lt{'rn'}</font></a>
+<a href='javascript:markcopy("$pagepath","$index","$renametitle","page","$pagesymb");'>
+<font size="-2" color="#000099">$lt{'cp'}</font></a></td>
+END
+        } else {
+            $line.=(<<END); 
+<form name="entry_$index" action="/adm/coursedocs" method="post">
+<input type="hidden" name="folderpath" value="$env{'form.folderpath'}" />
+<input type="hidden" name="markedcopy_url" value="$env{'form.markedcopy_url'}" />
+<input type="hidden" name="markedcopy_title" value="$env{'form.markedcopy_title'}" />
+<input type="hidden" name="setparms" value="$orderidx" />
 <td><table border='0' cellspacing='2' cellpadding='0'>
 <tr><td bgcolor="#DDDDDD">
-<a href='/adm/coursedocs?folder=$folder&cmd=up_$index'>
-<img src="${iconpath}move_up.gif" alt='UP' border='0' /></a></td></tr>
+<a href='/adm/coursedocs?cmd=up_$index&folderpath=$folderpath$cpinfo'>
+<img src="${iconpath}move_up.gif" alt='$lt{'up'}' border='0' /></a></td></tr>
 <tr><td bgcolor="#DDDDDD">
-<a href='/adm/coursedocs?folder=$folder&cmd=down_$index'>
-<img src="${iconpath}move_down.gif" alt='DOWN' border='0' /></a></td></tr>
-</table></td><td bgcolor="#DDDDDD">
-<a href='javascript:removeres("$folder","$index","$renametitle");'>
-<font size="-2" color="#990000">Remove</font></a>
-<a href='javascript:changename("$folder","$index","$renametitle");'>
-<font size="-2" color="#009900">Rename</font></a></td>
+<a href='/adm/coursedocs?cmd=down_$index&folderpath=$folderpath$cpinfo'>
+<img src="${iconpath}move_down.gif" alt='$lt{'dw'}' border='0' /></a></td></tr>
+</table></td>
+<td>$selectbox
+</td><td bgcolor="#DDDDDD">
+<a href='javascript:removeres("$folderpath","$index","$renametitle","sequence");'>
+<font size="-2" color="#990000">$lt{'rm'}</font></a>
+<a href='javascript:cutres("$folderpath","$index","$renametitle","sequence");'>
+<font size="-2" color="#550044">$lt{'ct'}</font></a>
+<a href='javascript:changename("$folderpath","$index","$renametitle","sequence");'>
+<font size="-2" color="#009900">$lt{'rn'}</font></a>
+<a href='javascript:markcopy("$folderpath","$index","$renametitle","sequence");'>
+<font size="-2" color="#000099">$lt{'cp'}</font></a></td>
 END
+        }
     }
 # Figure out what kind of a resource this is
     my ($extension)=($url=~/\.(\w+)$/);
     my $uploaded=($url=~/^\/*uploaded\//);
-    my $icon='unknown';
-    if (-e "/home/httpd/html/adm/lonIcons/$extension.gif") {
-	$icon=$extension;
-    }
+    my $icon=&Apache::loncommon::icon($url);
     my $isfolder=0;
+    my $ispage=0;
+    my $folderarg;
+    my $pagearg;
+    my $pagefile;
     if ($uploaded) {
-       if ($extension eq 'sequence') {
-	  $icon='folder_closed';
-          $url=~/\/(\w+)\.sequence/;
-          $url='/adm/coursedocs?folder='.$1;
-          $isfolder=1;
-       } else {
-	  $url=&Apache::lonnet::tokenwrapper($url);
-       } 
+	if ($extension eq 'sequence') {
+	    $icon=$iconpath.'/folder_closed.gif';
+	    $url=~/$coursenum\/([\/\w]+)\.sequence$/;
+	    $url='/adm/coursedocs?';
+	    $folderarg=$1;
+	    $isfolder=1;
+        } elsif ($extension eq 'page') {
+            $icon=$iconpath.'/page.gif';
+            $url=~/$coursenum\/([\/\w]+)\.page$/;
+            $pagearg=$1;
+            $url='/adm/coursedocs?';
+            $ispage=1;
+	} else {
+	    &Apache::lonnet::allowuploaded('/adm/coursedoc',$url);
+	}
     }
     $url=~s/^http\&colon\;\/\//\/adm\/wrapper\/ext\//;
-    if (($residx) && ($folder!~/supplemental/)) {
-       $url.=(($url=~/\?/)?'&':'?').'symb='.
-       &Apache::lonnet::escape(&Apache::lonnet::symbclean(
+    if ((!$isfolder) && ($residx) && ($folder!~/supplemental/) && (!$ispage)) {
+	my $symb=&Apache::lonnet::symbclean(
           &Apache::lonnet::declutter('uploaded/'.
-           $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}.'/'.
-           $ENV{'course.'.$ENV{'request.course.id'}.'.num'}.'/'.$folder.
+           $env{'course.'.$env{'request.course.id'}.'.domain'}.'/'.
+           $env{'course.'.$env{'request.course.id'}.'.num'}.'/'.$folder.
            '.sequence').
            '___'.$residx.'___'.
-	   &Apache::lonnet::declutter($url)));
+	   &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;
+	    }
+	} elsif ($url=~m|^/ext/|) { 
+	    $url='/adm/wrapper'.$url;
+	}
+	$url.=(($url=~/\?/)?'&':'?').'symb='.&Apache::lonnet::escape($symb);
+	if ($container eq 'page') {
+	    my $symb=$env{'form.pagesymb'};
+	    	    
+	    $url=&Apache::lonnet::clutter((&Apache::lonnet::decode_symb($symb))[2]);
+	    $url.=(($url=~/\?/)?'&':'?').'symb='.&Apache::lonnet::escape($symb);
+	}
+    }
+    my $parameterset='&nbsp;';
+    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).$cpinfo;
+	$parameterset='<label>'.&mt('Randomly Pick: ').
+	    '<input type="text" size="4" onChange="this.form.submit()" name="randpick_'.$orderidx.'" value="'.
+	    (&Apache::lonratedt::getparameter($orderidx,
+                                              'parameter_randompick'))[0].
+                                              '" />'.
+'<font size="-2"><a href="javascript:void(0)">'.&mt('Store').'</a></font></label>';
+       
     }
-    if ($isfolder) { $url.='&foldername='.
-       &Apache::lonnet::escape($foldertitle); }
-    $line.='<td bgcolor="#FFFFBB"><a href="'.$url.'" target="cat_'.$folder.
-'"><img src="/adm/lonIcons/'.
-        $icon.'.gif" border="0"></a></td>'.
-        "<td bgcolor='#FFFFBB'><a href='$url' target='cat_$folder'>$title</a></td></tr>";
+    if ($ispage) {
+        my $pagename=&Apache::lonnet::escape($pagetitle);
+        my $pagepath;
+        my $folderpath=$env{'form.folderpath'};
+        if ($folderpath) { $pagepath = $folderpath.'&' };
+        $pagepath.=$pagearg.'&'.$pagename;
+	my $symb=$env{'form.pagesymb'};
+	if (!$symb) {
+	    my $path='uploaded/'.
+		$env{'course.'.$env{'request.course.id'}.'.domain'}.'/'.
+		$env{'course.'.$env{'request.course.id'}.'.num'}.'/';
+	    $symb=&Apache::lonnet::encode_symb($path.$folder.'.sequence',
+					       $residx,
+					       $path.$pagearg.'.page');
+	}
+	$url.='pagepath='.&Apache::lonnet::escape($pagepath).
+	    '&pagesymb='.&Apache::lonnet::escape($symb).$cpinfo;
+    }
+    $line.='<td bgcolor="#FFFFBB"><a href="'.$url.'"><img src="'.$icon.
+	'" border="0"></a></td>'.
+        "<td bgcolor='#FFFFBB'><a href='$url'>$title</a></td>";
+    if (($allowed) && ($folder!~/^supplemental/)) {
+ 	my %lt=&Apache::lonlocal::texthash(
+ 			      'hd' => 'Hidden',
+ 			      'ec' => 'URL hidden');
+	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'>
+<nobr><label><input type="checkbox" name="hidprs_$orderidx" onClick="this.form.submit()" $hidtext /> $lt{'hd'}</label></nobr></td>
+<td bgcolor="#BBBBFF"><font size='-2'>
+<nobr><label><input type="checkbox" name="encprs_$orderidx" onClick="this.form.submit()" $enctext /> $lt{'ec'}</label></nobr></td>
+<td bgcolor="#BBBBFF"><font size="-2">$parameterset</font></td>
+ENDPARMS
+    }
+    $line.="</form></tr>";
     return $line;
 }
 
 # ---------------------------------------------------------------- tie the hash
 
 sub tiehash {
+    my ($mode)=@_;
     $hashtied=0;
-    if ($ENV{'request.course.fn'}) {
-        if (tie(%hash,'GDBM_File',$ENV{'request.course.fn'}.".db",
-            &GDBM_READER(),0640)) {
+    if ($env{'request.course.fn'}) {
+	if ($mode eq 'write') {
+	    if (tie(%hash,'GDBM_File',$env{'request.course.fn'}.".db",
+		    &GDBM_WRCREAT(),0640)) {
+                $hashtied=2;
+	    }
+	} else {
+	    if (tie(%hash,'GDBM_File',$env{'request.course.fn'}.".db",
+		    &GDBM_READER(),0640)) {
                 $hashtied=1;
-        }
+	    }
+	}
     }    
 }
 
@@ -432,10 +1651,11 @@ sub untiehash {
 
 sub checkonthis {
     my ($r,$url,$level,$title)=@_;
+    $url=&Apache::lonnet::unescape($url);
     $alreadyseen{$url}=1;
     $r->rflush();
     if (($url) && ($url!~/^\/uploaded\//) && ($url!~/\*$/)) {
-       $r->print('<br />');
+       $r->print("\n<br />");
        for (my $i=0;$i<=$level*5;$i++) {
            $r->print('&nbsp;');
        }
@@ -444,8 +1664,8 @@ sub checkonthis {
        if ($url=~/^\/res\//) {
 	  my $result=&Apache::lonnet::repcopy(
                               &Apache::lonnet::filelocation('',$url));
-          if ($result==OK) {
-             $r->print('<font color="green">ok</font>');
+          if ($result eq 'ok') {
+             $r->print('<font color="green">'.&mt('ok').'</font>');
              $r->rflush();
              &Apache::lonnet::countacc($url);
              $url=~/\.(\w+)$/;
@@ -455,25 +1675,25 @@ sub checkonthis {
                  for (my $i=0;$i<=$level*5;$i++) {
                      $r->print('&nbsp;');
                  }
-                 $r->print('- Rendering: ');
-                 my $oldpath=$ENV{'request.filename'};
-                 $ENV{'request.filename'}=&Apache::lonnet::filelocation('',$url);
-                 &Apache::lonxml::xmlparse($r,'web',
-                   &Apache::lonnet::getfile(
-                    &Apache::lonnet::filelocation('',$url)));
-		 $ENV{'request.filename'}=$oldpath;
-                 if (($Apache::lonxml::errorcount) ||
-                     ($Apache::lonxml::warningcount)) {
-		     if ($Apache::lonxml::errorcount) {
-                        $r->print('<font color="red"><b>'.
-			  $Apache::lonxml::errorcount.' error(s)</b></font> ');
+                 $r->print('- '.&mt('Rendering').': ');
+		 my ($errorcount,$warningcount)=split(/:/,
+	       &Apache::lonnet::ssi_body($url,
+			       ('grade_target'=>'web',
+				'return_only_error_and_warning_counts' => 1)));
+                 if (($errorcount) ||
+                     ($warningcount)) {
+		     if ($errorcount) {
+                        $r->print('<img src="/adm/lonMisc/bomb.gif" /><font color="red"><b>'.
+			  $errorcount.' '.
+				  &mt('error(s)').'</b></font> ');
                      }
-		     if ($Apache::lonxml::warningcount) {
+		     if ($warningcount) {
                         $r->print('<font color="blue">'.
-			  $Apache::lonxml::warningcount.' warning(s)</font>');
+			  $warningcount.' '.
+				  &mt('warning(s)').'</font>');
                      }
                  } else {
-                     $r->print('<font color="green">ok</font>');
+                     $r->print('<font color="green">'.&mt('ok').'</font>');
                  }
                  $r->rflush();
              }
@@ -484,12 +1704,16 @@ sub checkonthis {
                     &checkonthis($r,$_,$level+1);
                  }
              }
-          } elsif ($result==HTTP_SERVICE_UNAVAILABLE) {
-             $r->print('<font color="red"><b>connection down</b></font>');
-          } elsif ($result==HTTP_NOT_FOUND) {
-             $r->print('<font color="red"><b>not found</b></font>');
+          } elsif ($result eq 'unavailable') {
+             $r->print('<font color="red"><b>'.&mt('connection down').'</b></font>');
+          } elsif ($result eq 'not_found') {
+	      unless ($url=~/\$/) {
+		  $r->print('<font color="red"><b>'.&mt('not found').'</b></font>');
+	      } else {
+		  $r->print('<font color="yellow"><b>'.&mt('unable to verify variable URL').'</b></font>');
+	      }
           } else {
-             $r->print('<font color="red"><b>access denied</b></font>');
+             $r->print('<font color="red"><b>'.&mt('access denied').'</b></font>');
           }
       }
    }
@@ -497,178 +1721,439 @@ sub checkonthis {
 
 
 #
+# ----------------------------------------------------------------- List Symbs
+# 
+sub list_symbs {
+   my $r=shift; 
+   my $html=&Apache::lonxml::xmlbegin();
+   $r->print($html.'<head><title>Symb List</title></head>'.
+              &Apache::loncommon::bodytag('Symb List'));
+   my $navmap = Apache::lonnavmaps::navmap->new();
+   $r->print("<pre>\n");
+   foreach my $res ($navmap->retrieveResources()) {
+       $r->print($res->compTitle()."\t".$res->symb()."\n");
+   }
+   $r->print("\n</pre>\n");
+   $r->print('<a href="/adm/coursedocs">'.&mt('Return to DOCS').'</a>');
+}
+
+
+#
 # -------------------------------------------------------------- Verify Content
 # 
 sub verifycontent {
    my $r=shift; 
    my $loaderror=&Apache::lonnet::overloaderror($r);
    if ($loaderror) { return $loaderror; }
-
-   $r->print('<html><head><title>Verify Content</title></head>'.
+   my $html=&Apache::lonxml::xmlbegin();
+   $r->print($html.'<head><title>Verify Content</title></head>'.
               &Apache::loncommon::bodytag('Verify Course Documents'));
    $hashtied=0;
    undef %alreadyseen;
    %alreadyseen=();
    &tiehash();
    foreach (keys %hash) {
-       if (($_=~/^src\_(.+)$/) && (!$alreadyseen{$hash{$_}})) {
+       if ($hash{$_}=~/\.(page|sequence)$/) {
+	   if (($_=~/^src_/) && ($alreadyseen{&Apache::lonnet::unescape($hash{$_})})) {
+	       $r->print('<hr /><font color="red">'.
+			 &mt('The following sequence or page is included more than once in your course: ').
+			 &Apache::lonnet::unescape($hash{$_}).'</font><br />'.
+			 &mt('Note that grading records for problems included in this sequence or folder will overlap.<hr />'));
+	   }
+       }
+       if (($_=~/^src\_(.+)$/) && (!$alreadyseen{&Apache::lonnet::unescape($hash{$_})})) {
            &checkonthis($r,$hash{$_},0,$hash{'title_'.$1});
        }
    }
    &untiehash();
-   $r->print('<h1>Done.</h1>');
+   $r->print('<h1>'.&mt('Done').'.</h1>'.'<a href="/adm/coursedocs">'.
+	     &mt('Return to DOCS').'</a>');
 }
 
+
 # -------------------------------------------------------------- Check Versions
 
+sub devalidateversioncache {
+    my $src=shift;
+    &Apache::lonnet::devalidate_cache_new('courseresversion',$env{'request.course.id'}.'_'.
+					  &Apache::lonnet::clutter($src));
+}
+
 sub checkversions {
     my $r=shift;
-   $r->print('<html><head><title>Check Versions</title></head>'.
+    my $html=&Apache::lonxml::xmlbegin();
+    $r->print($html.'<head><title>Check Versions</title></head>'.
               &Apache::loncommon::bodytag('Check Course Document Versions'));
-   $hashtied=0;
-   &tiehash();
-   my %changes=&Apache::lonnet::dump
-    ('versionupdate',$ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
-                     $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
-   my $firstkey=(keys %changes)[0];
-   unless ($firstkey=~/^error\:/) {
-       unless ($ENV{'form.timerange'}) {
-	   $ENV{'form.timerange'}=604800;
-       }
-       my $seltext='during the last '.$ENV{'form.timerange'}.' seconds';
-       my $startsel='';
-       my $monthsel='';
-       my $weeksel='';
-       my $daysel='';
-       if ($ENV{'form.timerange'}==-1) {
-	   $seltext='since start of course';
-           $startsel='selected';
-           $ENV{'form.timerange'}=time;
-       }
-       my $starttime=time-$ENV{'form.timerange'};
-       if ($ENV{'form.timerange'}==2592000) {
-           $seltext='during the last month ('.localtime($starttime).')';
-           $monthsel='selected';
-       } elsif ($ENV{'form.timerange'}==604800) {
-           $seltext='during the last week ('.localtime($starttime).')';
-           $weeksel='selected';
-       } elsif ($ENV{'form.timerange'}==86400) {
-           $seltext='since yesterday ('.localtime($starttime).')';
-           $daysel='selected';
-       }
+    my $header='';
+    my $startsel='';
+    my $monthsel='';
+    my $weeksel='';
+    my $daysel='';
+    my $allsel='';
+    my %changes=();
+    my $starttime=0;
+    my $haschanged=0;
+    my %setversions=&Apache::lonnet::dump('resourceversions',
+			  $env{'course.'.$env{'request.course.id'}.'.domain'},
+			  $env{'course.'.$env{'request.course.id'}.'.num'});
 
-       $r->print(<<ENDHEADERS);
+    $hashtied=0;
+    &tiehash();
+    my %newsetversions=();
+    if ($env{'form.setmostrecent'}) {
+	$haschanged=1;
+	foreach (keys %hash) {
+	    if ($_=~/^ids\_(\/res\/.+)$/) {
+		$newsetversions{$1}='mostrecent';
+                &devalidateversioncache($1);
+	    }
+	}
+    } elsif ($env{'form.setcurrent'}) {
+	$haschanged=1;
+	foreach (keys %hash) {
+	    if ($_=~/^ids\_(\/res\/.+)$/) {
+		my $getvers=&Apache::lonnet::getversion($1);
+		if ($getvers>0) {
+		    $newsetversions{$1}=$getvers;
+		    &devalidateversioncache($1);
+		}
+	    }
+	}
+    } elsif ($env{'form.setversions'}) {
+	$haschanged=1;
+	foreach (keys %env) {
+	    if ($_=~/^form\.set_version_(.+)$/) {
+		my $src=$1;
+		if (($env{$_}) && ($env{$_} ne $setversions{$src})) {
+		    $newsetversions{$src}=$env{$_};
+		    &devalidateversioncache($src);
+		}
+	    }
+	}
+    }
+    if ($haschanged) {
+        if (&Apache::lonnet::put('resourceversions',\%newsetversions,
+			  $env{'course.'.$env{'request.course.id'}.'.domain'},
+			  $env{'course.'.$env{'request.course.id'}.'.num'}) eq 'ok') {		
+	    $r->print('<h1>'.&mt('Your Version Settings have been Stored').'</h1>');
+	} else {
+	    $r->print('<h1><font color="red">'.&mt('An Error Occured while Attempting to Store your Version Settings').'</font></h1>');
+	}
+	&mark_hash_old();
+    }
+    &changewarning($r,'');
+    if ($env{'form.timerange'} eq 'all') {
+# show all documents
+	$header=&mt('All Documents in Course');
+	$allsel=1;
+	foreach (keys %hash) {
+	    if ($_=~/^ids\_(\/res\/.+)$/) {
+		my $src=$1;
+		$changes{$src}=1;
+	    }
+	}
+    } else {
+# show documents which changed
+	%changes=&Apache::lonnet::dump
+	 ('versionupdate',$env{'course.'.$env{'request.course.id'}.'.domain'},
+                     $env{'course.'.$env{'request.course.id'}.'.num'});
+	my $firstkey=(keys %changes)[0];
+	unless ($firstkey=~/^error\:/) {
+	    unless ($env{'form.timerange'}) {
+		$env{'form.timerange'}=604800;
+	    }
+	    my $seltext=&mt('during the last').' '.$env{'form.timerange'}.' '
+		.&mt('seconds');
+	    if ($env{'form.timerange'}==-1) {
+		$seltext='since start of course';
+		$startsel='selected';
+		$env{'form.timerange'}=time;
+	    }
+	    $starttime=time-$env{'form.timerange'};
+	    if ($env{'form.timerange'}==2592000) {
+		$seltext=&mt('during the last month').' ('.&Apache::lonlocal::locallocaltime($starttime).')';
+		$monthsel='selected';
+	    } elsif ($env{'form.timerange'}==604800) {
+		$seltext=&mt('during the last week').' ('.&Apache::lonlocal::locallocaltime($starttime).')';
+		$weeksel='selected';
+	    } elsif ($env{'form.timerange'}==86400) {
+		$seltext=&mt('since yesterday').' ('.&Apache::lonlocal::locallocaltime($starttime).')';
+		$daysel='selected';
+	    }
+	    $header=&mt('Content changed').' '.$seltext;
+	} else {
+	    $header=&mt('No content modifications yet.');
+	}
+    }
+    %setversions=&Apache::lonnet::dump('resourceversions',
+			  $env{'course.'.$env{'request.course.id'}.'.domain'},
+			  $env{'course.'.$env{'request.course.id'}.'.num'});
+    my %lt=&Apache::lonlocal::texthash
+	      ('st' => 'Version changes since start of Course',
+	       'lm' => 'Version changes since last Month',
+	       'lw' => 'Version changes since last Week',
+	       'sy' => 'Version changes since Yesterday',
+               'al' => 'All Resources (possibly large output)',
+	       'sd' => 'Display',
+	       'fi' => 'File',
+	       'md' => 'Modification Date',
+               'mr' => 'Most recently published Version',
+	       've' => 'Version used in Course',
+               'vu' => 'Set Version to be used in Course',
+'sv' => 'Set Versions to be used in Course according to Selections below',
+'sm' => 'Keep all Resources up-to-date with most recent Versions (default)',
+'sc' => 'Set all Resource Versions to current Version (Fix Versions)',
+	       'di' => 'Differences');
+    $r->print(<<ENDHEADERS);
 <form action="/adm/coursedocs" method="post">
+<input type="hidden" name="versions" value="1" />
+<input type="submit" name="setmostrecent" value="$lt{'sm'}" />
+<input type="submit" name="setcurrent" value="$lt{'sc'}" /><hr />
 <select name="timerange">
-<option value="-1" $startsel>Since Start of Course</option>
-<option value="2592000" $monthsel>Last Month</option>
-<option value="604800" $weeksel>Last Week</option>
-<option value="86400" $daysel>Since Yesterday</option>
+<option value='all' $allsel>$lt{'al'}</option>
+<option value="-1" $startsel>$lt{'st'}</option>
+<option value="2592000" $monthsel>$lt{'lm'}</option>
+<option value="604800" $weeksel>$lt{'lw'}</option>
+<option value="86400" $daysel>$lt{'sy'}</option>
 </select>
-<input type="submit" name="versions" value="Display" />
-</form>
-<h3>Content changed $seltext</h3>
-<table border="2">
-<tr>
-<th>File</th><th>Modification Date</th>
-<th>Version</th><th>Differences</th></tr>
+<input type="submit" name="display" value="$lt{'sd'}" />
+<h3>$header</h3>
+<input type="submit" name="setversions" value="$lt{'sv'}" />
+<table border="0">
 ENDHEADERS
-       foreach (keys %changes) {
-	  if ($changes{$_}>$starttime) {
-	     my ($root,$extension)=($_=~/^(.*)\.(\w+)$/);
-             my $currentversion=&Apache::lonnet::getversion($_);
-             my $linkurl=&Apache::lonnet::clutter($_);
-             $r->print(
-                 '<tr><td><a href="'.$linkurl.'" target="cat">'.$linkurl.
-                 '</a></td><td>'.
-                 localtime($changes{$_}).'</td><td>'.$currentversion.'</td>'.
-		       '<td>');
-             my $lastold=1;
-             for (my $prevvers=1;$prevvers<$currentversion;$prevvers++) {
-                 my $url=$root.'.'.$prevvers.'.'.$extension;
-                 if (&Apache::lonnet::metadata($url,'lastrevisiondate')<
-                                                             $starttime) {
-                     $lastold=$prevvers;
-                 }
-             }
+    foreach (sort keys %changes) {
+	if ($changes{$_}>$starttime) {
+	    my ($root,$extension)=($_=~/^(.*)\.(\w+)$/);
+	    my $currentversion=&Apache::lonnet::getversion($_);
+	    if ($currentversion<0) {
+		$currentversion=&mt('Could not be determined.');
+	    }
+	    my $linkurl=&Apache::lonnet::clutter($_);
+	    $r->print(
+		      '<tr><td colspan="5"><br /><br /><font size="+1"><b>'.
+		      &Apache::lonnet::gettitle($linkurl).
+                      '</b></font></td></tr>'.
+                      '<tr><td>&nbsp;&nbsp;&nbsp;</td>'.
+                      '<td colspan="4">'.
+                      '<a href="'.$linkurl.'" target="cat">'.$linkurl.
+		      '</a></td></tr>'.
+                      '<tr><td></td>'.
+                      '<td title="'.$lt{'md'}.'">'.
+		      &Apache::lonlocal::locallocaltime(
+                           &Apache::lonnet::metadata($root.'.'.$extension,
+                                                     'lastrevisiondate')
+                                                        ).
+                      '</td>'.
+                      '<td title="'.$lt{'mr'}.'"><nobr>Most Recent: '.
+                      '<font size="+1">'.$currentversion.'</font>'.
+                      '</nobr></td>'.
+                      '<td title="'.$lt{'ve'}.'"><nobr>In Course: '.
+                      '<font size="+1">');
+# Used in course
+	    my $usedversion=$hash{'version_'.$linkurl};
+	    if (($usedversion) && ($usedversion ne 'mostrecent')) {
+		$r->print($usedversion);
+	    } else {
+		$r->print($currentversion);
+	    }
+	    $r->print('</font></nobr></td><td title="'.$lt{'vu'}.'">'.
+                      '<nobr>Use: ');
+# Set version
+	    $r->print(&Apache::loncommon::select_form($setversions{$linkurl},
+						      'set_version_'.$linkurl,
+						      ('select_form_order' =>
+						       ['',1..$currentversion,'mostrecent'],
+						       '' => '',
+						       'mostrecent' => 'most recent',
+						       map {$_,$_} (1..$currentversion))));
+	    $r->print('</nobr></td></tr><tr><td></td>');
+	    my $lastold=1;
+	    for (my $prevvers=1;$prevvers<$currentversion;$prevvers++) {
+		my $url=$root.'.'.$prevvers.'.'.$extension;
+		if (&Apache::lonnet::metadata($url,'lastrevisiondate')<
+		    $starttime) {
+		    $lastold=$prevvers;
+		}
+	    }
+            # 
+            # Code to figure out how many version entries should go in
+            # each of the four columns
+            my $entries_per_col = 0;
+            my $num_entries = ($currentversion-$lastold);
+            if ($num_entries % 4 == 0) {
+                $entries_per_col = $num_entries/4;
+            } else {
+                $entries_per_col = $num_entries/4 + 1;
+            }
+            my $entries_count = 0;
+            $r->print('<td valign="top"><font size="-2">'); 
+            my $cols_output = 1;
             for (my $prevvers=$lastold;$prevvers<$currentversion;$prevvers++) {
-                 my $url=$root.'.'.$prevvers.'.'.$extension;
-                 $r->print('<a href="'.&Apache::lonnet::clutter($url).
-                   '">Version '.$prevvers.' ('.
-                 localtime(&Apache::lonnet::metadata($url,'lastrevisiondate')).
-                 ')</a>');
-                 if (&Apache::loncommon::fileembstyle($extension) eq 'ssi') {
+		my $url=$root.'.'.$prevvers.'.'.$extension;
+		$r->print('<nobr><a href="'.&Apache::lonnet::clutter($url).
+			  '">'.&mt('Version').' '.$prevvers.'</a> ('.
+			  &Apache::lonlocal::locallocaltime(
+                                &Apache::lonnet::metadata($url,
+                                                          'lastrevisiondate')
+                                                            ).
+			  ')');
+		if (&Apache::loncommon::fileembstyle($extension) eq 'ssi') {
                     $r->print(' <a href="/adm/diff?filename='.
-                            &Apache::lonnet::clutter($root.'.'.$extension).
-                            '&versionone='.$prevvers.
-			     '">Diffs</a>');
-                 }
-                 $r->print('<br />');
-             }
-             $r->print('</td></tr>');
-          }
-       }
-       $r->print('</table>');
-       $r->print('<h1>Done.</h1>');
-   } else {
-       $r->print('<p>No content modifications yet.</p>');
-   }
-   &untiehash();
+			      &Apache::lonnet::clutter($root.'.'.$extension).
+			      '&versionone='.$prevvers.
+			      '">'.&mt('Diffs').'</a>');
+		}
+		$r->print('</nobr><br />');
+                if (++$entries_count % $entries_per_col == 0) {
+                    $r->print('</font></td>');
+                    if ($cols_output != 4) {
+                        $r->print('<td valign="top"><font size="-2">');
+                        $cols_output++;
+                    }
+                }
+	    }
+            while($cols_output++ < 4) {
+                $r->print('</font></td><td><font>')
+            }
+	    $r->print('</font></td></tr>'."\n");
+	}
+    }
+    $r->print('</table></form>');
+    $r->print('<h1>'.&mt('Done').'.</h1>');
+
+    &untiehash();
+}
+
+sub mark_hash_old {
+    my $retie_hash=0;
+    if ($hashtied) {
+	$retie_hash=1;
+	&untiehash();
+    }
+    &tiehash('write');
+    $hash{'old'}=1;
+    &untiehash();
+    if ($retie_hash) { &tiehash(); }
+}
+
+sub is_hash_old {
+    my $untie_hash=0;
+    if (!$hashtied) {
+	$untie_hash=1;
+	&tiehash();
+    }
+    my $return=$hash{'old'};
+    if ($untie_hash) { &untiehash(); }
+    return $return;
+}
+
+sub changewarning {
+    my ($r,$postexec,$message,$url)=@_;
+    if (!&is_hash_old()) { return; }
+    my $pathvar='folderpath';
+    my $path=&Apache::lonnet::escape($env{'form.folderpath'});
+    if (!defined($url)) {
+	if (defined($env{'form.pagepath'})) {
+	    $pathvar='pagepath';
+	    $path=&Apache::lonnet::escape($env{'form.pagepath'});
+	    $path.='&amp;pagesymb='.&Apache::lonnet::escape($env{'form.pagesymb'});
+	}
+	$url='/adm/coursedocs?'.$pathvar.'='.$path;
+    }
+    if (!defined($message)) {
+	$message='Changes will become active for your current session after [_1], or the next time you log in.';
+    }
+    $r->print("\n\n".
+'<script>function reinit(tf) { tf.submit();'.$postexec.' }</script>'."\n". 
+'<form name="reinitform" method="post" action="/adm/roles" target="loncapaclient">'.
+'<input type="hidden" name="orgurl" value="'.$url.
+'" /><input type="hidden" name="selectrole" value="1" /><h3><font color="red">'.
+&mt($message,' <input type="hidden" name="'.
+    $env{'request.role'}.'" value="1" /><input type="button" value="'.
+    &mt('re-initializing course').'" onClick="reinit(this.form)" />').
+$help{'Caching'}.'</font></h3></form>'."\n\n");
 }
 
 # ================================================================ Main Handler
 sub handler {
     my $r = shift;
-    $r->content_type('text/html');
+    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'});
+    &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;
     return OK if $r->header_only;
 
 # --------------------------------------------- Initialize help topics for this
-  foreach ('Adding_Course_Doc','Main_Course_Documents',
-           'Adding_External_Resource','Navigate_Content',
-           'Adding_Folders','Docs_Overview', 'Load_Map',
-           'Supplemental', 'Score_Upload_Form',
-           'Importing_LON-CAPA_Resource','Uploading_From_Harddrive') {
-      $help{$_}=&Apache::loncommon::help_open_topic('Docs_'.$_);
-  }
+    foreach ('Adding_Course_Doc','Main_Course_Documents',
+	     'Adding_External_Resource','Navigate_Content',
+	     'Adding_Folders','Docs_Overview', 'Load_Map',
+	     'Supplemental','Score_Upload_Form','Adding_Pages',
+	     'Importing_LON-CAPA_Resource','Uploading_From_Harddrive',
+	     'Check_Resource_Versions','Verify_Content') {
+	$help{$_}=&Apache::loncommon::help_open_topic('Docs_'.$_);
+    }
     # Composite help files
     $help{'Syllabus'} = &Apache::loncommon::help_open_topic(
 		    'Docs_About_Syllabus,Docs_Editing_Templated_Pages');
     $help{'Simple Page'} = &Apache::loncommon::help_open_topic(
 		    'Docs_About_Simple_Page,Docs_Editing_Templated_Pages');
+    $help{'Simple Problem'} = &Apache::loncommon::help_open_topic(
+		    'Option_Response_Simple');
     $help{'Bulletin Board'} = &Apache::loncommon::help_open_topic(
 		    'Docs_About_Bulletin_Board,Docs_Editing_Templated_Pages');
     $help{'My Personal Info'} = &Apache::loncommon::help_open_topic(
 		  'Docs_About_My_Personal_Info,Docs_Editing_Templated_Pages');
     $help{'Caching'} = &Apache::loncommon::help_open_topic('Caching');
- 
-  if ($ENV{'form.verify'}) {
+
+# does this user have privileges to modify docs
+    my $allowed=&Apache::lonnet::allowed('mdc',$env{'request.course.id'});
+
+  if ($allowed && $env{'form.verify'}) {
       &verifycontent($r);
-  } elsif ($ENV{'form.versions'}) {
+  } elsif ($allowed && $env{'form.listsymbs'}) {
+      &list_symbs($r);
+  } elsif ($allowed && $env{'form.versions'}) {
       &checkversions($r);
-  } elsif ($ENV{'form.dumpcourse'}) {
+  } elsif ($allowed && $env{'form.dumpcourse'}) {
       &dumpcourse($r);
+  } elsif ($allowed && $env{'form.exportcourse'}) {
+      &exportcourse($r);
   } else {
 # is this a standard course?
 
-    my $standard=($ENV{'request.course.uri'}=~/^\/uploaded\//);
-    my $forcestandard;
+    my $standard=($env{'request.course.uri'}=~/^\/uploaded\//);
+    my $forcestandard = 0;
     my $forcesupplement;
     my $script='';
-    my $allowed;
     my $events='';
     my $showdoc=0;
+    my $containertag;
+    my $uploadtag;
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
-       ['folder','foldername']);
+    ['folderpath','pagepath','pagesymb','markedcopy_url','markedcopy_title']);
+    if ($env{'form.folderpath'}) {
+	my (@folderpath)=split('&',$env{'form.folderpath'});
+	$env{'form.foldername'}=&Apache::lonnet::unescape(pop(@folderpath));
+	$env{'form.folder'}=pop(@folderpath);
+    }
+    if ($env{'form.pagepath'}) {
+        my (@pagepath)=split('&',$env{'form.pagepath'});
+        $env{'form.pagename'}=&Apache::lonnet::unescape(pop(@pagepath));
+        $env{'form.folder'}=pop(@pagepath);
+        $containertag = '<input type="hidden" name="pagepath" value="" />'.
+	    '<input type="hidden" name="pagesymb" value="" />';
+        $uploadtag = '<input type="hidden" name="pagepath" value="'.$env{'form.pagepath'}.'" />'.
+	    '<input type="hidden" name="pagesymb" value="'.$env{'form.pagesymb'}.'" />';
+    }
     if ($r->uri=~/^\/adm\/coursedocs\/showdoc\/(.*)$/) {
-       $showdoc=$1;
+       $showdoc='/'.$1;
     }
     unless ($showdoc) { # got called from remote
-       $forcestandard=($ENV{'form.folder'}=~/^default_/);
-       $forcesupplement=($ENV{'form.folder'}=~/^supplemental_/);
+       if (($env{'form.folder'}=~/^default_/) || 
+          ($env{'form.folder'} =~ m:^\d+/(pages|sequences)/:)) {
+           $forcestandard = 1;
+       } 
+       $forcesupplement=($env{'form.folder'}=~/^supplemental_/);
 
-# does this user have privileges to post, etc?
-       $allowed=&Apache::lonnet::allowed('mdc',$ENV{'request.course.id'});
        if ($allowed) { 
          &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['cmd']);
          $script=&Apache::lonratedt::editscript('simple'); 
@@ -681,25 +2166,26 @@ sub handler {
     }
 
 # get course data
-    my $coursenum=$ENV{'course.'.$ENV{'request.course.id'}.'.num'};
-    my $coursedom=$ENV{'course.'.$ENV{'request.course.id'}.'.domain'};
+    my $coursenum=$env{'course.'.$env{'request.course.id'}.'.num'};
+    my $coursedom=$env{'course.'.$env{'request.course.id'}.'.domain'};
 
 # get personal data
  
-    my $uname=$ENV{'user.name'};
-    my $udom=$ENV{'user.domain'};
+    my $uname=$env{'user.name'};
+    my $udom=$env{'user.domain'};
     my $plainname=&Apache::lonnet::escape(
                      &Apache::loncommon::plainname($uname,$udom));
 
 # graphics settings
 
-    $iconpath = $r->dir_config('lonIconsURL') . "/";
+    $iconpath = &Apache::loncommon::lonhttpdurl($r->dir_config('lonIconsURL') . "/");
 
     my $now=time;
 
 # print screen
+       my $html=&Apache::lonxml::xmlbegin();
     $r->print(<<ENDDOCUMENT);
-<html>
+$html
 <head>
 <title>The LearningOnline Network with CAPA</title>
 <script>
@@ -717,6 +2203,14 @@ function makenewfolder(targetform,folder
     }
 }
 
+function makenewpage(targetform,folderseq) {
+    var pagename=prompt('Name of New Page','New Page');
+    if (pagename) {
+        targetform.importdetail.value=pagename+"="+folderseq;
+        targetform.submit();
+    }
+}
+
 function makenewext(targetname) {
     this.document.forms.extimport.useform.value=targetname;
     window.open('/adm/rat/extpickframe.html');
@@ -758,6 +2252,33 @@ function makebulboard() {
    }
 }
 
+function makeabout() {
+   var user=prompt("Enter user\@domain for User's 'About Me' Page");
+   if (user) {
+       var comp=new Array();
+       comp=user.split('\@');
+       if ((typeof(comp[0])!=undefined) && (typeof(comp[1])!=undefined)) {
+	   if ((comp[0]) && (comp[1])) {
+	       this.document.forms.newaboutsomeone.importdetail.value=
+		   'About '+user+'=/adm/'+comp[1]+'/'+comp[0]+'/aboutme';
+	       this.document.forms.newaboutsomeone.submit();
+	   } else {
+               alert("Not a valid user\@domain");
+           }
+       } else {
+           alert("Please enter both user and domain in the format user\@domain"); 
+       }
+   }
+}
+
+function makeims() {
+    var caller = document.forms.ims.folder.value;
+    var newlocation = "/adm/imsimportdocs?folder="+caller+"&phase=one";
+    newWindow = window.open("","IMSimport","HEIGHT=700,WIDTH=750,scrollbars=yes");
+    newWindow.location.href = newlocation;
+}
+
+
 function finishpick() {
     var title=this.document.forms.extimport.title.value;
     var url=this.document.forms.extimport.url.value;
@@ -767,23 +2288,63 @@ function finishpick() {
     '";this.document.forms.'+form+'.submit();');
 }
 
-function changename(folder,index,oldtitle) {
+function changename(folderpath,index,oldtitle,container,pagesymb) {
     var title=prompt('New Title',oldtitle);
     if (title) {
 	this.document.forms.renameform.title.value=title;
 	this.document.forms.renameform.cmd.value='rename_'+index;
-	this.document.forms.renameform.folder.value=folder;
+        if (container == 'sequence') {
+	    this.document.forms.renameform.folderpath.value=folderpath;
+        }
+        if (container == 'page') {
+            this.document.forms.renameform.pagepath.value=folderpath;
+            this.document.forms.renameform.pagesymb.value=pagesymb;
+        }
         this.document.forms.renameform.submit();
     }
 }
 
-function removeres(folder,index,oldtitle) {
-    if ((oldtitle=='NO RESOURCE') || (confirm('Remove "'+oldtitle+'"?'))) {
+function removeres(folderpath,index,oldtitle,container,pagesymb) {
+    if (confirm('WARNING: Removing a resource makes associated grades and scores inaccessible!\\nRemove "'+oldtitle+'"?')) {
 	this.document.forms.renameform.cmd.value='del_'+index;
-	this.document.forms.renameform.folder.value=folder;
+        if (container == 'sequence') {
+            this.document.forms.renameform.folderpath.value=folderpath;
+        }
+        if (container == 'page') {
+            this.document.forms.renameform.pagepath.value=folderpath;
+            this.document.forms.renameform.pagesymb.value=pagesymb;
+        }
+        this.document.forms.renameform.submit();
+    }
+}
+
+function cutres(folderpath,index,oldtitle,container,pagesymb) {
+    if (confirm('WARNING: Cutting a resource makes associated grades and scores inaccessible!\\nGrades remain inaccessible if resource is pasted into another folder.\\nCut "'+oldtitle+'"?')) {
+	this.document.forms.renameform.cmd.value='cut_'+index;
+	this.document.forms.renameform.markcopy.value=index;
+        if (container == 'sequence') {
+            this.document.forms.renameform.folderpath.value=folderpath;
+        }
+        if (container == 'page') {
+            this.document.forms.renameform.pagepath.value=folderpath;
+            this.document.forms.renameform.pagesymb.value=pagesymb;
+        }
         this.document.forms.renameform.submit();
     }
 }
+
+function markcopy(folderpath,index,oldtitle,container,pagesymb) {
+    this.document.forms.renameform.markcopy.value=index;
+    if (container == 'sequence') {
+	this.document.forms.renameform.folderpath.value=folderpath;
+    }
+    if (container == 'page') {
+	this.document.forms.renameform.pagepath.value=folderpath;
+	this.document.forms.renameform.pagesymb.value=pagesymb;
+    }
+    this.document.forms.renameform.submit();
+}
+
 </script>
 
 ENDNEWSCRIPT
@@ -791,201 +2352,406 @@ ENDNEWSCRIPT
 # -------------------------------------------------------------------- Body tag
   $r->print('</head>'.
             &Apache::loncommon::bodytag('Course Documents','',$events,
-					'','',$showdoc));
-  unless ($showdoc) {
+					'','',$showdoc).
+	    &Apache::loncommon::help_open_menu('','','','',273,'RAT'));
+  my %allfiles = ();
+  my %codebase = ();
+  my ($upload_result,$upload_output);
+  if ($allowed) {
+      if (($env{'form.uploaddoc.filename'}) &&                                               ($env{'form.cmd'}=~/^upload_(\w+)/)) {
+# Process file upload - phase one - upload and parse primary file.  
+          $upload_result = &process_file_upload(\$upload_output,$coursenum,
+						$coursedom,\%allfiles,
+						\%codebase,$1);
+          if ($upload_result eq 'phasetwo') {
+              $r->print($upload_output);
+          }
+      } elsif ($env{'form.phasetwo'}) {
+          my %newname = ();
+          my %origname = ();
+          my %attribs = ();
+          my $updateflag = 0;
+          my $residx = $env{'form.newidx'};
+          my $primary_url = &Apache::lonnet::unescape($env{'form.primaryurl'});
+# Process file upload - phase two - gather secondary files.
+          for (my $i=0; $i<$env{'form.phasetwo'}; $i++) {
+              if ($env{'form.embedded_item_'.$i.'.filename'}) {
+                  my $javacodebase;
+                  $newname{$i} = &process_secondary_uploads(\$upload_output,$coursedom,$coursenum,'embedded_item_',$i,$residx);
+                  $origname{$i} = &Apache::lonnet::unescape($env{'form.embedded_orig_'.$i});
+                  if (exists($env{'form.embedded_codebase_'.$i})) {
+                      $javacodebase =  &Apache::lonnet::unescape($env{'form.embedded_codebase_'.$i});  
+                      $origname{$i} =~ s#^\Q$javacodebase\E/##; 
+                  }
+                  my @attributes = ();
+                  if ($env{'form.embedded_attrib_'.$i} =~ /:/) {
+                      @attributes = split/:/,$env{'form.embedded_attrib_'.$i};
+                  } else {
+                      @attributes = ($env{'form.embedded_attrib_'.$i});
+                  }
+                  foreach (@attributes) {
+                      push(@{$attribs{$i}},&Apache::lonnet::unescape($_));
+                  }
+                  if ($javacodebase) {
+                      $codebase{$i} = $javacodebase;
+                      $codebase{$i} =~ s#/$##;
+                      $updateflag = 1;
+                  }
+              }
+              unless ($newname{$i} eq $origname{$i}) {
+                  $updateflag = 1;
+              }
+          }
+# Process file upload - phase three - modify primary file
+          if ($updateflag) {
+              my ($content,$rtncode);
+              my $updateflag = 0;
+              my $getstatus = &Apache::lonnet::getuploaded('GET',$primary_url,$coursedom,$coursenum,\$content,\$rtncode);
+              if ($getstatus eq 'ok') {
+                  foreach my $item (keys %newname) {
+                      if ($newname{$item} ne $origname{$item}) {
+                          my $attrib_regexp = '';
+                          if (@{$attribs{$item}} > 1) {
+                              $attrib_regexp = join('|',@{$attribs{$item}});
+                          } else {
+                              $attrib_regexp = $attribs{$item}[0];
+                          }
+                          if ($content =~ m#($attrib_regexp\s*=\s*['"]?)\Q$origname{$item}\E(['"]?)#) {
+                          } 
+                          $content =~ s#($attrib_regexp\s*=\s*['"]?)\Q$origname{$item}\E(['"]?)#$1$newname{$item}$2#gi; 
+                      }
+                      if (exists($codebase{$item})) {
+                          $content =~ s/(codebase\s*=\s*["']?)\Q$codebase{$item}\E(["']?)/$1.$2/i;
+                      }
+                  }
+# Save edited file.
+                  my $saveresult;
+                  my $docuname=$env{'course.'.$env{'request.course.id'}.'.num'};
+                  my $docudom=$env{'course.'.$env{'request.course.id'}.'.domain'};
+                  my $url = &Apache::lonnet::store_edited_file($primary_url,$content,$docudom,$docuname,\$saveresult);
+              } else {
+                  &Apache::lonnet::logthis('retrieval of uploaded file - '.$primary_url.' - for editing, failed: '.$getstatus); 
+              }
+          }
+      }
+  }
+
+  unless ($showdoc ||  $upload_result eq 'phasetwo') {
+# -----------------------------------------------------------------------------
+       my %lt=&Apache::lonlocal::texthash(
+                'uplm' => 'Upload a new main course document',
+                'upls' => 'Upload a new supplemental course document',
+                'impp' => 'Import a document',
+                'pubd' => 'Published documents',
+		'copm' => 'All documents out of a published map into this folder',
+                'spec' => 'Special documents',
+                'upld' => 'Upload Document',
+                'srch' => 'Search',
+                'impo' => 'Import',
+                'selm' => 'Select Map',
+                'load' => 'Load Map',
+                'reco' => 'Recover Deleted Resources',
+                'newf' => 'New Folder',
+                'newp' => 'New Composite Page',
+                'extr' => 'External Resource',
+                'syll' => 'Syllabus',
+                'navc' => 'Navigate Contents',
+                'sipa' => 'Simple Page',
+                'sipr' => 'Simple Problem',
+                'scuf' => 'Score Upload Form',
+                'bull' => 'Bulletin Board',
+                'mypi' => 'My Personal Info',
+		'abou' => 'About User',
+                'imsf' => 'Import IMS package',
+                'file' =>  'File',
+                'title' => 'Title',
+                'comment' => 'Comment',
+                'parse' => 'If HTML file, upload embedded images/multimedia files'
+					  );
+# -----------------------------------------------------------------------------
     if ($allowed) {
        my $dumpbut=&dumpbutton();
+       my $exportbut=&exportbutton();
+       my %lt=&Apache::lonlocal::texthash(
+					 'vc' => 'Verify Content',
+					 'cv' => 'Check/Set Resource Versions',
+					 'ls' => 'List Symbs',
+					  );
+
+       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'));
+	   }
+       }
+       unless ($env{'form.pagepath'}) {
+           $containertag = '<input type="hidden" name="folderpath" value="" />';
+           $uploadtag = '<input type="hidden" name="folderpath" value="'.$folderpath.'" />';
+       }
+
        $r->print(<<ENDCOURSEVERIFY);
 <form name="renameform" method="post" action="/adm/coursedocs">
 <input type="hidden" name="title" />
 <input type="hidden" name="cmd" />
-<input type="hidden" name="folder" />
+<input type="hidden" name="markcopy" />
+$containertag
 </form>
 <form name="simpleedit" method="post" action="/adm/coursedocs">
 <input type=hidden name="importdetail" value="">
-<input type="hidden" name="folder" />
+$uploadtag
 </form>
 <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="Verify Content" />
+<input type="submit" name="verify" value="$lt{'vc'}" />$help{'Verify_Content'}
 </td><td bgcolor="#DDDDCC">
-<input type="submit" name="versions" value="Check Resource Versions" />
+    <input type="submit" name="versions" value="$lt{'cv'}" />$help{'Check_Resource_Versions'}
 $dumpbut
-</td></tr></table>
+$exportbut
+</td><!-- <td bgcolor="#DDDDCC">
+    <input type="submit" name="listsymbs" value="$lt{'ls'}" />
+</td>--></tr></table>
 </form>
 ENDCOURSEVERIFY
        $r->print(&Apache::loncommon::help_open_topic('Docs_Adding_Course_Doc',
-		     'Editing the Table of Contents for your Course'));
+		     &mt('Editing the Table of Contents for your Course')));
     }
 # --------------------------------------------------------- Standard documents
     $r->print('<table border=2 cellspacing=4 cellpadding=4>');
     if (($standard) && ($allowed) && (!$forcesupplement)) {
-       $r->print('<tr><td bgcolor="#BBBBBB"><h2>Main Course Documents'.
-  ($allowed?' '.$help{'Main_Course_Documents'}:'').'</h2>');
-       my $folder=$ENV{'form.folder'};
-       unless ($folder=~/^default/) { $folder='default'; }
+	$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 '' || $folder eq 'supplemental') {
+           $folder='default';
+	   $env{'form.folderpath'}='default&'.&Apache::lonnet::escape(&mt('Main Course Documents'));
+       }
        my $postexec='';
        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);
+       &editor($r,$coursenum,$coursedom,$folder,$allowed,$upload_output);
        if ($hadchanges) {
-	   $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">Changes will become active for your current session after <input type="hidden" name="'.
-$ENV{'request.role'}.'" value="1" /><input type="button" value="re-initializing course" onClick="reinit(this.form)"/>, or the next time you log in.'.
-$help{'Caching'}.'</font></h3></form>');
+	   &mark_hash_old()
        }
+       &changewarning($r,$postexec);
        my $folderseq='/uploaded/'.$coursedom.'/'.$coursenum.'/default_'.time.
                      '.sequence';
-
+       my $pageseq = '/uploaded/'.$coursedom.'/'.$coursenum.'/default_'.time.
+                     '.page';
+	my $container='sequence';
+	if ($env{'form.pagepath'}) {
+	    $container='page';
+	}
+	my $readfile='/uploaded/'.$coursedom.'/'.$coursenum.'/'.$folder.'.'.$container;
        $r->print(<<ENDFORM);
 <table cellspacing=4 cellpadding=4><tr>
-<th bgcolor="#DDDDDD">Upload a new main course document</th>
-<th bgcolor="#DDDDDD">Import a published document</th>
-<th bgcolor="#DDDDDD">Special documents</th>
+<th bgcolor="#DDDDDD">$lt{'uplm'}</th>
+<th bgcolor="#DDDDDD">$lt{'impp'}</th>
+<th bgcolor="#DDDDDD">$lt{'spec'}</th>
 </tr>
 <tr><td bgcolor="#DDDDDD">
-File:<br />
-<form action="/adm/coursedocs" method="post" enctype="multipart/form-data">
+$lt{'file'}:<br />
+<form name="uploaddocument" action="/adm/coursedocs" method="post" enctype="multipart/form-data">
 <input type="file" name="uploaddoc" size="40">
 <br />
-Title:<br />
+$lt{'title'}:<br />
 <input type="text" size="50" name="comment">
-<input type="hidden" name="folder" value="$folder">
-<input type="hidden" name="foldername" value="$ENV{'form.foldername'}">
+$uploadtag
 <input type="hidden" name="cmd" value="upload_default">
-<input type="submit" value="Upload Document">
+<br />
+<nobr>
+<label>$lt{'parse'}?
+<input type="checkbox" name="parserflag" />
+</label>
+</nobr>
+<br />
+<br />
 <nobr>
+<input type="submit" value="$lt{'upld'}">
  $help{'Uploading_From_Harddrive'}
 </nobr>
 </form>
 </td>
 <td bgcolor="#DDDDDD">
 <form action="/adm/coursedocs" method="post" name="simpleeditdefault">
-<input type="hidden" name="folder" value="$folder">
-<input type="hidden" name="foldername" value="$ENV{'form.foldername'}">
-<input type=button onClick=
-"javascript:document.forms.simpleedit.folder.value='$folder';groupsearch()" value="Search">
+$lt{'pubd'}<br />
+$uploadtag
+<input type=button onClick="javascript:groupsearch()" value="$lt{'srch'}">
 <nobr>
-<input type=button onClick=
-"javascript:document.forms.simpleedit.folder.value='$folder';groupimport();" value="Import">
+<input type=button onClick="javascript:groupimport();" value="$lt{'impo'}">
 $help{'Importing_LON-CAPA_Resource'}
 </nobr>
 <p>
 <hr />
-<input type="text" size="20" name="importmap"><br />
+$lt{'copm'}<br />
+<input type="text" size="40" name="importmap"><br />
 <nobr><input type=button 
 onClick="javascript:openbrowser('simpleeditdefault','importmap','sequence,page','')"
-value="Select Map"> <input type="submit" name="loadmap" value="Load Map">
+value="$lt{'selm'}"> <input type="submit" name="loadmap" value="$lt{'load'}">
 $help{'Load_Map'}</nobr>
 </p>
 </form>
-</td><td bgcolor="#DDDDDD">
+<hr />
+<form action="/adm/groupsort" method="post" name="recover">
+<input type="button" name="recovermap" onClick="javascript:groupopen('$readfile',1)" value="$lt{'reco'}" />
+</form>
+ENDFORM
+       unless ($env{'form.pagepath'}) {
+	   $r->print(<<ENDFORM);
+<hr />
+<form action="/adm/coursedocs" method="post" name="newext">
+$uploadtag
+<input type=hidden name="importdetail" value="">
+<nobr>
+<input name="newext" type="button" onClick="javascript:makenewext('newext');"
+value="$lt{'extr'}" /> $help{'Adding_External_Resource'}
+</nobr>
+</form>
+<form action="/adm/imsimportdocs" method="post" name="ims">
+<input type="hidden" name="folder" value="$folder" />
+<input name="imsimport" type="button" value="$lt{'imsf'}" onClick="javascript:makeims();" />
+</nobr>
+</form>
+ENDFORM
+       }
+       $r->print('</td><td bgcolor="#DDDDDD">');
+       unless ($env{'form.pagepath'}) {
+           $r->print(<<ENDFORM);
 <form action="/adm/coursedocs" method="post" name="newfolder">
-<input type="hidden" name="folder" value="$folder">
-<input type="hidden" name="foldername" value="$ENV{'form.foldername'}">
+<input type="hidden" name="folderpath" value="$env{'form.folderpath'}" />
 <input type=hidden name="importdetail" value="">
 <nobr>
 <input name="newfolder" type="button"
 onClick="javascript:makenewfolder(this.form,'$folderseq');"
-value="New Folder" />$help{'Adding_Folders'}
+value="$lt{'newf'}" />$help{'Adding_Folders'}
 </nobr>
 </form>
-<form action="/adm/coursedocs" method="post" name="newext">
-<input type="hidden" name="folder" value="$folder">
-<input type="hidden" name="foldername" value="$ENV{'form.foldername'}">
+<form action="/adm/coursedocs" method="post" name="newpage">
+<input type="hidden" name="folderpath" value="$env{'form.folderpath'}" />
 <input type=hidden name="importdetail" value="">
 <nobr>
-<input name="newext" type="button" onClick="javascript:makenewext('newext');"
-value="External Resource" /> $help{'Adding_External_Resource'}
+<input name="newpage" type="button"
+onClick="javascript:makenewpage(this.form,'$pageseq');"
+value="$lt{'newp'}" />$help{'Adding_Pages'}
 </nobr>
 </form>
 <form action="/adm/coursedocs" method="post" name="newsyl">
-<input type="hidden" name="folder" value="$folder">
-<input type="hidden" name="foldername" value="$ENV{'form.foldername'}">
+$uploadtag
 <input type=hidden name="importdetail" 
 value="Syllabus=/public/$coursedom/$coursenum/syllabus">
 <nobr>
-<input name="newsyl" type="submit" value="Syllabus" /> 
+<input name="newsyl" type="submit" value="$lt{'syll'}" /> 
  $help{'Syllabus'}
 </nobr>
 </form>
 <form action="/adm/coursedocs" method="post" name="newnav">
-<input type="hidden" name="folder" value="$folder">
-<input type="hidden" name="foldername" value="$ENV{'form.foldername'}">
+$uploadtag
 <input type=hidden name="importdetail" 
 value="Navigate Content=/adm/navmaps">
 <nobr>
-<input name="newnav" type="submit" value="Navigate Content" />
+<input name="newnav" type="submit" value="$lt{'navc'}" />
 $help{'Navigate_Content'}
 </nobr>
 </form>
 <form action="/adm/coursedocs" method="post" name="newsmppg">
-<input type="hidden" name="folder" value="$folder">
-<input type="hidden" name="foldername" value="$ENV{'form.foldername'}">
+$uploadtag
 <input type=hidden name="importdetail" value="">
 <nobr>
-<input name="newsmppg" type="button" value="Simple Page"
+<input name="newsmppg" type="button" value="$lt{'sipa'}"
 onClick="javascript:makesmppage();" /> $help{'Simple Page'}
 </nobr>
 </form>
 <form action="/adm/coursedocs" method="post" name="newsmpproblem">
-<input type="hidden" name="folder" value="$folder">
-<input type="hidden" name="foldername" value="$ENV{'form.foldername'}">
+$uploadtag
 <input type=hidden name="importdetail" value="">
 <nobr>
-<input name="newsmpproblem" type="button" value="Simple Problem"
+<input name="newsmpproblem" type="button" value="$lt{'sipr'}"
 onClick="javascript:makesmpproblem();" />$help{'Simple Problem'}
 </nobr>
 </form>
 <form action="/adm/coursedocs" method="post" name="newexamupload">
-<input type="hidden" name="folder" value="$folder">
-<input type="hidden" name="foldername" value="$ENV{'form.foldername'}">
+$uploadtag
 <input type=hidden name="importdetail" value="">
 <nobr>
-<input name="newexamupload" type="button" value="Score Upload Form"
+<input name="newexamupload" type="button" value="$lt{'scuf'}"
 onClick="javascript:makeexamupload();" />
 $help{'Score_Upload_Form'}
 </nobr>
 </form>
 <form action="/adm/coursedocs" method="post" name="newbul">
-<input type="hidden" name="folder" value="$folder">
-<input type="hidden" name="foldername" value="$ENV{'form.foldername'}">
+$uploadtag
 <input type=hidden name="importdetail" value="">
 <nobr>
-<input name="newbulletin" type="button" value="Bulletin Board"
+<input name="newbulletin" type="button" value="$lt{'bull'}"
 onClick="javascript:makebulboard();" />
 $help{'Bulletin Board'}
 </nobr>
 </form>
 <form action="/adm/coursedocs" method="post" name="newaboutme">
-<input type="hidden" name="folder" value="$folder">
-<input type="hidden" name="foldername" value="$ENV{'form.foldername'}">
+$uploadtag
 <input type=hidden name="importdetail" 
 value="$plainname=/adm/$udom/$uname/aboutme">
 <nobr>
-<input name="newaboutme" type="submit" value="My Personal Info" />
+<input name="newaboutme" type="submit" value="$lt{'mypi'}" />
 $help{'My Personal Info'}
 </nobr>
 </form>
-</td></tr>
-</table>
+<form action="/adm/coursedocs" method="post" name="newaboutsomeone">
+$uploadtag
+<input type=hidden name="importdetail" value="">
+<nobr>
+<input name="newaboutsomeone" type="button" value="$lt{'abou'}" 
+onClick="javascript:makeabout();" />
+</nobr>
+</form>
 ENDFORM
+       }
+       if ($env{'form.pagepath'}) {
+           $r->print(<<ENDBLOCK);
+<form action="/adm/coursedocs" method="post" name="newsmpproblem">
+$uploadtag
+<input type=hidden name="importdetail" value="">
+<nobr>
+<input name="newsmpproblem" type="button" value="$lt{'sipr'}"
+onClick="javascript:makesmpproblem();" />$help{'Simple Problem'}
+</nobr>
+</form>
+<form action="/adm/coursedocs" method="post" name="newexamupload">
+$uploadtag
+<input type=hidden name="importdetail" value="">
+<nobr>
+<input name="newexamupload" type="button" value="$lt{'scuf'}"
+onClick="javascript:makeexamupload();" />
+$help{'Score_Upload_Form'}
+</nobr>
+</form>
+ENDBLOCK
+       }
+       $r->print('</td></tr>'."\n".
+'</table>');
        $r->print('</td></tr>');
     }
 # ----------------------------------------------------- Supplemental documents
     if (!$forcestandard) {
-       $r->print(
-  '<tr><td bgcolor="#BBBBBB"><h2>Supplemental Course Documents'.
-  ($allowed?' '.$help{'Supplemental'}:'').'</h2>');
-       my $folder=$ENV{'form.folder'};
-       unless ($folder=~/supplemental/) { $folder='supplemental'; }
+       $r->print('<tr><td bgcolor="#BBBBBB">');
+# '<h2>'.&mt('Supplemental Course Documents').
+#  ($allowed?' '.$help{'Supplemental'}:'').'</h2>');
+       my $folder=$env{'form.folder'};
+       unless ($folder=~/^supplemental/) {
+	   $folder='supplemental';
+       }
+       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) {
        my $folderseq=
@@ -994,80 +2760,66 @@ ENDFORM
 
           $r->print(<<ENDSUPFORM);
 <table cellspacing=4 cellpadding=4><tr>
-<th bgcolor="#DDDDDD">Upload a new supplemental course document</th>
-<th bgcolor="#DDDDDD">Import a published document</th>
-<th bgcolor="#DDDDDD">Special documents</th>
+<th bgcolor="#DDDDDD">$lt{'upls'}</th>
+<th bgcolor="#DDDDDD">$lt{'spec'}</th>
 </tr>
 <tr><td bgcolor="#DDDDDD">
 <form action="/adm/coursedocs" method="post" enctype="multipart/form-data">
 <input type="file" name="uploaddoc" size="40">
-<br />Comment:<br />
+<br />
+<br />
+<nobr>
+<label>$lt{'parse'}?
+<input type="checkbox" name="parserflag" />
+</label>
+</nobr>
+<br /><br />
+$lt{'comment'}:<br />
 <textarea cols=50 rows=4 name='comment'>
 </textarea>
-<input type="hidden" name="folder" value="$folder">
-<input type="hidden" name="foldername" value="$ENV{'form.foldername'}">
+<br />
+<input type="hidden" name="folderpath" value="$env{'form.folderpath'}" />
 <input type="hidden" name="cmd" value="upload_supplemental">
 <nobr>
-<input type="submit" value="Upload Document">
+<input type="submit" value="$lt{'upld'}">
  $help{'Uploading_From_Harddrive'}
 </nobr>
 </form>
 </td>
 <td bgcolor="#DDDDDD">
-<form action="/adm/coursedocs" method="post" name="simpleeditsupplement">
-<input type="hidden" name="folder" value="$folder">
-<input type="hidden" name="foldername" value="$ENV{'form.foldername'}">
-<input type=hidden name="importdetail" value="">
-<input type=button onClick=
-"javascript:document.forms.simpleedit.folder.value='$folder';groupsearch()" value="Search">
-<input type=button onClick=
-"javascript:document.forms.simpleedit.folder.value='$folder';groupimport();" value="Import">$help{'Importing_LON-CAPA_Resource'}
-<p>
-<hr />
-<input type="text" size="20" name="importmap">
-<input type=button 
-onClick="javascript:openbrowser('simpleeditsupplement','importmap','sequence,page','')"
-value="Select Map"><input type="submit" name="loadmap" value="Load Map">
-</p>
-</form>
-</td><td bgcolor="#DDDDDD">
 <form action="/adm/coursedocs" method="post" name="supnewfolder">
-<input type="hidden" name="folder" value="$folder">
-<input type="hidden" name="foldername" value="$ENV{'form.foldername'}">
+<input type="hidden" name="folderpath" value="$env{'form.folderpath'}" />
 <input type=hidden name="importdetail" value="">
 <nobr>
 <input name="newfolder" type="button"
 onClick="javascript:makenewfolder(this.form,'$folderseq');"
-value="New Folder" /> $help{'Adding_Folders'}
+value="$lt{'newf'}" /> $help{'Adding_Folders'}
 </nobr>
 </form>
 <form action="/adm/coursedocs" method="post" name="supnewext">
-<input type="hidden" name="folder" value="$folder">
-<input type="hidden" name="foldername" value="$ENV{'form.foldername'}">
+<input type="hidden" name="folderpath" value="$env{'form.folderpath'}" />
 <input type=hidden name="importdetail" value="">
 <nobr>
 <input name="newext" type="button" 
 onClick="javascript:makenewext('supnewext');"
-value="External Resource" /> $help{'Adding_External_Resource'}
+value="$lt{'extr'}" /> $help{'Adding_External_Resource'}
 </nobr>
 </form>
 <form action="/adm/coursedocs" method="post" name="supnewsyl">
-<input type="hidden" name="folder" value="$folder">
-<input type="hidden" name="foldername" value="$ENV{'form.foldername'}">
+<input type="hidden" name="folderpath" value="$env{'form.folderpath'}" />
 <input type=hidden name="importdetail" 
 value="Syllabus=/public/$coursedom/$coursenum/syllabus">
 <nobr>
-<input name="newsyl" type="submit" value="Syllabus" />
+<input name="newsyl" type="submit" value="$lt{'syll'}" />
 $help{'Syllabus'}
 </nobr>
 </form>
 <form action="/adm/coursedocs" method="post" name="subnewaboutme">
-<input type="hidden" name="folder" value="$folder">
-<input type="hidden" name="foldername" value="$ENV{'form.foldername'}">
+<input type="hidden" name="folderpath" value="$env{'form.folderpath'}" />
 <input type=hidden name="importdetail" 
 value="$plainname=/adm/$udom/$uname/aboutme">
 <nobr>
-<input name="newaboutme" type="submit" value="My Personal Info" />
+<input name="newaboutme" type="submit" value="$lt{'mypi'}" />
 $help{'My Personal Info'}
 </nobr>
 </form>
@@ -1077,13 +2829,17 @@ ENDSUPFORM
        }
     }
     if ($allowed) {
-	$r->print('<form name="extimport"><input type="hidden" name="title"><input type="hidden" name="url"><input type="hidden" name="useform"></form>');
+	$r->print('<form method="POST" name="extimport" action="/adm/coursedocs"><input type="hidden" name="title" /><input type="hidden" name="url" /><input type="hidden" name="useform" /></form>');
     }
     $r->print('</table>');
   } else {
+      unless ($upload_result eq 'phasetwo') {
 # -------------------------------------------------------- This is showdoc mode
-      $r->print("<h1>Uploaded Document</h1><p>It is recommended that you use an up-to-date virus scanner before handling this file.</p><p><table>".
-         &entryline(0,"Click to download or use your browser's Save Link function",$showdoc).'</table></p>');
+          $r->print("<h1>".&mt('Uploaded Document').' - '.
+		&Apache::lonnet::gettitle($r->uri).'</h1><p>'.
+&mt('It is recommended that you use an up-to-date virus scanner before handling this file.')."</p><p><table>".
+          &entryline(0,&mt("Click to download or use your browser's Save Link function"),$showdoc).'</table></p>');
+      }
   }
  }
  $r->print('</body></html>');