--- loncom/interface/londocs.pm	2012/01/29 19:50:53	1.475
+++ loncom/interface/londocs.pm	2025/03/15 01:03:33	1.727
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.475 2012/01/29 19:50:53 raeburn Exp $
+# $Id: londocs.pm,v 1.727 2025/03/15 01:03:33 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -26,8 +26,6 @@
 # http://www.lon-capa.org/
 #
 
-
-
 package Apache::londocs;
 
 use strict;
@@ -42,10 +40,21 @@ use Apache::lonxml;
 use Apache::lonclonecourse;
 use Apache::lonnavmaps;
 use Apache::lonnavdisplay();
+use Apache::lonextresedit();
+use Apache::lontemplate();
+use Apache::lonsimplepage();
+use Apache::lonhomework();
+use Apache::lonpublisher();
+use Apache::loncourserespicker();
 use HTML::Entities;
+use HTML::TokeParser;
+use HTML::LCParser;
 use GDBM_File;
+use File::MMagic;
+use File::Copy;
 use Apache::lonlocal;
 use Cwd;
+use UUID::Tiny ':std';
 use LONCAPA qw(:DEFAULT :match);
 
 my $iconpath;
@@ -56,6 +65,7 @@ my $hashtied;
 my %alreadyseen=();
 
 my $hadchanges;
+my $suppchanges;
 
 
 my %help=();
@@ -69,13 +79,21 @@ sub mapread {
 }
 
 sub storemap {
-    my ($coursenum,$coursedom,$map)=@_;
+    my ($coursenum,$coursedom,$map,$contentchg)=@_;
+    my $report;
+    if (($contentchg) && ($map =~ /^default/)) {
+       $report = 1;
+    }
     my ($outtext,$errtext)=
       &LONCAPA::map::storemap('/uploaded/'.$coursedom.'/'.$coursenum.'/'.
-			      $map,1);
+			      $map,1,$report);
     if ($errtext) { return ($errtext,2); }
 
-    $hadchanges=1;
+    if ($map =~ /^default/) {
+        $hadchanges=1;
+    } elsif ($contentchg) {
+        $suppchanges=1;
+    }
     return ($errtext,0);
 }
 
@@ -85,6 +103,7 @@ sub authorhosts {
     my %outhash=();
     my $home=0;
     my $other=0;
+    my @ids=&Apache::lonnet::current_machine_ids();
     foreach my $key (keys(%env)) {
 	if ($key=~/^user\.role\.(au|ca)\.(.+)$/) {
 	    my $role=$1;
@@ -101,13 +120,17 @@ sub authorhosts {
 	    }
 	    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; } }
+	    foreach my $id (@ids) {
+                if ($id eq $myhome) {
+                    $allowed=1;
+                    last;
+                }
+            }
 	    if ($allowed) {
 		$home++;
-		$outhash{'home_'.$ca.'@'.$cd}=1;
+		$outhash{'home_'.$ca.':'.$cd}=1;
 	    } else {
-		$outhash{'otherhome_'.$ca.'@'.$cd}=$myhome;
+		$outhash{'otherhome_'.$ca.':'.$cd}=$myhome;
 		$other++;
 	    }
 	}
@@ -116,164 +139,1541 @@ sub authorhosts {
 }
 
 
-sub dumpbutton {
-    my ($home,$other,%outhash)=&authorhosts();
-    my $crstype = &Apache::loncommon::course_type();
-    if ($home+$other==0) { return ''; }
-    if ($home) {
-        my $link =
-            "<a class='LC_menubuttons_link' href='javascript:injectData(document.courseverify, \"dummy\", \"dumpcourse\", \""
-           .&mt('Dump '.$crstype.' Documents to Construction Space')
-           ."\")'>"
-           .&mt('Dump '.$crstype.' Documents to Construction Space')
-           .'</a>';
-        return
-            $link.' '
-           .&Apache::loncommon::help_open_topic('Docs_Dump_Course_Docs')
-           .'<br />';
-    } else {
-        return
-            &mt('Dump '.$crstype.' Documents to Construction Space: available on other servers');
-    }
-}
-
 sub clean {
     my ($title)=@_;
     $title=~s/[^\w\/\!\$\%\^\*\-\_\=\+\;\:\,\\\|\`\~]+/\_/gs;
     return $title;
 }
 
+sub default_folderpath {
+    my ($coursenum,$coursedom,$navmapref) = @_;
+    return unless ($coursenum && $coursedom && ref($navmapref));
+# Check if entire course is hidden and/or encrypted
+    my ($hiddenmap,$encryptmap,$folderpath,$hiddentop);
+    my $toplevel = "uploaded/$coursedom/$coursenum/default.sequence";
+    unless (ref($$navmapref)) {
+        $$navmapref = Apache::lonnavmaps::navmap->new();
+    }
+    if (ref($$navmapref)) {
+        if (lc($$navmapref->get_mapparam(undef,$toplevel,"0.hiddenresource")) eq 'yes') {
+            my $filterFunc = sub { my $res = shift; return (!$res->randomout() && !$res->is_map()) };
+            my @resources = $$navmapref->retrieveResources($toplevel,$filterFunc,1,1);
+            unless (@resources) {
+                $hiddenmap = 1;
+                unless ($env{'request.role.adv'}) {
+                    $hiddentop = 1;
+                    if ($env{'form.folder'}) {
+                        undef($env{'form.folder'});
+                    }
+                }
+            }
+        }
+        if (lc($$navmapref->get_mapparam(undef,$toplevel,"0.encrypturl")) eq 'yes') {
+            $encryptmap = 1;
+        }
+    }
+    unless ($hiddentop) {
+        $folderpath='default&'.&escape(&mt('Main Content')).
+                    '::'.$hiddenmap.':'.$encryptmap.'::';
+    }
+    if (wantarray) {
+        return ($folderpath,$hiddentop);
+    } else {
+        return $folderpath;
+    }
+}
 
+sub validate_supppath {
+    my ($coursenum,$coursedom) = @_;
+    my $backto;
+    if ($env{'form.supppath'} ne '') {
+        my @items = split(/\&/,$env{'form.supppath'});
+        my ($badpath,$got_supp,$supppath,%supphidden,%suppids);
+        for (my $i=0; $i<@items; $i++) {
+            my $odd = $i%2;
+            if ((!$odd) && ($items[$i] !~ /^supplemental(|_\d+)$/)) {
+                $badpath = 1;
+                last;
+            } elsif ($odd) {
+                my $suffix;
+                my $idx = $i-1;
+                if ($items[$i] =~ /^([^:]*)::(|1):::$/) {
+                    $backto .= '&'.$1;
+                } elsif ($items[$idx] eq 'supplemental') {
+                    $backto .= '&'.$items[$i];
+                } else {
+                    $backto .= '&'.$items[$i];
+                    my $is_hidden;
+                    unless ($got_supp) {
+                        my ($supplemental) = &Apache::loncommon::get_supplemental($coursenum,$coursedom);
+                        if (ref($supplemental) eq 'HASH') {
+                            if (ref($supplemental->{'hidden'}) eq 'HASH') {
+                                %supphidden = %{$supplemental->{'hidden'}};
+                            }
+                            if (ref($supplemental->{'ids'}) eq 'HASH') {
+                                %suppids = %{$supplemental->{'ids'}};
+                            }
+                        }
+                        $got_supp = 1;
+                    }
+                    if (ref($suppids{"/uploaded/$coursedom/$coursenum/$items[$idx].sequence"}) eq 'ARRAY') {
+                        my $mapid = $suppids{"/uploaded/$coursedom/$coursenum/$items[$idx].sequence"}->[0];
+                        if ($supphidden{$mapid}) {
+                            $is_hidden = 1;
+                        }
+                    }
+                    $suffix = '::'.$is_hidden.':::';
+                }
+                $supppath .= '&'.$items[$i].$suffix;
+            } else {
+                $supppath .= '&'.$items[$i];
+                $backto .= '&'.$items[$i];
+            }
+        }
+        if ($badpath) {
+            delete($env{'form.supppath'});
+        } else {
+            $supppath =~ s/^\&//;
+            $backto =~ s/^\&//;
+            $env{'form.supppath'} = $supppath;
+        }
+    }
+    return $backto;
+}
 
 sub dumpcourse {
     my ($r) = @_;
     my $crstype = &Apache::loncommon::course_type();
-    $r->print(&Apache::loncommon::start_page('Dump '.$crstype.' Documents to Construction Space').
-	      '<form name="dumpdoc" action="" method="post">');
-    $r->print(&Apache::lonhtmlcommon::breadcrumbs('Dump '.$crstype.' Documents to Construction Space'));
+    my ($starthash,$js);
+    unless (($env{'form.authorspace'}) && ($env{'form.authorfolder'}=~/\w/)) {
+        $js = <<"ENDJS";
+<script type="text/javascript">
+// <![CDATA[
+
+function hide_searching() {
+    if (document.getElementById('searching')) {
+        document.getElementById('searching').style.display = 'none';
+    }
+    return;
+}
+
+// ]]>
+</script>
+ENDJS
+        $starthash = {
+                         add_entries => {'onload' => "hide_searching();"},
+                     };
+    }
+    $r->print(&Apache::loncommon::start_page('Copy uploaded content to Authoring Space',$js,$starthash)."\n".
+              &Apache::lonhtmlcommon::breadcrumbs('Copy uploaded content to Authoring Space')."\n");
+    $r->print(&startContentScreen('tools'));
     my ($home,$other,%outhash)=&authorhosts();
-    unless ($home) { return ''; }
+    unless ($home) {
+        $r->print('<p class="LC_info">'.&mt('No author or co-author roles on this server.').'</p>'); 
+        $r->print(&endContentScreen());
+        return '';
+    }
     my $origcrsid=$env{'request.course.id'};
     my %origcrsdata=&Apache::lonnet::coursedescription($origcrsid);
     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'});
+	unless ($outhash{'home_'.$env{'form.authorspace'}}) {
+            $r->print('<p class="LC_info">'.&mt('Selected Authoring Space is not on this server.').'</p>'.
+                      &endContentScreen());
+            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 my $key (keys(%env)) {
-	    if ($key=~/^form\.namefor\_(.+)/) {
-		$replacehash{$1}=$env{$key};
-	    }
+        my ($navmap,$errormsg) =
+            &Apache::loncourserespicker::get_navmap_object($crstype,'dumpdocs');
+        my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+        my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+        my (%maps,%resources,%titles);
+        if (!ref($navmap)) {
+            $r->print($errormsg.
+                      &endContentScreen());
+            return '';
+        } else {
+            &Apache::loncourserespicker::enumerate_course_contents($navmap,\%maps,\%resources,\%titles,
+                                                                   'dumpdocs',$cdom,$cnum);
 	}
+        my @todump = &Apache::loncommon::get_env_multiple('form.archive');
+        my (%tocopy,%replacehash,%lookup,%deps,%display,%result,%depresult,%simpleproblems,%simplepages,
+            %newcontent,%has_simpleprobs);
+        foreach my $item (sort {$a <=> $b} (@todump)) {
+            my $name = $env{'form.namefor_'.$item};
+            if ($resources{$item}) {
+                my ($map,$id,$res) = &Apache::lonnet::decode_symb($resources{$item});
+                if ($res =~ m{^uploaded/$cdom/$cnum/\E((?:docs|supplemental)/.+)$}) {
+                    $tocopy{$1} = $name;
+                    $display{$item} = $1;
+                    $lookup{$1} = $item; 
+                } elsif ($res eq 'lib/templates/simpleproblem.problem') {
+                    $simpleproblems{$item} = {
+                                                symb => $resources{$item},
+                                                name => $name,
+                                             };
+                    $display{$item} = 'simpleproblem_'.$name;
+                    if ($map =~ m{^\Quploaded/$cdom/$cnum/\E(.+)$}) {
+                        $has_simpleprobs{$1}{$id} = $item;
+                    }
+                } elsif ($res =~ m{^adm/$match_domain/$match_username/(\d+)/smppg}) {
+                    my $marker = $1;
+                    my $db_name = &Apache::lonsimplepage::get_db_name($res,$marker,$cdom,$cnum);
+                    $simplepages{$item} = {
+                                            res    => $res,
+                                            title  => $titles{$item},
+                                            db     => $db_name,
+                                            marker => $marker,
+                                            symb   => $resources{$item},
+                                            name   => $name,
+                                          };
+                    $display{$item} = '/'.$res;
+                }
+            } elsif ($maps{$item}) {
+                if ($maps{$item} =~ m{^\Quploaded/$cdom/$cnum/\E((?:default|supplemental)_\d+\.(?:sequence|page))$}) {
+                    $tocopy{$1} = $name;
+                    $display{$item} = $1;
+                    $lookup{$1} = $item;
+                }
+            } else {
+                next;
+            }
+        }
 	my $crs='/uploaded/'.$env{'request.course.id'}.'/';
 	$crs=~s/\_/\//g;
-	foreach my $item (keys(%replacehash)) {
-	    my $newfilename=$title.'/'.$replacehash{$item};
-	    $newfilename=~s/\.(\w+)$//;
-	    my $ext=$1;
-	    $newfilename=&clean($newfilename);
-	    $newfilename.='.'.$ext;
-	    my @dirs=split(/\//,$newfilename);
-	    my $path=$r->dir_config('lonDocRoot')."/priv/$cd/$ca";
-	    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>'.$item.'</tt> => <tt>'.$newfilename.'</tt>: ');
-	    if (my $fh=Apache::File->new('>'.$path.'/'.$newfilename)) {
-		if ($item=~/\.(sequence|page|html|htm|xml|xhtml)$/) {
-		    print $fh &Apache::lonclonecourse::rewritefile(
-         &Apache::lonclonecourse::readfile($env{'request.course.id'},$item),
-				     (%replacehash,$crs => '')
-								    );
-		} else {
-		    print $fh
-         &Apache::lonclonecourse::readfile($env{'request.course.id'},$item);
-		       }
-		$fh->close();
-	    } else {
-		$fail=1;
-	    }
-	    if ($fail) {
-		$r->print('<span class="LC_error">'.&mt('fail').'</span>');
-	    } else {
-		$r->print('<span class="LC_success">'.&mt('ok').'</span>');
-	    }
-	}
+        my $mm = new File::MMagic;
+        my $prefix = "/uploaded/$cdom/$cnum/";
+        %replacehash = %tocopy;
+        foreach my $item (sort(keys(%simpleproblems))) {
+            my $content = &Apache::imsexport::simpleproblem($simpleproblems{$item}{'symb'});
+            $newcontent{$display{$item}} = $content;
+        }
+        my $gateway = Apache::lonhtmlgateway->new('web');
+        foreach my $item (sort(keys(%simplepages))) {
+            if (ref($simplepages{$item}) eq 'HASH') {
+                my $pagetitle = $simplepages{$item}{'title'};
+                my %fields = &Apache::lonnet::dump($simplepages{$item}{'db'},$cdom,$cnum);
+                my %contents;
+                foreach my $field (keys(%fields)) {
+                    if ($field =~ /^(?:aaa|bbb|ccc)_(\w+)$/) {
+                        my $name = $1;
+                        my $msg = $fields{$field};
+                        if ($name eq 'webreferences') {
+                            if ($msg =~ m{^https?://}) {
+                                $contents{$name} = '<a href="'.$msg.'"><tt>'.$msg.'</tt></a>';
+                            }
+                        } else {
+                            $msg = &Encode::decode('utf8',$msg);
+                            $msg = $gateway->process_outgoing_html($msg,1);
+                            $contents{$name} = $msg;
+                        }
+                    } elsif ($field eq 'uploaded.photourl') {
+                        my $marker = $simplepages{$item}{marker};
+                        if ($fields{$field} =~ m{^\Q$prefix\E(simplepage/$marker/.+)$}) {
+                            my $filepath = $1;
+                            my ($relpath,$fname) = ($filepath =~ m{^(.+/)([^/]+)$});
+                            if ($fname ne '') {
+                                $fname=~s/\.(\w+)$//;
+                                my $ext=$1;
+                                $fname = &clean($fname);
+                                $fname.='.'.$ext;
+                                $contents{image} = '<img src="'.$relpath.$fname.'" alt="Image" />';
+                                $replacehash{$filepath} = $relpath.$fname;
+                                $deps{$item}{$filepath} = 1;
+                            }
+                        }
+                    }
+                }
+                $replacehash{'/'.$simplepages{$item}{'res'}} = $simplepages{$item}{'name'};
+                $lookup{'/'.$simplepages{$item}{'res'}} = $item;
+                my $content = '
+<html>
+<head>
+<title>'.$pagetitle.'</title>
+</head>
+<body bgcolor="#ffffff">';
+                if ($contents{title}) {
+                    $content .= "\n".'<h2>'.$contents{title}.'</h2>';
+                }
+                if ($contents{image}) {
+                    $content .= "\n".$contents{image};
+                }
+                if ($contents{content}) {
+                    $content .= '
+<div class="LC_Box">
+<h4 class="LC_hcell">'.&mt('Content').'</h4>'.
+$contents{content}.'
+</div>';
+                }
+                if ($contents{webreferences}) {
+                    $content .= ' 
+<div class="LC_Box">
+<h4 class="LC_hcell">'.&mt('Web References').'</h4>'.
+$contents{webreferences}.'
+</div>';
+                }
+                $content .= '
+</body>
+</html>
+';
+                $newcontent{'/'.$simplepages{$item}{res}} = $content; 
+            }
+        }
+	foreach my $item (keys(%tocopy)) {
+            unless ($item=~/\.(sequence|page)$/) {
+                my $currurlpath = $prefix.$item;
+                my $currdirpath = &Apache::lonnet::filelocation('',$currurlpath);
+                &recurse_html($mm,$prefix,$currdirpath,$currurlpath,$item,$lookup{$item},\%replacehash,\%deps);
+            }
+        }
+        foreach my $num (sort {$a <=> $b} (@todump)) {
+            my $src = $display{$num};
+            next if ($src eq '');
+            my @needcopy = ();
+            if ($replacehash{$src}) {
+                push(@needcopy,$src);
+                if (ref($deps{$num}) eq 'HASH') {
+                    foreach my $dep (sort(keys(%{$deps{$num}}))) {
+                        if ($replacehash{$dep}) {
+                            push(@needcopy,$dep);
+                        }
+                    }
+                }
+            } elsif ($src =~ /^simpleproblem_/) {
+                push(@needcopy,$src);
+            }
+            next if (@needcopy == 0);
+            my ($result,$depresult);
+            for (my $i=0; $i<@needcopy; $i++) {
+                my $item = $needcopy[$i];
+                my $newfilename;
+                if ($simpleproblems{$num}) {
+                    $newfilename=$title.'/'.$simpleproblems{$num}{'name'};
+                } else {
+	            $newfilename=$title.'/'.$replacehash{$item};
+                }
+	        $newfilename=~s/\.(\w+)$//;
+	        my $ext=$1;
+	        $newfilename=&clean($newfilename);
+	        $newfilename.='.'.$ext;
+                my ($newrelpath) = ($newfilename =~ m{^\Q$title/\E(.+)$}); 
+                if ($newrelpath ne $replacehash{$item}) {
+                    $replacehash{$item} = $newrelpath;
+                }
+	        my @dirs=split(/\//,$newfilename);
+	        my $path=$r->dir_config('lonDocRoot')."/priv/$cd/$ca";
+	        my $makepath=$path;
+	        my $fail;
+                my $origin;
+	        for (my $i=0;$i<$#dirs;$i++) {
+		    $makepath.='/'.$dirs[$i];
+		    unless (-e $makepath) {
+		        unless(mkdir($makepath,0755)) { 
+                            $fail = &mt('Directory creation failed.');
+                        }
+		    }
+	        }
+                if ($i == 0) {
+	            $result = '<br /><tt>'.$item.'</tt> => <tt>'.$newfilename.'</tt>: ';
+                } else {
+                    $depresult .= '<li><tt>'.$item.'</tt> => <tt>'.$newfilename.'</tt> '.
+                                  '<span class="LC_fontsize_small" style="font-weight: bold;">'.
+                                  &mt('(dependency)').'</span>: ';
+                }
+                if (-e $path.'/'.$newfilename) {
+                    $fail = &mt('Destination already exists -- not overwriting.'); 
+	        } else {
+                    if (my $fh=Apache::File->new('>'.$path.'/'.$newfilename)) {
+                        if (($item =~ m{^/adm/$match_domain/$match_username/\d+/smppg}) ||
+                            ($item =~ /^simpleproblem_/)) {
+                            print $fh $newcontent{$item};
+                        } else {
+                            my $fileloc = &Apache::lonnet::filelocation('',$prefix.$item);
+                            if (-e $fileloc) {
+                                if ($item=~/\.(sequence|page|html|htm|xml|xhtml)$/) {
+                                    if ((($1 eq 'sequence') || ($1 eq 'page')) &&
+                                        (ref($has_simpleprobs{$item}) eq 'HASH')) {
+                                        my %changes = %{$has_simpleprobs{$item}};
+                                        my $content = &Apache::lonclonecourse::rewritefile(
+                     &Apache::lonclonecourse::readfile($env{'request.course.id'},$item),
+                                                      (%replacehash,$crs => '')
+                                                                                          );
+                                        my $updatedcontent = '';
+                                        my $parser = HTML::TokeParser->new(\$content);
+                                        $parser->attr_encoded(1);
+                                        while (my $token = $parser->get_token) {
+                                            if ($token->[0] eq 'S') {
+                                                if (($token->[1] eq 'resource') &&
+                                                    ($token->[2]->{'src'} eq '/res/lib/templates/simpleproblem.problem') && 
+                                                    ($changes{$token->[2]->{'id'}})) {
+                                                    my $id = $token->[2]->{'id'};
+                                                    $updatedcontent .= '<'.$token->[1];
+                                                    foreach my $attrib (@{$token->[3]}) {
+                                                        next unless ($attrib =~ /^(src|type|title|id)$/);
+                                                        if ($attrib eq 'src') {
+                                                            my ($file) = ($display{$changes{$id}} =~ /^\Qsimpleproblem_\E(.+)$/); 
+                                                            if ($file) {
+                                                                $updatedcontent .= ' '.$attrib.'="'.$file.'"';
+                                                            } else {
+                                                                $updatedcontent .= ' '.$attrib.'="'.$token->[2]->{$attrib}.'"'; 
+                                                            }
+                                                        } else {
+                                                            $updatedcontent .= ' '.$attrib.'="'.$token->[2]->{$attrib}.'"';
+                                                        }
+                                                    }
+                                                    $updatedcontent .= ' />'."\n";
+                                                } else {
+                                                    $updatedcontent .= $token->[4]."\n";
+                                                }
+                                             } else {
+                                                 $updatedcontent .= $token->[2];
+                                             }
+                                         }
+                                         print $fh $updatedcontent;
+                                    } else {  
+		                        print $fh &Apache::lonclonecourse::rewritefile(
+                     &Apache::lonclonecourse::readfile($env{'request.course.id'},$item),
+		                                      (%replacehash,$crs => '')
+							                              );
+                                    }
+                                } else {
+		                    print $fh
+                                        &Apache::lonclonecourse::readfile($env{'request.course.id'},$item);
+		                }
+                            } else {
+                                $fail = &mt('Source does not exist.');  
+                            }
+                        }
+                        $fh->close();
+	            } else {
+		        $fail = &mt('Could not write to destination.');
+                    }
+	        }
+                my $text;
+	        if ($fail) {
+                    $text = '<span class="LC_error">'.&mt('fail').('&nbsp;'x3).$fail.'</span>';
+	        } else {
+                    $text = '<span class="LC_success">'.&mt('ok').'</span>';
+                }
+                if ($i == 0) {
+                    $result .= $text;
+                } else {
+                    $depresult .= $text.'</li>';
+	        }
+            }
+            $r->print($result);
+            if ($depresult) {
+                $r->print('<ul>'.$depresult.'</ul>');
+            }
+        }
     } else {
-# Input form
-	unless ($home==1) {
-	    $r->print(
-		      '<h3>'.&mt('Select the Construction Space').'</h3><select name="authorspace">');
-	}
-	foreach my $key (sort(keys(%outhash))) {
-	    if ($key=~/^home_(.+)$/) {
-		if ($home==1) {
-		    $r->print(
-		  '<input type="hidden" name="authorspace" value="'.$1.'" />');
-		} else {
-		    $r->print('<option value="'.$1.'">'.$1.' - '.
-			      &Apache::loncommon::plainname(split(/\@/,$1)).'</option>');
-		}
-	    }
-	}
-	unless ($home==1) {
-	    $r->print('</select>');
-	}
-	my $title=$origcrsdata{'description'};
-	$title=~s/[\/\s]+/\_/gs;
-	$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>'.&mt('Filenames in Construction Space').'</h3>'
-                 .&Apache::loncommon::start_data_table()
-                 .&Apache::loncommon::start_data_table_header_row()
-                 .'<th>'.&mt('Internal Filename').'</th>'
-                 .'<th>'.&mt('Title').'</th>'
-                 .'<th>'.&mt('Save as ...').'</th>'
-                 .&Apache::loncommon::end_data_table_header_row());
-	foreach my $file (&Apache::lonclonecourse::crsdirlist($origcrsid,'userfiles')) {
-	    $r->print(&Apache::loncommon::start_data_table_row()
-                     .'<td>'.$file.'</td>');
-	    my ($ext)=($file=~/\.(\w+)$/);
-	    my $title=$hash{'title_'.$hash{
-		'ids_/uploaded/'.$origcrsdata{'domain'}.'/'.$origcrsdata{'num'}.'/'.$file}};
-	    $r->print('<td>'.($title?$title:'&nbsp;').'</td>');
-	    if (!$title) {
-		$title=$file;
-	    } else {
-		$title=~s|/|_|g;
-	    }
-	    $title=~s/\.(\w+)$//;
+        my ($navmap,$errormsg) =
+            &Apache::loncourserespicker::get_navmap_object($crstype,'dumpdocs');
+        if (!ref($navmap)) {
+            $r->print($errormsg);
+        } else {
+	    my $title=$origcrsdata{'description'};
+	    $title=~s/[\/\s]+/\_/gs;
 	    $title=&clean($title);
-	    $title.='.'.$ext;
-	    $r->print("\n<td><input type='text' size='60' name='namefor_".$file."' value='".$title."' /></td>"
-                     .&Apache::loncommon::end_data_table_row());
-	}
-	$r->print(&Apache::loncommon::end_data_table());
-	&untiehash();
-	$r->print(
-  '<p><input type="submit" name="dumpcourse" value="'.&mt("Dump $crstype Documents").'" /></p></form>');
+	    my $formname = 'dumpdoc';
+	    my $preamble = &authorspace_selector($r,$formname,$home,$title,%outhash).
+                           '<div style="padding:0;clear:both;margin:0;border:0"></div>'."\n";
+	    my %uploadedfiles;
+	    &tiehash();
+	    foreach my $file (&Apache::lonclonecourse::crsdirlist($origcrsid,'userfiles')) {
+	        my ($ext)=($file=~/\.(\w+)$/);
+# FIXME Check supplemental here
+	        my $title=$hash{'title_'.$hash{
+		                'ids_/uploaded/'.$origcrsdata{'domain'}.'/'.$origcrsdata{'num'}.'/'.$file}};
+	        if (!$title) {
+		    $title=$file;
+	        } else {
+		    $title=~s|/|_|g;
+	        }
+	        $title=~s/\.(\w+)$//;
+	        $title=&clean($title);
+	        $title.='.'.$ext;
+#	    $r->print("\n<td><input type='text' size='60' name='namefor_".$file."' value='".$title."' /></td>"
+                $uploadedfiles{$file} = $title;
+	    }
+	    &untiehash();
+            $r->print(&Apache::loncourserespicker::create_picker($navmap,'dumpdocs',$formname,$crstype,undef,
+                                                                 undef,undef,$preamble,$home,\%uploadedfiles));
+        }
     }
+    $r->print(&endContentScreen());
 }
 
-sub exportbutton {
-    my $crstype = &Apache::loncommon::course_type();
-    return "<a class='LC_menubuttons_link' href='javascript:injectData(document.courseverify, \"dummy\", \"exportcourse\", \"".&mt('IMS Export')."\")'>".&mt('IMS Export')."</a>".
-    &Apache::loncommon::help_open_topic('Docs_Export_Course_Docs').'<br />';
+sub authorspace_selector {
+    my ($r,$formname,$home,$title,%outhash) = @_;
+    $r->print('<div id="searching">'.&mt('Searching ...').'</div>'."\n");
+    $r->rflush();
+    my $preamble;
+    unless ($home==1) {
+        $preamble = '<div class="LC_left_float">'.
+                    '<fieldset><legend>'.
+                    &mt('Select the Authoring Space').
+                    '</legend><select name="authorspace">';
+    }
+    my @orderspaces = ();
+    foreach my $key (sort(keys(%outhash))) {
+        if ($key=~/^home_(.+)$/) {
+            if ($1 eq $env{'user.name'}.':'.$env{'user.domain'}) {
+                unshift(@orderspaces,$1);
+            } else {
+                push(@orderspaces,$1);
+            }
+        }
+    }
+    if ($home>1) {
+        $preamble .= '<option value="" selected="selected">'.&mt('Select').'</option>';
+    }
+    foreach my $user (@orderspaces) {
+        if ($home==1) {
+            $preamble .= '<input type="hidden" name="authorspace" value="'.$user.'" />';
+        } else {
+            $preamble .= '<option value="'.$user.'">'.$user.' - '.
+                         &Apache::loncommon::plainname(split(/\:/,$user)).'</option>';
+        }
+    }
+    unless ($home==1) {
+        $preamble .= '</select></fieldset></div>'."\n";
+    }
+    $preamble .= '<div class="LC_left_float">'.
+                 '<fieldset><legend>'.&mt('Folder in Authoring Space').'</legend>'.
+                 '<input type="text" size="30" name="authorfolder" value="'.$title.'" />'."\n".
+                 '</fieldset></div>'."\n";
+    return $preamble;
+}
+
+sub recurse_html {
+    my ($mm,$prefix,$currdirpath,$currurlpath,$container,$item,$replacehash,$deps) = @_;
+    return unless ((ref($replacehash) eq 'HASH') && (ref($deps) eq 'HASH'));
+    my (%allfiles,%codebase);
+    if (&Apache::lonnet::extract_embedded_items($currdirpath,\%allfiles,\%codebase) eq 'ok') {
+        if (keys(%allfiles)) {
+            foreach my $dependency (keys(%allfiles)) {
+                next if (($dependency =~ m{^/(res|adm)/}) || ($dependency =~ m{^https?://}));
+                my ($depurl,$relfile,$newcontainer);
+                if ($dependency =~ m{^/}) {
+                    if ($dependency =~ m{^\Q$currurlpath/\E(.+)$}) {
+                        $relfile = $1;
+                        if ($dependency =~ m{^\Q$prefix\E(.+)$}) {
+                            $newcontainer = $1;
+                            next if ($replacehash->{$newcontainer});
+                        }
+                        $depurl = $dependency;
+                    } else {
+                        next;
+                    }
+                } else {
+                    $relfile = $dependency;
+                    $depurl = $currurlpath;
+                    $depurl =~ s{[^/]+$}{};
+                    $depurl .= $dependency;
+                    ($newcontainer) = ($depurl =~ m{^\Q$prefix\E(.+)$});
+                }
+                next if ($relfile eq '');
+                my $newname = $replacehash->{$container};
+                $newname =~ s{[^/]+$}{};
+                $replacehash->{$newcontainer} = $newname.$relfile;
+                $deps->{$item}{$newcontainer} = 1;
+                my ($newurlpath) = ($depurl =~ m{^(.*)/[^/]+$});  
+                my $depfile = &Apache::lonnet::filelocation('',$depurl);
+                my $type = $mm->checktype_filename($depfile);
+                if ($type eq 'text/html') {
+                    &recurse_html($mm,$prefix,$depfile,$newurlpath,$newcontainer,$item,$replacehash,$deps);
+                }
+            }
+        }
+    }
+    return;
 }
 
-sub group_import {
-    my ($coursenum, $coursedom, $folder, $container, $caller, @files) = @_;
+sub copycrsauthored {
+    my ($r,$coursenum,$coursedom,$coursehome,$readonly) = @_;
+    my ($starthash,$js,$title,$formname);
+    my %origcrsdata=&Apache::lonnet::coursedescription($env{'request.course.id'});
+    $title=$origcrsdata{'description'};
+    $title=~s/[\/\s]+/\_/gs;
+    $title=&clean($title);
+    my ($home,$other,%outhash)=&authorhosts();
+    unless (($env{'form.authorspace'}) && ($env{'form.authorfolder'}=~/\w/)) {
+        my %js_lt;
+        $formname = 'copycrsauthored';
+        if ($home) {
+            %js_lt =
+                &Apache::lonlocal::texthash(
+                    yomu => 'You must select an Authoring Space',
+                    whco => 'When Copyright set to "custom", URL of a published rights file is needed.',
+            );
+            &js_escape(\%js_lt);
+        }
+        if ($home > 1) {
+            $js = <<"ENDJS";
+<script type="text/javascript">
+// <![CDATA[
+
+function validCrsCopy() {
+    var dest = document.$formname.authorspace.options[document.$formname.authorspace.selectedIndex].value;
+    if (dest == '') {
+        alert("$js_lt{'yomu'}");
+        return false;
+    }
+    var dist = document.$formname.copyright.options[document.$formname.copyright.selectedIndex].value;
+    if (dist == 'custom') {
+        if (document.$formname.customrights.value == '') {
+            alert("$js_lt{'whco'}");
+            return false;
+        }
+    }
+    return true;
+}
+
+function init_copycrs_form() {
+    document.$formname.authorspace.selectedIndex = "0";
+    document.$formname.authorfolder.value = '$title';
+    document.$formname.copyright.selectedIndex = "0";
+}
+
+// ]]>
+</script>
+
+ENDJS
+        } elsif ($home) {
+            $js = <<"ENDJS";
+<script type="text/javascript">
+// <![CDATA[
+
+function init_copycrs_form() {
+    document.$formname.authorfolder.value = '$title';
+    document.$formname.copyright.selectedIndex = "0";
+}
+
+// ]]>
+</script>
+
+ENDJS
+        }
+        $js .= <<"ENDJS";
+<script type="text/javascript">
+// <![CDATA[
+
+function hide_searching() {
+    if (document.getElementById('searching')) {
+        document.getElementById('searching').style.display = 'none';
+    }
+    return;
+}
+
+function showHideCustom(caller,divid) {
+    if (document.getElementById(divid)) {
+        if (caller.options[caller.selectedIndex].value == 'custom') {
+            document.getElementById(divid).style.display="inline-block";
+        } else {
+            document.getElementById(divid).style.display="none";
+        }
+    }
+    return;
+}
+
+// ]]>
+</script>
+ENDJS
+
+        $js .= "\n".&Apache::lonhtmlcommon::scripttag(&Apache::loncommon::browser_and_searcher_javascript())."\n";
+        $starthash = {
+                         add_entries => {'onload' => "hide_searching(); init_copycrs_form();"},
+                     };
+    }
+    $r->print(&Apache::loncommon::start_page('Copy from Course Authoring to User Authoring',$js,$starthash)."\n".
+              &Apache::lonhtmlcommon::breadcrumbs('Copy from Course Authoring Space')."\n");
+    $r->print(&startContentScreen('tools'));
+    unless ($home) {
+        $r->print('<p class="LC_info">'.&mt('No author or co-author roles on this server.').'</p>');
+        $r->print(&endContentScreen());
+        return '';
+    }
+    my $docroot = $r->dir_config('lonDocRoot');
+    my $is_course_home;
+    my @ids=&Apache::lonnet::current_machine_ids();
+    if (($coursehome ne '') && (grep(/^\Q$coursehome\E$/,@ids))) {
+        $is_course_home = 1;
+    }
+    my $exclude = &Apache::lonnet::priv_exclude();
+    my $srcurl = "/priv/$coursedom/$coursenum";
+    my $srctop = $docroot.$srcurl;
+    my $resurl = "/res/$coursedom/$coursenum";
+    my $res_exclude = &Apache::lonnet::res_exclude();
+    if (($env{'form.authorspace'}) && ($env{'form.authorfolder'}=~/\w/)) {
+        $r->print('<h3>'.&mt('Copying Files and/or Sub-directories').'</h3>');
+        if ($readonly) {
+            $r->print('<p class="LC_info">'.
+                      &mt('You do not have permission to copy files and/or directories from Course Authoring Space.').
+                      '</p>'.
+                      &endContentScreen());
+            return '';
+        }
+        unless ($outhash{'home_'.$env{'form.authorspace'}}) {
+            $r->print('<p class="LC_info">'.&mt('Selected Authoring Space is not on this server.').'</p>'.
+                      &endContentScreen());
+            return '';
+        }
+        my ($ca,$cd)=split(/\:/,$env{'form.authorspace'});
+        my $desturl = "/priv/$cd/$ca";
+        my $destresurl = "/res/$cd/$ca";
+        my $desttop = $docroot.$desturl;
+        my $subdir = &clean($env{'form.authorfolder'});
+        $subdir = &cleandir($subdir);
+        if ($subdir eq '') {
+            $r->print('<p class="LC_info">'.&mt('After removal of disallowed characters target sub-directory name was blank.').'</p>'.
+                      &endContentScreen());
+            return '';
+        } elsif ($subdir =~/^_+$/) {
+            $r->print('<p class="LC_info">'.&mt('After replacement of non-alphanumeric characters with _ in target sub-directory name, nothing but underscores was left.').'</p>'.
+                      &endContentScreen());
+            return '';
+        }
+        my (%tocopy,%dirs_to_make,%files_to_copy);
+        map { $tocopy{&unescape($_)} = 1; } &Apache::loncommon::get_env_multiple('form.copytouser');
+        if (keys(%tocopy)) {
+            my (%subdirs,%files);
+            &Apache::lonnet::recursedirs($is_course_home,1,undef,$exclude,0,0,$srcurl,'',\%subdirs,\%files);
+            foreach my $possible (sort(keys(%tocopy))) {
+                if ($possible =~ m{/$}) {
+                    my $possdir = $possible;
+                    $possdir =~ s{^/+|/+$}{}g;
+                    if (exists($subdirs{$possdir})) {
+                        $dirs_to_make{$possdir} = 1;
+                    } else {
+                        delete($tocopy{$possible});
+                    }
+                } else {
+                    my ($path,$fname) = ($possible =~ m{(.*/)([^/]+)$});
+                    my $found = 0;
+                    if ($path eq '/') {
+                        if (ref($files{$path}) eq 'HASH') {
+                            if (exists($files{$path}{$fname})) {
+                                $found = 1;
+                                $files_to_copy{$fname} = 1;
+                            }
+                        }
+                    } else {
+                        $path =~ s{^/+|/+$}{}g;
+                        if (ref($files{$path}) eq 'HASH') {
+                            if (exists($files{$path}{$fname})) {
+                                $dirs_to_make{$path} = 1;
+                                $files_to_copy{"$path/$fname"} = 1;
+                                $found = 1;
+                            }
+                        }
+                    }
+                    unless ($found) {
+                        delete($tocopy{$possible});
+                    }
+                }
+            }
+        } else {
+            $r->print('<p>'.&mt('No files or directories selected for copying').'</p>');
+            $r->print(&endContentScreen());
+            return '';
+        }
+        if (keys(%tocopy)) {
+            my (%resdirs,%resfiles);
+            &Apache::lonnet::recursedirs($is_course_home,1,undef,$res_exclude,0,0,$resurl,'',\%resdirs,\%resfiles);
+            my ($notopdir,%newdir,%newfile,%checkdeps,%newresfile);
+            $r->print('<p>'.&mt('Copy to: [_1]',
+                                '<span class="LC_filename">'.$desturl.'/'.$subdir.'</span>').
+                      '</p>'."\n");
+            if (keys(%dirs_to_make)) {
+                unless (-e $desttop.'/'.$subdir) {
+                    mkdir($desttop.'/'.$subdir,0755);
+                }
+                if (-e $desttop.'/'.$subdir) {
+                    foreach my $dir (sort(keys(%dirs_to_make))) {
+                        my @dirs=split(/\//,$dir);
+                        my $path="$desttop/$subdir";
+                        my $makepath=$path;
+                        my $fail;
+                        for (my $i=0;$i<@dirs;$i++) {
+                            $makepath.='/'.$dirs[$i];
+                            unless (-e $makepath) {
+                                unless (mkdir($makepath,0755)) {
+                                    $fail = 1;
+                                    last;
+                                }
+                                if (($i == scalar(@dirs)-1) && (!$fail))  {
+                                    $newdir{$dir} = 1;
+                                }
+                            }
+                        }
+                        if ($fail) {
+                            $r->print('<p class="LC_warning">'.&mt('Target directory: [_1] does not exist, and could not be created.',
+                                                                   '<span class="LC_filename">'.$desturl.'/'.$subdir.'/'.$dir.'</span>').
+                                      '</p>'."\n");
+                        }
+                    }
+                } else {
+                    $notopdir = 1;
+                }
+            }
+            if (keys(%files_to_copy)) {
+                unless (-e $desttop.'/'.$subdir) {
+                    mkdir($desttop.'/'.$subdir,0755);
+                }
+                if (-e $desttop.'/'.$subdir) {
+                    my $num = 0;
+                    my ($copyright,$customdistfile);
+                    if ($env{'form.copyright'} eq 'default' || $env{'form.copyright'} eq 'domain' || $env{'form.copyright'} eq 'public') {
+                        $copyright = $env{'form.copyright'};
+                    } elsif ($env{'form.copyright'} eq 'custom') {
+                        if ($env{'form.customrights'} =~ m{^/res/$match_domain/$match_username/.+\.rights$}) {
+                            my ($rightsdom,$rightsuname) = ($1,$2);
+                            my $rightshome = &Apache::lonnet::homeserver($rightsdom,$rightsuname);
+                            if (($rightshome eq 'no_host') || ($rightshome eq '')) {
+                                $copyright = 'default';
+                            } elsif (grep(/^\Q$rightshome\E$/,@ids)) {
+                                if (-e $docroot.$env{'form.customrights'}) {
+                                    $copyright = 'custom';
+                                    $customdistfile = $env{'form.customrights'};
+                                } else {
+                                    $copyright = 'default';
+                                }
+                            } else {
+                                my $rightsfile = &Apache::lonnet::filelocation('',$env{'form.customrights'});
+                                unless (&Apache::lonnet::getfile($rightsfile) eq '-1') {
+                                    $customdistfile = $env{'form.customrights'};
+                                }
+                            }
+                        }
+                    }
+                    my $sourceavail;
+                    if ($env{'form.sourceavail'} =~ /^(open|closed)$/) {
+                        $sourceavail = $env{'form.sourceavail'};
+                    }
+                    my $respublish;
+                    if ($env{'form.respublish'}) {
+                        $respublish = 1;
+                    }
+                    my $nokeyref = &Apache::lonpublisher::getnokey($r->dir_config('lonIncludes'));
+                    foreach my $file (keys(%files_to_copy)) {
+                        my ($fail,$dup,$dir_is_file,$src,$dest,$path,$fname);
+                        if ($file =~ m{/}) {
+                            ($path,$fname) = ($file =~ m{^(.+)/([^/]+)$});
+                            if (-d "$desttop/$subdir/$path") {
+                                if (-e "$desttop/$subdir/$path/$fname") {
+                                    $dup = 1;
+                                } else {
+                                    $src = "$srctop/$path/$fname";
+                                    $dest = "$desttop/$subdir/$path/$fname";
+                                }
+                            } elsif (-f "$desttop/$subdir/$path") {
+                                $dir_is_file = 1;
+                            } else {
+                                $fail = 1;
+                            }
+                        } elsif (-e "$desttop/$subdir/$file") {
+                            $dup = 1;
+                        } else {
+                            $src = "$srctop/$file";
+                            $dest = "$desttop/$subdir/$file";
+                            $fname = $file;
+                        }
+                        if ($fail) {
+                            $r->print('<p class="LC_warning">'.&mt('Target directory: [_1] does not exist, and could not be created.',
+                                                                   '<span class="LC_filename">'.$desturl.'/'.$subdir.'/'.$path.'</span>').
+                                      '</p>'."\n");
+                        } elsif ($dup) {
+                            $r->print('<p class="LC_warning">'.&mt('Target file: [_1] already exists -- not overwriting.',
+                                                                   '<span class="LC_filename">'.$desturl.'/'.$subdir.'/'.$file.'</span>').
+                                      '</p>'."\n");
+                        } elsif ($dir_is_file) {
+                            $r->print('<p class="LC_warning">'.&mt('Target directory: [_1] name is already in a use for a file -- not overwriting.',
+                                                                   '<span class="LC_filename">'.$desturl.'/'.$subdir.'/'.$file.'</span>').
+                                      '</p>'."\n");
+                        } elsif (($src ne '') && ($dest ne '')) {
+                            my $ressrc = $docroot.$resurl.'/'.$file;
+                            my $ressrcmeta = $ressrc.'.meta';
+                            my ($ext) = ($file =~ /\.(\w+)$/);
+                            my $embstyle=&Apache::loncommon::fileembstyle($ext);
+                            my ($getres,$getresmeta);
+                            if ($respublish) {
+                                if ($path eq '') {
+                                    if ((ref($resfiles{'/'}) eq 'HASH') &&
+                                        (exists($resfiles{'/'}{$fname}))) {
+                                        $getres = 1;
+                                        $getresmeta = 1;
+                                    }
+                                } elsif ((ref($resfiles{$path}) eq 'HASH') &&
+                                         (exists($resfiles{$path}{$fname}))) {
+                                    $getres = 1;
+                                    $getresmeta = 1;
+                                }
+                            }
+                            if ($is_course_home) {
+                                my ($needpriv,$needprivmeta);
+                                if ($respublish) {
+                                    if ($getres) {
+                                        if (&Apache::londiff::are_different_files($src,$ressrc)) {
+                                            $needpriv = 1;
+                                            if (&File::Copy::copy($ressrc,$dest)) {
+                                                if ($embstyle eq 'ssi') {
+                                                    &crsres_fixup($dest,$coursenum,$coursedom,$ca,$cd);
+                                                }
+                                            }
+                                        } else {
+                                            if (&File::Copy::copy($src,$dest)) {
+                                                $newfile{$file} = $desturl.'/'.$subdir.'/'.$file;
+                                                if ($embstyle eq 'ssi') {
+                                                    &crsres_fixup($dest,$coursenum,$coursedom,$ca,$cd,$subdir);
+                                                }
+                                            }
+                                        }
+                                    } else {
+                                        $needpriv = 1;
+                                    }
+                                    if ($getresmeta) {
+                                        if ((-e $src.'.meta') && (!-e $dest.'.meta')) {
+                                            if (&Apache::londiff::are_different_files($src.'.meta',$ressrc.'.meta')) {
+                                                if (&File::Copy::copy($ressrc.'.meta',$dest.'.meta')) {
+                                                    &crsres_fixup_meta($dest,$coursenum,$coursedom,$ca,$cd,$copyright,
+                                                                       $customdistfile,$sourceavail,\%checkdeps);
+                                                }
+                                                $needprivmeta = 1;
+                                            } else {
+                                                if (&File::Copy::copy($src.'.meta',$dest.'.meta')) {
+                                                    &crsres_fixup_meta($dest,$coursenum,$coursedom,$ca,$cd,$copyright,
+                                                                       $customdistfile,$sourceavail,\%checkdeps);
+                                                }
+                                            }
+                                        }
+                                    }
+                                    if ($getres) {
+                                        my $destresfile = $docroot.$destresurl.'/'.$subdir.'/'.$file;
+                                        if (-e $dest) {
+                                            my $output = &Apache::lonpublisher::batchpublish($r,$dest,$destresfile,$nokeyref,1);
+                                            if (-e $destresfile) {
+                                                $newresfile{$file} = $destresurl.'/'.$subdir.'/'.$file;
+                                            }
+                                        }
+                                    }
+                                } else {
+                                    $needpriv = 1;
+                                    if ((-e $src.'.meta') && (!-e $dest.'.meta')) {
+                                        $needprivmeta = 1;
+                                    }  
+                                }
+                                if ($needpriv) {
+                                    if (&File::Copy::copy($src,$dest)) {
+                                        $newfile{$file} = $desturl.'/'.$subdir.'/'.$file;
+                                        if ($embstyle eq 'ssi') {
+                                            &crsres_fixup($dest,$coursenum,$coursedom,$ca,$cd,$subdir);
+                                        }
+                                    }
+                                }
+                                if ($needprivmeta) {
+                                    if (&File::Copy::copy($src.'.meta',$dest.'.meta')) {
+                                         &crsres_fixup_meta($dest,$coursenum,$coursedom,$ca,$cd,$copyright,
+                                                            $customdistfile,$sourceavail,\%checkdeps);
+                                    }
+                                }
+                            } else {
+                                my ($needpriv,$needprivmeta);
+                                if ($respublish) {
+                                    if ($getres) {
+                                        &Apache::lonnet::repcopy($docroot.$resurl.'/'.$file);
+                                    }
+                                    if ($getresmeta) {
+                                        &Apache::lonnet::repcopy($docroot.$resurl.'/'.$file.'.meta');
+                                    }
+                                    if (-e $docroot.$resurl.'/'.$file) {
+                                        if (&Apache::lonnet::repcopy_crsprivfile($srcurl.'/'.$file,$dest) eq 'ok') {
+                                            if (&Apache::londiff::are_different_files($docroot.$resurl.'/'.$file,$dest)) {
+                                                $needpriv = 1;
+                                                if (&File::Copy::copy($docroot.$resurl.'/'.$file,$dest)) {
+                                                    if ($embstyle eq 'ssi') {
+                                                        &crsres_fixup($dest,$coursenum,$coursedom,$ca,$cd);
+                                                    }
+                                                }
+                                            } else {
+                                                if ($embstyle eq 'ssi') {
+                                                    &crsres_fixup($dest,$coursenum,$coursedom,$ca,$cd,$subdir);
+                                                }
+                                                $newfile{$file} = $desturl.'/'.$subdir.'/'.$file;
+                                            }
+                                        }
+                                    } else {
+                                        $needpriv = 1;
+                                    }
+                                    if (-e $docroot.$resurl.'/'.$file.'.meta') {
+                                        if (&Apache::lonnet::repcopy_crsprivfile($srcurl.'/'.$file.'.meta',$dest.'.meta') eq 'ok') {
+                                            if (&Apache::londiff::are_different_files($docroot.$resurl.'/'.$file.'.meta',$dest.'.meta')) {
+                                                $needprivmeta = 1;
+                                                if (&File::Copy::copy($docroot.$resurl.'/'.$file.'.meta',$dest.'.meta')) {
+                                                    &crsres_fixup_meta($dest,$coursenum,$coursedom,$ca,$cd,$copyright,
+                                                                       $customdistfile,$sourceavail,\%checkdeps);
+                                                }
+                                            } else {
+                                                &crsres_fixup_meta($dest,$coursenum,$coursedom,$ca,$cd,$copyright,
+                                                                   $customdistfile,$sourceavail,\%checkdeps);
+                                            }
+                                        }
+                                    } else {
+                                        if (!-e $dest.'.meta') {
+                                            $needprivmeta = 1;
+                                        }
+                                    }
+                                    if ($getres) {
+                                        my $destresfile = $docroot.$destresurl.'/'.$subdir.'/'.$file;
+                                        if (-e $dest) {
+                                            my $output = &Apache::lonpublisher::batchpublish($r,$dest,$destresfile,$nokeyref,1);
+                                            if (-e $destresfile) {
+                                                $newresfile{$file} = $destresurl.'/'.$subdir.'/'.$file;
+                                            }
+                                        }
+                                    }
+                                } else {
+                                    $needpriv = 1;
+                                    if (!-e $dest.'.meta') {
+                                        $needprivmeta = 1;
+                                    }
+                                }
+                                if ($needpriv) {
+                                    if (&Apache::lonnet::repcopy_crsprivfile($srcurl.'/'.$file,$dest) eq 'ok') {
+                                        if ($embstyle eq 'ssi') {
+                                            &crsres_fixup($dest,$coursenum,$coursedom,$ca,$cd,$subdir);
+                                        }
+                                        $newfile{$file} = $desturl.'/'.$subdir.'/'.$file;
+                                    }
+                                }
+                                if ($needprivmeta) {
+                                    if (&Apache::lonnet::repcopy_crsprivfile($srcurl.'/'.$file.'.meta',$dest.'.meta') eq 'ok') {
+                                        &crsres_fixup_meta($dest,$coursenum,$coursedom,$ca,$cd,$copyright,
+                                                           $customdistfile,$sourceavail,\%checkdeps);
+                                    }
+                                }
+                            }
+                        }
+                    }
+                } else {
+                    $notopdir = 1;
+                }
+            }
+            if ($notopdir) {
+                $r->print('<p><span class="LC_info">'.&mt('No files or sub-directories copied').'</span><br />'."\n".
+                          '<span class="LC_warning">'.&mt('Target directory: [_1] does not exist, and could not be created.',
+                                                          '<span class="LC_filename">'.$desturl.'/'.$subdir.'</span>').
+                          '</span></p>'."\n");
+            }
+            if (keys(%newdir)) {
+                 $r->print('<p>'.&mt('Created the following directories in [_1]:','<span class="LC_filename">'.$desturl.'/'.$subdir.'</span>').
+                           '</p>'."\n".
+                           '<ul><li>'.join('</li><li>',sort(keys(%newdir))).'</li></ul></p>'."\n");
+            }
+            if (keys(%newfile)) {
+                $r->print('<p>'.&mt('Copied the following files to [_1]:','<span class="LC_filename">'.$desturl.'/'.$subdir.'</span>').
+                          '</p>'."\n".
+                          '<ul><li>'.join('</li><li>',sort(keys(%newfile))).'</li></ul></p>'."\n");
+                foreach my $file (keys(%newfile)) {
+                    my %storehash = (
+                                      'priv' => $newfile{$file},
+                                      'who'  => $env{'user.name'}.':'.$env{'user.domain'},
+                                    );
+                    if (exists($newresfile{$file})) {
+                        $storehash{'res'} = 1;
+                    }
+                    &Apache::lonnet::store_userdata(\%storehash,$file,'copycourseauthor',$coursedom,$coursenum);
+                }
+            }
+            if (keys(%checkdeps)) {
+                my %missingdep;
+                foreach my $depfile (sort(keys(%checkdeps))) {
+                    unless (-e "$desttop/$depfile") {
+                        $missingdep{$depfile} = 1;
+                    }
+                }
+                if (keys(%missingdep)) {
+                    $r->print('<p>'.&mt('You may also need to copy the following missing dependencies for files copied to [_1]:',
+                                        '<span class="LC_filename">'.$desturl.'/'.$subdir.'</span>').
+                          '</p>'."\n".
+                          '<ul><li>'.join('</li><li>',sort(keys(%missingdep))).'</li></ul></p>'."\n");
+                }
+            }
+        } else {
+            $r->print('<p>'.&mt('No currently existing files or directories in Course Authoring Space selected for copying').'</p>');
+            $r->print(&endContentScreen());
+            return '';
+        }
+    } else {
+        my $chkname = 'copytouser';
+        my $context = 'crsauthored';
+        my (%subdirs,%files,@dirs_by_depth,@files_by_depth,%parent,%children,%hierarchy,@checked_maps);
+        &Apache::lonnet::recursedirs($is_course_home,1,undef,$exclude,0,0,$srcurl,'',\%subdirs,\%files,1);
+        foreach my $key (keys(%subdirs)) {
+            next if (($key eq '/') || ($key eq ''));
+            my @items = split(/\//,$key);
+            my $dir = pop(@items);
+            my $depth = scalar(@items);
+            my $path;
+            if (!$depth) {
+                $path = '/';
+            } else {
+                $path = join('/',@items);
+            }
+            $dirs_by_depth[$depth]{$path}{$dir} = 1;
+        }
+        foreach my $path (keys(%files)) {
+            next if ($path eq '');
+            my $depth;
+            if ($path eq '/') {
+                $depth = 0;
+            } else {
+                $depth = scalar(split(/\//,$path));
+            }
+            if (ref($files{$path}) eq 'HASH') {
+                foreach my $file (keys(%{$files{$path}})) {
+                    $files_by_depth[$depth]{$path}{$file} = $files{$path}{$file};
+                }
+            }
+        }
+        my ($info,$display,$onsubmit,$togglebuttons,$disabled);
+        my (%resdirs,%resfiles);
+        &Apache::lonnet::recursedirs($is_course_home,1,undef,$res_exclude,0,0,$resurl,'',\%resdirs,\%resfiles);
+        my $numpub = 0;
+        if (keys(%resfiles)) {
+            foreach my $dir (keys(%resfiles)) {
+                if (ref($resfiles{$dir}) eq 'HASH') {
+                    foreach my $file (keys(%{$resfiles{$dir}})) {
+                        if (exists($files{$dir}{$file})) {
+                            $numpub ++;
+                        }
+                    }
+                }
+            }
+        }
+        if ($readonly) {
+            $disabled = ' disabled="disabled"';
+        }
+        if ($disabled) {
+            $togglebuttons = '<br />';
+        } else {
+            $togglebuttons = '<input type="button" value="'.&mt('check all').'" '.
+                             'onclick="javascript:checkAll(document.'.$formname.'.'.$chkname.')" />'.
+                             '&nbsp;&nbsp;<input type="button" value="'.&mt('uncheck all').'"'.
+                             ' onclick="javascript:uncheckAll(document.'.$formname.'.'.$chkname.')" />';
+        }
+        my $preamble = &authorspace_selector($r,$formname,$home,$title,%outhash).
+                       &courseresource_options($formname,$numpub).
+                       '<div style="padding:0;clear:both;margin:0;border:0"></div>'."\n";
+        my $display = '<form name="'.$formname.'" action="" method="post" onsubmit="return validCrsCopy();">'."\n".
+                      $preamble."\n".
+                      '<div class="LC_float_left">'."\n".
+                      '<fieldset>'."\n".
+                      '<legend>'.&mt('Content to copy').('&nbsp;'x4).$togglebuttons.'</legend>'."\n".
+                      '<span class="LC_fontsize_medium">'.
+                      &mt('Choose the files and/or folders to copy from Course Authoring to User Authoring').
+                      '</span><br /><br />'."\n";
+        my $count = 0;
+#
+# Warning to developers:
+#
+# If you add or remove form elements which precede the table of items to copy
+# you will need to modify the value for startcount. Form elements include both:
+# <input> and <fieldset> tags.
+# $startcount (set to 9) contains the following:
+# fieldsets with following legends: (a) Folder in Authoring Space, (b) Distribution to set in metadata
+# (c) Content to copy
+# inputs: textbox for destination folder; dropdown lists: (a) Copyright, (b) Source
+# hidden: customrights file;  buttons: (a) check all, (b) uncheck all.
+# authorspace: if more than 1: a fieldset with legend: Select the Authoring Space,
+# or if 1: an input (hidden) with available author/coauthor role.
+# if there are multiple possible author/coauthor roles (i.e., $home > 1),
+# incerement startcount by 1 for the dropdown list uses to select the target.
+#
+# If there are published files, increment startcount by 3:
+# fieldset (legend: Published Resources), and two radio buttons (Yes/No).
+#
+        my $startcount = 9;
+        if ($home > 1) {
+            $startcount ++;
+        }
+        if ($numpub) {
+            $startcount += 3;
+        }
+        my $lastcontainer = $startcount;
+        $display .= &Apache::loncommon::start_data_table()."\n".
+                    &Apache::loncommon::start_data_table_header_row().
+                    '<th>'.&mt('Copy?').'</th>'.
+                    '<th>'.&mt('Name').'</th>'.
+                    '<th>'.&mt('Last modified').'</th>'.
+                    '<th>'.&mt('Published?').'</th>'.
+                    &Apache::loncommon::end_data_table_header_row()."\n";
+        $count = &recurse_crsauthored(0,\@dirs_by_depth,\@files_by_depth,'/',$startcount,
+                                      $count,\$display,\%parent,\%children,$readonly,
+                                      $formname,$chkname,\$lastcontainer,\%resfiles);
+        $display .= &Apache::loncommon::end_data_table().'</fieldset>';
+        unless ($readonly) {
+            $display .= '</div><div style="padding:0;clear:both;margin:0;border:0"></div>'.
+                        '<div>'.
+                        '<input type="submit" name="copyauthored" value="'.&mt("Copy Selected Content").'" />'.
+                        '</div>';
+        }
+        $display .= &Apache::loncourserespicker::respicker_javascript($startcount,$count,$context,$formname,\%children,
+                                                                      \%hierarchy,\@checked_maps,$home,$chkname);
+        $r->print($display);
+    }
+    $r->print(&endContentScreen());
+}
+
+sub recurse_crsauthored {
+    my ($currdepth,$dirs_by_depth,$files_by_depth,$currpath,$startcount,$count,$displayref,
+        $parent,$children,$readonly,$formname,$chkname,$lastcontainerref,$resfilesref) = @_;
+    return $count unless ((ref($dirs_by_depth) eq 'ARRAY') && (ref($files_by_depth) eq 'ARRAY') &&
+                          (ref($resfilesref) eq 'HASH'));
+    my ($disabled,$hasdirs,$hasfiles,%unique,%dirs,%files);
+    if ((ref($dirs_by_depth->[$currdepth]) eq 'HASH') &&
+        (ref($dirs_by_depth->[$currdepth]{$currpath}) eq 'HASH')) {
+        $hasdirs = 1;
+        %dirs = %{$dirs_by_depth->[$currdepth]{$currpath}};
+        map { $unique{$_} = 1; } keys(%dirs);
+    }
+    if ((ref($files_by_depth->[$currdepth]) eq 'HASH') &&
+        (ref($files_by_depth->[$currdepth]{$currpath}) eq 'HASH')) {
+        $hasfiles = 1;
+        %files = %{$files_by_depth->[$currdepth]{$currpath}};
+        map { $unique{$_} = 1; } keys(%files);
+    }
+    if ($readonly) {
+        $disabled = ' disabled="disabled"';
+    }
+    my $location=&Apache::loncommon::lonhttpdurl("/adm/lonIcons");
+    my $whitespace =
+        '<img src="'.$location.'/whitespace_21.gif" class="LC_docs_spacer" alt="" />';
+    $parent->{$currdepth} = $$lastcontainerref;
+    foreach my $item (sort { lc($a) cmp lc($b) } (keys(%unique))) {
+        next if ($item eq '');
+        my $currelem;
+        if ($hasdirs && exists($dirs{$item})) {
+            $count ++;
+            my $deeper = $currdepth+1;
+            my ($newpath,$showpath);
+            if ($currpath eq '/') {
+                $newpath = $item;
+                $showpath = $currpath.$item.'/';
+            } else {
+                $newpath = $currpath.'/'.$item;
+                $showpath = '/'.$currpath.'/'.$item.'/';
+            }
+            $currelem = $count+$startcount;
+            $$lastcontainerref = $currelem;
+            $children->{$parent->{$currdepth}} .= $currelem.':';
+            my $icon = 'src="'.$location.'/navmap.folder.open.gif" alt="'.&mt('Folder').'"';
+            $$displayref .= &Apache::loncommon::start_data_table_row().
+                            '<td><input type="checkbox" name="'.$chkname.'" value="'.&escape($showpath).'" '.
+                            'onclick="javascript:checkFolder(document.'.$formname.','."'$currelem'".')" '.
+                            $disabled.' /></td><td>';
+            for (my $i=0; $i<$currdepth; $i++) {
+                $$displayref .= "$whitespace\n";
+            }
+            $$displayref .= '<img '.$icon.' />&nbsp;'.$item.'</td><td>&nbsp;</td><td>&nbsp;</td>'.
+                            &Apache::loncommon::end_data_table_row()."\n";
+            $count = &recurse_crsauthored($deeper,$dirs_by_depth,$files_by_depth,$newpath,
+                                          $startcount,$count,$displayref,$parent,$children,
+                                          $readonly,$formname,$chkname,$lastcontainerref,$resfilesref);
+        }
+        if ($hasfiles && exists($files{$item})) {
+            $count ++;
+            $currelem = $count+$startcount;
+            $children->{$parent->{$currdepth}} .= $currelem.':';
+            my $icon = 'src="'.&Apache::loncommon::icon($item).'"';
+            my ($ext) = ($item =~ /\.([^.]+)$/);
+            my $alttext;
+            if (lc($ext) eq 'problem') {
+                $alttext = ' alt="'.&mt('Problem Icon').'"';
+            } elsif ($ext =~ /^x?html?$/i) {
+                $alttext = ' alt="'.&mt('Web Page Icon').'"';
+            } elsif ($ext =~ /^(jpg|gif|png|svg|jpeg)$/) {
+                $alttext = ' alt="'.&mt('Image Icon').'"';
+            } else {
+                $alttext = ' alt="'.&mt('Resource Icon').'"';
+            }
+            my $showpath;
+            if ($currpath eq '/') {
+                $showpath = $currpath;
+            } else {
+                $showpath = "/$currpath/";
+            }
+            my ($published,$lastmod);
+            if ((ref($resfilesref->{$currpath})) && (exists($resfilesref->{$currpath}{$item}))) {
+                $published = '<img src="'.$location.'/navmap.correct.gif" alt="'.&mt('yes').'" />';
+            } else {
+                $published = '<img src="'.$location.'/navmap.wrong.gif" alt="'.&mt('no').'" />';
+            }
+            $$displayref .= &Apache::loncommon::start_data_table_row().
+                            '<td><input type="checkbox" name="'.$chkname.'" value="'.&escape($showpath.$item).'" '.
+                            'onclick="javascript:checkResource(document.'.$formname.','."'$currelem'".')" '.
+                            $disabled.' /></td><td>';
+            for (my $i=0; $i<$currdepth; $i++) {
+                $$displayref .= "$whitespace\n";
+            }
+            $$displayref .= '<img '.$icon.$alttext.' />&nbsp;'.$item.'</td>'.
+                            '<td>'.&Apache::lonlocal::locallocaltime($files{$item}).'</td>'.
+                            '<td style="text-align: center;">'.$published.'</td>'.
+                            &Apache::loncommon::end_data_table_row()."\n";
+        }
+    }
+    $$lastcontainerref = $parent->{$currdepth};
+    return $count;
+}
+
+sub courseresource_options {
+    my ($formname,$numpub) = @_;
+    my %lt = &Apache::lonlocal::texthash(
+                                          'default' => 'System wide - can be used for any courses system wide',
+                                          'domain'  => 'Domain only - use limited to courses in the domain',
+                                          'custom'  => 'Customized right of use ...',
+                                          'public'  => 'Public - no authentication or authorization required for use',
+                                          'closed'  => 'Closed - XML source is closed to everyone',
+                                          'open'    => 'Open - XML source is open to people who want to use it',
+                                          'sel'     => 'Select',
+                                        );
+    my $output;
+    if ($numpub) {
+        $output .= '<div class="LC_left_float">'.
+                   '<fieldset><legend>'.&mt('Published Resources').'</legend>'.
+                   &mt('[quant,_1,file] in Course Authoring Space also exist in Resource Space.',
+                       $numpub).'</br />'.
+                   &mt('Publish copied files in selected Authoring Space?').': '."\n".
+                   '<label><input type="radio" name="respublish" checked="checked" value="1" />'.
+                   &mt('Yes').'</label>'."\n".
+                   '<label><input type="radio" name="respublish" value="0" />'.
+                   &mt('No').'</label>'."\n".
+                   '</fieldset></div>'."\n";
+    }
+    $output .= '<div class="LC_left_float">'.
+               '<fieldset><legend>'.&mt('Distribution to set in metadata').'</legend>'.
+               &mt('Copyright').': '.
+               '<select name="copyright" onchange="showHideCustom(this,'."'LC_customfile'".');">'."\n".
+               '<option value="default" selected="selected">'.$lt{'default'}.'</option>'."\n".
+               '<option value="domain">'.$lt{'domain'}.'</option>'."\n".
+               '<option value="public">'.$lt{'public'}.'</option>'."\n".
+               '<option value="custom">'.$lt{'custom'}.'</option>'."\n".
+               '</select><div id="LC_customfile" style="padding:0;clear:both;margin:0;border:0;display:none">'."\n".
+               '<input type="text" name="customrights" size="60" value="" />'.
+               '<a href="javascript:openbrowser('."'$formname','customrights','rights'".');">'.
+               $lt{'sel'}.'</a></div><br />'."\n".
+               &mt('Source').' :'.
+               '<select name="sourceavail">'."\n".
+               '<option value="closed" selected="selected">'.$lt{'closed'}.'</option>'."\n".
+               '<option value="open">'.$lt{'open'}.'</option>'."\n".
+               '</select><br />'."\n".
+               '</fieldset></div>'."\n";
+    return $output;
+}
+
+sub crsres_fixup_meta {
+    my ($dest,$coursenum,$coursedom,$ca,$cd,$copyright,$customdistfile,$sourceavail,$checkdeps) = @_;
+    return unless (ref($checkdeps) eq 'HASH');
+    if (open(my $fh,'<',$dest.'.meta')) {
+        my ($output,$now,$setsourceavail);
+        $now = time;
+        if (($dest =~ /\.(xml|html|htm|xhtml|xhtm)$/i) || ($dest =~ /$LONCAPA::assess_re/)) {
+            $setsourceavail = 1;
+        }
+        while (my $line=<$fh>) {
+            chomp($line);
+            if ($line eq "<authorspace>$coursenum:$coursedom</authorspace>") {
+                $output .= "<authorspace>$ca:$cd</authorspace>\n";
+            } elsif ($line eq '<copyright>custom</copyright>') {
+                $output .= "<copyright>$copyright</copyright>\n";
+            } elsif ($line =~ m{^<creationdate>\d+</creationdate>$}) {
+                $output .= "<creationdate>$now</creationdate>\n";
+            } elsif ($line eq "<customdistributionfile>/res/$coursedom/$coursenum/default.rights</customdistributionfile>") {
+                $output .= "<customdistributionfile>$customdistfile</customdistributionfile>\n";
+            } elsif ($line =~ m{^<sourceavail>(open|closed)</sourceavail>$}) {
+                if ($setsourceavail) {
+                    $output .= "<sourceavail>$sourceavail</sourceavail>\n";
+                }
+            } elsif ($line eq "<domain>$coursedom</domain>") {
+                $output .= "<domain>$cd</domain>\n";
+            } elsif ($line =~ m{^<lastrevisiondate>\d+</lastrevisiondate>$}) {
+                $output .= "<lastrevisiondate>$now</lastrevisiondate>\n";
+            } elsif ($line =~ m{^<modifyinguser>$match_username:$match_domain</modifyinguser>$}) {
+                $output .= "<modifyinguser>$env{'user.name'}:$env{'user.domain'}</modifyinguser>\n";
+            } elsif ($line eq "<owner>$coursenum:$coursedom</owner>") {
+                $output .= "<owner>$ca:$cd</owner>\n";
+            } elsif ($line =~ m{^<dependencies>(.+)</dependencies>$}) {
+                my @deps = split(/\s*,\s*/,$1);
+                my @newdeps;
+                my $changed = 0;
+                foreach my $dep (@deps) {
+                    if ($dep =~ m{^/res/$coursedom/$coursenum/(.+)$}) {
+                        my $rest = $1;
+                        push(@newdeps,"/res/$cd/$ca/$rest");
+                        $checkdeps->{$rest} = 1;
+                        $changed ++;
+                    } else {
+                        push(@newdeps,$dep);
+                    }
+                }
+                if ($changed) {
+                    $output .= '<dependencies>'.join(',',@newdeps).'</dependencies>'."\n";
+                }
+            } else {
+                $output .= "$line\n";
+            }
+        }
+        close($fh);
+        if (open(my $fh,'>',$dest.'.meta')) {
+            print $fh $output;
+            close($fh);
+        }
+    }
+}
+
+sub crsres_fixup {
+    my ($dest,$coursenum,$coursedom,$ca,$cd,$subdir) = @_;
+    my $outstring='';
+    my $changes = 0;
+    my @parser;
+    $parser[0]=HTML::LCParser->new($dest);
+    $parser[-1]->xml_mode(1);
+    my $token;
+    while (@parser) {
+        while ($token=$parser[-1]->get_token) {
+            if ($token->[0] eq 'S') {
+                my $tag=$token->[1];
+                my $lctag=lc($tag);
+                my %parms=%{$token->[2]};
+                foreach my $type ('src','href','background','bgimg') {
+                    foreach my $key (keys(%parms)) {
+                        if ($key =~ /^$type$/i) {
+                            next if (($lctag eq 'img') && ($type eq 'src') &&
+                                     ($parms{$key} =~ m{^data\:image/gif;base64,}));
+                            if ($parms{$key} =~ m{^\Q/res/$coursedom/$coursenum/\E}si) {
+                                $parms{$key} =~ s{^\Q/res/$coursedom/$coursenum/\E}{/res/$cd/$ca/$subdir/}si;
+                                $changes ++;
+                            }
+                        }
+                    }
+                }
+                # probably a <randomlabel> image type <label>
+                # or a <image> tag inside <imageresponse> or <drawimage>
+                if (($lctag eq 'label' && defined($parms{'description'}))
+                    || ($lctag eq 'image') || ($lctag eq 'import')) {
+                    my $next_token=$parser[-1]->get_token();
+                    if ($next_token->[0] eq 'T') {
+                        $next_token->[1] =~ s/[\n\r\f]+//g;
+                        if ($next_token->[1] =~ m{^\Q/res/$coursedom/$coursenum/\E}si) {
+                            $next_token->[1] =~ s{^\Q/res/$coursedom/$coursenum/\E}{/res/$cd/$ca/$subdir/}si;
+                            $changes ++;
+                        }
+                    }
+                    $parser[-1]->unget_token($next_token);
+                }
+                if ($lctag eq 'applet') {
+                    my $havecodebase=0;
+                    foreach my $key (keys(%parms)) {
+                        if (lc($key) eq 'codebase') {
+                            if ($parms{$key} =~ m{^\Q/res/$coursedom/$coursenum/\E}si) {
+                                $parms{$key} =~ s{^\Q/res/$coursedom/$coursenum/\E}{/res/$cd/$ca/$subdir/}si;
+                                $changes ++;
+                            }
+                            $havecodebase = 1;
+                        }
+                    }
+                    unless ($havecodebase) {
+                        foreach my $key (keys(%parms)) {
+                            if ($key =~ /(archive|code|object)/i) {
+                                if ($parms{$key} =~ m{^\Q/res/$coursedom/$coursenum/\E}si) {
+                                    $parms{$key} =~ s{^\Q/res/$coursedom/$coursenum/\E}{/res/$cd/$ca/$subdir/si};
+                                    $changes ++;
+                                }
+                            }
+                        }
+                    }
+                }
+                my $newparmstring='';
+                my $endtag='';
+                foreach my $parkey (keys(%parms)) {
+                    if ($parkey eq '/') {
+                        $endtag=' /';
+                    } else {
+                        my $quote=($parms{$parkey}=~/\"/?"'":'"');
+                        $newparmstring.=' '.$parkey.'='.$quote.$parms{$parkey}.$quote;
+                    }
+                }
+                if (!$endtag) { if ($token->[4]=~m:/>$:) { $endtag=' /'; }; }
+                $outstring.='<'.$tag.$newparmstring.$endtag.'>';
+                if ($lctag eq 'm' || $lctag eq 'answer' || $lctag eq 'display' ||
+                    $lctag eq 'tex') {
+                    $outstring.=&Apache::lonxml::get_all_text_unbalanced('/'.$lctag,\@parser);
+                } elsif ($lctag eq 'script') {
+                    if ($parms{'type'} eq 'loncapa/perl') {
+                        $outstring.=&Apache::lonxml::get_all_text_unbalanced('/'.$lctag,\@parser);
+                    } else {
+                        my $needsupdate;
+                        my $script = &Apache::lonxml::get_all_text_unbalanced('/'.$lctag,\@parser);
+                        if ($script =~ m{\.addMediaSrc\((["'])((?!\1).+)\1\);}) {
+                            my $src = $2;
+                            if ($src =~ m{^\Q/res/$coursedom/$coursenum/\E}si) {
+                                $needsupdate = 1;
+                            }
+                        }
+                        if ($script =~ /\(document,\s*(['"])script\1,\s*\[([^\]]+)\]\);/s) {
+                            my $scriptslist = $2;
+                            my @srcs = split(/\s*,\s*/,$scriptslist);
+                            foreach my $src (@srcs) {
+                                if ($src =~ /(["'])(?:(?!\1).)+\.js\1/) {
+                                    my $quote = $1;
+                                    my ($url) = ($src =~ m/\Q$quote\E([^$quote]+)\Q$quote\E/);
+                                    if ($url =~ m{^\Q/res/$coursedom/$coursenum/\E}si) {
+                                        $needsupdate = 1;
+                                    }
+                                }
+                            }
+                        }
+                        if ($script =~ m{loadScript\(\s*(['"])((?:(?!\1).)+\.js)\1,\s*function}is) {
+                            my $src = $2;
+                            if ($src =~ m{^\Q/res/$coursedom/$coursenum/\E}si) {
+                                $needsupdate = 1;
+                            }
+                        }
+                        if ($needsupdate) {
+                            $script =~ s{^\Q/res/$coursedom/$coursenum/\E}{/res/$cd/$ca/$subdir/gsi};
+                            $changes ++;
+                        }
+                        $outstring .= $script;
+                    }
+                }
+            } elsif ($token->[0] eq 'E') {
+                if ($token->[2]) {
+                    unless ($token->[1] eq 'allow') {
+                        $outstring.='</'.$token->[1].'>';
+                    }
+                }
+            } else {
+                $outstring.=$token->[1];
+            }
+        }
+        pop(@parser);
+    }
+    if ($changes) {
+        if (open(my $fh,'>',$dest)) {
+            print $fh $outstring;
+            close($fh);
+        }
+    }
+}
 
+sub group_import {
+    my ($coursenum, $coursedom, $folder, $container, $caller, $ltitoolsref, @files) = @_;
+    my ($donechk,$allmaps,%hierarchy,%titles,%addedmaps,%removefrommap,
+        %removeparam,$importuploaded,$fixuperrors);
+    $allmaps = {};
     while (@files) {
 	my ($name, $url, $residx) = @{ shift(@files) };
         if (($url =~ m{^/uploaded/\Q$coursedom\E/\Q$coursenum\E/(default_\d+\.)(page|sequence)$})
@@ -290,7 +1690,7 @@ sub group_import {
             $env{'form.output'}=$newmapstr;
             my $result=&Apache::lonnet::finishuserfileupload($coursenum,$coursedom,
                                                 'output',$1.$2);
-            if ($result != m|^/uploaded/|) {
+            if ($result !~ m{^/uploaded/}) {
                 $errtext.='Map not saved: A network error occurred when trying to save the new map. ';
                 $fatal = 2;
             }
@@ -299,6 +1699,201 @@ sub group_import {
             }
         }
 	if ($url) {
+            if ($url =~ m{^(/adm/$coursedom/$coursenum/(\d+)/ext\.tool)\:?(.*)$}) {
+                $url = $1;
+                my $marker = $2;
+                my $info = $3;
+                my ($toolid,$toolprefix,$tooltype,%toolhash,%toolsettings);
+                my @extras = ('linktext','explanation','crslabel','crstitle','crsappend','returnurl','backtourl');
+                my @toolinfo = split(/:/,$info);
+                if ($residx) {
+                    %toolsettings=&Apache::lonnet::dump('exttool_'.$marker,$coursedom,$coursenum);
+                    $toolid = $toolsettings{'id'};
+                } else {
+                    $toolid = shift(@toolinfo);
+                }
+                if ($toolid =~ /^c/) {
+                    $tooltype = 'crs';
+                    $toolprefix = 'c';
+                } else {
+                    $tooltype = 'dom';
+                }
+                $toolid =~ s/\D//g;
+                ($toolhash{'target'},$toolhash{'width'},$toolhash{'height'},
+                 $toolhash{'linktext'},$toolhash{'explanation'},$toolhash{'crslabel'},
+                 $toolhash{'crstitle'},$toolhash{'crsappend'},$toolhash{'gradable'},
+                 $toolhash{'returnurl'},$toolhash{'backtourl'}) = @toolinfo;
+                foreach my $item (@extras) {
+                    $toolhash{$item} = &unescape($toolhash{$item});
+                }
+                if ($folder =~ /^supplemental/) {
+                    delete($toolhash{'gradable'});
+                } else {
+                    $toolhash{'gradable'} =~ s/\D+//g;
+                }
+                if (ref($ltitoolsref) eq 'HASH') {
+                    if (ref($ltitoolsref->{$tooltype}) eq 'HASH') {
+                        if (ref($ltitoolsref->{$tooltype}->{$toolid}) eq 'HASH') {
+                            my %tools = %{$ltitoolsref->{$tooltype}->{$toolid}};
+                            my @deleted;
+                            $toolhash{'id'} = $toolprefix.$toolid;
+                            if (($toolhash{'target'} eq 'iframe') || ($toolhash{'target'} eq 'tab') ||
+                                ($toolhash{'target'} eq 'window')) {
+                                if ($toolhash{'target'} eq 'window') {
+                                    foreach my $item ('width','height') {
+                                        $toolhash{$item} =~ s/^\s+//;
+                                        $toolhash{$item} =~ s/\s+$//;
+                                        if ($toolhash{$item} =~ /\D/) {
+                                            delete($toolhash{$item});
+                                            if ($residx) {
+                                                if ($toolsettings{$item}) {
+                                                    push(@deleted,$item);
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                            } elsif ($residx) {
+                                $toolhash{'target'} = $toolsettings{'target'};
+                                if ($toolhash{'target'} eq 'window') {
+                                    foreach my $item ('width','height') {
+                                        $toolhash{$item} = $toolsettings{$item};
+                                    }
+                                }
+                            } elsif (ref($tools{'display'}) eq 'HASH') {
+                                $toolhash{'target'} = $tools{'display'}{'target'};
+                                if ($toolhash{'target'} eq 'window') {
+                                    $toolhash{'width'} = $tools{'display'}{'width'};
+                                    $toolhash{'height'} = $tools{'display'}{'height'};
+                                }
+                            }
+                            if ($toolhash{'target'} eq 'iframe') {
+                                foreach my $item ('width','height','linktext','explanation') {
+                                    delete($toolhash{$item});
+                                    if ($residx) {
+                                        if ($toolsettings{$item}) {
+                                            push(@deleted,$item);
+                                        }
+                                    }
+                                }
+                            } elsif ($toolhash{'target'} eq 'tab') {
+                                foreach my $item ('width','height') {
+                                    delete($toolhash{$item});
+                                    if ($residx) {
+                                        if ($toolsettings{$item}) {
+                                            push(@deleted,$item);
+                                        }
+                                    }
+                                }
+                            }
+                            if (ref($tools{'crsconf'}) eq 'HASH') {
+                                foreach my $item ('label','title','linktext','explanation') {
+                                    my $crsitem;
+                                    if (($item eq 'label') || ($item eq 'title')) {
+                                        $crsitem = 'crs'.$item;
+                                    } else {
+                                        $crsitem = $item;
+                                    }
+                                    if ($tools{'crsconf'}{$item}) {
+                                        $toolhash{$crsitem} =~ s/^\s+//;
+                                        $toolhash{$crsitem} =~ s/\s+$//;
+                                        if ($toolhash{$crsitem} eq '') {
+                                            delete($toolhash{$crsitem});
+                                        }
+                                    } else {
+                                        delete($toolhash{$crsitem});
+                                    }
+                                    if (($residx) && (exists($toolsettings{$crsitem}))) {
+                                        unless (exists($toolhash{$crsitem})) {
+                                            push(@deleted,$crsitem);
+                                        }
+                                    }
+                                }
+                                if ($tools{'crsconf'}{'returnurl'}) {
+                                    unless ($toolhash{'returnurl'} eq 'custom') {
+                                        delete($toolhash{'backtourl'});
+                                    }
+                                } else {
+                                    delete($toolhash{'returnurl'});
+                                    delete($toolhash{'backtourl'});
+                                }
+                            }
+                            if ($toolhash{'passback'}) {
+                                my $gradesecret = UUID::Tiny::create_uuid_as_string(UUID_V4);
+                                $toolhash{'gradesecret'} = $gradesecret;
+                                $toolhash{'gradesecretdate'} = time;
+                            }
+                            if ($toolhash{'roster'}) {
+                                my $rostersecret = UUID::Tiny::create_uuid_as_string(UUID_V4);
+                                $toolhash{'rostersecret'} = $rostersecret;
+                                $toolhash{'rostersecretdate'} = time;
+                            }
+                            my $changegradable;
+                            if (($residx) && ($folder =~ /^default/)) {
+                                if ($toolsettings{'gradable'}) {
+                                    unless (($toolhash{'gradable'}) || (defined($LONCAPA::map::zombies[$residx]))) {
+                                        push(@deleted,'gradable');
+                                        $changegradable = 1;
+                                    }
+                                } elsif ($toolhash{'gradable'}) {
+                                    $changegradable = 1;
+                                }
+                                if (($caller eq 'londocs') && (defined($LONCAPA::map::zombies[$residx]))) {
+                                    $changegradable = 1;
+                                    if ($toolsettings{'gradable'}) {
+                                        $toolhash{'gradable'} = 1;
+                                    }
+                                }
+                            }
+                            if ($residx) {
+                                if (($toolsettings{'backtourl'} ne '') && (!exists($toolhash{'backtourl'}))) {
+                                    push(@deleted,'backtourl');
+                                }
+                                if (($toolsettings{'returnurl'} ne '') && (!exists($toolhash{'returnurl'}))) {
+                                    push(@deleted,'returnurl');
+                                }
+                            }
+                            my $putres = &Apache::lonnet::put('exttool_'.$marker,\%toolhash,$coursedom,$coursenum);
+                            if ($putres eq 'ok') {
+                                if (@deleted) {
+                                    &Apache::lonnet::del('exttool_'.$marker,\@deleted,$coursedom,$coursenum);
+                                }
+                                if (($changegradable) && ($folder =~ /^default/)) {
+                                    my $val;
+                                    if ($toolhash{'gradable'}) {
+                                        $val = 'yes';
+                                    } else {
+                                        $val = 'no';
+                                    }
+                                    &LONCAPA::map::storeparameter($residx,'parameter_0_gradable',$val,
+                                                                  'string_yesno');
+                                    &remember_parms($residx,'gradable','set',$val);
+                                }
+                            } else {
+                                return (&mt('Failed to save update to external tool.'),1);
+                            }
+                        }
+                    }
+                }
+            }
+            if (($caller eq 'londocs') &&
+                ($folder =~ /^default/)) {
+                if (($url =~ /\.(page|sequence)$/) && (!$donechk)) {
+                    my $chome = &Apache::lonnet::homeserver($coursenum,$coursedom);
+                    my $cid = $coursedom.'_'.$coursenum;
+                    $allmaps =
+                        &Apache::loncommon::allmaps_incourse($coursedom,$coursenum,
+                                                             $chome,$cid);
+                    $donechk = 1;
+                }
+                if ($url =~ m{^/uploaded/\Q$coursedom\E/\Q$coursenum\E/(default_\d+\.)(page|sequence)$}) {
+                    &contained_map_check($url,$folder,$coursenum,$coursedom,\%removefrommap,
+                                        \%removeparam,\%addedmaps,\%hierarchy,\%titles,$allmaps);
+                    $importuploaded = 1;
+                } elsif ($url =~ m{^/res/.+\.(page|sequence)$}) {
+                    next if ($allmaps->{$url});
+                }
+            }
 	    if (!$residx
 		|| defined($LONCAPA::map::zombies[$residx])) {
 		$residx = &LONCAPA::map::getresidx($url,$residx);
@@ -306,73 +1901,98 @@ sub group_import {
 	    }
 	    my $ext = 'false';
 	    if ($url=~m{^http://} || $url=~m{^https://}) { $ext = 'true'; }
-	    $url  = &LONCAPA::map::qtunescape($url);
-	    $name = &LONCAPA::map::qtunescape($name);
+            if ($url =~ m{^/uploaded/$coursedom/$coursenum/((?:docs|supplemental)/(?:default|\d+))/new\.html$}) {
+                my $filepath = $1;
+                my $fname;
+                if ($name eq '') {
+                    $name = &mt('Web Page');
+                    $fname = 'web';
+                } else {
+                    $fname = $name;
+                    $fname=&Apache::lonnet::clean_filename($fname);
+                    if ($fname eq '') {
+                        $fname = 'web';
+                    } elsif (length($fname) > 15) {
+                        $fname = substr($fname,0,14);
+                    }
+                }
+                my $title = &Apache::loncommon::cleanup_html($name);
+                my $initialtext = &mt('Replace with your own content.');
+                my $newhtml = <<END;
+<html>
+<head>
+<title>$title</title>
+</head>
+<body bgcolor="#ffffff">
+$initialtext
+</body>
+</html>
+END
+                $env{'form.output'}=$newhtml;
+                my $result =
+                    &Apache::lonnet::finishuserfileupload($coursenum,$coursedom,
+                                                          'output',
+                                                          "$filepath/$residx/$fname.html");
+                if ($result =~ m{^/uploaded/}) {
+                    $url = $result;
+                    if ($filepath =~ /^supplemental/) {
+                        $name = time.'___&&&___'.$env{'user.name'}.'___&&&___'.
+                                $env{'user.domain'}.'___&&&___'.$name;
+                    }
+                } else {
+                    return (&mt('Failed to save new web page.'),1);
+                }
+            }
+            $name = &LONCAPA::map::qtunescape($name);
+            $url  = &LONCAPA::map::qtunescape($url);
 	    $LONCAPA::map::resources[$residx] =
 		join(':', ($name, $url, $ext, 'normal', 'res'));
 	}
     }
-    return &storemap($coursenum, $coursedom, $folder.'.'.$container);
-}
-
-sub breadcrumbs {
-    my ($allowed,$crstype)=@_;
-    &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='';
-    my $plain='';
-    my $randompick=-1;
-    my $isencrypted=0;
-    my $ishidden=0;
-    my $is_random_order=0;
-    while (@folders) {
-	my $folder=shift(@folders);
-    	my $foldername=shift(@folders);
-	if ($folderpath) {$folderpath.='&';}
-	$folderpath.=$folder.'&'.$foldername;
-        my $url;
-        if ($allowed) {
-            $url = '/adm/coursedocs?folderpath=';
-        } else {
-            $url = '/adm/supplemental?folderpath=';
-        }
-	$url .= &escape($folderpath);
-	my $name=&unescape($foldername);
-# randompick number, hidden, encrypted, random order, is appended with ":"s to the foldername
- 	$name=~s/\:(\d*)\:(\w*)\:(\w*):(\d*)$//;
-	if ($1 ne '') {
-           $randompick=$1;
-        } else {
-           $randompick=-1;
-        }
-        if ($2) { $ishidden=1; }
-        if ($3) { $isencrypted=1; }
-	if ($4 ne '') { $is_random_order = 1; }
-        if ($folder eq 'supplemental') {
-            $name = &mt('Supplemental '.$crstype.' Content');
-        }
-	&Apache::lonhtmlcommon::add_breadcrumb(
-		      {'href'=>$url.$cpinfo,
-		       'title'=>$name,
-		       'text'=>$name,
-		       'no_mt'=>1,
-		       });
-	$plain.=$name.' &gt; ';
-    }
-    $plain=~s/\&gt\;\s*$//;
-    return (&Apache::lonhtmlcommon::breadcrumbs(undef,undef,0,'nohelp',
-					       undef, undef, 1 ),$randompick,$ishidden,
-                                               $isencrypted,$plain,$is_random_order);
+    if ($importuploaded) {
+        my %import_errors;
+        my %updated = (
+                          removefrommap => \%removefrommap,
+                          removeparam   => \%removeparam,
+                      );
+        my ($result,$msgsarray,$lockerror) = 
+            &apply_fixups($folder,1,$coursedom,$coursenum,\%import_errors,\%updated);
+        if (keys(%import_errors) > 0) {
+            $fixuperrors =
+                '<p span class="LC_warning">'."\n".
+                &mt('The following files are either dependencies of a web page or references within a folder and/or composite page for which errors occurred during import:')."\n".
+                '<ul>'."\n";
+            foreach my $key (sort(keys(%import_errors))) {
+                $fixuperrors .= '<li>'.$key.'</li>'."\n";
+            }
+            $fixuperrors .= '</ul></p>'."\n";
+        }
+        if (ref($msgsarray) eq 'ARRAY') {
+            if (@{$msgsarray} > 0) {
+                $fixuperrors .= '<p class="LC_info">'.
+                                join('<br />',@{$msgsarray}).
+                                '</p>';
+            }
+        }
+        if ($lockerror) {
+            $fixuperrors .= '<p class="LC_error">'.
+                            $lockerror.
+                            '</p>';
+        }
+    }
+    my ($errtext,$fatal) =
+        &storemap($coursenum, $coursedom, $folder.'.'.$container,1);
+    unless ($fatal) {
+        if ($folder =~ /^supplemental/) {
+            my ($errtext,$fatal) = &mapread($coursenum,$coursedom,
+                                            $folder.'.'.$container);
+        }
+    }
+    return ($errtext,$fatal,$fixuperrors);
 }
 
 sub log_docs {
-    return &Apache::lonnet::instructor_log('docslog',@_);
+    return &Apache::lonnet::write_log('course','docslog',@_);
 }
 
 {
@@ -432,24 +2052,53 @@ sub log_docs {
     }
 }
 
-
-
-
-
 sub docs_change_log {
-    my ($r)=@_;
-    my $folder=$env{'form.folder'};
-    $r->print(&Apache::loncommon::start_page('Course Document Change Log'));
-    $r->print(&Apache::lonhtmlcommon::breadcrumbs('Course Document Change Log'));
+    my ($r,$coursenum,$coursedom,$folder,$allowed,$crstype,$iconpath,$canedit)=@_;
+    my $supplementalflag=($env{'form.folderpath'}=~/^supplemental/);
+    my $navmap; 
+    my $js = '<script type="text/javascript">'."\n".
+             '// <![CDATA['."\n".
+             &Apache::loncommon::display_filter_js('docslog')."\n".
+             &editing_js($env{'user.domain'},$env{'user.name'},$supplementalflag,
+                         $coursedom,$coursenum,'','',$canedit,'',\$navmap)."\n".
+             &history_tab_js()."\n".
+             &Apache::lonratedt::editscript('simple')."\n".
+             '// ]]>'."\n".
+             '</script>'."\n";
+    $r->print(&Apache::loncommon::start_page('Content Change Log',$js));
+    $r->print(&Apache::lonhtmlcommon::breadcrumbs('Content Change Log'));
+    $r->print(&startContentScreen(($supplementalflag?'suppdocs':'docs')));
+    my %orderhash;
+    my $container='sequence';
+    my $pathitem;
+    if ($env{'form.folderpath'} =~ /\:1$/) {
+        $container='page';
+    }
+    my $folderpath=$env{'form.folderpath'};
+    if ($folderpath eq '') {
+        $folderpath = &default_folderpath($coursenum,$coursedom,\$navmap);
+    }
+    undef($navmap);
+    $pathitem = '<input type="hidden" name="folderpath" value="'.
+                &HTML::Entities::encode($folderpath,'<>&"').'" />';
+    my $readfile="/uploaded/$coursedom/$coursenum/$folder.$container";
+    my $jumpto = $readfile;
+    $jumpto =~ s{^/}{};
+    my $tid = 1;
+    if ($supplementalflag) {
+        $tid = 2;
+    }
+    my ($breadcrumbtrail) =
+        &Apache::lonhtmlcommon::docs_breadcrumbs($allowed,$crstype,1);
+    $r->print($breadcrumbtrail.
+              &generate_edit_table($tid,\%orderhash,undef,$iconpath,$jumpto,
+              $readfile));
     my %docslog=&Apache::lonnet::dump('nohist_docslog',
                                       $env{'course.'.$env{'request.course.id'}.'.domain'},
                                       $env{'course.'.$env{'request.course.id'}.'.num'});
 
     if ((keys(%docslog))[0]=~/^error\:/) { undef(%docslog); }
 
-    $r->print('<form action="/adm/coursedocs" method="post" name="docslog">'.
-              '<input type="hidden" name="docslog" value="1" />');
-
     my %saveable_parameters = ('show' => 'scalar',);
     &Apache::loncommon::store_course_settings('docs_log',
                                               \%saveable_parameters);
@@ -461,11 +2110,17 @@ sub docs_change_log {
 	    'encrypturl'     => 'URL hidden',
 	    'randompick'     => 'Randomly pick',
 	    'randomorder'    => 'Randomly ordered',
+            'gradable'       => 'Grade can be assigned to External Tool',
 	    'set'            => 'set to',
 	    'del'            => 'deleted');
-    $r->print(&Apache::loncommon::display_filter().
-              '<input type="hidden" name="folder" value="'.$folder.'" />'.
-              '<input type="submit" value="'.&mt('Display').'" /></form>');
+    my $filter = &Apache::loncommon::display_filter('docslog')."\n".
+                 $pathitem."\n".
+                 '<input type="hidden" name="folder" value="'.$env{'form.folder'}.'" />'.
+                 ('&nbsp;'x2).'<input type="submit" value="'.&mt('Display').'" />';
+    $r->print('<div class="LC_left_float">'.
+              '<fieldset><legend>'.&mt('Display of Content Changes').'</legend>'."\n".
+              &makedocslogform($filter,1).
+              '</fieldset></div><br clear="all" />');
     $r->print(&Apache::loncommon::start_data_table().&Apache::loncommon::start_data_table_header_row().
               '<th>'.&mt('Time').'</th><th>'.&mt('User').'</th><th>'.&mt('Folder').'</th><th>'.&mt('Before').'</th><th>'.
               &mt('After').'</th>'.
@@ -509,18 +2164,30 @@ sub docs_change_log {
                                   ':'.$docslog{$id}{'exe_udom'}.'</tt>'.
                   $send_msg_link.'</td><td>'.
                   $docslog{$id}{'logentry'}{'folder'}.'</td><td>');
+        my $is_supp = 0; 
+        if ($docslog{$id}{'logentry'}{'currentfolder'} =~ /^supplemental/) {
+            $is_supp = 1;
+        }
 # Before
 	for (my $idx=0;$idx<=$docslog{$id}{'logentry'}{'maxidx'};$idx++) {
 	    my $oldname=(split(/\:/,$docslog{$id}{'logentry'}{'before_resources_'.$idx}))[0];
 	    my $newname=(split(/\:/,$docslog{$id}{'logentry'}{'after_resources_'.$idx}))[0];
 	    if ($oldname ne $newname) {
-		$r->print(&LONCAPA::map::qtescape($oldname));
+                my $shown = &LONCAPA::map::qtescape($oldname);
+                if ($is_supp) {
+                    $shown = &Apache::loncommon::parse_supplemental_title($shown);
+                }
+                $r->print($shown);
 	    }
 	}
 	$r->print('<ul>');
 	for (my $idx=0;$idx<=$docslog{$id}{'logentry'}{'maxidx'};$idx++) {
             if ($docslog{$id}{'logentry'}{'before_order_res_'.$idx}) {
-		$r->print('<li>'.&LONCAPA::map::qtescape((split(/\:/,$docslog{$id}{'logentry'}{'before_order_res_'.$idx}))[0]).'</li>');
+                my $shown = &LONCAPA::map::qtescape((split(/\:/,$docslog{$id}{'logentry'}{'before_order_res_'.$idx}))[0]);
+                if ($is_supp) {
+                    $shown = &Apache::loncommon::parse_supplemental_title($shown);
+                }
+		$r->print('<li>'.$shown.'</li>');
 	    }
 	}
 	$r->print('</ul>');
@@ -531,19 +2198,33 @@ sub docs_change_log {
 	    my $oldname=(split(/\:/,$docslog{$id}{'logentry'}{'before_resources_'.$idx}))[0];
 	    my $newname=(split(/\:/,$docslog{$id}{'logentry'}{'after_resources_'.$idx}))[0];
 	    if ($oldname ne '' && $oldname ne $newname) {
-		$r->print(&LONCAPA::map::qtescape($newname));
+                my $shown = &LONCAPA::map::qtescape($newname);
+                if ($is_supp) {
+                    $shown = &Apache::loncommon::parse_supplemental_title(&LONCAPA::map::qtescape($newname));
+                }
+                $r->print($shown);
 	    }
 	}
 	$r->print('<ul>');
 	for (my $idx=0;$idx<=$docslog{$id}{'logentry'}{'maxidx'};$idx++) {
             if ($docslog{$id}{'logentry'}{'after_order_res_'.$idx}) {
-		$r->print('<li>'.&LONCAPA::map::qtescape((split(/\:/,$docslog{$id}{'logentry'}{'after_order_res_'.$idx}))[0]).'</li>');
+                my $shown = &LONCAPA::map::qtescape((split(/\:/,$docslog{$id}{'logentry'}{'after_order_res_'.$idx}))[0]);
+                if ($is_supp) {
+                    $shown = &Apache::loncommon::parse_supplemental_title($shown);
+                }
+                $r->print('<li>'.$shown.'</li>');
 	    }
 	}
 	$r->print('</ul>');
 	if ($docslog{$id}{'logentry'}{'parameter_res'}) {
-	    $r->print(&LONCAPA::map::qtescape((split(/\:/,$docslog{$id}{'logentry'}{'parameter_res'}))[0]).':<ul>');
-	    foreach my $parameter ('randompick','hiddenresource','encrypturl','randomorder') {
+            my ($title,$url) = split(/\:/,$docslog{$id}{'logentry'}{'parameter_res'},3);
+            if ($title eq '') {
+                ($title) = ($url =~ m{/([^/]+)$});
+            } elsif ($is_supp) {
+                $title = &Apache::loncommon::parse_supplemental_title($title);
+            }
+            $r->print(&LONCAPA::map::qtescape($title).':<ul>');
+	    foreach my $parameter ('randompick','hiddenresource','encrypturl','randomorder','gradable') {
 		if ($docslog{$id}{'logentry'}{'parameter_action_'.$parameter}) {
 # FIXME: internationalization seems wrong here
 		    $r->print('<li>'.
@@ -560,171 +2241,1528 @@ sub docs_change_log {
         if (!($env{'form.show'} eq &mt('all')
               || $shown<=$env{'form.show'})) { last; }
     }
-    $r->print(&Apache::loncommon::end_data_table());
+    $r->print(&Apache::loncommon::end_data_table()."\n".
+              &makesimpleeditform($pathitem)."\n".
+              '</div></div>');
+    $r->print(&endContentScreen());
 }
 
 sub update_paste_buffer {
-    my ($coursenum,$coursedom) = @_;
+    my ($coursenum,$coursedom,$folder) = @_;
+    my (@possibles,%removals,%cuts,$output);
+    if ($env{'form.multiremove'}) {
+        $env{'form.multiremove'} =~ s/,$//;
+        map { $removals{$_} = 1; } split(/,/,$env{'form.multiremove'});
+    }
+    if (($env{'form.multicopy'}) || ($env{'form.multicut'})) {
+        if ($env{'form.multicut'}) {
+            $env{'form.multicut'} =~ s/,$//;
+            foreach my $item (split(/,/,$env{'form.multicut'})) {
+                unless ($removals{$item}) {
+                    $cuts{$item} = 1;
+                    push(@possibles,$item.':cut');
+                }
+            }
+        }
+        if ($env{'form.multicopy'}) {
+            $env{'form.multicopy'} =~ s/,$//;
+            foreach my $item (split(/,/,$env{'form.multicopy'})) {
+                unless ($removals{$item} || $cuts{$item}) {
+                    push(@possibles,$item.':copy'); 
+                }
+            }
+        }
+    } elsif ($env{'form.markcopy'}) {
+        @possibles = split(/,/,$env{'form.markcopy'});
+    }
 
-    return if (!defined($env{'form.markcopy'}));
+    return if (@possibles == 0);
     return if (!defined($env{'form.copyfolder'}));
-    return if ($env{'form.markcopy'} < 0);
 
     my ($errtext,$fatal) = &mapread($coursenum,$coursedom,
 				    $env{'form.copyfolder'});
-
     return if ($fatal);
 
-# Mark for copying
-    my ($title,$url)=split(':',$LONCAPA::map::resources[$LONCAPA::map::order[$env{'form.markcopy'}]]);
-    if (&is_supplemental_title($title)) {
-        &Apache::lonnet::appenv({'docs.markedcopy_supplemental' => $title});
-	($title) = &parse_supplemental_title($title);
-    } elsif ($env{'docs.markedcopy_supplemental'}) {
-        &Apache::lonnet::delenv('docs.markedcopy_supplemental');
+    my %curr_groups = &Apache::longroup::coursegroups();
+
+# Retrieve current paste buffer suffixes.
+    my @currpaste = split(/,/,$env{'docs.markedcopies'});
+    my (%pasteurls,@newpaste);
+
+# Construct identifiers for current contents of user's paste buffer
+    if (@currpaste) {
+        foreach my $suffix (@currpaste) {
+            my $cid = $env{'docs.markedcopy_crs_'.$suffix};
+            my $url = $env{'docs.markedcopy_url_'.$suffix};
+            my $mapidx = $env{'docs.markedcopy_map_'.$suffix};
+            if (($cid =~ /^$match_domain(?:_)$match_courseid$/) &&
+                ($url ne '')) {
+                if ($url eq '/res/lib/templates/simpleproblem.problem') {
+                    $pasteurls{$cid.'_'.$mapidx} = 1;
+                } elsif ($url =~ m{^/res/$match_domain/$match_username/}) {
+                    $pasteurls{$url} = 1;
+                } else {
+                    $pasteurls{$cid.'_'.$url} = 1;
+                }
+            }
+        }
     }
-    $url=~s{http(&colon;|:)//https(&colon;|:)//}{https$2//};
 
-    &Apache::lonnet::appenv({'docs.markedcopy_title' => $title,
-			    'docs.markedcopy_url'   => $url});
+# Mark items for copying (skip any items already in user's paste buffer)
+    my %addtoenv;
+
+    my @pathitems = split(/\&/,$env{'form.folderpath'});
+    my @folderconf = split(/\:/,$pathitems[-1]);
+    my $ispage = $folderconf[5];
+
+    foreach my $item (@possibles) {
+        my ($orderidx,$cmd) = split(/:/,$item);
+        next if ($orderidx =~ /\D/);
+        next unless (($cmd eq 'cut') || ($cmd eq 'copy') || ($cmd eq 'remove'));
+        my $mapidx = $folder.':'.$orderidx.':'.$ispage;
+        my ($title,$url)=split(':',$LONCAPA::map::resources[$orderidx]);
+        my %denied = &action_restrictions($coursenum,$coursedom,
+                                          &LONCAPA::map::qtescape($url),
+                                          $env{'form.folderpath'},\%curr_groups);
+        next if ($denied{'copy'});
+        $url=~s{http(&colon;|:)//https(&colon;|:)//}{https$2//};
+        if ($url eq '/res/lib/templates/simpleproblem.problem') {
+            next if (exists($pasteurls{$coursedom.'_'.$coursenum.'_'.$mapidx}));
+        } elsif ($url =~ m{^/res/$match_domain/$match_username/}) {
+            next if (exists($pasteurls{$url}));
+        } else {
+            next if (exists($pasteurls{$coursedom.'_'.$coursenum.'_'.$url}));
+        }
+        my ($suffix,$errortxt,$locknotfreed) =
+            &new_timebased_suffix($env{'user.domain'},$env{'user.name'},'paste');
+        if ($suffix ne '') {
+            push(@newpaste,$suffix);
+        } else {
+            if ($locknotfreed) {
+                return $locknotfreed;
+            }
+        }
+        if (&is_supplemental_title($title)) {
+            &Apache::lonnet::appenv({'docs.markedcopy_supplemental_'.$suffix => $title});
+	    ($title) = &Apache::loncommon::parse_supplemental_title($title);
+        }
+
+        $addtoenv{'docs.markedcopy_title_'.$suffix} = $title,
+        $addtoenv{'docs.markedcopy_url_'.$suffix}   = $url,
+        $addtoenv{'docs.markedcopy_cmd_'.$suffix}   = $cmd,
+        $addtoenv{'docs.markedcopy_crs_'.$suffix}   = $env{'request.course.id'};
+        $addtoenv{'docs.markedcopy_map_'.$suffix}   = $mapidx;
+        if ($url =~ m{^/uploaded/$match_domain/$match_courseid/(default|supplemental)_?(\d*)\.(page|sequence)$}) {
+            my $prefix = $1;
+            my $subdir =$2;
+            if ($subdir eq '') {
+                $subdir = $prefix;
+            }
+            my (%addedmaps,%removefrommap,%removeparam,%hierarchy,%titles,%allmaps);
+            &contained_map_check($url,$folder,$coursenum,$coursedom,\%removefrommap,
+                                 \%removeparam,\%addedmaps,\%hierarchy,\%titles,\%allmaps);
+            if (ref($hierarchy{$url}) eq 'HASH') {
+                my ($nested,$nestednames);
+                &recurse_uploaded_maps($url,$subdir,\%hierarchy,\%titles,\$nested,\$nestednames);
+                $nested =~ s/\&$//;
+                $nestednames =~ s/\Q___&&&___\E$//;
+                if ($nested ne '') {
+                    $addtoenv{'docs.markedcopy_nested_'.$suffix} = $nested;
+                }
+                if ($nestednames ne '') {
+                    $addtoenv{'docs.markedcopy_nestednames_'.$suffix} = $nestednames;
+                }
+            }
+        }
+        if ($locknotfreed) {
+            $output = $locknotfreed;
+            last;
+        }
+    }
+    if (@newpaste) {
+        $addtoenv{'docs.markedcopies'} = join(',',(@currpaste,@newpaste));
+    }
+    &Apache::lonnet::appenv(\%addtoenv);
     delete($env{'form.markcopy'});
+    return $output;
+}
+
+sub recurse_uploaded_maps {
+    my ($url,$dir,$hierarchy,$titlesref,$nestref,$namesref) = @_;
+    if (ref($hierarchy->{$url}) eq 'HASH') {
+        my @maps = map { $hierarchy->{$url}{$_}; } sort { $a <=> $b } (keys(%{$hierarchy->{$url}}));
+        my @titles = map { $titlesref->{$url}{$_}; } sort { $a <=> $b } (keys(%{$titlesref->{$url}}));
+        my (@uploaded,@names,%shorter);
+        for (my $i=0; $i<@maps; $i++) {
+            my ($inner) = ($maps[$i] =~ m{^/uploaded/$match_domain/$match_courseid/(?:default|supplemental)_(\d+)\.(?:page|sequence)$});
+            if ($inner ne '') {
+                push(@uploaded,$inner);
+                push(@names,&escape($titles[$i]));
+                $shorter{$maps[$i]} = $inner;
+            }
+        }
+        $$nestref .= "$dir:".join(',',@uploaded).'&';
+        $$namesref .= "$dir:".(join(',',@names)).'___&&&___';
+        foreach my $map (@maps) {
+            if ($shorter{$map} ne '') {
+                &recurse_uploaded_maps($map,$shorter{$map},$hierarchy,$titlesref,$nestref,$namesref);
+            }
+        }
+    }
+    return;
 }
 
 sub print_paste_buffer {
-    my ($r,$container) = @_;
-    return if (!defined($env{'docs.markedcopy_url'}));
+    my ($r,$container,$folder,$coursedom,$coursenum) = @_;
+    return if (!defined($env{'docs.markedcopies'}));
 
-    $r->print('<fieldset>'
-             .'<legend>'.&mt('Clipboard').'</legend>'
-             .'<form name="pasteform" action="/adm/coursedocs" method="post">'
-             .'<input type="submit" name="pastemarked" value="'.&mt('Paste').'" /> '
-    );
+    unless (($env{'form.pastemarked'}) || ($env{'form.clearmarked'})) {
+        return if ($env{'docs.markedcopies'} eq '');
+    }
 
-    my $type;
-    if ($env{'docs.markedcopy_url'} =~ m{^(?:/adm/wrapper/ext|(?:http|https)(?:&colon;|:))//} ) {
-	$type = &mt('External Resource');
-	$r->print($type.': '.
-		  &LONCAPA::map::qtescape($env{'docs.markedcopy_title'}).' ('.
-		  &LONCAPA::map::qtescape($env{'docs.markedcopy_url'}).')');
-    }  else {
-	my $extension = (split(/\./,$env{'docs.markedcopy_url'}))[-1];
-	my $icon = &Apache::loncommon::icon($extension);
-	if ($extension eq 'sequence' &&
-	    $env{'docs.markedcopy_url'} =~ m{/default_\d+\.sequence$ }x) {
-	    $icon = &Apache::loncommon::lonhttpdurl($r->dir_config('lonIconsURL'));
-	    $icon .= '/navmap.folder.closed.gif';
-	}
-	$icon = '<img src="'.$icon.'" alt="" class="LC_icon" />';
-	$r->print($icon.$type.': '.  &parse_supplemental_title(&LONCAPA::map::qtescape($env{'docs.markedcopy_title'})));
+    my @currpaste = split(/,/,$env{'docs.markedcopies'});
+    my ($pasteitems,@pasteable,$same_institution,$checkedsameinst);
+    my $clipboardcount = 0;
+
+# Construct identifiers for current contents of user's paste buffer
+    foreach my $suffix (@currpaste) {
+        next if ($suffix =~ /\D/);
+        my $cid = $env{'docs.markedcopy_crs_'.$suffix};
+        my $url = $env{'docs.markedcopy_url_'.$suffix};
+        my $mapidx = $env{'docs.markedcopy_map_'.$suffix};
+        if (($cid =~ /^$match_domain\_$match_courseid$/) &&
+            ($url ne '')) {
+            $clipboardcount ++;
+            my ($is_external,$othercourse,$fromsupp,$is_uploaded_map,$parent,
+                $canpaste,$nopaste,$othercrs,$areachange,$is_exttool,$toolcdom,
+                $toolcnum,$marker);
+            my $extension = (split(/\./,$env{'docs.markedcopy_url_'.$suffix}))[-1];
+            if ($url =~ m{^(?:/adm/wrapper/ext|(?:http|https)(?:&colon;|:))//} ) {
+                $is_external = 1;
+            } elsif ($url =~ m{^/adm/($match_domain)/($match_courseid)/(\d+)/ext\.tool$}) {
+                ($toolcdom,$toolcnum,$marker) = ($1,$2,$3);
+                $is_exttool = 1;
+            }
+            if ($folder =~ /^supplemental/) {
+                $canpaste = &supp_pasteable($env{'docs.markedcopy_url_'.$suffix});
+                unless ($canpaste) {
+                    $nopaste = &mt('Paste into Supplemental Content unavailable.');
+                }
+            } else {
+                $canpaste = 1;
+            }
+            if ($canpaste) {
+                if ($url =~ m{^/uploaded/($match_domain)/($match_courseid)/(.+)$}) {
+                    my $srcdom = $1;
+                    my $srcnum = $2;
+                    my $rem = $3;
+                    if (($srcdom ne $coursedom) || ($srcnum ne $coursenum)) {
+                        $othercourse = 1;
+                        if ($env{"user.priv.cm./$srcdom/$srcnum"} =~ /\Q:mdc&F\E/) {
+                            $othercrs = '<br />'.&mt('(from another course)');
+                        } else {
+                            $canpaste = 0;
+                            $nopaste = &mt('Paste from another course unavailable.'); 
+                        }
+                    }
+                    if ($rem =~ m{^(default|supplemental)_?(\d*)\.(?:page|sequence)$}) {
+                        my $prefix = $1;
+                        $parent = $2;
+                        if ($folder !~ /^\Q$prefix\E/) {
+                            $areachange = 1;
+                        }
+                        $is_uploaded_map = 1;
+                    }
+                } elsif (($url =~ m{^/res/lib/templates/\w+\.problem$}) ||
+                         ($url =~ m{^/adm/($match_domain)/($match_username)/\d+/(bulletinboard|smppg|ext\.tool)$})) {
+                    if ($cid ne $env{'request.course.id'}) {
+                        my ($srcdom,$srcnum) = split(/_/,$cid);
+                        if ($env{"user.priv.cm./$srcdom/$srcnum"} =~ /\Q:mdc&F\E/) {
+                            if ($is_exttool) {
+                                if ($toolcdom ne $coursedom) {
+                                    $canpaste = 0;
+                                    $nopaste = &mt('Paste from another domain unavailable.');
+                                } elsif ($toolcnum ne $coursenum) {
+                                    my %toolsettings =
+                                        &Apache::lonnet::dump('exttool_'.$marker,$toolcdom,$toolcnum);
+                                    my %tooltypes = &Apache::loncommon::usable_exttools();
+                                    if ((($toolsettings{'id'} =~ /^c\d+$/) && (!$tooltypes{'crs'})) ||
+                                        (($toolsettings{'id'} =~ /^\d+$/) && (!$tooltypes{'dom'}))) {
+                                        $canpaste = 0;
+                                        $nopaste = &mt('Paste from another course unavailable.');
+                                    } elsif ($toolsettings{'id'} =~ /^c\d+$/) {
+                                        unless ($checkedsameinst) {
+                                            my $primary_id = &Apache::lonnet::domain($coursedom,'primary');
+                                            my $intdom = &Apache::lonnet::internet_dom($primary_id);
+                                            if ($intdom ne '') {
+                                                my $internet_names =
+                                                    &Apache::lonnet::get_internet_names($Apache::lonnet::perlvar{'lonHostID'});
+                                                if (ref($internet_names) eq 'ARRAY') {
+                                                    if (grep(/^\Q$intdom\E$/,@{$internet_names})) {
+                                                        $same_institution = 1;
+                                                    }
+                                                }
+                                            }
+                                            $checkedsameinst = 1;
+                                        }
+                                        if ($same_institution) {
+                                            $othercrs = '<br />'.&mt('(from another course)');
+                                        } else {
+                                            $nopaste = &mt('Paste from another course unavailable.');
+                                        }
+                                    } else {
+                                        $othercrs = '<br />'.&mt('(from another course)');
+                                    }
+                                }
+                            }
+                        } else {
+                            $canpaste = 0;
+                            $nopaste = &mt('Paste from another course unavailable.');
+                        }
+                    }
+                } elsif ($url =~ m{/res/($match_domain)/($match_username)/}) {
+                    my ($audom,$auname) = ($1,$2);
+                    unless (($auname eq $coursenum) && ($audom eq $coursedom)) {
+                        if (&Apache::lonnet::is_course($audom,$auname)) {
+                            $canpaste = 0;
+                            $nopaste = &mt('Paste from another course unavailable.');
+                        }
+                    }
+                }
+                if ($canpaste) {
+                    push(@pasteable,$suffix);
+                }
+            }
+            my $buffer;
+            if ($is_external) {
+                $buffer = &mt('External Resource').': '.
+                    &LONCAPA::map::qtescape($env{'docs.markedcopy_title_'.$suffix}).' ('.
+                    &LONCAPA::map::qtescape($url).')';
+            } elsif ($is_exttool) {
+                $buffer = &mt('External Tool').': '.
+                    &LONCAPA::map::qtescape($env{'docs.markedcopy_title_'.$suffix});
+            } else {
+                my $icon = &Apache::loncommon::icon($extension);
+                my $icontext;
+                if ($extension eq 'sequence') {
+                    $icontext = &mt('folder icon');
+                } elsif ($extension eq 'page') {
+                    $icontext = &mt('composite page icon');
+                } else {
+                    $icontext = &mt('file icon');
+                }
+                $icontext = &HTML::Entities::encode($icontext);
+                if ($extension eq 'sequence' &&
+                    $url =~ m{/default_\d+\.sequence$}x) {
+                    $icon = &Apache::loncommon::lonhttpdurl($r->dir_config('lonIconsURL'));
+                    $icon .= '/navmap.folder.closed.gif';
+                }
+                my $title = $env{'docs.markedcopy_title_'.$suffix};
+                if ($title eq '') {
+                    ($title) = ($url =~ m{/([^/]+)$});
+                }
+                $buffer = '<img src="'.$icon.'" alt="'.$icontext.'" class="LC_icon" />'.
+                          ': '.
+                          &Apache::loncommon::parse_supplemental_title(
+                             &LONCAPA::map::qtescape($title));
+            }
+            $pasteitems .= '<div class="LC_left_float">';
+            my ($options,$onclick);
+            if (($canpaste) && (!$areachange) && (!$othercourse) &&
+                ($env{'docs.markedcopy_cmd_'.$suffix} eq 'cut')) {
+                if (($is_uploaded_map) ||
+                    ($url =~ /(bulletinboard|smppg)$/) ||
+                    ($url =~ m{^/uploaded/$coursedom/$coursenum/(?:docs|supplemental)/(.+)$})) {
+                    $options = &paste_options($suffix,$is_uploaded_map,$parent);
+                    $onclick= 'onclick="showOptions(this,'."'$suffix'".');" ';
+                }
+            }
+            $pasteitems .= '<label><input type="checkbox" name="pasting" id="pasting_'.$suffix.'" value="'.$suffix.'" '.$onclick.'/>'.$buffer.'</label>';
+            if ($nopaste) {
+                 $pasteitems .= ' <span class="LC_cusr_emph">'.$nopaste.'</span>';   
+            } else {
+                if ($othercrs) {
+                    $pasteitems .= $othercrs;
+                }
+                if ($options) {
+                    $pasteitems .= $options;
+                }
+            }
+            $pasteitems .= '</div>';
+        }
     }
-    if ($container eq 'page') {
-	$r->print('
-	<input type="hidden" name="pagepath" value="'.&HTML::Entities::encode($env{'form.pagepath'},'<>&"').'" />
-	<input type="hidden" name="pagesymb" value="'.&HTML::Entities::encode($env{'form.pagesymb'},'<>&"').'" />
-');
+    if ($pasteitems eq '') {
+        &Apache::lonnet::delenv('docs.markedcopies');
+    }
+    my ($pasteform,$form_start,$buttons,$form_end);
+    if ($pasteitems) {
+        $pasteitems .= '<div style="padding:0;clear:both;margin:0;border:0"></div>';
+        $form_start = '<form name="pasteform" action="/adm/coursedocs" method="post" onsubmit="return validateClipboard();">';
+        if (@pasteable) {
+            my $value = &mt('Paste to current folder');
+            if ($container eq 'page') {
+                $value = &mt('Paste to current page');
+            } 
+            $buttons = '<input type="submit" name="pastemarked" value="'.$value.'" />'.('&nbsp;'x2);
+        }
+        $buttons .= '<input type="submit" name="clearmarked" value="'.&mt('Remove from clipboard').'" />'.('&nbsp;'x2);
+        if ($clipboardcount > 1) {
+            $buttons .=
+                '<span style="text-decoration:line-through">'.('&nbsp;'x20).'</span>'.('&nbsp;'x2).
+                '<input type="button" name="checkallclip" value="'.&mt('Check all').'" style="height:20px;" onclick="checkClipboard();" />'.
+                ('&nbsp;'x2).
+                '<input type="button" name="uncheckallclip" value="'.&mt('Uncheck all').'" style="height:20px;" onclick="uncheckClipboard();" />'.
+                ('&nbsp;'x2);
+        }
+        $form_end = '<input type="hidden" name="folderpath" value="'.&HTML::Entities::encode($env{'form.folderpath'},'<>&"').'" />'.
+                    '</form>';
     } else {
-	$r->print('
-        <input type="hidden" name="folderpath" value="'.&HTML::Entities::encode($env{'form.folderpath'},'<>&"').'" />
-');
+        $pasteitems = &mt('Clipboard is empty');
+    }
+    $r->print($form_start
+             .'<fieldset>'
+             .'<legend>'.&mt('Clipboard').('&nbsp;' x2).$buttons.'</legend>'
+             .$pasteitems
+             .'</fieldset>'
+             .$form_end);
+}
+
+sub paste_options {
+    my ($suffix,$is_uploaded_map,$parent) = @_;
+    my ($copytext,$movetext);
+    if ($is_uploaded_map) {
+        $copytext = &mt('Copy to new folder');
+        $movetext = &mt('Move old');
+    } elsif ($env{'docs.markedcopy_url_'.$suffix} =~ /bulletinboard$/) {
+        $copytext = &mt('Copy to new board');
+        $movetext = &mt('Move (not posts)');
+    } elsif ($env{'docs.markedcopy_url_'.$suffix} =~ /smppg$/) {
+        $copytext = &mt('Copy to new page');
+        $movetext = &mt('Move');
+    } else {
+        $copytext = &mt('Copy to new file');
+        $movetext = &mt('Move');
+    }
+    my $output = '<br />'.
+                 '<span id="pasteoptionstext_'.$suffix.'" class="LC_fontsize_small LC_nobreak"></span>'.
+                 '<div id="pasteoptions_'.$suffix.'" class="LC_dccid" style="display:none;"><span class="LC_nobreak">'.('&nbsp;'x 4).
+                 '<label>'.
+                 '<input type="radio" name="docs.markedcopy_options_'.$suffix.'" value="new" checked="checked" />'.
+                 $copytext.'</label></span>'.('&nbsp;'x2).' '.
+                 '<span class="LC_nobreak"><label>'.
+                 '<input type="radio" name="docs.markedcopy_options_'.$suffix.'" value="move" />'.
+                 $movetext.'</label></span>';
+    if (($is_uploaded_map) && ($env{'docs.markedcopy_nested_'.$suffix})) {
+        $output .= '<br /><fieldset><legend>'.&mt('Folder to paste contains sub-folders').
+                   '</legend><table border="0">';
+        my @pastemaps = split(/\&/,$env{'docs.markedcopy_nested_'.$suffix});
+        my @titles = split(/\Q___&&&___\E/,$env{'docs.markedcopy_nestednames_'.$suffix});
+        my $lastdir = $parent;
+        my %depths = (
+                       $lastdir => 0,
+                     );
+        my (%display,%deps);
+        for (my $i=0; $i<@pastemaps; $i++) {
+            ($lastdir,my $subfolderstr) = split(/\:/,$pastemaps[$i]);
+            my ($namedir,$esctitlestr) = split(/\:/,$titles[$i]);
+            my @subfolders = split(/,/,$subfolderstr);
+            $deps{$lastdir} = \@subfolders;
+            my @subfoldertitles = map { &unescape($_); } split(/,/,$esctitlestr);
+            my $depth = $depths{$lastdir} + 1;
+            my $offset = int($depth * 4);
+            my $indent = ('&nbsp;' x $offset);
+            for (my $j=0; $j<@subfolders; $j++) {
+                $depths{$subfolders[$j]} = $depth;
+                $display{$subfolders[$j]} =
+                    '<tr><td>'.$indent.$subfoldertitles[$j].'&nbsp;</td>'.
+                    '<td><label>'.
+                    '<input type="radio" name="docs.markedcopy_'.$suffix.'_'.$subfolders[$j].'" value="new" checked="checked" />'.&mt('Copy to new').'</label>'.('&nbsp;' x2).
+                    '<label>'.
+                    '<input type="radio" name="docs.markedcopy_'.$suffix.'_'.$subfolders[$j].'" value="move" />'.
+                    &mt('Move old').'</label>'.
+                    '</td></tr>';
+             }
+        }
+        &recurse_print(\$output,$parent,\%deps,\%display);
+        $output .= '</table></fieldset>';
+    }
+    $output .= '</div>';
+    return $output;
+}
+
+sub recurse_print {
+    my ($outputref,$dir,$deps,$display) = @_;
+    $$outputref .= $display->{$dir}."\n";
+    if (ref($deps->{$dir}) eq 'ARRAY') {
+        foreach my $subdir (@{$deps->{$dir}}) {
+            &recurse_print($outputref,$subdir,$deps,$display);
+        }
+    }
+}
+
+sub supp_pasteable {
+    my ($url) = @_;
+    if (($url =~ m{^(?:/adm/wrapper/ext|(?:http|https)(?:&colon;|:))//}) ||
+        (($url =~ /\.sequence$/) && ($url =~ m{^/uploaded/})) ||
+        ($url =~ m{^/uploaded/$match_domain/$match_courseid/(docs|supplemental)/(default|\d+)/\d+/}) ||
+        ($url =~ m{^/adm/$match_domain/$match_username/aboutme}) ||
+        ($url =~ m{^/public/$match_domain/$match_courseid/syllabus}) ||
+        ($url =~ m{^/adm/$match_domain/$match_courseid/\d+/ext\.tool$})) {
+        return 1;
+    }
+    return;
+}
+
+sub paste_popup_js {
+    my %html_js_lt = &Apache::lonlocal::texthash(
+                                          show => 'Show Options',
+                                          hide => 'Hide Options',
+                                        );
+    my %js_lt = &Apache::lonlocal::texthash(
+                                          none => 'No items selected from clipboard.',
+                                        );
+    &html_escape(\%html_js_lt);
+    &js_escape(\%html_js_lt);
+    &js_escape(\%js_lt);
+    return <<"END";
+
+function showPasteOptions(suffix) {
+    document.getElementById('pasteoptions_'+suffix).style.display='block';
+    document.getElementById('pasteoptionstext_'+suffix).innerHTML = '&nbsp;&nbsp;&nbsp;&nbsp;<a href="javascript:hidePasteOptions(\\''+suffix+'\\');" class="LC_menubuttons_link">$html_js_lt{'hide'}</a>';
+    return;
+}
+
+function hidePasteOptions(suffix) {
+    document.getElementById('pasteoptions_'+suffix).style.display='none';
+    document.getElementById('pasteoptionstext_'+suffix).innerHTML ='&nbsp;&nbsp;&nbsp;&nbsp;<a href="javascript:showPasteOptions(\\''+suffix+'\\')" class="LC_menubuttons_link">$html_js_lt{'show'}</a>';
+    return;
+}
+
+function showOptions(caller,suffix) {
+    if (document.getElementById('pasteoptionstext_'+suffix)) {
+        if (caller.checked) {
+            document.getElementById('pasteoptionstext_'+suffix).innerHTML ='&nbsp;&nbsp;&nbsp;&nbsp;<a href="javascript:showPasteOptions(\\''+suffix+'\\')" class="LC_menubuttons_link">$html_js_lt{'show'}</a>';
+        } else {
+            document.getElementById('pasteoptionstext_'+suffix).innerHTML ='';
+        }
+        if (document.getElementById('pasteoptions_'+suffix)) {
+            document.getElementById('pasteoptions_'+suffix).style.display='none';
+        }
     }
-    $r->print('</form></fieldset>');
+    return;
+}
+
+function validateClipboard() {
+    var numchk = 0;
+    if (document.pasteform.pasting.length > 1) {
+        for (var i=0; i<document.pasteform.pasting.length; i++) {
+            if (document.pasteform.pasting[i].checked) {
+                numchk ++;
+            }
+        }
+    } else {
+        if (document.pasteform.pasting.type == 'checkbox') {
+            if (document.pasteform.pasting.checked) {
+                numchk ++; 
+            } 
+        }
+    }
+    if (numchk > 0) { 
+        return true;
+    } else {
+        alert("$js_lt{'none'}");
+        return false;
+    }
+}
+
+function checkClipboard() {
+    if (document.pasteform.pasting.length > 1) {
+        for (var i=0; i<document.pasteform.pasting.length; i++) {
+            document.pasteform.pasting[i].checked = true;
+        } 
+    }
+    return;
+}
+
+function uncheckClipboard() {
+    if (document.pasteform.pasting.length >1) {
+        for (var i=0; i<document.pasteform.pasting.length; i++) {
+            document.pasteform.pasting[i].checked = false;
+        }
+    }
+    return;
+}
+
+END
+
 }
 
 sub do_paste_from_buffer {
-    my ($coursenum,$coursedom,$folder) = @_;
+    my ($coursenum,$coursedom,$folder,$container,$errors) = @_;
 
-    if (!$env{'form.pastemarked'}) {
-        return;
+# Array of items in paste buffer
+    my (@currpaste,%pastebuffer,%allerrors);
+    @currpaste = split(/,/,$env{'docs.markedcopies'});
+
+# Early out if paste buffer is empty
+    if (@currpaste == 0) {
+        return ();
+    } 
+    map { $pastebuffer{$_} = 1; } @currpaste;
+
+# Array of items selected items to paste
+    my @reqpaste = &Apache::loncommon::get_env_multiple('form.pasting');
+
+# Early out if nothing selected to paste
+    if (@reqpaste == 0) {
+        return();
+    }
+    my @topaste;
+    foreach my $suffix (@reqpaste) {
+        next if ($suffix =~ /\D/);
+        next unless (exists($pastebuffer{$suffix}));
+        push(@topaste,$suffix);
+    }
+
+# Early out if nothing available to paste
+    if (@topaste == 0) {
+        return();
+    }
+
+    my (%msgs,%before,%after,@dopaste,%is_map,%notinsupp,%notincrs,%notindom,
+        %othcrstool,%othcrsres,%duplicate,%prefixchg,%srcdom,%srcnum,%srcmapidx,
+        %marktomove,$save_err,$lockerrors,$allresult,%currcrsltitools,
+        %currltititles,$currltimax,$gotcrsltitools);
+    $currltimax = 0;
+    $gotcrsltitools = 0;
+    foreach my $suffix (@topaste) {
+        my $url=&LONCAPA::map::qtescape($env{'docs.markedcopy_url_'.$suffix});
+        my $cid=&LONCAPA::map::qtescape($env{'docs.markedcopy_crs_'.$suffix});
+        my $mapidx=&LONCAPA::map::qtescape($env{'docs.markedcopy_map_'.$suffix}); 
+# Supplemental content may only include certain types of content
+# Early out if pasted content is not supported in Supplemental area
+        if ($folder =~ /^supplemental/) {
+            unless (&supp_pasteable($url)) {
+                $notinsupp{$suffix} = 1;
+                next;
+            }
+        }
+        if ($url =~ m{^/uploaded/($match_domain)/($match_courseid)/}) {
+            my $srcd = $1;
+            my $srcn = $2;
+# When paste buffer was populated using an active role in a different course
+# check for mdc privilege in the course from which the resource was pasted
+            if (($srcd ne $coursedom) || ($srcn ne $coursenum)) {
+                unless ($env{"user.priv.cm./$srcd/$srcn"} =~ /\Q:mdc&F\E/) {
+                    $notincrs{$suffix} = 1;
+                    next;
+                }
+            }
+            $srcdom{$suffix} = $srcd;
+            $srcnum{$suffix} = $srcn;
+        } elsif (($url =~ m{^/res/lib/templates/\w+\.problem$}) ||
+                 ($url =~ m{^/adm/$match_domain/$match_username/\d+/(bulletinboard|smppg)$}) ||
+                 ($url =~ m{^/adm/$match_domain/$match_courseid/\d+/ext\.tool$})) {
+            my ($srcd,$srcn) = split(/_/,$cid);
+# When paste buffer was populated using an active role in a different course
+# check for mdc privilege in the course from which the resource was pasted
+            if (($srcd ne $coursedom) || ($srcn ne $coursenum)) {
+                unless ($env{"user.priv.cm./$srcd/$srcn"} =~ /\Q:mdc&F\E/) {
+                    $notincrs{$suffix} = 1;
+                    next;
+                }
+            }
+# When buffer was populated using an active role in a different course
+# disallow pasting of External Tool if course is in a different domain,
+# or if External Tool use is not permitted in this course.
+            if ($url =~ m{^/adm/($match_domain)/($match_courseid)/(\d+)/ext\.tool$}) {
+                my ($toolcdom,$toolcnum,$marker) = ($1,$2,$3);
+                if ($toolcdom ne $coursedom) {
+                    $notindom{$suffix} = 1;
+                    next;
+                } elsif ($toolcnum ne $coursenum) {
+                    my %toolsettings =
+                        &Apache::lonnet::dump('exttool_'.$marker,$toolcdom,$toolcnum);
+                    my %tooltypes = &Apache::loncommon::usable_exttools();
+                    if ((($toolsettings{'id'} =~ /^c\d+$/) && (!$tooltypes{'crs'})) ||
+                        (($toolsettings{'id'} =~ /^\d+$/) && (!$tooltypes{'dom'}))) {
+                        $othcrstool{$suffix} = 1;
+                        next;
+                    }
+                    if ($toolsettings{'id'} =~ /^c\d+$/) {
+                        unless ($gotcrsltitools) {
+                            %currcrsltitools =
+                                &Apache::lonnet::get_course_lti($coursenum,$coursedom,'consumer');
+                            foreach my $item (sort(keys(%currcrsltitools))) {
+                                if (ref($currcrsltitools{$item}) eq 'HASH') {
+                                    $currltimax ++;
+                                    if (ref($currltititles{$currcrsltitools{$item}{'title'}}) eq 'ARRAY') {
+                                        push(@{$currltititles{$currcrsltitools{$item}{'title'}}},$item);
+                                    } else {
+                                        $currltititles{$currcrsltitools{$item}{'title'}} = [$item];
+                                    }
+                                }
+                            }
+                            $gotcrsltitools = 1;
+                        }
+                    }
+                }
+            }
+            $srcdom{$suffix} = $srcd;
+            $srcnum{$suffix} = $srcn;
+        } elsif ($url =~ m{^/res/($match_domain)/($match_courseid)/}) {
+            my ($audom,$auname) = ($1,$2);
+# When buffer was populated using an active role in a different course
+# disallow pasting of published resources from Course Authoring Space
+            unless (($auname eq $coursenum) && ($audom eq $coursedom)) {
+                if (&Apache::lonnet::is_course($audom,$auname)) {
+                    $othcrsres{$suffix} = 1;
+                    next;
+                }
+            }
+        }
+        $srcmapidx{$suffix} = $mapidx;
+        push(@dopaste,$suffix);
+        if ($url=~/\.(page|sequence)$/) {
+            $is_map{$suffix} = 1; 
+        }
+        if ($url =~ m{^/uploaded/$match_domain/$match_courseid/([^/]+)}) {
+            my $oldprefix = $1;
+# When pasting content from Main Content to Supplemental Content and vice versa 
+# URLs will contain different paths (which depend on whether pasted item is
+# a folder/page or a document).
+            if (($folder =~ /^supplemental/) && (($oldprefix =~ /^default/) || ($oldprefix eq 'docs'))) {
+                $prefixchg{$suffix} = 'docstosupp';
+            } elsif (($folder =~ /^default/) && ($oldprefix =~ /^supplemental/)) {
+                $prefixchg{$suffix} = 'supptodocs';
+            }
+
+# If pasting an uploaded map, get list of contained uploaded maps.
+            if ($env{'docs.markedcopy_nested_'.$suffix}) {
+                my @nested;
+                my ($type) = ($oldprefix =~ /^(default|supplemental)/);
+                my @items = split(/\&/,$env{'docs.markedcopy_nested_'.$suffix});
+                my @deps = map { /\d+:([\d,]+$)/ } @items;
+                foreach my $dep (@deps) {
+                    if ($dep =~ /,/) {
+                        push(@nested,split(/,/,$dep));
+                    } else {
+                        push(@nested,$dep);
+                    }
+                }
+                foreach my $item (@nested) {
+                    if ($env{'form.docs.markedcopy_'.$suffix.'_'.$item} eq 'move') {
+                        push(@{$marktomove{$suffix}},$type.'_'.$item);
+                    }
+                }
+            }
+        }
+    }
+
+# Early out if nothing available to paste
+    if (@dopaste == 0) {
+        return ();
     }
 
-# paste resource to end of list
-    my $url=&LONCAPA::map::qtescape($env{'docs.markedcopy_url'});
-    my $title=&LONCAPA::map::qtescape($env{'docs.markedcopy_title'});
+# Populate message hash and hashes used for main content <=> supplemental content
+# changes    
+
+    %msgs = &Apache::lonlocal::texthash (
+                notinsupp => 'Paste failed: content type is not supported within Supplemental Content',
+                notincrs  => 'Paste failed: Item is from a different course which you do not have rights to edit.',
+                notindom  => 'Paste failed: Item is an external tool from a course in a different domain.',
+                othcrstool => 'Paste failed: Item is an external tool from a different course, for which use is not allowed in this course.',
+                othcrsres => 'Paste failed: Item is a course-authored resource from a different course',
+                duplicate => 'Paste failed: only one instance of a particular published sequence or page is allowed within each course.',
+            );
+
+    %before = (
+                 docstosupp => {
+                                   map => 'default',
+                                   doc => 'docs',
+                               },
+                 supptodocs => {
+                                   map => 'supplemental',
+                                   doc => 'supplemental',
+                               },
+              );
+
+    %after = (
+                 docstosupp => {
+                                   map => 'supplemental',
+                                   doc => 'supplemental'
+                               },
+                 supptodocs => {
+                                   map => 'default',
+                                   doc => 'docs',
+                               },
+             );
+
+# Retrieve information about all course maps in main content area 
+
+    my $allmaps = {};
+    my (@toclear,%mapurls,%lockerrs,%msgerrs,%results,$donechk,
+        @updatetoolsenc,$updatetoolscache,$checkedsameinst,
+        $same_institution);
+
+# Loop over the items to paste
+    foreach my $suffix (@dopaste) {
 # Maps need to be copied first
-    if (($url=~/\.(page|sequence)$/) && ($url=~/^\/uploaded\//)) {
-	$title=&mt('Copy of').' '.$title;
-	my $newid=$$.int(rand(100)).time;
-	my ($oldid,$ext) = ($url=~/^(.+)\.(\w+)$/);
-        if ($oldid =~ m{^(/uploaded/\Q$coursedom\E/\Q$coursenum\E/)(\D+)(\d+)$}) {
-            my $path = $1;
-            my $prefix = $2;
-            my $ancestor = $3;
-            if (length($ancestor) > 10) {
-                $ancestor = substr($ancestor,-10,10);
+        my (%removefrommap,%removeparam,%addedmaps,%rewrites,%retitles,%copies,
+            %dbcopies,%zombies,%params,%docmoves,%mapmoves,%mapchanges,%newsubdir,
+            %newurls,%tomove,%resdatacopy);
+        if (ref($marktomove{$suffix}) eq 'ARRAY') {
+            map { $tomove{$_} = 1; } @{$marktomove{$suffix}};
+        }
+        my $url=&LONCAPA::map::qtescape($env{'docs.markedcopy_url_'.$suffix});
+        my $title=&LONCAPA::map::qtescape($env{'docs.markedcopy_title_'.$suffix});
+        my $cid=&LONCAPA::map::qtescape($env{'docs.markedcopy_crs_'.$suffix}); 
+        my $oldurl = $url;
+        if ($is_map{$suffix}) {
+# If pasting a map, check if map contains other maps
+            my (%hierarchy,%titles);
+            if (($folder =~ /^default/) && (!$donechk)) {
+                $allmaps =
+                    &Apache::loncommon::allmaps_incourse($coursedom,$coursenum,
+                                                         $env{"course.$env{'request.course.id'}.home"},
+                                                         $env{'request.course.id'});
+                $donechk = 1;
+            }
+            &contained_map_check($url,$folder,$coursenum,$coursedom,
+                                 \%removefrommap,\%removeparam,\%addedmaps,
+                                 \%hierarchy,\%titles,$allmaps);
+            if ($url=~ m{^/uploaded/}) {
+                my $newurl;
+                unless ($env{'form.docs.markedcopy_options_'.$suffix} eq 'move') {
+                    ($newurl,my $error) = 
+                        &get_newmap_url($url,$folder,$prefixchg{$suffix},$coursedom,
+                                        $coursenum,$srcdom{$suffix},$srcnum{$suffix},
+                                        \$title,$allmaps,\%newurls);
+                    if ($error) {
+                        $allerrors{$suffix} = $error;
+                        next;
+                    }
+                    if ($newurl ne '') {
+                        if ($newurl ne $url) {
+                            if ($newurl =~ /(?:default|supplemental)_(\d+).(?:sequence|page)$/) {
+                                $newsubdir{$url} = $1;
+                            }
+                            $mapchanges{$url} = 1;
+                        }
+                    }
+                }
+                if (($srcdom{$suffix} ne $coursedom) ||
+                    ($srcnum{$suffix} ne $coursenum) ||
+                    ($prefixchg{$suffix}) || (($newurl ne '') && ($newurl ne $url))) {
+                    unless (&url_paste_fixups($url,$folder,$prefixchg{$suffix},
+                                              $coursedom,$coursenum,$srcdom{$suffix},
+                                              $srcnum{$suffix},$allmaps,\%rewrites,
+                                              \%retitles,\%copies,\%dbcopies,
+                                              \%zombies,\%params,\%mapmoves,
+                                              \%mapchanges,\%tomove,\%newsubdir,
+                                              \%newurls,\%resdatacopy)) {
+                        $mapmoves{$url} = 1;
+                    }
+                    $url = $newurl;
+                } elsif ($env{'docs.markedcopy_nested_'.$suffix}) {
+                    &url_paste_fixups($url,$folder,$prefixchg{$suffix},$coursedom,
+                                      $coursenum,$srcdom{$suffix},$srcnum{$suffix},
+                                      $allmaps,\%rewrites,\%retitles,\%copies,\%dbcopies,
+                                      \%zombies,\%params,\%mapmoves,\%mapchanges,
+                                      \%tomove,\%newsubdir,\%newurls,\%resdatacopy);
+                }
+            } elsif ($url=~m {^/res/}) {
+# published map can only exist once, so remove from paste buffer when done
+                push(@toclear,$suffix);
+# if pasting published map (main content area only) check map not already in course
+                if ($folder =~ /^default/) {
+                    if ((ref($allmaps) eq 'HASH') && ($allmaps->{$url})) {
+                        $duplicate{$suffix} = 1; 
+                        next;
+                    }
+                }
+            }
+        }
+        if ($url=~ m{/(bulletinboard|smppg|ext\.tool)$}) {
+            my $prefix = $1;
+            my $fromothercrs;
+            #need to copy the db contents to a new one, unless this is a move.
+            my %info = (
+                         src  => $url,
+                         cdom => $coursedom,
+                         cnum => $coursenum,
+                       );
+            if ($prefix eq 'ext.tool') {
+                if ($prefixchg{$suffix} eq 'docstosupp') {
+                    $info{'delgradable'} = 1;
+                }
+            }
+            if (($srcdom{$suffix} =~ /^$match_domain$/) && ($srcnum{$suffix} =~ /^$match_courseid$/)) {
+                unless (($srcdom{$suffix} eq $coursedom) && ($srcnum{$suffix} eq $coursenum)) {
+                    $fromothercrs = 1;
+                    $info{'cdom'} = $srcdom{$suffix};
+                    $info{'cnum'} = $srcnum{$suffix};
+                    unless ($checkedsameinst) {
+                        my $primary_id = &Apache::lonnet::domain($coursedom,'primary');
+                        my $intdom = &Apache::lonnet::internet_dom($primary_id);
+                        if ($intdom ne '') {
+                            my $internet_names =
+                                &Apache::lonnet::get_internet_names($Apache::lonnet::perlvar{'lonHostID'});
+                            if (ref($internet_names) eq 'ARRAY') {
+                                if (grep(/^\Q$intdom\E$/,@{$internet_names})) {
+                                    $same_institution = 1;
+                                }
+                            }
+                        }
+                        $checkedsameinst = 1;
+                    }
+                }
+            }
+            unless (($env{'form.docs.markedcopy_options_'.$suffix} eq 'move') && (!$fromothercrs)) {
+                my (%lockerr,$msg);
+                my ($newurl,$result,$errtext) =
+                    &dbcopy(\%info,$coursedom,$coursenum,\%lockerr,\%currltititles,
+                            \$currltimax,\@updatetoolsenc,\$updatetoolscache,$same_institution);
+                if ($result eq 'ok') {
+                    $url = $newurl;
+                    $title=&mt('Copy of').' '.$title;
+                } else {
+                    if ($prefix eq 'smppg') {
+                        $msg = &mt('Paste failed: An error occurred when copying the simple page.').' '.$errtext;
+                    } elsif ($prefix eq 'bulletinboard') {
+                        $msg = &mt('Paste failed: An error occurred when copying the discussion board.').' '.$errtext;
+                    } elsif ($prefix eq 'ext.tool') {
+                        $msg = &mt('Paste failed: An error occurred when copying the external tool.').' '.$errtext;
+                    }
+                    $results{$suffix} = $result;
+                    $msgerrs{$suffix} = $msg;
+                    $lockerrs{$suffix} = $lockerr{$prefix}; 
+                    next;
+	        }
+                if ($lockerr{$prefix}) {
+                    $lockerrs{$suffix} = $lockerr{$prefix};  
+                }
+            }
+        }
+        $title = &LONCAPA::map::qtunescape($title);
+        my $ext='false';
+        if ($url=~m{^http(|s)://}) { $ext='true'; }
+        if ($env{'docs.markedcopy_supplemental_'.$suffix}) {
+            if ($folder !~ /^supplemental/) {
+                (undef,undef,$title) =
+                    &Apache::loncommon::parse_supplemental_title($env{'docs.markedcopy_supplemental_'.$suffix});
+            }
+        } else {
+            if ($folder=~/^supplemental/) {
+                $title=time.'___&&&___'.$env{'user.name'}.'___&&&___'.
+                       $env{'user.domain'}.'___&&&___'.$title;
+            }
+        }
+
+# For uploaded files (excluding pages/sequences) path in copied file is changed
+# if paste is from Main to Supplemental (or vice versa), or if pasting between
+# courses.
+
+        unless ($is_map{$suffix}) {
+            my $newidx;
+# Now insert the URL at the bottom
+            $newidx = &LONCAPA::map::getresidx(&LONCAPA::map::qtunescape($url));
+            if ($url =~ m{^/uploaded/$match_domain/$match_courseid/(?:docs|supplemental)/(.+)$}) {
+                my $relpath = $1;
+                if ($relpath ne '') {
+                    my ($prefix,$subdir,$rem) = ($relpath =~ m{^(default|\d+)/(\d+)/(.+)$});
+                    my ($newloc,$newdocsdir) = ($folder =~ /^(default|supplemental)_?(\d*)/);
+                    my $newprefix = $newloc;
+                    if ($newloc eq 'default') {
+                        $newprefix = 'docs';
+                    }
+                    if ($newdocsdir eq '') {
+                        $newdocsdir = 'default';
+                    }
+                    if (($prefixchg{$suffix}) ||
+                        ($srcdom{$suffix} ne $coursedom) ||
+                        ($srcnum{$suffix} ne $coursenum) ||
+                        ($env{'form.docs.markedcopy_options_'.$suffix} ne 'move')) {
+                        my $newpath = "$newprefix/$newdocsdir/$newidx/$rem";
+                        $url =
+                            &Apache::lonclonecourse::writefile($env{'request.course.id'},$newpath,
+                                                               &Apache::lonnet::getfile($oldurl));
+                        if ($url eq '/adm/notfound.html') {
+                            $msgs{$suffix} = &mt('Paste failed: an error occurred saving the file.');
+                            next;
+                        } else {
+                            my ($newsubpath) = ($newpath =~ m{^(.*/)[^/]*$});
+                            $newsubpath =~ s{/+$}{/};
+                            $docmoves{$oldurl} = $newsubpath;
+                        }
+                    }
+                }
+            } elsif ($url =~ m{^/res/lib/templates/(\w+)\.problem$}) {
+                my $template = $1;
+                if ($newidx) {
+                    &copy_templated_files($url,$srcdom{$suffix},$srcnum{$suffix},$srcmapidx{$suffix},
+                                          $coursedom,$coursenum,$template,$newidx,"$folder.$container");
+                }
+            } elsif ($url =~ /ext\.tool$/) {
+                if (($newidx) && ($folder=~/^default/)) {
+                    my $marker = (split(m{/},$url))[4];
+                    my %toolsettings = &Apache::lonnet::dump('exttool_'.$marker,$coursedom,$coursenum);
+                    my $val = 'no';
+                    if ($toolsettings{'gradable'}) {
+                        $val = 'yes';
+                    }
+                    &LONCAPA::map::storeparameter($newidx,'parameter_0_gradable',$val,
+                                                  'string_yesno');
+                    &remember_parms($newidx,'gradable','set',$val);
+                }
+            }
+            $LONCAPA::map::resources[$newidx]=$title.':'.&LONCAPA::map::qtunescape($url).
+                                              ':'.$ext.':normal:res';
+            push(@LONCAPA::map::order,$newidx);
+# Store the result
+            my ($errtext,$fatal) =
+                &storemap($coursenum,$coursedom,$folder.'.'.$container,1);
+            if ($fatal) {
+                $save_err .= $errtext;
+                $allresult = 'fail';
+            }
+        }
+
+# Apply any changes to maps, or copy dependencies for uploaded HTML pages, or update
+# resourcedata for simpleproblems copied from another course 
+        unless ($allresult eq 'fail') {
+            my %updated = (
+                            rewrites      => \%rewrites,
+                            zombies       => \%zombies,
+                            removefrommap => \%removefrommap,
+                            removeparam   => \%removeparam,
+                            dbcopies      => \%dbcopies,
+                            resdatacopy   => \%resdatacopy,
+                            retitles      => \%retitles,
+                          );
+            my %info = (
+                           newsubdir => \%newsubdir,
+                           params    => \%params,
+                       );
+            if ($prefixchg{$suffix}) {
+                $info{'before'} = $before{$prefixchg{$suffix}};
+                $info{'after'} = $after{$prefixchg{$suffix}};
+            }
+            my %moves = (
+                           copies   => \%copies,
+                           docmoves => \%docmoves,
+                           mapmoves => \%mapmoves,
+                        );
+            (my $result,$msgs{$suffix},my $lockerror) =
+                &apply_fixups($folder,$is_map{$suffix},$coursedom,$coursenum,$errors,
+                              \%updated,\%info,\%moves,$prefixchg{$suffix},$oldurl,
+                              $url,'paste');
+            $lockerrors .= $lockerror;
+            if ($result eq 'ok') {
+                if ($is_map{$suffix}) {
+                    my ($errtext,$fatal) = &mapread($coursenum,$coursedom,
+                                                    $folder.'.'.$container);
+                    if ($fatal) {
+                        $allresult = 'failread';
+                    } else {
+                        if ($#LONCAPA::map::order<1) {
+                            my $idx=&LONCAPA::map::getresidx();
+                            if ($idx<=0) { $idx=1; }
+                            $LONCAPA::map::order[0]=$idx;
+                            $LONCAPA::map::resources[$idx]='';
+                        }
+                        my $newidx = &LONCAPA::map::getresidx(&LONCAPA::map::qtunescape($url));
+                        $LONCAPA::map::resources[$newidx]=$title.':'.&LONCAPA::map::qtunescape($url).
+                                                          ':'.$ext.':normal:res';
+                        push(@LONCAPA::map::order,$newidx);
+
+# Store the result
+                        my ($errtext,$fatal) = 
+                            &storemap($coursenum,$coursedom,$folder.'.'.$container,1);
+                        if ($fatal) {
+                            $save_err .= $errtext;
+                            $allresult = 'failstore';
+                        }
+                    } 
+                }
+                if ($env{'form.docs.markedcopy_options_'.$suffix} eq 'move') {
+                     push(@toclear,$suffix);
+                }
+            }
+        }
+    }
+    if (($updatetoolscache) || (@updatetoolsenc)) {
+        &update_ltitools_caches($coursedom,$coursenum,$updatetoolscache,
+                                \@updatetoolsenc);
+    }
+    &clear_from_buffer(\@toclear,\@currpaste);
+    my $msgsarray;
+    foreach my $suffix (keys(%msgs)) {
+         if (ref($msgs{$suffix}) eq 'ARRAY') {
+             $msgsarray .= join(',',@{$msgs{$suffix}});
+         }
+    }
+    return ($allresult,$save_err,$msgsarray,$lockerrors);
+}
+
+sub do_buffer_empty {
+    my @currpaste = split(/,/,$env{'docs.markedcopies'});
+    if (@currpaste == 0) {
+        return &mt('Clipboard is already empty');
+    }
+    my @toclear = &Apache::loncommon::get_env_multiple('form.pasting');
+    if (@toclear == 0) {
+        return &mt('Nothing selected to clear from clipboard');
+    }
+    my $numdel = &clear_from_buffer(\@toclear,\@currpaste);
+    if ($numdel) {
+        return &mt('[quant,_1,item] cleared from clipboard',$numdel);
+    } else {
+        return &mt('Clipboard unchanged');
+    }
+    return;
+}
+
+sub clear_from_buffer {
+    my ($toclear,$currpaste) = @_;
+    return unless ((ref($toclear) eq 'ARRAY') && (ref($currpaste) eq 'ARRAY'));
+    my %pastebuffer;
+    map { $pastebuffer{$_} = 1; } @{$currpaste};
+    my $numdel = 0;
+    foreach my $suffix (@{$toclear}) {
+        next if ($suffix =~ /\D/);
+        next unless (exists($pastebuffer{$suffix}));
+        my $regexp = 'docs.markedcopy_[a-z]+_'.$suffix;
+        if (&Apache::lonnet::delenv($regexp,1) eq 'ok') {
+            delete($pastebuffer{$suffix});
+            $numdel ++;
+        }
+    }
+    my $newbuffer = join(',',sort(keys(%pastebuffer)));
+    &Apache::lonnet::appenv({'docs.markedcopies' => $newbuffer});
+    return $numdel;
+}
+
+sub update_ltitools_caches {
+    my ($coursedom,$coursenum,$updatetoolscache,$updatetoolsenc) = @_;
+    my $hashid=$coursedom.'_'.$coursenum;
+    if ($updatetoolscache) {
+        &Apache::lonnet::devalidate_cache_new('courseltitools',$hashid);
+    }
+    if ((ref($updatetoolsenc) eq 'ARRAY') &&
+        (@{$updatetoolsenc})) {
+        my @ids=&Apache::lonnet::current_machine_ids();
+        my $updatedone;
+        foreach my $lonhost (@{$updatetoolsenc}) {
+            if (grep(/^\Q$lonhost\E$/,@ids)) {
+                unless ($updatedone) {
+                    &Apache::lonnet::devalidate_cache_new('crsltitoolsenc',$hashid);
+                }
+                $updatedone = 1;
+            } else {
+                &Apache::lonnet::remote_devalidate_cache($lonhost,["crsltitoolsenc:$hashid"]);
             }
-            $oldid = $path.$prefix.$ancestor;
+        }
+    }
+    return;
+}
+
+sub get_newmap_url {
+    my ($url,$folder,$prefixchg,$coursedom,$coursenum,$srcdom,$srcnum,
+        $titleref,$allmaps,$newurls) = @_;
+    my $newurl;
+    if ($url=~ m{^/uploaded/}) {
+        $$titleref=&mt('Copy of').' '.$$titleref;
+    }
+    my $now = time;
+    my $suffix=$$.int(rand(100)).$now;
+    my ($oldid,$ext) = ($url=~/^(.+)\.(\w+)$/);
+    if ($oldid =~ m{^(/uploaded/$match_domain/$match_courseid/)(\D+)(\d+)$}) {
+        my $path = $1;
+        my $prefix = $2;
+        my $ancestor = $3;
+        if (length($ancestor) > 10) {
+            $ancestor = substr($ancestor,-10,10);
+        }
+        my $newid;
+        if ($prefixchg) {
+            if ($folder =~ /^supplemental/) {
+                $prefix =~ s/^default/supplemental/;
+            } else {
+                $prefix =~ s/^supplemental/default/;
+            }
+        }
+        if (($srcdom eq $coursedom) && ($srcnum eq $coursenum)) {
+            $newurl = $path.$prefix.$ancestor.$suffix.'.'.$ext;
+        } else {
+            $newurl = "/uploaded/$coursedom/$coursenum/$prefix".$now.'.'.$ext;
         }
         my $counter = 0;
-        my $newurl=$oldid.$newid.'.'.$ext;
         my $is_unique = &uniqueness_check($newurl);
-        while (!$is_unique && $counter < 100) {
-            $counter ++;
-            $newid ++;
-            $newurl = $oldid.$newid;
-            $is_unique = &uniqueness_check($newurl);
+        if ($folder =~ /^default/) {
+            if ($allmaps->{$newurl}) {
+                $is_unique = 0;
+            }
         }
-        if (!$is_unique) {
-            if ($url=~/\.page$/) {
-                return &mt('Paste failed: an error occurred creating a unique URL for the composite page');
+        while ((!$is_unique || $allmaps->{$newurl} || $newurls->{$newurl}) && ($counter < 100)) {
+            $counter ++;
+            $suffix ++;
+            if (($srcdom eq $coursedom) && ($srcnum eq $coursenum)) {
+                $newurl = $path.$prefix.$ancestor.$suffix.'.'.$ext;
             } else {
-                return &mt('Paste failed: an error occurred creating a unique URL for the folder');
+                $newurl = "/uploaded/$coursedom/$coursenum/$prefix".$ancestor.$suffix.'.'.$ext;
             }
+            $is_unique = &uniqueness_check($newurl);
         }
-	my $storefn=$newurl;
-	$storefn=~s{^/\w+/$match_domain/$match_username/}{};
-	my $paste_map_result =
-            &Apache::lonclonecourse::writefile($env{'request.course.id'},$storefn,
-					       &Apache::lonnet::getfile($url));
-        if ($paste_map_result eq '/adm/notfound.html') {
+        if ($is_unique) {
+            $newurls->{$newurl} = 1;
+        } else {
             if ($url=~/\.page$/) {
-                return &mt('Paste failed: an error occurred saving the composite page');
+                return (undef,&mt('Paste failed: an error occurred creating a unique URL for the composite page'));
             } else {
-                return &mt('Paste failed: an error occurred saving the folder');
+                return (undef,&mt('Paste failed: an error occurred creating a unique URL for the folder'));
             }
         }
-	$url = $newurl;
     }
-# published maps can only exists once, so remove it from paste buffer when done
-    if (($url=~/\.(page|sequence)$/) && ($url=~m {^/res/})) {
-	&Apache::lonnet::delenv('docs.markedcopy');
-    }
-    if ($url=~ m{/smppg$}) {
-	my $db_name = &Apache::lonsimplepage::get_db_name($url);
-	if ($db_name =~ /^smppage_/) {
-	    #simple pages, need to copy the db contents to a new one.
-	    my %contents=&Apache::lonnet::dump($db_name,$coursedom,$coursenum);
-	    my $now = time();
-	    $db_name =~ s{_\d*$ }{_$now}x;
-	    my $result=&Apache::lonnet::put($db_name,\%contents,
-					    $coursedom,$coursenum);
-	    $url =~ s{/(\d*)/smppg$ }{/$now/smppg}x;
-	    $title=&mt('Copy of').' '.$title;
-	}
-    }
-    $title = &LONCAPA::map::qtunescape($title);
-    my $ext='false';
-    if ($url=~m{^http(|s)://}) { $ext='true'; }
-    $url       = &LONCAPA::map::qtunescape($url);
-# Now insert the URL at the bottom
-    my $newidx = &LONCAPA::map::getresidx($url);
-    if ($env{'docs.markedcopy_supplemental'}) {
-        if ($folder =~ /^supplemental/) {
-            $title = $env{'docs.markedcopy_supplemental'};
-        } else {
-            (undef,undef,$title) =
-                &parse_supplemental_title($env{'docs.markedcopy_supplemental'});
-        }
-    } else {
-        if ($folder=~/^supplemental/) {
-           $title=time.'___&&&___'.$env{'user.name'}.'___&&&___'.
-                  $env{'user.domain'}.'___&&&___'.$title;
+    return ($newurl);
+}
+
+sub dbcopy {
+    my ($dbref,$coursedom,$coursenum,$lockerrorsref,$currltititles,
+        $currltimax,$updatetoolsenc,$updatetoolscache,$same_institution) = @_;
+    my ($url,$result,$errtext);
+    if (ref($dbref) eq 'HASH') {
+        $url = $dbref->{'src'};
+        if ($url =~ m{/(smppg|bulletinboard|ext\.tool)$}) {
+            my $prefix = $1;
+            if ($prefix eq 'ext.tool') {
+                $prefix = 'exttool';
+            }
+            if (($dbref->{'cdom'} =~ /^$match_domain$/) && 
+                ($dbref->{'cnum'} =~ /^$match_courseid$/)) {
+                my $db_name;
+                my $marker = (split(m{/},$url))[4];
+                $marker=~s/\D//g;
+                if ($dbref->{'src'} =~ m{/smppg$}) {
+                    $db_name =
+                        &Apache::lonsimplepage::get_db_name($url,$marker,
+                                                            $dbref->{'cdom'},
+                                                            $dbref->{'cnum'});
+                } elsif ($dbref->{'src'} =~ m{/ext\.tool$}) {
+                    $db_name = 'exttool_'.$marker;
+                } else {
+                    $db_name = 'bulletinpage_'.$marker;
+                }
+                my ($suffix,$freedlock,$error) =
+                    &Apache::lonnet::get_timebased_id($prefix,'num','templated',
+                                                      $coursedom,$coursenum,
+                                                      'concat');
+                if (!$suffix) {
+                    if ($prefix eq 'smppg') {
+                        $errtext = &mt('Failed to acquire a unique timestamp-based suffix when copying a simple page [_1].',$url);
+                    } elsif ($prefix eq 'exttool') {
+                        $errtext = &mt('Failed to acquire a unique timestamp-based suffix when copying an external tool [_1].',$url);
+                    } else {
+                        $errtext = &mt('Failed to acquire a unique timestamp-based suffix when copying a discussion board [_1].',$url);
+                    }
+                    if ($error) {
+                        $errtext .= '<br />'.$error;
+                    }
+                } else {
+                    #need to copy the db contents to a new one.
+                    my %contents=&Apache::lonnet::dump($db_name,
+                                                       $dbref->{'cdom'},
+                                                       $dbref->{'cnum'});
+                    my ($toolcopyerror,$toolpassback,$toolroster,%toolinfo,$oldtoolid,$defincrs);
+                    if ($url eq '/adm/'.$dbref->{'cdom'}.'/'.$dbref->{'cnum'}."/$marker/ext.tool") {
+                        if ($contents{'id'} =~ /^(|c)(\d+)$/) {
+                            $oldtoolid = $2;
+                            if ($1 eq 'c') {
+                                $defincrs = 1;
+                                %toolinfo =
+                                    &Apache::lonnet::get('ltitools',[$oldtoolid],$dbref->{'cdom'},$dbref->{'cnum'});
+                            } else {
+                                %toolinfo= &Apache::lonnet::get_domain_lti($dbref->{'cdom'},'consumer');
+                            }
+                            if (ref($toolinfo{$oldtoolid}) eq 'HASH') {
+                                if ($toolinfo{$oldtoolid}{'passback'}) {
+                                    $toolpassback = 1;
+                                }
+                                if ($toolinfo{$oldtoolid}{'roster'}) {
+                                    $toolroster = 1;
+                                }
+                            } else {
+                                $toolcopyerror = 1;
+                                $errtext = &mt('Could not retrieve original settings for pasted external tool.');
+                            }
+                        }
+                        unless (($dbref->{'cnum'} eq $coursenum) && ($dbref->{'cdom'} eq $coursedom)) {
+                            $url = "/adm/$coursedom/$coursenum/$marker/ext.tool";
+                            if ($contents{'crstitle'} ne '') {
+                                $contents{'crstitle'} = $env{'course.'.$coursedom.'_'.$coursenum.'.description'};
+                            }
+                            if (($defincrs) && (!$toolcopyerror)) {
+                                my %newtool;
+                                my $oldcdom = $dbref->{'cdom'};
+                                my $oldcnum = $dbref->{'cnum'};
+                                my $title = $toolinfo{$oldtoolid}{'title'};
+                                if (ref($currltititles) eq 'HASH') {
+                                    if (exists($currltititles->{$title})) {
+                                        $title .= ' (copied from another course)';
+                                    }
+                                }
+                                my ($newid,$iderror) =
+                                    &Apache::lonnet::get_ltitools_id('course',$coursedom,$coursenum,$title);
+                                if ($newid =~ /^\d+$/) {
+                                    %{$newtool{$newid}} = %{$toolinfo{$oldtoolid}};
+                                    $newtool{$newid}{'title'} = $title;
+                                    if (ref($currltimax)) {
+                                        $newtool{$newid}{'order'} = $$currltimax;
+                                    }
+                                    if ($newtool{$newid}{'image'} =~ m{^\Q/uploaded/$oldcdom/$oldcnum/toollogo/$oldtoolid/\E([^/]+)$}) {
+                                        my $fname = $1;
+                                        my $content = &Apache::lonnet::getfile($newtool{$newid}{'image'});
+                                        if ($content eq '-1') {
+                                            delete($newtool{$newid}{'image'});
+                                        } else {
+                                            $env{'form.'.$suffix.'.image'} = $content;
+                                            my $newlogo =
+                                                &Apache::lonnet::finishuserfileupload($coursenum,$coursedom,$suffix.'.image',"toollogo/$newid/$fname");
+                                            delete($env{'form.'.$suffix.'.image'});
+                                            if ($newlogo =~ m{^/uploaded/}) {
+                                                $newtool{$newid}{'image'} = $newlogo;
+                                            } else {
+                                                delete($newtool{$newid}{'image'});
+                                            }
+                                        }
+                                    }
+                                    my $newusable;
+                                    if ($same_institution) {
+                                        my %oldtoolsenc = &Apache::lonnet::eget('nohist_toolsenc',[$oldtoolid],$oldcdom,$oldcnum);
+                                        if (ref($oldtoolsenc{$oldtoolid}) eq 'HASH') {
+                                            my %newtoolsenc;
+                                            %{$newtoolsenc{$newid}} = %{$oldtoolsenc{$oldtoolid}};
+                                            my $putres = &Apache::lonnet::put('nohist_toolsenc',\%newtoolsenc,$coursedom,$coursenum,1);
+                                            if ($putres eq 'ok') {
+                                                if (ref($updatetoolsenc) eq 'ARRAY') {
+                                                    my $newhome = &Apache::lonnet::homeserver($coursenum,$coursedom);
+                                                    unless (grep(/^\Q$newhome\E$/,@{$updatetoolsenc})) {
+                                                        push(@{$updatetoolsenc},$newhome);
+                                                    }
+                                                }
+                                                $newusable = 1;
+                                            }
+                                        }
+                                    }
+                                    if ($newtool{$newid}{'usable'}) {
+                                        unless ($newusable) {
+                                            delete($newtool{$newid}{'usable'});
+                                        }
+                                    }
+                                    my $putres = &Apache::lonnet::put('ltitools',\%newtool,$coursedom,$coursenum);
+                                    if ($putres eq 'ok') {
+                                        $contents{'id'} = "c$newid";
+                                        if (ref($updatetoolscache)) {
+                                            $$updatetoolscache ++;
+                                        }
+                                        if (ref($currltititles->{$title}) eq 'ARRAY') {
+                                            push(@{$currltititles->{$title}},$newid);
+                                        } else {
+                                            $currltititles->{$title} = [$newid];
+                                        }
+                                        if (ref($currltimax)) {
+                                            $$currltimax ++;
+                                        }
+                                    } else {
+                                        $toolcopyerror = 1;
+                                        $errtext = &mt('Unable to save external tool definition in Course Settings.');
+                                    }
+                                } else {
+                                    $toolcopyerror = 1;
+                                    $errtext = &mt('Unable to retrieve new tool ID when adding external tool definition to Course Settings.');
+                                }
+                            }
+                        }
+                    }
+                    if (exists($contents{'uploaded.photourl'})) {
+                        my $photo = $contents{'uploaded.photourl'};
+                        my ($subdir,$fname) =
+                            ($photo =~ m{^/uploaded/$match_domain/$match_courseid/+(bulletin|simplepage)/(?:|\d+/)([^/]+)$});
+                        my $newphoto;
+                        if ($fname ne '') {
+                            my $content = &Apache::lonnet::getfile($photo);
+                            unless ($content eq '-1') {
+                                $env{'form.'.$suffix.'.photourl'} = $content;
+                                $newphoto = 
+                                    &Apache::lonnet::finishuserfileupload($coursenum,$coursedom,$suffix.'.photourl',"$subdir/$suffix/$fname");
+                                delete($env{'form.'.$suffix.'.photourl'});
+                            }
+                        }
+                        if ($newphoto =~ m{^/uploaded/}) {
+                            $contents{'uploaded.photourl'} = $newphoto;
+                        }
+                    }
+                    $db_name =~ s{_\d*$ }{_$suffix}x;
+                    if ($prefix eq 'exttool') {
+                        unless ($toolcopyerror) {
+                            foreach my $key ('oldgradesecret','gradesecret','gradesecretdate','oldrostersecret','rostersecret','rostersecretdate') {
+                                if (exists($contents{$key})) {
+                                    delete($contents{$key});
+                                }
+                            }
+                            if ($dbref->{'delgradable'}) {
+                                if (exists($contents{'gradable'})) {
+                                    delete($contents{'gradable'});
+                                }
+                            }
+                            if ($toolpassback) {
+                                if ($contents{'gradable'}) {
+                                    my $gradesecret = UUID::Tiny::create_uuid_as_string(UUID_V4);
+                                    $contents{'gradesecret'} = $gradesecret;
+                                    $contents{'gradesecretdate'} = time;
+                                }
+                            }
+                            if ($toolroster) {
+                                my $rostersecret = UUID::Tiny::create_uuid_as_string(UUID_V4);
+                                $contents{'rostersecret'} = $rostersecret;
+                                $contents{'rostersecretdate'} = time;
+                            }
+                        }
+                    }
+                    if (($prefix eq 'exttool') && ($toolcopyerror)) {
+                        $result = 'error';
+                    } else {
+                        $result=&Apache::lonnet::put($db_name,\%contents,
+                                                     $coursedom,$coursenum);
+                        if ($result eq 'ok') {
+                            $url =~ s{/(\d*)/(smppg|bulletinboard|ext\.tool)$}{/$suffix/$2}x;
+                        }
+                    }
+                }
+                if (($freedlock ne 'ok') && (ref($lockerrorsref) eq 'HASH')) {
+                    $lockerrorsref->{$prefix} =
+                        '<div class="LC_error">'.
+                        &mt('There was a problem removing a lockfile.');
+                    if ($prefix eq 'smppg') {
+                        $lockerrorsref->{$prefix} .=
+                            ' '.&mt('This will prevent creation of additional simple pages in this course.');
+                    } elsif ($prefix eq 'exttool') {
+                        $lockerrorsref->{$prefix} .=
+                            ' '.&mt('This will prevent addition of more external tools to this course.');
+                    } else {
+                        $lockerrorsref->{$prefix} .= ' '.&mt('This will prevent creation of additional discussion boards in this course.');
+                    }
+                    $lockerrorsref->{$prefix} .= ' '.&mt('Please contact the [_1]helpdesk[_2] for assistance.',
+                                                     '<a href="/adm/helpdesk" target="_helpdesk">','</a>').
+                                                 '</div>';
+                }
+            }
+        } elsif ($url =~ m{/syllabus$}) {
+            if (($dbref->{'cdom'} =~ /^$match_domain$/) &&
+                ($dbref->{'cnum'} =~ /^$match_courseid$/)) {
+                if (($dbref->{'cdom'} ne $coursedom) ||
+                    ($dbref->{'cnum'} ne $coursenum)) {
+                    my %contents=&Apache::lonnet::dump('syllabus',
+                                                       $dbref->{'cdom'},
+                                                       $dbref->{'cnum'});
+                    $result=&Apache::lonnet::put('syllabus',\%contents,
+                                                 $coursedom,$coursenum);
+                }
+            }
         }
     }
+    return ($url,$result,$errtext);
+}
 
-    $LONCAPA::map::resources[$newidx]= 	$title.':'.$url.':'.$ext.':normal:res';
-    push(@LONCAPA::map::order, $newidx);
-    return 'ok';
-# Store the result
+sub copy_templated_files {
+    my ($srcurl,$srcdom,$srcnum,$srcmapinfo,$coursedom,$coursenum,$template,$newidx,$newmapname) = @_;
+    my ($srcfolder,$srcid,$srcwaspage) = split(/:/,$srcmapinfo);
+    my $srccontainer = 'sequence';
+    if ($srcwaspage) {
+        $srccontainer = 'page';
+    }
+    my $srcsymb = "uploaded/$srcdom/$srcnum/$srcfolder.$srccontainer".
+                  '___'.$srcid.'___'.&Apache::lonnet::declutter($srcurl);
+    my $srcprefix = $srcdom.'_'.$srcnum.'.'.$srcsymb;
+    my %srcparms=&Apache::lonnet::dump('resourcedata',$srcdom,$srcnum,$srcprefix);
+    my $newsymb = "uploaded/$coursedom/$coursenum/$newmapname".'___'.$newidx.'___lib/templates/'.
+                  $template.'.problem';
+    my $newprefix = $coursedom.'_'.$coursenum.'.'.$newsymb;
+    if ($template eq 'simpleproblem') {
+        $srcprefix .= '.0.';
+        my $weightprefix = $newprefix;
+        $newprefix .= '.0.';
+        my @simpleprobqtypes = qw(radio option string essay numerical);
+        my $qtype=$srcparms{$srcprefix.'questiontype'};
+        if (grep(/^\Q$qtype\E$/,@simpleprobqtypes)) {
+            my %newdata = (
+                $newprefix.'questiontype' => $qtype,
+            );
+            foreach my $type (@simpleprobqtypes) {
+                if ($type eq $qtype) {
+                    $newdata{"$weightprefix.$type.weight"}=1;
+                } else {
+                    $newdata{"$weightprefix.$type.weight"}=0;
+                }
+            }
+            $newdata{$newprefix.'hiddenparts'} = '!'.$qtype;
+            $newdata{$newprefix.'questiontext'} = $srcparms{$srcprefix.'questiontext'};
+            $newdata{$newprefix.'hinttext'} = $srcparms{$srcprefix.'hinttext'};
+            if ($qtype eq 'numerical') {
+                $newdata{$newprefix.'numericalscript'} = $srcparms{$srcprefix.'numericalscript'};
+                $newdata{$newprefix.'numericalanswer'} = $srcparms{$srcprefix.'numericalanswer'};
+                $newdata{$newprefix.'numericaltolerance'} = $srcparms{$srcprefix.'numericaltolerance'};
+                $newdata{$newprefix.'numericalsigfigs'} = $srcparms{$srcprefix.'numericalsigfigs'};
+            } elsif (($qtype eq 'option') || ($qtype eq 'radio')) {
+                my $maxfoils=$srcparms{$srcprefix.'maxfoils'};
+                unless (defined($maxfoils)) { $maxfoils=10; }
+                    unless ($maxfoils=~/^\d+$/) { $maxfoils=10; }
+                        if ($maxfoils<=0) { $maxfoils=10; }
+                            my $randomize=$srcparms{$srcprefix.'randomize'};
+                            unless (defined($randomize)) { $randomize='yes'; }
+                            unless ($randomize eq 'no') { $randomize='yes'; }
+                            $newdata{$newprefix.'maxfoils'} = $maxfoils;
+                            $newdata{$newprefix.'randomize'} = $randomize;
+                            if ($qtype eq 'option') {
+                                $newdata{$newprefix.'options'} = $srcparms{$srcprefix.'options'};
+                            }
+                            for (my $i=1; $i<=10; $i++) {
+                                $newdata{$newprefix.'value'.$i} = $srcparms{$srcprefix.'value'.$i};
+                                $newdata{$newprefix.'position'.$i} = $srcparms{$srcprefix.'position'.$i};
+                                $newdata{$newprefix.'text'.$i} = $srcparms{$srcprefix.'text'.$i};
+                            }
+
+            } elsif (($qtype eq 'option') || ($qtype eq 'radio')) {
+                my $maxfoils=$srcparms{$srcprefix.'maxfoils'};
+                unless (defined($maxfoils)) { $maxfoils=10; }
+                unless ($maxfoils=~/^\d+$/) { $maxfoils=10; }
+                if ($maxfoils<=0) { $maxfoils=10; }
+                my $randomize=$srcparms{$srcprefix.'randomize'};
+                unless (defined($randomize)) { $randomize='yes'; }
+                unless ($randomize eq 'no') { $randomize='yes'; }
+                $newdata{$newprefix.'maxfoils'} = $maxfoils;
+                $newdata{$newprefix.'randomize'} = $randomize;
+                if ($qtype eq 'option') {
+                    $newdata{$newprefix.'options'} = $srcparms{$srcprefix.'options'};
+                }
+                for (my $i=1; $i<=10; $i++) {
+                    $newdata{$newprefix.'value'.$i} = $srcparms{$srcprefix.'value'.$i};
+                    $newdata{$newprefix.'position'.$i} = $srcparms{$srcprefix.'position'.$i};
+                    $newdata{$newprefix.'text'.$i} = $srcparms{$srcprefix.'text'.$i};
+                }
+            } elsif ($qtype eq 'string') {
+                $newdata{$newprefix.'stringanswer'} = $srcparms{$srcprefix.'stringanswer'};
+                $newdata{$newprefix.'stringtype'} = $srcparms{$srcprefix.'stringtype'};
+            }
+            if (keys(%newdata)) {
+                my $putres = &Apache::lonnet::cput('resourcedata',\%newdata,$coursedom,
+                                                   $coursenum);
+                if ($putres eq 'ok') {
+                    &Apache::lonnet::devalidatecourseresdata($coursenum,$coursedom);
+                }
+            }
+        }
+    }
 }
 
 sub uniqueness_check {
@@ -741,6 +3779,675 @@ sub uniqueness_check {
     return $unique;
 }
 
+sub contained_map_check {
+    my ($url,$folder,$coursenum,$coursedom,$removefrommap,$removeparam,$addedmaps,
+        $hierarchy,$titles,$allmaps) = @_;
+    my $content = &Apache::lonnet::getfile($url);
+    unless ($content eq '-1') {
+        my $parser = HTML::TokeParser->new(\$content);
+        $parser->attr_encoded(1);
+        while (my $token = $parser->get_token) {
+            next if ($token->[0] ne 'S');
+            if ($token->[1] eq 'resource') {
+                next if ($token->[2]->{'type'} eq 'zombie');
+                my $ressrc = $token->[2]->{'src'};
+                if ($ressrc =~ m{^/adm/($match_domain)/($match_courseid)/(\d+)/ext\.tool$}) {
+                    my ($srcdom,$srcnum,$marker) = ($1,$2,$3);
+                    unless ($srcdom eq $coursedom) {
+                        $removefrommap->{$url}{$token->[2]->{'id'}} = $ressrc;
+                        next;
+                    }
+                    unless ($srcnum eq $coursenum) {
+                        my %toolsettings =
+                            &Apache::lonnet::dump('exttool_'.$marker,$srcdom,$srcnum);
+                        my %tooltypes = &Apache::loncommon::usable_exttools();
+                        if ((($toolsettings{'id'} =~ /^c\d+$/) && (!$tooltypes{'crs'})) ||
+                            (($toolsettings{'id'} =~ /^\d+$/) && (!$tooltypes{'dom'}))) {
+                            $removefrommap->{$url}{$token->[2]->{'id'}} = $ressrc;
+                            next;
+                        }
+                    }
+                } elsif ($folder =~ /^supplemental/) {
+                    unless (&supp_pasteable($ressrc)) {
+                        $removefrommap->{$url}{$token->[2]->{'id'}} = $ressrc;
+                        next;
+                    }
+                }
+                if ($ressrc =~ m{^/res/($match_domain)/($match_courseid)/}) {
+                    my ($srcdom,$srcnum) = ($1,$2);
+                    unless (($srcnum eq $coursenum) && ($srcdom eq $coursedom)) {
+                        if (&Apache::lonnet::is_course($srcdom,$srcnum)) {
+                            $removefrommap->{$url}{$token->[2]->{'id'}} = $ressrc;
+                            next;
+                        }
+                    }
+                }
+                if ($ressrc =~ m{^/(res|uploaded)/.+\.(sequence|page)$}) {
+                    if ($1 eq 'uploaded') {
+                        $hierarchy->{$url}{$token->[2]->{'id'}} = $ressrc;
+                        $titles->{$url}{$token->[2]->{'id'}} = $token->[2]->{'title'};
+                    } else {
+                        if ($allmaps->{$ressrc}) {
+                            $removefrommap->{$url}{$token->[2]->{'id'}} = $ressrc;
+                        } elsif (ref($addedmaps->{$ressrc}) eq 'ARRAY') {
+                            $removefrommap->{$url}{$token->[2]->{'id'}} = $ressrc;
+                        } else {
+                            $addedmaps->{$ressrc} = [$url];
+                        }
+                    }
+                    &contained_map_check($ressrc,$folder,$coursenum,$coursedom,$removefrommap,
+                                         $removeparam,$addedmaps,$hierarchy,$titles,$allmaps);
+                }
+            } elsif ($token->[1] eq 'param') {
+                if ($folder =~ /^supplemental/) {
+                    if (ref($removeparam->{$url}{$token->[2]->{'to'}}) eq 'ARRAY') {
+                        push(@{$removeparam->{$url}{$token->[2]->{'to'}}},$token->[2]->{'name'});
+                    } else {
+                        $removeparam->{$url}{$token->[2]->{'to'}} = [$token->[2]->{'name'}]; 
+                    }
+                }
+            }
+        }
+    }
+    return;
+}
+
+sub url_paste_fixups {
+    my ($oldurl,$folder,$prefixchg,$cdom,$cnum,$fromcdom,$fromcnum,$allmaps,
+        $rewrites,$retitles,$copies,$dbcopies,$zombies,$params,$mapmoves,
+        $mapchanges,$tomove,$newsubdir,$newurls,$resdatacopy) = @_;
+    my $checktitle;
+    if (($prefixchg) &&
+        ($oldurl =~ m{^/uploaded/$match_domain/$match_courseid/supplemental})) {
+        $checktitle = 1;
+    }
+    my $skip;
+    if ($oldurl =~ m{^\Q/uploaded/$cdom/$cnum/\E(default|supplemental)(_?\d*)\.(?:page|sequence)$}) {
+        my $mapid = $1.$2;
+        if ($tomove->{$mapid}) {
+            $skip = 1;
+        }
+    }
+    my $file = &Apache::lonnet::getfile($oldurl);
+    return if ($file eq '-1');
+    my $parser = HTML::TokeParser->new(\$file);
+    $parser->attr_encoded(1);
+    my $changed = 0;
+    while (my $token = $parser->get_token) {
+        next if ($token->[0] ne 'S');
+        if ($token->[1] eq 'resource') {
+            my $ressrc = $token->[2]->{'src'};
+            next if ($ressrc eq '');
+            my $id = $token->[2]->{'id'};
+            my $title = $token->[2]->{'title'};
+            if ($checktitle) {
+                if ($title =~ m{\d+\Q___&amp;&amp;&amp;___\E$match_username\Q___&amp;&amp;&amp;___\E$match_domain\Q___&amp;&amp;&amp;___\E(.+)$}) {
+                    $retitles->{$oldurl}{$id} = $ressrc;
+                }
+            }
+            next if ($token->[2]->{'type'} eq 'external');
+            if ($token->[2]->{'type'} eq 'zombie') {
+                next if ($skip);  
+                $zombies->{$oldurl}{$id} = $ressrc;
+                $changed = 1;
+            } elsif ($ressrc =~ m{^/uploaded/($match_domain)/($match_courseid)/(.+)$}) {
+                my $srcdom = $1;
+                my $srcnum = $2;
+                my $rem = $3;
+                my $newurl;
+                my $mapname;
+                if ($rem =~ /^(default|supplemental)(_?\d*).(sequence|page)$/) {
+                    my $prefix = $1;
+                    $mapname = $prefix.$2;
+                    if ($tomove->{$mapname}) {
+                        &url_paste_fixups($ressrc,$folder,$prefixchg,$cdom,$cnum,
+                                          $srcdom,$srcnum,$allmaps,$rewrites,
+                                          $retitles,$copies,$dbcopies,$zombies,
+                                          $params,$mapmoves,$mapchanges,$tomove,
+                                          $newsubdir,$newurls,$resdatacopy);
+                        next;
+                    } else {
+                        ($newurl,my $error) =
+                            &get_newmap_url($ressrc,$folder,$prefixchg,$cdom,$cnum,
+                                            $srcdom,$srcnum,\$title,$allmaps,$newurls);
+                        if ($newurl =~ /(?:default|supplemental)_(\d+)\.(?:sequence|page)$/) {
+                            $newsubdir->{$ressrc} = $1;
+                        }
+                        if ($error) {
+                            next;
+                        }
+                    }
+                }
+                if (($srcdom ne $cdom) || ($srcnum ne $cnum) || ($prefixchg) ||
+                    ($mapchanges->{$oldurl}) || (($newurl ne '') && ($newurl ne $oldurl))) {
+                   
+                    if ($rem =~ /^(default|supplemental)(_?\d*).(sequence|page)$/) {
+                        $rewrites->{$oldurl}{$id} = $ressrc;
+                        $mapchanges->{$ressrc} = 1;
+                        unless (&url_paste_fixups($ressrc,$folder,$prefixchg,$cdom,
+                                                  $cnum,$srcdom,$srcnum,$allmaps,
+                                                  $rewrites,$retitles,$copies,$dbcopies,
+                                                  $zombies,$params,$mapmoves,$mapchanges,
+                                                  $tomove,$newsubdir,$newurls,$resdatacopy)) {
+                            $mapmoves->{$ressrc} = 1;
+                        }
+                        $changed = 1;
+                    } else {
+                        $rewrites->{$oldurl}{$id} = $ressrc;
+                        $copies->{$oldurl}{$ressrc} = $id;
+                        $changed = 1;
+                    }
+                }
+            } elsif ($ressrc =~ m{^/adm/($match_domain)/($match_courseid)/(.+)$}) {
+                next if ($skip);
+                my $srcdom = $1;
+                my $srcnum = $2;
+                my $rem = $3;
+                my ($is_exttool,$exttoolchg);
+                if ($rem =~ m{\d+/ext\.tool$}) {
+                    $is_exttool = 1;
+                }
+                if (($srcdom ne $cdom) || ($srcnum ne $cnum)) {
+                    $rewrites->{$oldurl}{$id} = $ressrc;
+                    $dbcopies->{$oldurl}{$id}{'src'} = $ressrc;
+                    $dbcopies->{$oldurl}{$id}{'cdom'} = $srcdom;
+                    $dbcopies->{$oldurl}{$id}{'cnum'} = $srcnum;
+                    $changed = 1;
+                    if ($is_exttool) {
+                        $exttoolchg = 1;
+                    }
+                } elsif (($is_exttool) &&
+                         ($env{'form.docs.markedcopy_options'} ne 'move')) {
+                    $dbcopies->{$oldurl}{$id}{'src'} = $ressrc;
+                    $dbcopies->{$oldurl}{$id}{'cdom'} = $srcdom;
+                    $dbcopies->{$oldurl}{$id}{'cnum'} = $srcnum;
+                    $changed = 1;
+                    $exttoolchg = 1;
+                }
+                if (($is_exttool) && ($prefixchg)) {
+                    if ($oldurl =~ m{^/uploaded/$match_domain/$match_courseid/default}) {
+                        if ($exttoolchg) {
+                            $dbcopies->{$oldurl}{$id}{'delgradable'} = 1;
+                        }
+                    }
+                }
+            } elsif ($ressrc =~ m{^/adm/$match_domain/$match_username/\d+/(smppg|bulletinboard)$}) {
+                if (($fromcdom ne $cdom) || ($fromcnum ne $cnum) ||
+                    ($env{'form.docs.markedcopy_options'} ne 'move')) {
+                    $dbcopies->{$oldurl}{$id}{'src'} = $ressrc;
+                    $dbcopies->{$oldurl}{$id}{'cdom'} = $fromcdom;
+                    $dbcopies->{$oldurl}{$id}{'cnum'} = $fromcnum;
+                    $changed = 1;
+                }
+            } elsif ($ressrc eq '/res/lib/templates/simpleproblem.problem') {
+                if (($fromcdom ne $cdom) || ($fromcnum ne $cnum)) {
+                    $resdatacopy->{$oldurl}{$id}{'src'} = $ressrc;
+                    $resdatacopy->{$oldurl}{$id}{'cdom'} = $fromcdom;
+                    $resdatacopy->{$oldurl}{$id}{'cnum'} = $fromcnum;
+                }
+            } elsif ($ressrc =~ m{^/public/($match_domain)/($match_courseid)/(.+)$}) {
+                next if ($skip);
+                my $srcdom = $1;
+                my $srcnum = $2;
+                if (($srcdom ne $cdom) || ($srcnum ne $cnum)) {
+                    $dbcopies->{$oldurl}{$id}{'src'} = $ressrc;
+                    $dbcopies->{$oldurl}{$id}{'cdom'} = $srcdom;
+                    $dbcopies->{$oldurl}{$id}{'cnum'} = $srcnum;
+                    $changed = 1;
+                }
+            }
+        } elsif ($token->[1] eq 'param') {
+            next if ($skip);
+            my $to = $token->[2]->{'to'}; 
+            if ($to ne '') {
+                if (ref($params->{$oldurl}{$to}) eq 'ARRAY') {
+                    push(@{$params->{$oldurl}{$to}},$token->[2]->{'name'});
+                } else {
+                    @{$params->{$oldurl}{$to}} = ($token->[2]->{'name'});
+                }
+            }
+        }
+    }
+    return $changed;
+}
+
+sub apply_fixups {
+    my ($folder,$is_map,$cdom,$cnum,$errors,$updated,$info,$moves,$prefixchg,
+        $oldurl,$url,$caller) = @_;
+    my (%rewrites,%zombies,%removefrommap,%removeparam,%dbcopies,%retitles,
+        %params,%newsubdir,%before,%after,%copies,%docmoves,%mapmoves,@msgs,
+        %resdatacopy,%lockerrors,$lockmsg,%currcrsltitools,$gotcrsltitools,
+        %currltititles,$currltimax);
+    $currltimax = 0;
+    if (ref($updated) eq 'HASH') {
+        if (ref($updated->{'rewrites'}) eq 'HASH') {
+            %rewrites = %{$updated->{'rewrites'}};
+        }
+        if (ref($updated->{'zombies'}) eq 'HASH') {
+            %zombies = %{$updated->{'zombies'}};
+        }
+        if (ref($updated->{'removefrommap'}) eq 'HASH') {
+            %removefrommap = %{$updated->{'removefrommap'}};
+        }
+        if (ref($updated->{'removeparam'}) eq 'HASH') {
+            %removeparam = %{$updated->{'removeparam'}};
+        }
+        if (ref($updated->{'dbcopies'}) eq 'HASH') {
+            %dbcopies = %{$updated->{'dbcopies'}};
+        }
+        if (ref($updated->{'retitles'}) eq 'HASH') {
+            %retitles = %{$updated->{'retitles'}};
+        }
+        if (ref($updated->{'resdatacopy'}) eq 'HASH') {
+            %resdatacopy = %{$updated->{'resdatacopy'}};
+        }
+    }
+    if (ref($info) eq 'HASH') {
+        if (ref($info->{'newsubdir'}) eq 'HASH') {
+            %newsubdir = %{$info->{'newsubdir'}};
+        }
+        if (ref($info->{'params'}) eq 'HASH') {
+            %params = %{$info->{'params'}};
+        }
+        if (ref($info->{'before'}) eq 'HASH') {
+            %before = %{$info->{'before'}};
+        }
+        if (ref($info->{'after'}) eq 'HASH') {
+            %after = %{$info->{'after'}};
+        }
+    }
+    if (ref($moves) eq 'HASH') {
+        if (ref($moves->{'copies'}) eq 'HASH') {
+            %copies = %{$moves->{'copies'}};
+        }
+        if (ref($moves->{'docmoves'}) eq 'HASH') {
+            %docmoves = %{$moves->{'docmoves'}};
+        }
+        if (ref($moves->{'mapmoves'}) eq 'HASH') {
+            %mapmoves = %{$moves->{'mapmoves'}};
+        }
+    }
+    foreach my $key (keys(%copies),keys(%docmoves)) {
+        my @allcopies;
+        if (exists($copies{$key})) {
+            if (ref($copies{$key}) eq 'HASH') {
+                my %added;
+                foreach my $innerkey (keys(%{$copies{$key}})) {
+                    if (($innerkey ne '') && (!$added{$innerkey})) {
+                        push(@allcopies,$innerkey);
+                        $added{$innerkey} = 1;
+                    }
+                }
+                undef(%added);
+            }
+        }
+        if ($key eq $oldurl) {
+            if ((exists($docmoves{$key}))) {
+                unless (grep(/^\Q$oldurl\E$/,@allcopies)) {
+                    push(@allcopies,$oldurl);
+                }
+            }
+        }
+        if (@allcopies > 0) {
+            foreach my $item (@allcopies) {
+                my ($relpath,$oldsubdir,$fname) = 
+                    ($item =~ m{^(/uploaded/$match_domain/$match_courseid/(?:docs|supplemental)/(default|\d+)/.*/)([^/]+)$});
+                if ($fname ne '') {
+                    my $content = &Apache::lonnet::getfile($item);
+                    unless ($content eq '-1') {
+                        my $storefn;
+                        if (($key eq $oldurl) && (exists($docmoves{$key}))) {
+                            $storefn = $docmoves{$key};
+                        } else {
+                            $storefn = $relpath;
+                            $storefn =~s{^/uploaded/$match_domain/$match_courseid/}{};
+                            if ($prefixchg && $before{'doc'} && $after{'doc'}) {
+                                $storefn =~ s/^\Q$before{'doc'}\E/$after{'doc'}/;
+                            }
+                            if ($newsubdir{$key}) {
+                                $storefn =~ s#^(docs|supplemental)/\Q$oldsubdir\E/#$1/$newsubdir{$key}/#;
+                            }
+                        }
+                        &copy_dependencies($item,$storefn,$relpath,$errors,\$content);
+                        my $copyurl = 
+                            &Apache::lonclonecourse::writefile($env{'request.course.id'},
+                                                               $storefn.$fname,$content);
+                        if ($copyurl eq '/adm/notfound.html') {
+                            if (exists($docmoves{$oldurl})) {
+                                return &mt('Paste failed: an error occurred copying the file.');
+                            } elsif (ref($errors) eq 'HASH') {
+                                $errors->{$item} = 1;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+    foreach my $key (keys(%mapmoves)) {
+        my $storefn=$key;
+        $storefn=~s{^/uploaded/$match_domain/$match_courseid/}{};
+        if ($prefixchg && $before{'map'} && $after{'map'}) {
+            $storefn =~ s/^\Q$before{'map'}\E/$after{'map'}/;
+        }
+        if ($newsubdir{$key}) {
+            $storefn =~ s/^((?:default|supplemental)_)(\d+)/$1$newsubdir{$key}/;
+        }
+        my $mapcontent = &Apache::lonnet::getfile($key);
+        if (($mapcontent eq '-1') && ($before{'map'} eq 'supplemental') &&
+            ($after{'map'} eq 'default') &&
+            ($key =~ m{^/uploaded/$match_domain/$match_courseid/supplemental_\d+\.sequence$})) {
+            $mapcontent = '<map>'."\n".
+                          '<resource id="1" src="" type="start" />'."\n".
+                          '<link from="1" to="2" index="1" />'."\n".
+                          '<resource id="2" src="" type="finish" />'."\n".
+                          '</map>';
+        }
+        if ($mapcontent eq '-1') {
+            if (ref($errors) eq 'HASH') {
+                $errors->{$key} = 1;
+            }
+        } else {
+            my $newmap =
+                &Apache::lonclonecourse::writefile($env{'request.course.id'},$storefn,
+                                                   $mapcontent);
+            if ($newmap eq '/adm/notfound.html') {
+                if (ref($errors) eq 'HASH') {
+                    $errors->{$key} = 1;
+                }
+            }
+        }
+    }
+    my %updates;
+    if ($is_map) {
+        if (ref($updated) eq 'HASH') {
+            foreach my $type (keys(%{$updated})) {
+                if (ref($updated->{$type}) eq 'HASH') {
+                    foreach my $key (keys(%{$updated->{$type}})) {
+                        $updates{$key} = 1;
+                    }
+                }
+            }
+        }
+        my ($updatetoolscache,@updatetoolsenc,$same_institution,$checkedsameinst);
+        foreach my $key (keys(%updates)) {
+            my (%torewrite,%toretitle,%toremove,%remparam,%currparam,%zombie,%newdb);
+            if (ref($rewrites{$key}) eq 'HASH') {
+                %torewrite = %{$rewrites{$key}};
+            }
+            if (ref($retitles{$key}) eq 'HASH') {
+                %toretitle = %{$retitles{$key}};
+            }
+            if (ref($removefrommap{$key}) eq 'HASH') {
+                %toremove = %{$removefrommap{$key}};
+            }
+            if (ref($removeparam{$key}) eq 'HASH') {
+                %remparam = %{$removeparam{$key}};
+            }
+            if (ref($zombies{$key}) eq 'HASH') {
+                %zombie = %{$zombies{$key}};
+            }
+            if (ref($dbcopies{$key}) eq 'HASH') {
+                foreach my $idx (keys(%{$dbcopies{$key}})) {
+                    if (ref($dbcopies{$key}{$idx}) eq 'HASH') {
+                        my $oldurl = $dbcopies{$key}{$idx}{'src'};
+                        my $oldcdom = $dbcopies{$key}{$idx}{'cdom'};
+                        my $oldcnum = $dbcopies{$key}{$idx}{'cnum'};
+                        my $oldmarker;
+                        if ($oldurl =~ m{^\Q/adm/$oldcdom/$oldcnum/\E(\d+)/ext\.tool$}) {
+                            $oldmarker = $1;
+                            unless (($gotcrsltitools) ||
+                                    (($oldcnum eq $cnum) && ($oldcdom eq $cdom))) {
+                                my %oldtoolsettings=&Apache::lonnet::dump('exttool_'.$oldmarker,$oldcdom,$oldcnum);
+                                if ($oldtoolsettings{'id'} =~ /^c\d+$/) {
+                                    unless ($gotcrsltitools) {
+                                        %currcrsltitools =
+                                            &Apache::lonnet::get_course_lti($cnum,$cdom,'consumer');
+                                        foreach my $item (sort(keys(%currcrsltitools))) {
+                                            if (ref($currcrsltitools{$item}) eq 'HASH') {
+                                                $currltimax ++;
+                                                if (ref($currltititles{$currcrsltitools{$item}{'title'}}) eq 'ARRAY') {
+                                                    push(@{$currltititles{$currcrsltitools{$item}{'title'}}},$item);
+                                                } else {
+                                                    $currltititles{$currcrsltitools{$item}{'title'}} = [$item];
+                                                }
+                                            }
+                                        }
+                                        $gotcrsltitools = 1;
+                                    }
+                                    unless ($checkedsameinst) {
+                                        my $primary_id = &Apache::lonnet::domain($cdom,'primary');
+                                        my $intdom = &Apache::lonnet::internet_dom($primary_id);
+                                        if ($intdom ne '') {
+                                            my $internet_names =
+                                                &Apache::lonnet::get_internet_names($Apache::lonnet::perlvar{'lonHostID'});
+                                            if (ref($internet_names) eq 'ARRAY') {
+                                                if (grep(/^\Q$intdom\E$/,@{$internet_names})) {
+                                                    $same_institution = 1;
+                                                }
+                                            }
+                                        }
+                                        $checkedsameinst = 1;
+                                    }
+                                }
+                            }
+                        }
+                        my ($newurl,$result,$errtext) =
+                            &dbcopy($dbcopies{$key}{$idx},$cdom,$cnum,\%lockerrors,\%currltititles,
+                                    \$currltimax,\@updatetoolsenc,\$updatetoolscache,$same_institution);
+                        if ($result eq 'ok') {
+                            $newdb{$idx} = $newurl;
+                            if ($newurl =~ /ext\.tool$/) {
+                                if ($torewrite{$idx} eq "/adm/$oldcdom/$oldcnum/$oldmarker/ext.tool") {
+                                    if ($newurl =~ m{^\Q/adm/$cdom/$cnum/\E(\d+)/ext.tool$}) {
+                                        my $newmarker = $1;
+                                        unless ($oldmarker eq $newmarker) {
+                                            $torewrite{$idx} = "/adm/$oldcdom/$oldcnum/$newmarker/ext.tool";
+                                        }
+                                    }
+                                }
+                            }
+                        } elsif (ref($errors) eq 'HASH') {
+                            $errors->{$key} = 1;
+                        }
+                        push(@msgs,$errtext);
+                    }
+                }
+            }
+            if (ref($resdatacopy{$key}) eq 'HASH') {
+                my ($gotnewmapname,$newmapname,$srcfolder,$srccontainer);
+                foreach my $idx (keys(%{$resdatacopy{$key}})) {
+                    if (ref($resdatacopy{$key}{$idx}) eq 'HASH') {
+                        my $srcurl = $resdatacopy{$key}{$idx}{'src'};
+                        if ($srcurl =~ m{^/res/lib/templates/(\w+)\.problem$}) {
+                            my $template = $1;
+                            if (($resdatacopy{$key}{$idx}{'cdom'} =~ /^$match_domain$/) &&
+                                ($resdatacopy{$key}{$idx}{'cnum'} =~ /^$match_courseid$/)) {
+                                my $srcdom = $resdatacopy{$key}{$idx}{'cdom'};
+                                my $srcnum = $resdatacopy{$key}{$idx}{'cnum'};
+                                unless ($gotnewmapname) {
+                                    ($newmapname) = ($key =~ m{/([^/]+)$});
+                                    ($srcfolder,$srccontainer) = split(/\./,$newmapname);
+                                    if ($newsubdir{$key}) {
+                                        $newmapname =~ s/^((?:default|supplemental)_)(\d+)/$1$newsubdir{$key}/;
+                                    }
+                                    $gotnewmapname = 1;
+                                }
+                                my $srcmapinfo = $srcfolder.':'.$idx;
+                                if ($srccontainer eq 'page') {
+                                    $srcmapinfo .= ':1';
+                                }
+                                &copy_templated_files($srcurl,$srcdom,$srcnum,$srcmapinfo,$cdom,
+                                                      $cnum,$template,$idx,$newmapname);
+                            }
+                        }
+                    }
+                }
+            }
+            if (ref($params{$key}) eq 'HASH') {
+                %currparam = %{$params{$key}};
+            }
+            my ($errtext,$fatal) = &LONCAPA::map::mapread($key);
+            if ($fatal) {
+                return ($errtext);
+            }
+            for (my $i=0; $i<@LONCAPA::map::zombies; $i++) {
+                if (defined($LONCAPA::map::zombies[$i])) {
+                    my ($title,$src,$ext,$type)=split(/\:/,$LONCAPA::map::zombies[$i]);
+                    if ($zombie{$i} eq $src) {
+                        undef($LONCAPA::map::zombies[$i]);
+                    }
+                }
+            }
+            my $total = scalar(@LONCAPA::map::order) - 1;
+            for (my $i=$total; $i>=0; $i--) {
+                my $idx = $LONCAPA::map::order[$i];
+                if (defined($LONCAPA::map::resources[$idx])) {
+                    my $changed;
+                    my ($title,$src,$ext,$type)=split(/\:/,$LONCAPA::map::resources[$idx]);
+                    if ((exists($toremove{$idx})) && 
+                        ($toremove{$idx} eq &LONCAPA::map::qtescape($src))) {
+                        splice(@LONCAPA::map::order,$i,1);
+                        if (ref($currparam{$idx}) eq 'ARRAY') {
+                            foreach my $name (@{$currparam{$idx}}) {
+                                &LONCAPA::map::delparameter($idx,$name);
+                            }
+                        }
+                        next;
+                    }
+                    my $origsrc = $src;
+                    if ((exists($toretitle{$idx})) && ($toretitle{$idx} eq $src)) {
+                        if ($title =~ m{^\d+\Q___&amp;&amp;&amp;___\E$match_username\Q___&amp;&amp;&amp;___\E$match_domain\Q___&amp;&amp;&amp;___\E(.+)$}) {
+                            $changed = 1;
+                        }
+                    }
+                    if ((exists($torewrite{$idx})) && ($torewrite{$idx} eq $src)) {
+                        $src =~ s{^/(uploaded|adm|public)/$match_domain/$match_courseid/}{/$1/$cdom/$cnum/};
+                        if ($origsrc =~ m{^/uploaded/}) {
+                            if ($prefixchg && $before{'map'} && $after{'map'}) {
+                                if ($src =~ /\.(page|sequence)$/) {
+                                    $src =~ s#^(/uploaded/$match_domain/$match_courseid/)\Q$before{'map'}\E#$1$after{'map'}#;
+                                } else {
+                                    $src =~ s#^(/uploaded/$match_domain/$match_courseid/)\Q$before{'doc'}\E#$1$after{'doc'}#;
+                                }
+                            }
+                            if ($origsrc =~ /\.(page|sequence)$/) {
+                                if ($newsubdir{$origsrc}) {
+                                    $src =~ s#^(/uploaded/$match_domain/$match_courseid/(?:default|supplemental)_)(\d+)#$1$newsubdir{$origsrc}#;
+                                }
+                            } elsif ($newsubdir{$key}) {
+                                $src =~ s#^(/uploaded/$match_domain/$match_courseid/\w+/)(\d+)#$1$newsubdir{$key}#;
+                            }
+                        }
+                        $changed = 1;
+                    } elsif ($newdb{$idx} ne '') {
+                        $src = $newdb{$idx};
+                        $changed = 1;
+                    }
+                    if ($changed) {
+                        $LONCAPA::map::resources[$idx] = join(':',($title,&LONCAPA::map::qtunescape($src),$ext,$type));
+                    }
+                }
+            }
+            foreach my $idx (keys(%remparam)) {
+                if (ref($remparam{$idx}) eq 'ARRAY') {
+                    foreach my $name (@{$remparam{$idx}}) {   
+                        &LONCAPA::map::delparameter($idx,$name);
+                    }
+                }
+            }
+            if (values(%lockerrors) > 0) {
+                $lockmsg = join('<br />',values(%lockerrors));
+            }
+            my $storefn;
+            if ($key eq $oldurl) {
+                $storefn = $url;
+                $storefn=~s{^/uploaded/$match_domain/$match_courseid/}{};
+            } else {
+                $storefn = $key;
+                $storefn=~s{^/uploaded/$match_domain/$match_courseid/}{};
+                if ($prefixchg && $before{'map'} && $after{'map'}) {
+                    $storefn =~ s/^\Q$before{'map'}\E/$after{'map'}/;
+                }
+                if ($newsubdir{$key}) {
+                    $storefn =~ s/^((?:default|supplemental)_)(\d+)/$1$newsubdir{$key}/;
+                }
+            }
+            my $report;
+            if ($folder !~ /^supplemental/) {
+                $report = 1;
+            }
+            (my $outtext,$errtext) =
+                &LONCAPA::map::storemap("/uploaded/$cdom/$cnum/$storefn",1,$report);
+            if ($errtext) {
+                if ($caller eq 'paste') {
+                    return (&mt('Paste failed: an error occurred saving the folder or page.'));
+                }
+            }
+        }
+        if (($updatetoolscache) || (@updatetoolsenc)) {
+            &update_ltitools_caches($cdom,$cnum,$updatetoolscache,
+                                    \@updatetoolsenc);
+        }
+    }
+    return ('ok',\@msgs,$lockmsg);
+}
+
+sub copy_dependencies {
+    my ($item,$storefn,$relpath,$errors,$contentref) = @_;
+    my $content;
+    if (ref($contentref)) {
+        $content = $$contentref;
+    } else {
+        $content = &Apache::lonnet::getfile($item);
+    }
+    unless ($content eq '-1') {
+        my $mm = new File::MMagic;
+        my $mimetype = $mm->checktype_contents($content);
+        if ($mimetype eq 'text/html') {
+            my (%allfiles,%codebase,$state);
+            my $res = &Apache::lonnet::extract_embedded_items(undef,\%allfiles,\%codebase,\$content);
+            if ($res eq 'ok') {
+                my ($numexisting,$numpathchanges,$existing);
+                (undef,$numexisting,$numpathchanges,$existing) =
+                    &Apache::loncommon::ask_for_embedded_content(
+                        '/adm/coursedocs',$state,\%allfiles,\%codebase,
+                        {'error_on_invalid_names'   => 1,
+                         'ignore_remote_references' => 1,
+                         'docs_url'                 => $item,
+                         'context'                  => 'paste'});
+                if ($numexisting > 0) {
+                    if (ref($existing) eq 'HASH') {
+                        foreach my $dep (keys(%{$existing})) {
+                            my $depfile = $dep;
+                            unless ($depfile =~ m{^\Q$relpath\E}) {
+                                $depfile = $relpath.$dep;
+                            }
+                            my $depcontent = &Apache::lonnet::getfile($depfile);
+                            unless ($depcontent eq '-1') {
+                                my $storedep = $dep;
+                                $storedep =~ s{^\Q$relpath\E}{};
+                                my $dep_url =
+                                    &Apache::lonclonecourse::writefile(
+                                        $env{'request.course.id'},
+                                        $storefn.$storedep,$depcontent);
+                                if ($dep_url eq '/adm/notfound.html') {
+                                    if (ref($errors) eq 'HASH') {
+                                        $errors->{$depfile} = 1;
+                                    }
+                                } else {
+                                    &copy_dependencies($depfile,$storefn,$relpath,$errors,\$depcontent);
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+    return;
+}
+
 my %parameter_type = ( 'randompick'     => 'int_pos',
 		       'hiddenresource' => 'string_yesno',
 		       'encrypturl'     => 'string_yesno',
@@ -748,34 +4455,128 @@ my %parameter_type = ( 'randompick'
 my $valid_parameters_re = join('|',keys(%parameter_type));
 # set parameters
 sub update_parameter {
-
-    return 0 if ($env{'form.changeparms'} !~ /^($valid_parameters_re)$/);
-
-    my $which = $env{'form.changeparms'};
-    my $idx = $env{'form.setparms'};
-    if ($env{'form.'.$which.'_'.$idx}) {
-	my $value = ($which eq 'randompick') ? $env{'form.'.$which.'_'.$idx}
-	                                     : 'yes';
-	&LONCAPA::map::storeparameter($idx, 'parameter_'.$which, $value,
-				      $parameter_type{$which});
-	&remember_parms($idx,$which,'set',$value);
+    if ($env{'form.changeparms'} eq 'all') {
+        my (@allidx,@allmapidx,%allchecked,%currchecked);
+        %allchecked = (
+                         'hiddenresource' => {},
+                         'encrypturl'     => {},
+                         'randompick'     => {},
+                         'randomorder'    => {},
+                      );
+        foreach my $which (keys(%allchecked)) {
+            $env{'form.all'.$which} =~ s/,$//;
+            if ($which eq 'randompick') {
+                foreach my $item (split(/,/,$env{'form.all'.$which})) {
+                    my ($res,$value) = split(/:/,$item);
+                    if ($value =~ /^\d+$/) {
+                        $allchecked{$which}{$res} = $value;
+                    }
+                }
+            } else {
+                if ($env{'form.all'.$which}) {
+                    map { $allchecked{$which}{$_} = 1; } split(/,/,$env{'form.all'.$which});
+                }
+            }
+        }
+        my $haschanges = 0;
+        foreach my $res (@LONCAPA::map::order) {
+            my ($name,$url)=split(/\:/,$LONCAPA::map::resources[$res]);
+            $name=&LONCAPA::map::qtescape($name);
+            $url=&LONCAPA::map::qtescape($url);
+            next unless $url;
+            my $is_map;
+            if ($url =~ m{/uploaded/.+\.(page|sequence)$}) {
+                $is_map = 1;
+            }
+            foreach my $which (keys(%allchecked)) {
+                if (($which eq 'randompick' || $which eq 'randomorder')) {
+                    next if (!$is_map);
+                } 
+                my $oldvalue = 0;
+                my $newvalue = 0;
+                if ($allchecked{$which}{$res}) {
+                    $newvalue = $allchecked{$which}{$res};
+                }
+                my $current = (&LONCAPA::map::getparameter($res,'parameter_'.$which))[0];
+                if ($which eq 'randompick') {
+                    if ($current =~ /^(\d+)$/) {
+                        $oldvalue = $1;
+                    }
+                } else {
+                    if ($current =~ /^yes$/i) {
+                        $oldvalue = 1;
+                    }
+                }
+                if ($oldvalue ne $newvalue) {
+                    $haschanges = 1;
+                    if ($newvalue) {
+                        my $storeval = 'yes';
+                        if ($which eq 'randompick') {
+                            $storeval = $newvalue;
+                        }
+                        &LONCAPA::map::storeparameter($res,'parameter_'.$which,
+                                                      $storeval,
+                                                      $parameter_type{$which});
+                        &remember_parms($res,$which,'set',$storeval);
+                    } elsif ($oldvalue) {
+                        &LONCAPA::map::delparameter($res,'parameter_'.$which);
+                        &remember_parms($res,$which,'del');
+                    }
+                }
+            }
+        }
+        return $haschanges;
     } else {
-	&LONCAPA::map::delparameter($idx,'parameter_'.$which);
+        my $haschanges = 0;
+        return $haschanges if ($env{'form.changeparms'} !~ /^($valid_parameters_re)$/);
 
-	&remember_parms($idx,$which,'del');
+        my $which = $env{'form.changeparms'};
+        my $idx = $env{'form.setparms'};
+        my $oldvalue = 0;
+        my $newvalue = 0;
+        my $current = (&LONCAPA::map::getparameter($idx,'parameter_'.$which))[0];
+        if ($which eq 'randompick') {
+            if ($current =~ /^(\d+)$/) {
+                $oldvalue = $1;
+            }
+        } elsif ($current =~ /^yes$/i) {
+            $oldvalue = 1;
+        }
+        if ($env{'form.'.$which.'_'.$idx}) {
+	    $newvalue = ($which eq 'randompick') ? $env{'form.rpicknum_'.$idx}
+	                                         : 1;
+        }
+        if ($oldvalue ne $newvalue) {
+            $haschanges = 1;
+            if ($newvalue) {
+                my $storeval = 'yes';
+                if ($which eq 'randompick') {
+                    $storeval = $newvalue;
+                }
+	        &LONCAPA::map::storeparameter($idx, 'parameter_'.$which, $storeval,
+				              $parameter_type{$which});
+	        &remember_parms($idx,$which,'set',$storeval);
+            } else {
+	        &LONCAPA::map::delparameter($idx,'parameter_'.$which);
+	        &remember_parms($idx,$which,'del');
+            }
+        }
+        return $haschanges;
     }
-    return 1;
 }
 
-
 sub handle_edit_cmd {
     my ($coursenum,$coursedom) =@_;
+    my $haschanges = 0;
+    if ($env{'form.cmd'} eq '') {
+        return $haschanges; 
+    }
     my ($cmd,$idx)=split('_',$env{'form.cmd'});
 
     my $ratstr = $LONCAPA::map::resources[$LONCAPA::map::order[$idx]];
     my ($title, $url, @rrest) = split(':', $ratstr);
 
-    if ($cmd eq 'del') {
+    if ($cmd eq 'remove') {
 	if (($url=~m|/+uploaded/\Q$coursedom\E/\Q$coursenum\E/|) &&
 	    ($url!~/$LONCAPA::assess_page_seq_re/)) {
 	    &Apache::lonnet::removeuploadedurl($url);
@@ -783,21 +4584,20 @@ sub handle_edit_cmd {
 	    &LONCAPA::map::makezombie($LONCAPA::map::order[$idx]);
 	}
 	splice(@LONCAPA::map::order, $idx, 1);
-
+        $haschanges = 1;
     } elsif ($cmd eq 'cut') {
 	&LONCAPA::map::makezombie($LONCAPA::map::order[$idx]);
 	splice(@LONCAPA::map::order, $idx, 1);
-
+        $haschanges = 1;
     } elsif ($cmd eq 'up'
 	     && ($idx) && (defined($LONCAPA::map::order[$idx-1]))) {
 	@LONCAPA::map::order[$idx-1,$idx] = @LONCAPA::map::order[$idx,$idx-1];
-
+        $haschanges = 1;
     } elsif ($cmd eq 'down'
 	     && defined($LONCAPA::map::order[$idx+1])) {
 	@LONCAPA::map::order[$idx+1,$idx] = @LONCAPA::map::order[$idx,$idx+1];
-
+        $haschanges = 1;
     } elsif ($cmd eq 'rename') {
-
 	my $comment = &LONCAPA::map::qtunescape($env{'form.title'});
 	if ($comment=~/\S/) {
 	    $LONCAPA::map::resources[$LONCAPA::map::order[$idx]]=
@@ -806,21 +4606,69 @@ sub handle_edit_cmd {
 # Devalidate title cache
 	my $renamed_url=&LONCAPA::map::qtescape($url);
 	&Apache::lonnet::devalidate_title_cache($renamed_url);
-    } else {
-	return 0;
+        $haschanges = 1;
+    } elsif ($cmd eq 'setalias') {
+        my $newvalue = $env{'form.alias'};
+        if ($newvalue ne '') {
+            unless (Apache::lonnet::get_symb_from_alias($newvalue)) {
+                &LONCAPA::map::storeparameter($idx,'parameter_0_mapalias',$newvalue,
+                                              'string');
+                &remember_parms($idx,'mapalias','set',$newvalue);
+                $haschanges = 1;
+            }
+        }
+    } elsif ($cmd eq 'delalias') {
+        my $current = (&LONCAPA::map::getparameter($idx,'parameter_0_mapalias'))[0];  
+        if ($current ne '') {
+            &LONCAPA::map::delparameter($idx,'parameter_0_mapalias');
+            &remember_parms($idx,'mapalias','del');
+            $haschanges = 1;
+        }
     }
-    return 1;
+    return $haschanges;
 }
 
 sub editor {
     my ($r,$coursenum,$coursedom,$folder,$allowed,$upload_output,$crstype,
-        $supplementalflag,$orderhash,$iconpath)=@_;
-    my $container= ($env{'form.pagepath'}) ? 'page'
-		                           : 'sequence';
+        $supplementalflag,$orderhash,$iconpath,$pathitem,$ltitoolsref,
+        $canedit,$hostname,$navmapref,$hiddentop)=@_;
+    my ($randompick,$ishidden,$isencrypted,$plain,$is_random_order,$container);
+    if ($allowed) {
+        (my $breadcrumbtrail,$randompick,$ishidden,$isencrypted,$plain,
+         $is_random_order,$container) =
+            &Apache::lonhtmlcommon::docs_breadcrumbs($allowed,$crstype,1);
+        $r->print($breadcrumbtrail);
+    } elsif ($env{'form.folderpath'} =~ /\:1$/) {
+        $container = 'page'; 
+    } else {
+        $container = 'sequence';
+    }
 
-    my ($errtext,$fatal) = &mapread($coursenum,$coursedom,
-				    $folder.'.'.$container);
-    return $errtext if ($fatal);
+    my $jumpto;
+
+    unless ($supplementalflag) {
+        $jumpto = "uploaded/$coursedom/$coursenum/$folder.$container";
+    }
+
+    unless ($allowed) {
+        $randompick = -1;
+    }
+
+    my ($errtext,$fatal);
+    if (($folder eq '') && (!$supplementalflag)) {
+        if (@LONCAPA::map::order) {
+            undef(@LONCAPA::map::order);
+            undef(@LONCAPA::map::resources);
+            undef(@LONCAPA::map::resparms);
+            undef(@LONCAPA::map::zombies);
+        }
+        $folder = 'default';
+        $container = 'sequence'; 
+    } else {
+        ($errtext,$fatal) = &mapread($coursenum,$coursedom,
+				     $folder.'.'.$container);
+        return $errtext if ($fatal);
+    }
 
     if ($#LONCAPA::map::order<1) {
 	my $idx=&LONCAPA::map::getresidx();
@@ -829,25 +4677,15 @@ sub editor {
         $LONCAPA::map::resources[$idx]='';
     }
 
-    my ($breadcrumbtrail,$randompick,$ishidden,$isencrypted,$plain,$is_random_order) =
-        &breadcrumbs($allowed,$crstype);
-    $r->print($breadcrumbtrail);
-
-    my $jumpto = "uploaded/$coursedom/$coursenum/$folder.$container";
-
-    unless ($allowed) {
-        $randompick = -1;
-    }
-
 # ------------------------------------------------------------ Process commands
 
 # ---------------- if they are for this folder and user allowed to make changes
-    if (($allowed) && ($env{'form.folder'} eq $folder)) {
+    if (($allowed && $canedit) && ($env{'form.folder'} eq $folder)) {
 # set parameters and change order
 	&snapshotbefore();
 
 	if (&update_parameter()) {
-	    ($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container);
+	    ($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container,1);
 	    return $errtext if ($fatal);
 	}
 
@@ -861,35 +4699,187 @@ sub editor {
 	}
 
 	if ($env{'form.pastemarked'}) {
-            my $paste_res =
-                &do_paste_from_buffer($coursenum,$coursedom,$folder);
-            if ($paste_res eq 'ok') {
-                ($errtext,$fatal) = &storemap($coursenum,$coursedom,$folder.'.'.$container);
-                return $errtext if ($fatal);
-            } elsif ($paste_res ne '') {
-                $r->print('<p><span class="LC_error">'.$paste_res.'</span></p>');
+            my %paste_errors;
+            my ($paste_res,$save_error,$pastemsgarray,$lockerror) =
+                &do_paste_from_buffer($coursenum,$coursedom,$folder,$container,
+                                      \%paste_errors);
+            if (ref($pastemsgarray) eq 'ARRAY') {
+                if (@{$pastemsgarray} > 0) {
+                    $r->print('<p class="LC_info">'.
+                              join('<br />',@{$pastemsgarray}).
+                              '</p>');
+                }
             }
-	}
+            if ($lockerror) {
+                $r->print('<p class="LC_error">'.
+                          $lockerror.
+                          '</p>');
+            }
+            if ($save_error ne '') {
+                return $save_error; 
+            }
+            if ($paste_res) {
+                my %errortext = &Apache::lonlocal::texthash (
+                                    fail      => 'Storage of folder contents failed',
+                                    failread  => 'Reading folder contents failed',
+                                    failstore => 'Storage of folder contents failed',
+                                );
+                if ($errortext{$paste_res}) {
+                    $r->print('<p class="LC_error">'.$errortext{$paste_res}.'</p>');
+                }
+            }
+            if (keys(%paste_errors) > 0) {
+                $r->print('<p class="LC_warning">'."\n".
+                          &mt('The following files are either dependencies of a web page or references within a folder and/or composite page which could not be copied during the paste operation:')."\n".
+                          '<ul>'."\n");
+                foreach my $key (sort(keys(%paste_errors))) {
+                    $r->print('<li>'.$key.'</li>'."\n");
+                }
+                $r->print('</ul></p>'."\n");
+            }
+	} elsif ($env{'form.clearmarked'}) {
+            my $output = &do_buffer_empty();
+            if ($output) {
+                $r->print('<p class="LC_info">'.$output.'</p>');
+            }
+        }
 
 	$r->print($upload_output);
 
-	if (&handle_edit_cmd()) {
-	    ($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container);
+# Rename, cut, copy or remove a single resource
+	if (&handle_edit_cmd($coursenum,$coursedom)) {
+            my $contentchg;
+            if ($env{'form.cmd'} =~ m{^(remove|cut|setalias|delalias)_}) {
+                $contentchg = 1;
+            }
+	    ($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container,$contentchg);
 	    return $errtext if ($fatal);
 	}
+
+# Cut, copy and/or remove multiple resources
+        if ($env{'form.multichange'}) {
+            my %allchecked = (
+                               cut     => {},
+                               remove  => {},
+                             );
+            my $needsupdate;
+            foreach my $which (keys(%allchecked)) {
+                $env{'form.multi'.$which} =~ s/,$//;
+                if ($env{'form.multi'.$which}) {
+                    map { $allchecked{$which}{$_} = 1; } split(/,/,$env{'form.multi'.$which});
+                    if (ref($allchecked{$which}) eq 'HASH') {
+                        $needsupdate += scalar(keys(%{$allchecked{$which}}));
+                    }
+                }
+            }
+            if ($needsupdate) {
+                my $haschanges = 0;
+                my %curr_groups = &Apache::longroup::coursegroups();
+                my $total = scalar(@LONCAPA::map::order) - 1; 
+                for (my $i=$total; $i>=0; $i--) {
+                    my $res = $LONCAPA::map::order[$i];
+                    my ($name,$url)=split(/\:/,$LONCAPA::map::resources[$res]);
+                    $name=&LONCAPA::map::qtescape($name);
+                    $url=&LONCAPA::map::qtescape($url);
+                    next unless $url;
+                    my %denied =
+                        &action_restrictions($coursenum,$coursedom,$url,
+                                             $env{'form.folderpath'},\%curr_groups);
+                    foreach my $which (keys(%allchecked)) {
+                        next if ($denied{$which});
+                        next unless ($allchecked{$which}{$res});
+                        if ($which eq 'remove') {
+                            if (($url=~m|/+uploaded/\Q$coursedom\E/\Q$coursenum\E/|) &&
+                                ($url!~/$LONCAPA::assess_page_seq_re/)) {
+                                &Apache::lonnet::removeuploadedurl($url);
+                            } else {
+                                &LONCAPA::map::makezombie($res);
+                            }
+                            splice(@LONCAPA::map::order,$i,1);
+                            $haschanges ++;
+                        } elsif ($which eq 'cut') {
+                            &LONCAPA::map::makezombie($res);
+                            splice(@LONCAPA::map::order,$i,1);
+                            $haschanges ++;
+                        }
+                    }
+                }
+                if ($haschanges) {
+                    ($errtext,$fatal) = 
+                        &storemap($coursenum,$coursedom,$folder.'.'.$container,1);
+                    return $errtext if ($fatal);
+                }
+            }
+        }
+
 # Group import/search
 	if ($env{'form.importdetail'}) {
 	    my @imports;
 	    foreach my $item (split(/\&/,$env{'form.importdetail'})) {
 		if (defined($item)) {
 		    my ($name,$url,$residx)=
-			map {&unescape($_)} split(/\=/,$item);
+			map { &unescape($_); } split(/\=/,$item);
+                    if ($url =~ m{^\Q/uploaded/$coursedom/$coursenum/\E(default|supplemental)_new\.(sequence|page)$}) {
+                        my ($suffix,$errortxt,$locknotfreed) =
+                            &new_timebased_suffix($coursedom,$coursenum,'map',$1,$2);
+                        if ($locknotfreed) {
+                            $r->print($locknotfreed);
+                        }
+                        if ($suffix) {
+                            $url =~ s/_new\./_$suffix./; 
+                        } else {
+                            return $errortxt;
+                        }
+                    } elsif ($url =~ m{^/adm/$match_domain/$match_username/new/(smppg|bulletinboard)$}) {
+                        my $type = $1;
+                        my ($suffix,$errortxt,$locknotfreed) =
+                            &new_timebased_suffix($coursedom,$coursenum,$type);
+                        if ($locknotfreed) {
+                            $r->print($locknotfreed);
+                        }
+                        if ($suffix) {
+                            $url =~ s{^(/adm/$match_domain/$match_username)/new}{$1/$suffix};
+                        } else {
+                            return $errortxt;
+                        }
+                    } elsif ($url =~ m{^/adm/$coursedom/$coursenum/new/ext\.tool}) {
+                        my ($suffix,$errortxt,$locknotfreed) =
+                            &new_timebased_suffix($coursedom,$coursenum,'exttool');
+                        if ($locknotfreed) {
+                            $r->print($locknotfreed);
+                        }
+                        if ($suffix) {
+                            $url =~ s{^(/adm/$coursedom/$coursenum)/new}{$1/$suffix};
+                        } else {
+                            return $errortxt;
+                        }
+                    } elsif ($url =~ m{^/uploaded/$coursedom/$coursenum/(docs|supplemental)/(default|\d+)/new.html$}) {
+                        if ($supplementalflag) {
+                            next unless ($1 eq 'supplemental');
+                            if ($folder eq 'supplemental') {
+                                next unless ($2 eq 'default');
+                            } else {
+                                next unless ($folder eq 'supplemental_'.$2);
+                            }
+                        } else {
+                            next unless ($1 eq 'docs');
+                            if ($folder eq 'default') {
+                                next unless ($2 eq 'default');
+                            } else {
+                                next unless ($folder eq 'default_'.$2);
+                            }
+                        }
+                    }
 		    push(@imports, [$name, $url, $residx]);
 		}
 	    }
-	    ($errtext,$fatal)=&group_import($coursenum, $coursedom, $folder,
-					    $container,'londocs',@imports);
+            ($errtext,$fatal,my $fixuperrors) =
+                &group_import($coursenum, $coursedom, $folder,$container,
+                              'londocs',$ltitoolsref,@imports);
 	    return $errtext if ($fatal);
+            if ($fixuperrors) {
+                $r->print($fixuperrors);
+            }
 	}
 # Loading a complete map
 	if ($env{'form.loadmap'}) {
@@ -901,7 +4891,7 @@ sub editor {
 		    $LONCAPA::map::order[$#LONCAPA::map::order+1]=$idx;
 		}
 		($errtext,$fatal)=&storemap($coursenum,$coursedom,
-					    $folder.'.'.$container);
+					    $folder.'.'.$container,1);
 		return $errtext if ($fatal);
 	    } else {
 		$r->print('<p><span class="LC_error">'.&mt('No map selected.').'</span></p>');
@@ -945,8 +4935,32 @@ sub editor {
         $r->print('</div>');
     }
 
-    my ($to_show,$output);
+    if ((!$allowed) && ($folder =~ /^supplemental_\d+$/)) {
+        my ($supplemental) = &Apache::loncommon::get_supplemental($coursenum,$coursedom);
+        if (ref($supplemental) eq 'HASH') {
+            if ((ref($supplemental->{'hidden'}) eq 'HASH') &&
+                (ref($supplemental->{'ids'}) eq 'HASH')) {
+                if (ref($supplemental->{'ids'}->{"/uploaded/$coursedom/$coursenum/$folder.$container"}) eq 'ARRAY') {
+                    my $mapnum = $supplemental->{'ids'}->{"/uploaded/$coursedom/$coursenum/$folder.$container"}->[0];
+                    if ($supplemental->{'hidden'}->{$mapnum}) {
+                        $ishidden = 1;
+                    }
+                }
+            }
+        }
+    }
 
+    my ($to_show,$output,@allidx,@allmapidx,%filters,%lists,%curr_groups);
+    %filters =  (
+                  canremove      => [],
+                  cancut         => [],
+                  cancopy        => [],
+                  hiddenresource => [],
+                  encrypturl     => [],
+                  randomorder    => [],
+                  randompick     => [],
+                );
+    %curr_groups = &Apache::longroup::coursegroups();
     &Apache::loncommon::start_data_table_count(); #setup a row counter 
     foreach my $res (@LONCAPA::map::order) {
         my ($name,$url)=split(/\:/,$LONCAPA::map::resources[$res]);
@@ -954,66 +4968,250 @@ sub editor {
         $url=&LONCAPA::map::qtescape($url);
         unless ($name) {  $name=(split(/\//,$url))[-1]; }
         unless ($name) { $idx++; next; }
+        push(@allidx,$res);
+        if ($url =~ m{/uploaded/.+\.(page|sequence)$}) {
+            push(@allmapidx,$res);
+        }
+
+        if (($supplementalflag) && (!$allowed) && (!$env{'request.role.adv'})) {
+            if (($ishidden) || ((&LONCAPA::map::getparameter($res,'parameter_hiddenresource'))[0]=~/^yes$/i)) {
+                $idx++;
+                next;
+            }
+        }
         $output .= &entryline($idx,$name,$url,$folder,$allowed,$res,
-                              $coursenum,$crstype);
+                              $coursenum,$coursedom,$crstype,
+                              $pathitem,$supplementalflag,$container,
+                              \%filters,\%curr_groups,$ltitoolsref,$canedit,
+                              $isencrypted,$ishidden,$navmapref,$hostname);
         $idx++;
         $shown++;
     }
     &Apache::loncommon::end_data_table_count();
-    
-    if ($shown) {
-        $to_show = &Apache::loncommon::start_scrollbox('900px','880px','400px','contentscroll')
-                  .&Apache::loncommon::start_data_table(undef,'contentlist');
-        if ($allowed) {
-            $to_show .= &Apache::loncommon::start_data_table_header_row()
-                     .'<th colspan="2">'.&mt('Move').'</th>'
-                     .'<th>'.&mt('Actions').'</th>'
-                     .'<th colspan="2">'.&mt('Document').'</th>';
-            if ($folder !~ /^supplemental/) {
-                $to_show .= '<th colspan="4">'.&mt('Settings').'</th>';
+
+    my $need_save;
+    if ($allowed || ($supplementalflag && $folder eq 'supplemental')) {
+        my $toolslink;
+        if ($allowed || $canedit) {
+            my $helpitem = 'Navigation_Screen';
+            if (!$allowed) {
+                $helpitem = 'Supplemental_Navigation';
             }
-            $to_show .= &Apache::loncommon::end_data_table_header_row();
+            $toolslink = '<div class="LC_navtools">'
+                       .'<div class="LC_navtools">'
+                       .&Apache::loncommon::help_open_menu('Navigation Screen',
+                                                           $helpitem,undef,'RAT')
+                       .'</div><div class="LC_navtools">'.&mt('Tools:').'</div>'
+                       .'<div class="LC_navtools">'."\n".'<ul id="LC_toolbar">'
+                       .'<li><a href="/adm/coursedocs?forcesupplement=1&amp;command=editsupp" '
+                       .'id="LC_content_toolbar_edittoplevel" '
+                       .'class="LC_toolbarItem" '
+                       .'title="'.&mt('Supplemental Content Editor').'">'
+                       .'</a></li></ul></div></div>'."\n"
+                       .'<div style="padding:0;clear:both;margin:0;border:0"></div><br />'."\n";
+        }
+        if ($shown) {
+            if ($allowed) {
+                $to_show = &Apache::loncommon::start_scrollbox('900px','880px','400px','contentscroll')
+                          .&Apache::loncommon::start_data_table(undef,'contentlist')
+                          .&Apache::loncommon::start_data_table_header_row()
+                          .'<th colspan="2">'.&mt('Move').'</th>'
+                          .'<th colspan="3">'.&mt('Actions').'</th>'
+                          .'<th>'.&mt('Document').'</th>'
+                          .'<th colspan="2">'.&mt('Settings').'</th>'
+                          .&Apache::loncommon::end_data_table_header_row();
+                if ($folder !~ /^supplemental/) {
+                    $lists{'canhide'} = join(',',@allidx);
+                    $lists{'canrandomlyorder'} = join(',',@allmapidx);
+                    my @possfilters = ('canremove','cancut','cancopy','hiddenresource','encrypturl',
+                                       'randomorder','randompick');
+                    foreach my $item (@possfilters) {
+                        if (ref($filters{$item}) eq 'ARRAY') {
+                            if (@{$filters{$item}} > 0) {
+                                $lists{$item} = join(',',@{$filters{$item}});
+                            }
+                        }
+                    }
+                    if (@allidx > 0) {
+                        my $path;
+                        if ($env{'form.folderpath'}) {
+                            $path =
+                                &HTML::Entities::encode($env{'form.folderpath'},'<>&"');
+                        }
+                        if (@allidx > 1) {
+                            $to_show .=
+                                &Apache::loncommon::continue_data_table_row().
+                                '<td colspan="2">&nbsp;</td>'.
+                                '<td>'.
+                                &multiple_check_form('actions',\%lists,$canedit).
+                                '</td>'.
+                                '<td colspan="3">&nbsp;</td>'.
+                                '<td colspan="2">'.
+                                &multiple_check_form('settings',\%lists,$canedit).
+                                '</td>'.
+                                &Apache::loncommon::end_data_table_row();
+                             $need_save = 1;
+                        }
+                    }
+                }
+                $to_show .= $output.' '
+                           .&Apache::loncommon::end_data_table()
+                           .'<br style="line-height:2px;" />'
+                           .&Apache::loncommon::end_scrollbox();
+            } else {
+                $to_show .= $toolslink
+                           .&Apache::loncommon::start_data_table('LC_tableOfContent')
+                           .&Apache::loncommon::start_data_table_header_row('LC_visually_hidden')
+                           .'<th>'.&mt('Resource Type (Icon)').'</th><th>'.&mt('Resource or Folder').'</th>'
+                           .&Apache::loncommon::end_data_table_header_row()
+                           .$output.' '
+                           .&Apache::loncommon::end_data_table();
+            }
+        } else {
+            if (!$allowed) {
+                $to_show .= $toolslink;
+            }
+            my $noresmsg;
+            if ($allowed && $hiddentop && !$supplementalflag) {
+                $noresmsg = &mt('Main Content Hidden'); 
+            } else {
+                $noresmsg = &mt('Currently empty');
+            }
+            $to_show .= &Apache::loncommon::start_scrollbox('400px','380px','200px','contentscroll')
+                       .'<div class="LC_info" id="contentlist">'
+                       .$noresmsg
+                       .'</div>'
+                       .&Apache::loncommon::end_scrollbox();
+        }
+    } else {
+        if ($shown) {
+            $to_show = '<div>'
+                      .&Apache::loncommon::start_data_table('LC_tableOfContent')
+                      .$output
+                      .&Apache::loncommon::end_data_table()
+                      .'</div>';
+        } else {
+            $to_show = '<div class="LC_info" id="contentlist">'
+                      .&mt('Currently empty')
+                      .'</div>'
         }
-        $to_show .= $output.' '
-                 .&Apache::loncommon::end_data_table()
-                 .'<br style="line-height:2px;" />'
-                 .&Apache::loncommon::end_scrollbox();
-    } else {
-        $to_show .= &Apache::loncommon::start_scrollbox('400px','380px','200px','contentscroll')
-                 .'<div class="LC_info" id="contentlist">'
-                 .&mt('Currently no documents.')
-                 .'</div>'
-                 .&Apache::loncommon::end_scrollbox();
     }
     my $tid = 1;
     if ($supplementalflag) {
         $tid = 2;
     }
     if ($allowed) {
-        $r->print(&generate_edit_table($tid,$orderhash,$to_show,$iconpath,$jumpto));
-        &print_paste_buffer($r,$container);
-    } else {
-        if (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) {
-            #Function Box for Supplemental Content for users with mdc priv.
-            my $funcname = &mt('Folder Editor');
-            $r->print(
-                &Apache::loncommon::head_subbox(
-                    &Apache::lonhtmlcommon::start_funclist().
-                    &Apache::lonhtmlcommon::add_item_funclist(
-                        '<a href="/adm/coursedocs?command=direct&forcesupplement=1&'.
-                        'supppath='.&HTML::Entities::encode($env{'form.folderpath'}).'">'.
-                        '<img src="/res/adm/pages/docs.png" alt="'.$funcname.'" class="LC_icon" />'.
-                        '<span class="LC_menubuttons_inline_text">'.$funcname.'</span></a>').
-                          &Apache::lonhtmlcommon::end_funclist()));
+        my $readfile="/uploaded/$coursedom/$coursenum/$folder.$container";
+        $r->print(&generate_edit_table($tid,$orderhash,$to_show,$iconpath,
+                                       $jumpto,$readfile,$need_save,"$folder.$container",$canedit));
+        if ($canedit) {
+            &print_paste_buffer($r,$container,$folder,$coursedom,$coursenum);
         }
+    } else {
         $r->print($to_show);
     }
     return;
 }
 
+sub multiple_check_form {
+    my ($caller,$listsref,$canedit) = @_;
+    return unless (ref($listsref) eq 'HASH');
+    my $disabled;
+    unless ($canedit) {
+        $disabled = ' disabled="disabled"';
+    }
+    my $output =
+    '<form action="/adm/coursedocs" method="post" name="togglemult'.$caller.'">'.
+    '<span class="LC_nobreak" style="font-size:x-small;font-weight:bold;">'.
+    '<label><input type="radio" name="showmultpick" value="0" onclick="javascript:togglePick('."'$caller','0'".');" checked="checked" />'.&mt('one').'</label>'.('&nbsp;'x2).'<label><input type="radio" name="showmultpick" value="1" onclick="javascript:togglePick('."'$caller','1'".');" />'.&mt('multiple').'</label></span><span id="more'.$caller.'" class="LC_nobreak LC_docs_ext_edit"></span></form>'.
+    '<div id="multi'.$caller.'" style="display:none;margin:0;padding:0;border:0">'.
+    '<form action="/adm/coursedocs" method="post" name="cumulative'.$caller.'">'."\n".
+    '<fieldset id="allfields'.$caller.'" style="display:none"><legend style="font-size:x-small;">'.&mt('check/uncheck all').'</legend>'."\n";
+    if ($caller eq 'settings') {
+        $output .= 
+            '<table><tr>'.
+            '<td class="LC_docs_entry_parameter">'.
+            '<span class="LC_nobreak"><label>'.
+            '<input type="checkbox" name="hiddenresourceall" id="hiddenresourceall" onclick="propagateState(this.form,'."'hiddenresource'".')"'.$disabled.' />'.&mt('Hidden').
+            '</label></span></td>'.
+            '<td class="LC_docs_entry_parameter">'.
+            '<span class="LC_nobreak"><label><input type="checkbox" name="randompickall" id="randompickall" onclick="updatePick(this.form,'."'all','check'".');propagateState(this.form,'."'randompick'".');propagateState(this.form,'."'rpicknum'".');"'.$disabled.' />'.&mt('Randomly Pick').'</label><span id="rpicktextall"></span><input type="hidden" name="rpicknumall" id="rpicknumall" value="" />'.
+            '</span></td>'.
+            '</tr>'."\n".
+            '<tr>'.
+            '<td class="LC_docs_entry_parameter">'.
+            '<span class="LC_nobreak"><label><input type="checkbox" name="encrypturlall" id="encrypturlall" onclick="propagateState(this.form,'."'encrypturl'".')"'.$disabled.' />'.&mt('URL hidden').'</label></span></td><td class="LC_docs_entry_parameter"><span class="LC_nobreak"><label><input type="checkbox" name="randomorderall" id="randomorderall" onclick="propagateState(this.form,'."'randomorder'".')"'.$disabled.' />'.&mt('Random Order').
+            '</label></span>'.
+            '</td></tr></table>'."\n";
+    } else {
+        $output .=
+            '<table><tr>'.
+            '<td class="LC_docs_entry_parameter">'.
+            '<span class="LC_nobreak LC_docs_remove">'.
+            '<label><input type="checkbox" name="removeall" id="removeall" onclick="propagateState(this.form,'."'remove'".')"'.$disabled.' />'.&mt('Remove').
+            '</label></span></td>'.
+            '<td class="LC_docs_entry_parameter">'.
+            '<span class="LC_nobreak LC_docs_cut">'.
+            '<label><input type="checkbox" name="cut" id="cutall" onclick="propagateState(this.form,'."'cut'".');"'.$disabled.' />'.&mt('Cut').
+            '</label></span></td>'."\n".
+            '<td class="LC_docs_entry_parameter">'.
+            '<span class="LC_nobreak LC_docs_copy">'.
+            '<label><input type="checkbox" name="copyall" id="copyall" onclick="propagateState(this.form,'."'copy'".')"'.$disabled.' />'.&mt('Copy').
+            '</label></span></td>'.
+            '</tr></table>'."\n";
+    }
+    $output .= 
+        '</fieldset>'.
+        '<input type="hidden" name="allidx" value="'.$listsref->{'canhide'}.'" />';
+    if ($caller eq 'settings') {
+        $output .= 
+        '<input type="hidden" name="allmapidx" value="'.$listsref->{'canrandomlyorder'}.'" />'."\n".
+        '<input type="hidden" name="currhiddenresource" value="'.$listsref->{'hiddenresource'}.'" />'."\n".
+        '<input type="hidden" name="currencrypturl" value="'.$listsref->{'encrypturl'}.'" />'."\n".
+        '<input type="hidden" name="currrandomorder" value="'.$listsref->{'randomorder'}.'" />'."\n".
+        '<input type="hidden" name="currrandompick" value="'.$listsref->{'randompick'}.'" />'."\n";
+    } elsif ($caller eq 'actions') {
+        $output .=
+        '<input type="hidden" name="allremoveidx" id="allremoveidx" value="'.$listsref->{'canremove'}.'" />'.
+        '<input type="hidden" name="allcutidx" id="allcutidx" value="'.$listsref->{'cancut'}.'" />'.
+        '<input type="hidden" name="allcopyidx" id="allcopyidx" value="'.$listsref->{'cancopy'}.'" />';
+    }
+    $output .= 
+        '</form>'.
+        '</div>';
+    return $output;
+}
+
 sub process_file_upload {
-    my ($upload_output,$coursenum,$coursedom,$allfiles,$codebase,$uploadcmd) = @_;
+    my ($upload_output,$coursenum,$coursedom,$allfiles,$codebase,$uploadcmd,$crstype) = @_;
 # upload a file, if present
+    my $filesize = length($env{'form.uploaddoc'});
+    if (!$filesize) {
+        $$upload_output = '<div class="LC_error">'.
+                           &mt('Unable to upload [_1]. (size = [_2] bytes)',
+                          '<span class="LC_filename">'.$env{'form.uploaddoc.filename'}.'</span>',
+                          $filesize).'<br />'.
+                          &mt('Either the file you attempted to upload was empty, or your web browser was unable to read its contents.').'<br />'.
+                          '</div>';
+        return;
+    }
+    my $quotatype = 'unofficial';
+    if ($crstype eq 'Community') {
+        $quotatype = 'community';
+    } elsif ($crstype eq 'Placement') {
+        $quotatype = 'placement';
+    } elsif ($env{'course.'.$coursedom.'_'.$coursenum.'.internal.coursecode'}) {
+        $quotatype = 'official';
+    } elsif ($env{'course.'.$coursedom.'_'.$coursenum.'.internal.textbook'}) {
+        $quotatype = 'textbook';
+    }
+    if (&Apache::loncommon::get_user_quota($coursenum,$coursedom,'course',$quotatype)) {
+        $filesize = int($filesize/1000); #expressed in kb
+        $$upload_output = &Apache::loncommon::excess_filesize_warning($coursenum,$coursedom,'course',
+                                                                      $env{'form.uploaddoc.filename'},$filesize,
+                                                                      'upload',$quotatype);
+        return if ($$upload_output);
+    }
     my ($parseaction,$showupload,$nextphase,$mimetype);
     if ($env{'form.parserflag'}) {
         $parseaction = 'parse';
@@ -1026,19 +5224,15 @@ sub process_file_upload {
         my $errtext='';
         my $fatal=0;
         my $container='sequence';
-        if ($env{'form.pagepath'}) {
+        if ($env{'form.folderpath'} =~ /:1$/) {
             $container='page';
         }
         ($errtext,$fatal)=
-              &mapread($coursenum,$coursedom,$folder.'.'.$container);
+            &mapread($coursenum,$coursedom,$folder.'.'.$container);
         if ($#LONCAPA::map::order<1) {
             $LONCAPA::map::order[0]=1;
             $LONCAPA::map::resources[1]='';
         }
-        if ($fatal) {
-            $$upload_output = '<div class="LC_error" id="uploadfileresult">'.&mt('The uploaded file has not been stored as an error occurred reading the contents of the current folder.').'</div>';
-            return;
-        }
         my $destination = 'docs/';
         if ($folder =~ /^supplemental/) {
             $destination = 'supplemental/';
@@ -1048,6 +5242,10 @@ sub process_file_upload {
         } elsif ($folder =~ /^(default|supplemental)_(\d+)$/) {
             $destination .=  $2.'/';
         }
+        if ($fatal) {
+            $$upload_output = '<div class="LC_error" id="uploadfileresult">'.&mt('The uploaded file has not been stored as an error occurred reading the contents of the current folder.').'</div>';
+            return;
+        }
 # this is for a course, not a user, so set context to coursedoc.
         my $newidx=&LONCAPA::map::getresidx();
         $destination .= $newidx;
@@ -1079,7 +5277,7 @@ sub process_file_upload {
 	    $comment.':'.$url.':'.$ext.':normal:res';
         $LONCAPA::map::order[$#LONCAPA::map::order+1]= $newidx;
         ($errtext,$fatal)=&storemap($coursenum,$coursedom,
-				    $folder.'.'.$container);
+				    $folder.'.'.$container,1);
         if ($fatal) {
             $$upload_output = '<div class="LC_error" id="uploadfileresult">'.$errtext.'</div>';
             return;
@@ -1091,7 +5289,7 @@ sub process_file_upload {
                     my $uploadphase = 'upload_embedded';
                     my $primaryurl = &HTML::Entities::encode($url,'<>&"');
 		    my $state = &embedded_form_elems($uploadphase,$primaryurl,$newidx); 
-                    my ($embedded,$num) = 
+                    my ($embedded,$num) =
                         &Apache::loncommon::ask_for_embedded_content(
                             '/adm/coursedocs',$state,$allfiles,$codebase,{'docs_url' => $url});
                     if ($embedded) {
@@ -1109,80 +5307,139 @@ sub process_file_upload {
                     $$upload_output .= &mt('No embedded items identified').'<br />';
                 }
                 $$upload_output = '<div id="uploadfileresult">'.$$upload_output.'</div>';
+            } elsif ((&Apache::loncommon::is_archive_file($mimetype)) &&
+                     ($env{'form.uploaddoc.filename'} =~ /\.(zip|tar|bz2|gz|tar.gz|tar.bz2|tgz)$/i)) {
+                $nextphase = 'decompress_uploaded';
+                my $position = scalar(@LONCAPA::map::order)-1;
+                my $noextract = &return_to_editor();
+                my $archiveurl = &HTML::Entities::encode($url,'<>&"');
+                my %archiveitems = (
+                    folderpath => $env{'form.folderpath'},
+                    cmd        => $nextphase,
+                    newidx     => $newidx,
+                    position   => $position,
+                    phase      => $nextphase,
+                    comment    => $comment,
+                );
+                my ($destination,$dir_root) = &embedded_destination($coursenum,$coursedom);
+                my @current = &get_dir_list($url,$coursenum,$coursedom,$newidx); 
+                $$upload_output = $showupload.
+                                  &Apache::loncommon::decompress_form($mimetype,
+                                      $archiveurl,'/adm/coursedocs',$noextract,
+                                      \%archiveitems,\@current);
             }
         }
     }
     return $nextphase;
 }
 
-sub is_supplemental_title {
-    my ($title) = @_;
-    return scalar($title =~ m/^(\d+)___&&&___($match_username)___&&&___($match_domain)___&&&___(.*)$/);
+sub get_dir_list {
+    my ($url,$coursenum,$coursedom,$newidx) = @_;
+    my ($destination,$dir_root) = &embedded_destination();
+    my ($dirlistref,$listerror) =  
+        &Apache::lonnet::dirlist("$dir_root/$destination/$newidx",$coursedom,$coursenum,1);
+    my @dir_lines;
+    my $dirptr=16384;
+    if (ref($dirlistref) eq 'ARRAY') {
+        foreach my $dir_line (sort
+                          {
+                              my ($afile)=split('&',$a,2);
+                              my ($bfile)=split('&',$b,2);
+                              return (lc($afile) cmp lc($bfile));
+                          } (@{$dirlistref})) {
+            my ($filename,$dom,undef,$testdir,undef,undef,undef,undef,$size,undef,$mtime,undef,undef,undef,$obs,undef)=split(/\&/,$dir_line,16);
+            $filename =~ s/\s+$//;
+            next if ($filename =~ /^\.\.?$/); 
+            my $isdir = 0;
+            if ($dirptr&$testdir) {
+                $isdir = 1;
+            }
+            push(@dir_lines, [$filename,$dom,$isdir,$size,$mtime,$obs]);
+        }
+    }
+    return @dir_lines;
 }
 
-sub parse_supplemental_title {
+sub is_supplemental_title {
     my ($title) = @_;
-
-    my ($foldertitle,$renametitle);
-    if ($title =~ /&amp;&amp;&amp;/) {
-	$title = &HTML::Entites::decode($title);
-    }
- if ($title =~ m/^(\d+)___&&&___($match_username)___&&&___($match_domain)___&&&___(.*)$/) {
-	$renametitle=$4;
-	my ($time,$uname,$udom) = ($1,$2,$3);
-	$foldertitle=&Apache::lontexconvert::msgtexconverted($4);
-	my $name =  &Apache::loncommon::plainname($uname,$udom);
-	$name = &HTML::Entities::encode($name,'"<>&\'');
-        $renametitle = &HTML::Entities::encode($renametitle,'"<>&\'');
-	$title='<i>'.&Apache::lonlocal::locallocaltime($time).'</i> '.
-	    $name.': <br />'.$foldertitle;
-    }
-    if (wantarray) {
-	return ($title,$foldertitle,$renametitle);
-    }
-    return $title;
+    return scalar($title =~ m/^(\d+)___&&&___($match_username)___&&&___($match_domain)___&&&___(.*)$/);
 }
 
 # --------------------------------------------------------------- An entry line
 
 sub entryline {
-    my ($index,$title,$url,$folder,$allowed,$residx,$coursenum,$crstype)=@_;
-    my ($foldertitle,$pagetitle,$renametitle);
+    my ($index,$title,$url,$folder,$allowed,$residx,$coursenum,$coursedom,
+        $crstype,$pathitem,$supplementalflag,$container,$filtersref,$currgroups,
+        $ltitoolsref,$canedit,$isencrypted,$ishidden,$navmapref,$hostname)=@_;
+    my ($foldertitle,$renametitle,$oldtitle,$encodedtitle);
     if (&is_supplemental_title($title)) {
-	($title,$foldertitle,$renametitle) = &parse_supplemental_title($title);
-	$pagetitle = $foldertitle;
+	($title,$foldertitle,$renametitle) = &Apache::loncommon::parse_supplemental_title($title);
+        $encodedtitle=$title;
     } else {
 	$title=&HTML::Entities::encode($title,'"<>&\'');
+        $encodedtitle=$title;
 	$renametitle=$title;
 	$foldertitle=$title;
-	$pagetitle=$title;
     }
 
-    my $orderidx=$LONCAPA::map::order[$index];
+    my ($disabled,$readonly,$js_lt);
+    unless ($canedit) {
+        $disabled = 'disabled="disabled"';
+        $readonly = 1;
+    }
 
+    my $orderidx=$LONCAPA::map::order[$index];
 
     $renametitle=~s/\\/\\\\/g;
     $renametitle=~s/\&quot\;/\\\"/g;
+    $renametitle=~s/"/%22/g;
     $renametitle=~s/ /%20/g;
+    $oldtitle = $renametitle;
+    $renametitle=~s/\&#39;/\\\'/g;
     my $line=&Apache::loncommon::start_data_table_row();
-    my ($form_start,$form_end);
+    my ($form_start,$form_end,$form_common,$form_param);
 # Edit commands
-    my ($container, $type, $esc_path, $path, $symb);
+    my ($esc_path, $path, $symb, $shownsymb, $curralias);
     if ($env{'form.folderpath'}) {
-	$type = 'folder';
-        $container = 'sequence';
 	$esc_path=&escape($env{'form.folderpath'});
 	$path = &HTML::Entities::encode($env{'form.folderpath'},'<>&"');
 	# $htmlfoldername=&HTML::Entities::encode($env{'form.foldername'},'<>&"');
     }
-    if ($env{'form.pagepath'}) {
-        $type = $container = 'page';
-        $esc_path=&escape($env{'form.pagepath'});
-	$path = &HTML::Entities::encode($env{'form.pagepath'},'<>&"');
-        $symb=&escape($env{'form.pagesymb'});
+    my $isexternal;
+    if ($residx) {
+        my $currurl = $url;
+        $currurl =~ s{^http(|s)(&colon;|:)//}{/adm/wrapper/ext/};
+        if ($currurl =~ m{^/adm/wrapper/ext/}) {
+            $isexternal = 1;
+        }
+        if (!$supplementalflag) {
+            my $path = 'uploaded/'.
+                       $env{'course.'.$env{'request.course.id'}.'.domain'}.'/'.
+                       $env{'course.'.$env{'request.course.id'}.'.num'}.'/';
+            $symb = &Apache::lonnet::encode_symb($path.$folder.".$container",
+                                                 $residx,
+                                                 &Apache::lonnet::declutter($currurl));
+        }
+    }
+    my ($renamelink,%lt,$ishash);
+    if (ref($filtersref) eq 'HASH') {
+        $ishash = 1;
     }
-    my $cpinfo='';
+
     if ($allowed) {
+        $form_start = '
+   <form action="/adm/coursedocs" method="post">
+';
+        $form_common=(<<END);
+   <input type="hidden" name="folderpath" value="$path" />
+   <input type="hidden" name="symb" value="$symb" />
+END
+        $form_param=(<<END);
+   <input type="hidden" name="setparms" value="$orderidx" />
+   <input type="hidden" name="changeparms" value="0" />
+END
+        $form_end = '</form>';
+
 	my $incindex=$index+1;
 	my $selectbox='';
 	if (($#LONCAPA::map::order>0) &&
@@ -1194,7 +5451,7 @@ sub entryline {
 	     ne '')) {
 	    $selectbox=
 		'<input type="hidden" name="currentpos" value="'.$incindex.'" />'.
-		'<select name="newpos" onchange="this.form.submit()">';
+		'<select name="newpos" onchange="this.form.submit()"'.$disabled.'>';
 	    for (my $i=1;$i<=$#LONCAPA::map::order+1;$i++) {
 		if ($i==$incindex) {
 		    $selectbox.='<option value="" selected="selected">('.$i.')</option>';
@@ -1204,266 +5461,769 @@ sub entryline {
 	    }
 	    $selectbox.='</select>';
 	}
-	my %lt=&Apache::lonlocal::texthash(
+	%lt=&Apache::lonlocal::texthash(
                 'up' => 'Move Up',
 		'dw' => 'Move Down',
 		'rm' => 'Remove',
                 'ct' => 'Cut',
 		'rn' => 'Rename',
-		'cp' => 'Copy');
-	my $nocopy=0;
-        my $nocut=0;
-        if ($url=~/\.(page|sequence)$/) {
-	    if ($url =~ m{/res/}) {
-		# no copy for published maps
-		$nocopy = 1;
-	    } else {
-		foreach my $item (&Apache::lonsequence::attemptread(&Apache::lonnet::filelocation('',$url),1)) {
-		    my ($title,$url,$ext,$type)=split(/\:/,$item);
-		    if (($url=~/\.(page|sequence)/) && ($type ne 'zombie')) {
-			$nocopy=1;
-			last;
-		    }
-		}
-	    }
-	}
-        if ($url=~/^\/res\/lib\/templates\//) {
-           $nocopy=1;
-           $nocut=1;
-        }
-        my $copylink='&nbsp;';
-        my $cutlink='&nbsp;';
-
+		'cp' => 'Copy',
+                'da' => 'Unset alias', 
+                'sa' => 'Set alias',
+                'ex' => 'External Resource',
+                'et' => 'External Tool',
+                'ed' => 'Edit',
+                'pr' => 'Preview',
+                'sv' => 'Save',
+                'ul' => 'URL',
+                'ti' => 'Title',
+                'er' => 'Editing rights unavailable for your current role.', 
+                );
+	my %denied = &action_restrictions($coursenum,$coursedom,$url,
+                                          $env{'form.folderpath'},
+                                          $currgroups);
+        my ($copylink,$cutlink,$removelink);
 	my $skip_confirm = 0;
+        my $confirm_removal = 0;
 	if ( $folder =~ /^supplemental/
 	     || ($url =~ m{( /smppg$
 			    |/syllabus$
 			    |/aboutme$
 			    |/navmaps$
 			    |/bulletinboard$
-			    |\.html$
-			    |^/adm/wrapper/ext)}x)) {
+                            |/ext\.tool$
+			    |\.html$)}x)
+             || $isexternal) {
 	    $skip_confirm = 1;
 	}
+        if (($url=~m|/+uploaded/\Q$coursedom\E/\Q$coursenum\E/|) &&
+            ($url!~/$LONCAPA::assess_page_seq_re/)) {
+            $confirm_removal = 1;
+        }
+        if ($url =~ /$LONCAPA::assess_re/) {
+            $curralias = (&LONCAPA::map::getparameter($orderidx,'parameter_0_mapalias'))[0];
+        }
 
-	if (!$nocopy) {
+	if ($denied{'copy'}) {
+            $copylink=(<<ENDCOPY)
+<span style="visibility: hidden;">$lt{'cp'}</span>
+ENDCOPY
+        } else {
+            my $formname = 'edit_copy_'.$orderidx;
+            my $js = "javascript:checkForSubmit(document.forms.renameform,'copy','actions','$orderidx','$esc_path','$index','$renametitle',$skip_confirm,'$container','$folder');";
 	    $copylink=(<<ENDCOPY);
-<a href='javascript:markcopy("$esc_path","$index","$renametitle","$container","$symb","$folder");' class="LC_docs_copy">$lt{'cp'}</a>
+<form name="$formname" method="post" action="/adm/coursedocs">
+$form_common
+<label><input type="checkbox" name="copy" id="copy_$orderidx" value="$orderidx" onclick="javascript:singleCheck(this,'$orderidx','copy');" class="LC_hidden" $disabled /><a href="$js" class="LC_docs_copy">$lt{'cp'}</a></label>
+$form_end
 ENDCOPY
+            if (($ishash) && (ref($filtersref->{'cancopy'}) eq 'ARRAY')) {
+                push(@{$filtersref->{'cancopy'}},$orderidx);
+            }
         }
-	if (!$nocut) {
+	if ($denied{'cut'}) {
+            $cutlink=(<<ENDCUT);
+<span style="visibility: hidden;">$lt{'ct'}</span>
+ENDCUT
+        } else {
+            my $formname = 'edit_cut_'.$orderidx;
+            my $js = "javascript:checkForSubmit(document.forms.renameform,'cut','actions','$orderidx','$esc_path','$index','$renametitle',$skip_confirm,'$container','$folder');";
 	    $cutlink=(<<ENDCUT);
-<a href='javascript:cutres("$esc_path","$index","$renametitle","$container","$symb","$folder",$skip_confirm);' class="LC_docs_cut">$lt{'ct'}</a>
+<form name="$formname" method="post" action="/adm/coursedocs">
+$form_common
+<input type="hidden" name="skip_$orderidx" id="skip_cut_$orderidx" value="$skip_confirm" />
+<label><input type="checkbox" name="cut" id="cut_$orderidx" value="$orderidx" onclick="javascript:singleCheck(this,'$orderidx','cut');" class="LC_hidden" $disabled /><a href="$js" class="LC_docs_cut">$lt{'ct'}</a></label>
+$form_end
 ENDCUT
+            if (($ishash) && (ref($filtersref->{'cancut'}) eq 'ARRAY')) {
+                push(@{$filtersref->{'cancut'}},$orderidx);
+            }
+        }
+        if ($denied{'remove'}) {
+            $removelink=(<<ENDREM);
+<span style="visibility: hidden;">$lt{'rm'}</a>
+ENDREM
+        } else {
+            my $formname = 'edit_remove_'.$orderidx;
+            my $js = "javascript:checkForSubmit(document.forms.renameform,'remove','actions','$orderidx','$esc_path','$index','$renametitle',$skip_confirm,'$container','$folder',$confirm_removal);";
+            $removelink=(<<ENDREM);
+<form name="$formname" method="post" action="/adm/coursedocs">
+$form_common
+<input type="hidden" name="skip_$orderidx" id="skip_remove_$orderidx" value="$skip_confirm" />
+<input type="hidden" name="confirm_rem_$orderidx" id="confirm_removal_$orderidx" value="$confirm_removal" />
+<label><input type="checkbox" name="remove" id="remove_$orderidx" value="$orderidx" onclick="javascript:singleCheck(this,'$orderidx','remove');" class="LC_hidden" $disabled /><a href="$js" class="LC_docs_remove">$lt{'rm'}</a></label>
+$form_end
+ENDREM
+            if (($ishash) && (ref($filtersref->{'canremove'}) eq 'ARRAY')) {
+                push(@{$filtersref->{'canremove'}},$orderidx);
+            }
+        }
+        $renamelink=(<<ENDREN);
+<a href='javascript:changename("$esc_path","$index","$oldtitle");' class="LC_docs_rename">$lt{'rn'}</a>
+ENDREN
+        my ($uplink,$downlink);
+        if ($canedit) {
+            $uplink = "/adm/coursedocs?cmd=up_$index&amp;folderpath=$esc_path&amp;symb=$symb";
+            $downlink = "/adm/coursedocs?cmd=down_$index&amp;folderpath=$esc_path&amp;symb=$symb";
+        } else {
+            $uplink = "javascript:alert('".&js_escape($lt{'er'})."');";
+            $downlink = $uplink;
         }
-	$form_start = (<<END);
-   <form  action="/adm/coursedocs" method="post">
-   <input type="hidden" name="${type}path" value="$path" />
-   <input type="hidden" name="${type}symb" value="$symb" />
-   <input type="hidden" name="setparms" value="$orderidx" />
-   <input type="hidden" name="changeparms" value="0" />
-END
-        $form_end = '</form>';
 	$line.=(<<END);
 <td>
 <div class="LC_docs_entry_move">
-  <a href='/adm/coursedocs?cmd=up_$index&amp;${type}path=$esc_path&amp;${type}symb=$symb$cpinfo'>
-    <img src="${iconpath}move_up.gif" alt='$lt{'up'}' class="LC_icon" />
+  <a href="$uplink">
+    <img src="${iconpath}move_up.gif" alt="$lt{'up'}" class="LC_icon" />
   </a>
 </div>
 <div class="LC_docs_entry_move">
-  <a href='/adm/coursedocs?cmd=down_$index&amp;${type}path=$esc_path&amp;${type}symb=$symb$cpinfo'>
-    <img src="${iconpath}move_down.gif" alt='$lt{'dw'}' class="LC_icon" />
+  <a href="$downlink">
+    <img src="${iconpath}move_down.gif" alt="$lt{'dw'}" class="LC_icon" />
   </a>
 </div>
 </td>
 <td>
    $form_start
+   $form_param
+   $form_common
    $selectbox
    $form_end
 </td>
-<td class="LC_docs_entry_commands">
-   <a href='javascript:removeres("$esc_path","$index","$renametitle","$container","$symb",$skip_confirm);' class="LC_docs_remove">$lt{'rm'}</a>
+<td class="LC_docs_entry_commands LC_nobreak">
+$removelink
 $cutlink
-   <a href='javascript:changename("$esc_path","$index","$renametitle","$container","$symb");' class="LC_docs_rename">$lt{'rn'}</a>
 $copylink
 </td>
 END
-
     }
+    my $icontext;
 # Figure out what kind of a resource this is
     my ($extension)=($url=~/\.(\w+)$/);
+    if ($extension eq 'sequence') {
+        $icontext = &mt('folder icon');
+    } elsif ($extension eq 'page') {
+        $icontext = &mt('composite page icon');
+    } else {
+        $icontext = &mt('file icon');
+    }
+    $icontext = &HTML::Entities::encode($icontext);
     my $uploaded=($url=~/^\/*uploaded\//);
     my $icon=&Apache::loncommon::icon($url);
-    my $isfolder=0;
-    my $ispage=0;
-    my $folderarg;
-    my $pagearg;
-    my $pagefile;
+    my $isfolder;
+    my $ispage;
+    my $containerarg;
+    my $folderurl;
+    my $plainurl;
     if ($uploaded) {
         if (($extension eq 'sequence') || ($extension eq 'page')) {
             $url=~/\Q$coursenum\E\/([\/\w]+)\.\Q$extension\E$/;
-            my $containerarg = $1;
+            $containerarg = $1;
 	    if ($extension eq 'sequence') {
 	        $icon=$iconpath.'navmap.folder.closed.gif';
-                $folderarg=$containerarg;
                 $isfolder=1;
             } else {
                 $icon=$iconpath.'page.gif';
-                $pagearg=$containerarg;
                 $ispage=1;
             }
+            $folderurl = &Apache::lonnet::declutter($url);
             if ($allowed) {
                 $url='/adm/coursedocs?';
             } else {
                 $url='/adm/supplemental?';
             }
 	} else {
-	    &Apache::lonnet::allowuploaded('/adm/coursedoc',$url);
+	    $plainurl = $url;
 	}
     }
 
+    my ($editlink,$extresform,$anchor,$hiddenres,$nomodal);
     my $orig_url = $url;
     $orig_url=~s{http(&colon;|:)//https(&colon;|:)//}{https$2//};
-    my $external = ($url=~s{^http(|s)(&colon;|:)//}{/adm/wrapper/ext/});
-    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.
-           '.sequence').
-           '___'.$residx.'___'.
-	   &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')) {
+    if ($container eq 'page') {
+        $url=~s{^http(|s)(&colon;|:)//}{/ext/};
+    } else {
+        $url=~s{^http(|s)(&colon;|:)//}{/adm/wrapper/ext/};
+    }
+    if (!$supplementalflag && $residx && $symb) {
+        if ((!$isfolder) && (!$ispage)) {
+	    (undef,undef,$url)=&Apache::lonnet::decode_symb($symb);
+            if (($url =~ m{^ext/}) && ($container eq 'page')) {
+                $url=&Apache::lonnet::clutter_with_no_wrapper($url);
+            } else {
+                $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{^(|/adm/wrapper)/ext/([^#]+)}) {
+                my $wrapped = $1;
+                my $exturl = $2;
+                if (($wrapped eq '') && ($container ne 'page')) { 
+                    $url='/adm/wrapper'.$url;
+                }
+                if (($ENV{'SERVER_PORT'} == 443) && ($exturl !~ /^https:/)) {
+                    $nomodal = 1;
+                }
+	    } elsif ($url=~m{^/adm/$coursedom/$coursenum/\d+/ext\.tool$}) {
 		$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;
-	    $external = 1;
+            } elsif ($url eq "/public/$coursedom/$coursenum/syllabus") {
+                if (($ENV{'SERVER_PORT'} == 443) &&
+                    ($env{'course.'.$env{'request.course.id'}.'.externalsyllabus'} =~ m{^http://})) {
+                    unless ((&Apache::lonnet::uses_sts()) || (&Apache::lonnet::waf_allssl($hostname))) {
+                        $url .= '?usehttp=1';
+                    }
+                    $nomodal = 1;
+                }
+            }
+            my $checkencrypt;
+            if (!$env{'request.role.adv'}) {
+                if (((&LONCAPA::map::getparameter($orderidx,'parameter_encrypturl'))[0]=~/^yes$/i) ||
+                    ($isencrypted) || (&Apache::lonnet::EXT('resource.0.encrypturl',$symb) =~ /^yes$/i)) {
+                    $checkencrypt = 1;
+                } elsif (ref($navmapref)) {
+                    unless (ref($$navmapref)) {
+                        $$navmapref = Apache::lonnavmaps::navmap->new();
+                    }
+                    if (ref($$navmapref)) {
+                        if (lc($$navmapref->get_mapparam($symb,undef,"0.encrypturl")) eq 'yes') {
+                            $checkencrypt = 1;
+                        }
+                    }
+                }
+            }
+            if ($checkencrypt) {
+                my $currenc = $env{'request.enc'};
+                $env{'request.enc'} = 1;
+                $shownsymb = &Apache::lonenc::encrypted($symb);
+                my $shownurl = &Apache::lonenc::encrypted($url);
+                if (&Apache::lonnet::symbverify($symb,$url)) {
+                    $url = $shownurl;
+                } else {
+                    $url = '';
+                }
+                $env{'request.enc'} = $currenc;
+            } elsif (&Apache::lonnet::symbverify($symb,$url)) {
+                $shownsymb = $symb;
+                if ($isexternal) {
+                    $url =~ s/\#[^#]+$//;
+                    if ($container eq 'page') {
+                        $url = &Apache::lonnet::clutter($url);
+                    }
+                }
+            } else {
+                $url = '';
+            }
+            unless ($env{'request.role.adv'}) {
+                if ((&LONCAPA::map::getparameter($orderidx,'parameter_hiddenresource'))[0]=~/^yes$/i) {
+                    $url = '';
+                }
+                if (&Apache::lonnet::EXT('resource.0.hiddenresource',$symb) =~ /^yes$/i) {
+                    $url = '';
+                    $hiddenres = 1;
+                }
+            }
+            if (($url ne '') && ($shownsymb ne '')) {
+                $url .= (($url=~/\?/)?'&':'?').'symb='.&escape($shownsymb);
+            }
 	}
-        if (&Apache::lonnet::symbverify($symb,$url)) {
-	    $url.=(($url=~/\?/)?'&':'?').'symb='.&escape($symb);
-        } else {
-            $url='';
+    } elsif ($supplementalflag) {
+        if ($isexternal) {
+            if ($url =~ /^([^#]+)#([^#]+)$/) {
+                $url = $1;
+                $anchor = $2;
+                if (($url =~ m{^(|/adm/wrapper)/ext/(?!https:)}) && ($ENV{'SERVER_PORT'} == 443)) {
+                    unless ((&Apache::lonnet::uses_sts()) || (&Apache::lonnet::waf_allssl($hostname))) {
+                        if ($hostname ne '') {
+                            $url = 'http://'.$hostname.$url;
+                        }
+                        $url .= (($url =~ /\?/) ? '&amp;':'?').'usehttp=1';
+                    }
+                    $nomodal = 1;
+                }
+            }
+        } elsif ($url =~ m{^\Q/public/$coursedom/$coursenum/syllabus\E}) {
+            if (($ENV{'SERVER_PORT'} == 443) &&
+                ($env{'course.'.$env{'request.course.id'}.'.externalsyllabus'} =~ m{^http://})) {
+                unless ((&Apache::lonnet::uses_sts()) || (&Apache::lonnet::waf_allssl($hostname))) {
+                    if ($hostname ne '') {
+                        $url = 'http://'.$hostname.$url;
+                    }
+                    $url .= (($url =~ /\?/) ? '&amp;':'?').'usehttp=1';
+                }
+                $nomodal = 1;
+            }
+        } elsif (($uploaded) && ($url ne '/adm/supplemental?') && ($url ne '/adm/coursedocs?')) {
+            my $embstyle=&Apache::loncommon::fileembstyle($extension);
+            unless ($embstyle eq 'ssi') {
+                if (($embstyle eq 'img')
+                 || ($embstyle eq 'emb')
+                 || ($embstyle eq 'wrp')) {
+                    $url='/adm/wrapper'.$url;
+                } elsif ($url !~ /\.(sequence|page)$/) {
+                    $url='/adm/coursedocs/showdoc'.$url;
+                }
+            }
+        }
+        unless ($allowed && $env{'request.role.adv'}) {
+            if ($ishidden || (&LONCAPA::map::getparameter($orderidx,'parameter_hiddenresource'))[0]=~/^yes$/i) {
+                $hiddenres = 1;
+            }
         }
-	if ($container eq 'page') {
-	    my $symb=$env{'form.pagesymb'};
-
-	    $url=&Apache::lonnet::clutter((&Apache::lonnet::decode_symb($symb))[2]);
-	    $url.=(($url=~/\?/)?'&':'?').'symb='.&escape($symb);
-	}
     }
-    my ($parameterset,$rand_order_text) = ('&nbsp;', '&nbsp;');
-    if ($isfolder || $extension eq 'sequence') {
+    my ($rand_pick_text,$rand_order_text,$hiddenfolder);
+    my $filterFunc = sub { my $res = shift; return (!$res->randomout() && !$res->is_map()) };
+    if ($isfolder || $ispage || $extension eq 'sequence' || $extension eq 'page') {
 	my $foldername=&escape($foldertitle);
 	my $folderpath=$env{'form.folderpath'};
 	if ($folderpath) { $folderpath.='&' };
+        if (!$allowed && $supplementalflag) {
+            $folderpath.=$containerarg.'&'.$foldername;
+            $url.='folderpath='.&escape($folderpath);
+            if ($ishidden || (&LONCAPA::map::getparameter($orderidx,'parameter_hiddenresource'))[0]=~/^yes$/i) {
+                $hiddenfolder = 1;
+            }
+        } else {
+            my $rpicknum = (&LONCAPA::map::getparameter($orderidx,
+                                                        'parameter_randompick'))[0];
+            my $randorder = ((&LONCAPA::map::getparameter($orderidx,
+                                              'parameter_randomorder'))[0]=~/^yes$/i);
+            my $hiddenmap = ((&LONCAPA::map::getparameter($orderidx,
+                                              'parameter_hiddenresource'))[0]=~/^yes$/i);
+            my $encryptmap = ((&LONCAPA::map::getparameter($orderidx,
+                                              'parameter_encrypturl'))[0]=~/^yes$/i);
+            unless ($hiddenmap) {
+                if (ref($navmapref)) {
+                    unless (ref($$navmapref)) {
+                        $$navmapref = Apache::lonnavmaps::navmap->new();
+                    }
+                    if (ref($$navmapref)) {
+                        if (lc($$navmapref->get_mapparam(undef,$folderurl,"0.hiddenresource")) eq 'yes') {
+                            my @resources = $$navmapref->retrieveResources($folderurl,$filterFunc,1,1);
+                            unless (@resources) {
+                                $hiddenmap = 1;
+                                unless ($env{'request.role.adv'}) {  
+                                    $url = '';
+                                    $hiddenfolder = 1;
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+            unless ($encryptmap) {
+                if ((ref($navmapref)) && (ref($$navmapref))) {
+                    if (lc($$navmapref->get_mapparam(undef,$folderurl,"0.encrypturl")) eq 'yes') {
+                        $encryptmap = 1;
+                    }
+                }
+            }
+
 # Append randompick number, hidden, and encrypted with ":" to foldername,
 # so it gets transferred between levels
-	$folderpath.=$folderarg.'&'.$foldername.':'.(&LONCAPA::map::getparameter($orderidx,
-                                              'parameter_randompick'))[0]
-                                               .':'.((&LONCAPA::map::getparameter($orderidx,
-                                              'parameter_hiddenresource'))[0]=~/^yes$/i)
-                                               .':'.((&LONCAPA::map::getparameter($orderidx,
-                                              'parameter_encrypturl'))[0]=~/^yes$/i)
-                                               .':'.((&LONCAPA::map::getparameter($orderidx,
-                                              'parameter_randomorder'))[0]=~/^yes$/i);
-	$url.='folderpath='.&escape($folderpath).$cpinfo;
-	$parameterset='<label>'.&mt('Randomly Pick: ').
-	    '<input type="text" size="4" onchange="this.form.changeparms.value='."'randompick'".';this.form.submit()" name="randompick_'.$orderidx.'" value="'.
-	    (&LONCAPA::map::getparameter($orderidx,
-                                              'parameter_randompick'))[0].
-                                              '" />'.
-'<a href="javascript:void(0)">'.&mt('Save').'</a></label>';
-    	my $ro_set=
-	    ((&LONCAPA::map::getparameter($orderidx,'parameter_randomorder'))[0]=~/^yes$/i?' checked="checked"':'');
-	$rand_order_text ='
-<span class="LC_nobreak"><label><input type="checkbox" name="randomorder_'.$orderidx.'" onclick="this.form.changeparms.value=\'randomorder\';this.form.submit()" '.$ro_set.' /> '.&mt('Random Order').' </label></span>';
-    }
-    if ($ispage) {
-        my $pagename=&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='.&escape($pagepath).
-	    '&amp;pagesymb='.&escape($symb).$cpinfo;
-    }
-    if (($external) && ($allowed)) {
-	my $form = ($folder =~ /^default/)? 'newext' : 'supnewext';
-	$external = '&nbsp;<a class="LC_docs_ext_edit" href="javascript:edittext(\''.$form.'\',\''.$residx.'\',\''.&escape($title).'\',\''.&escape($orig_url).'\');" >'.&mt('Edit').'</a>';
-    } else {
-	undef($external);
+	    $folderpath.=$containerarg.'&'.$foldername.
+                         ':'.$rpicknum.':'.$hiddenmap.':'.$encryptmap.':'.$randorder.':'.$ispage;
+            unless ($url eq '') {
+                $url.='folderpath='.&escape($folderpath);
+            }
+            my $rpckchk;
+            if ($rpicknum) {
+                $rpckchk = ' checked="checked"';
+                if (($ishash) && (ref($filtersref->{'randompick'}) eq 'ARRAY')) {
+                    push(@{$filtersref->{'randompick'}},$orderidx.':'.$rpicknum);
+                }
+            }
+            my $formname = 'edit_randompick_'.$orderidx;
+	    $rand_pick_text = 
+'<form action="/adm/coursedocs" method="post" name="'.$formname.'">'."\n".
+$form_param."\n".
+$form_common."\n".
+'<span class="LC_nobreak"><label><input type="checkbox" name="randompick_'.$orderidx.'" id="randompick_'.$orderidx.'" onclick="'."updatePick(this.form,'$orderidx','check');".'"'.$rpckchk.$disabled.' /> '.&mt('Randomly Pick').'</label><input type="hidden" name="rpicknum_'.$orderidx.'" id="rpicknum_'.$orderidx.'" value="'.$rpicknum.'" /><span id="randompicknum_'.$orderidx.'">';
+            if ($rpicknum ne '') {
+                $rand_pick_text .= ':&nbsp;<a href="javascript:updatePick('."document.$formname,'$orderidx','link'".')">'.$rpicknum.'</a>';
+            }
+            $rand_pick_text .= '</span></span>'.
+                               $form_end;
+            my $ro_set;
+            if ($randorder) {
+                $ro_set = 'checked="checked"';
+                if (($ishash) && (ref($filtersref->{'randomorder'}) eq 'ARRAY')) {
+                    push(@{$filtersref->{'randomorder'}},$orderidx);
+                }
+            }
+            $formname = 'edit_rorder_'.$orderidx;
+	    $rand_order_text = 
+'<form action="/adm/coursedocs" method="post" name="'.$formname.'">'."\n".
+$form_param."\n".
+$form_common."\n".
+'<span class="LC_nobreak"><label><input type="checkbox" name="randomorder_'.$orderidx.'" id="randomorder_'.$orderidx.'" onclick="checkForSubmit(this.form,'."'randomorder','settings'".');" '.$ro_set.$disabled.' /> '.&mt('Random Order').' </label></span>'.
+$form_end; 
+        }
+    } elsif ($supplementalflag) {
+        my $isexttool;
+        if ($url=~m{^/adm/$coursedom/$coursenum/\d+/ext\.tool$}) {
+            $url='/adm/wrapper'.$url;
+            $isexttool = 1;
+        }
+        $url .= ($url =~ /\?/) ? '&amp;':'?';
+        $url .= 'folderpath='.&HTML::Entities::encode($esc_path,'<>&"');
+        if ($title) {
+            $url .= '&amp;title='.$encodedtitle;
+        }
+        if ((($isexternal) || ($isexttool)) && $orderidx) {
+            $url .= '&amp;idx='.$orderidx;
+        }
+        if ($anchor ne '') {
+            $url .= '&amp;anchor='.&HTML::Entities::encode($anchor,'"<>&');
+        }
+    }
+    my ($tdalign,$tdwidth);
+    if ($allowed) {
+        my $fileloc =
+            &Apache::lonnet::declutter(&Apache::lonnet::filelocation('',$orig_url));
+        if ($isexternal) {
+            ($editlink,$extresform) =
+                &Apache::lonextresedit::extedit_form(0,$residx,$orig_url,$title,$pathitem,
+                                                     undef,undef,undef,undef,undef,undef,
+                                                     undef,$disabled);
+        } elsif ($orig_url =~ m{^/adm/$coursedom/$coursenum/\d+/ext\.tool$}) {
+            ($editlink,$extresform) =
+                &Apache::lonextresedit::extedit_form(0,$residx,$orig_url,$title,$pathitem,
+                                                     undef,undef,undef,'tool',$coursedom,
+                                                     $coursenum,$ltitoolsref,$disabled);
+        } elsif (!$isfolder && !$ispage) {
+            my ($cfile,$home,$switchserver,$forceedit,$forceview) = 
+                &Apache::lonnet::can_edit_resource($fileloc,$coursenum,$coursedom,$orig_url);
+            if (($cfile ne '') && ($symb ne '' || $supplementalflag)) {
+                my $suppanchor;
+                if ($supplementalflag) {
+                    $suppanchor = $anchor;
+                }
+                my $jscall =
+                    &Apache::lonhtmlcommon::jump_to_editres($cfile,$home,
+                                                            $switchserver,
+                                                            $forceedit,
+                                                            undef,$symb,$shownsymb,
+                                                            &escape($env{'form.folderpath'}),
+                                                            $renametitle,$hostname,
+                                                            '','',1,$suppanchor);
+                if ($jscall) {
+                    $editlink = '<a class="LC_docs_ext_edit" href="javascript:'.
+                                $jscall.'" >'.&mt('Edit').'</a>&nbsp;'."\n";
+                }
+            }
+        }
+        $tdalign = ' align="right" valign="top"';
+        $tdwidth = ' width="80%"';
     }
     my $reinit;
     if ($crstype eq 'Community') {
         $reinit = &mt('(re-initialize community to access)');
     } else {
         $reinit = &mt('(re-initialize course to access)');
-    }  
-    $line.='<td>';
+    }
+    if ($allowed) {
+        $line.='<td class="LC_docs_entry_commands"'.$tdalign.'><span class="LC_nobreak">'.$editlink.$renamelink.'</span>';
+        if ($orig_url =~ /$LONCAPA::assess_re/) {
+            $line.= '<br />';
+            if ($curralias ne '') {
+                $line.='<span class="LC_nobreak"><a href="javascript:delalias('."'$esc_path','$orderidx'".');" class="LC_docs_alias">'.
+                       $lt{'da'}.'</a></span>';
+            } else {
+                $line.='<span class="LC_nobreak"><a href="javascript:setalias('."'$esc_path','$orderidx'".');" class="LC_docs_alias">'.
+                       $lt{'sa'}.'</a></span>';
+            }
+        }
+        $line.='</td>';
+    }
+    $line .= '<td><span class="LC_nobreak">';
+    my ($link,$nolink);
     if (($url=~m{/adm/(coursedocs|supplemental)}) || (!$allowed && $url)) {
-       $line.='<a href="'.$url.'"><img src="'.$icon.'" alt="" class="LC_icon" /></a>';
+        if ($allowed && !$env{'request.role.adv'} && !$isfolder && !$ispage) {
+            if ((&LONCAPA::map::getparameter($orderidx,'parameter_hiddenresource'))[0]=~/^yes$/i) {
+                $nolink = 1;
+            }
+        }
+        if ($nolink) {
+            $line .= '<img src="'.$icon.'" alt="'.$icontext.'" class="LC_icon" /></a>';
+        } else {
+            $line.='<a href="'.$url.'"><img src="'.$icon.'" alt="'.$icontext.'" class="LC_icon" /></a>';
+        }
     } elsif ($url) {
-       $line.=&Apache::loncommon::modal_link($url.(($url=~/\?/)?'&':'?').'inhibitmenu=yes',
-                                             '<img src="'.$icon.'" alt="" class="LC_icon" />',600,500);
+       if ($anchor ne '') {
+           if ($supplementalflag) {
+               $anchor = '&amp;anchor='.&HTML::Entities::encode($anchor,'"<>&');
+           } else {
+               $anchor = '#'.&HTML::Entities::encode($anchor,'"<>&');
+           }
+       }
+       if (($nomodal) && ($hostname ne '')) {
+           $link = 'http://'.$hostname.$url;
+       } else {
+           $link = $url;
+       }
+       my $inhibitmenu;
+       if ((($supplementalflag) && ($allowed) && ($url =~ m{^/adm/wrapper/})) ||
+           (($allowed) && (($url =~ m{^/adm/(viewclasslist|$match_domain/$match_username/aboutme)(\?|$)}) ||
+                           ($url =~ m{^/public/$match_domain/$match_courseid/syllabus(\?|$)})))) {
+           $inhibitmenu = 'only_body=1';
+       } else {
+           $inhibitmenu = 'inhibitmenu=yes';
+       }
+       $link = &js_escape($link.(($url=~/\?/)?'&amp;':'?').$inhibitmenu.$anchor);
+       if ($allowed && !$env{'request.role.adv'} && !$isfolder && !$ispage && !$uploaded) {
+           if ((&LONCAPA::map::getparameter($orderidx,'parameter_hiddenresource'))[0]=~/^yes$/i) {
+               $nolink = 1;
+           }
+       }
+       if ($nolink) {
+           $line.='<img src="'.$icon.'" alt="'.$icontext.'" class="LC_icon" />';
+       } elsif ($nomodal) {
+           $line.='<a href="#" onclick="javascript:window.open('."'$link','syllabuspreview','height=400,width=500,scrollbars=1,resizable=1,menubar=0,location=1')".'; return false;" />'.
+                  '<img src="'.$icon.'" alt="'.$icontext.'" class="LC_icon" border="0" /></a>';
+       } else {
+           $line.=&Apache::loncommon::modal_link($link,
+                                                 '<img src="'.$icon.'" alt="'.$icontext.'" class="LC_icon" />',600,500);
+       }
     } else {
-       $line.='<img src="'.$icon.'" alt="" class="LC_icon" />';
+       $line.='<img src="'.$icon.'" alt="'.$icontext.'" class="LC_icon" />';
     }
-    $line.='</td><td>';
+    $line.='</span></td><td'.$tdwidth.'>';
     if (($url=~m{/adm/(coursedocs|supplemental)}) || (!$allowed && $url)) {
-       $line.='<a href="'.$url.'">'.$title.'</a>';
+       if ($nolink) {
+           $line.=$title;
+       } else {
+           $line.='<a href="'.$url.'">'.$title.'</a>';
+       }
+       if (!$allowed && $supplementalflag && $canedit && $isfolder) {
+           my $editicon = &Apache::loncommon::lonhttpdurl('/res/adm/pages').'/editmap.png';
+           my $editurl = $url;
+           $editurl =~ s{^\Q/adm/supplemental?\E}{/adm/coursedocs?command=direct&amp;forcesupplement=1&amp;};
+           $line .= '&nbsp;'.'<a href="'.$editurl.'">'.
+                    '<img src="'.$editicon.'" alt="'.&mt('Edit Content').'" title="'.&mt('Edit Content').'" />'.
+                    '</a>';
+       }
+       if ((($hiddenfolder) || ($hiddenres)) && (!$allowed) && ($supplementalflag))  {
+           $line.= ' <span class="LC_warning">('.&mt('hidden').')</span> ';
+       }
     } elsif ($url) {
-       $line.=&Apache::loncommon::modal_link($url.(($url=~/\?/)?'&':'?').'inhibitmenu=yes',
-                                             $title,600,500);
+       if ($nolink) {
+           $line.=$title;
+       } elsif ($nomodal) {
+           $line.='<a href="#" onclick="javascript:window.open('."'$link','syllabuspreview','height=400,width=500,scrollbars=1,resizable=1,menubar=0,location=1')".'; return false;" />'.
+                  $title.'</a>';
+       } else {
+           $line.=&Apache::loncommon::modal_link($link,$title,600,500);
+       }
+    } elsif (($hiddenfolder) || ($hiddenres)) {
+       $line.=$title.' <span class="LC_warning LC_docs_reinit_warn">('.&mt('Hidden').')</span>';
     } else {
        $line.=$title.' <span class="LC_docs_reinit_warn">'.$reinit.'</span>';
     }
-    $line.=$external."</td>";
-    if (($allowed) && ($folder!~/^supplemental/)) {
- 	my %lt=&Apache::lonlocal::texthash(
- 			      'hd' => 'Hidden',
- 			      'ec' => 'URL hidden');
-	my $enctext=
-	    ((&LONCAPA::map::getparameter($orderidx,'parameter_encrypturl'))[0]=~/^yes$/i?' checked="checked"':'');
-	my $hidtext=
-	    ((&LONCAPA::map::getparameter($orderidx,'parameter_hiddenresource'))[0]=~/^yes$/i?' checked="checked"':'');
-	$line.=(<<ENDPARMS);
+    if (($allowed) && ($curralias ne '')) {
+        $line .= '<br /><span class="LC_docs_alias_name">('.$curralias.')</span>';
+    } else {
+        $line .= $extresform;
+    }
+    $line .= '</td>';
+    $rand_pick_text = '&nbsp;' if ($rand_pick_text eq '');
+    $rand_order_text = '&nbsp;' if ($rand_order_text eq '');
+    if ($uploaded && $url && !$isfolder && !$ispage) {
+        if (($plainurl ne '') && ($env{'request.role.adv'} || $allowed || !$hiddenres)) {
+            &Apache::lonnet::allowuploaded('/adm/coursedoc',$plainurl);
+        }
+    }
+    if ($allowed) {
+        my %lt=&Apache::lonlocal::texthash(
+                              'hd' => 'Hidden',
+                              'ec' => 'URL hidden');
+        my ($enctext,$hidtext,$formhidden,$formurlhidden);
+        if ((&LONCAPA::map::getparameter($orderidx,'parameter_hiddenresource'))[0]=~/^yes$/i) {
+            $hidtext = ' checked="checked"';
+            if (($ishash) && (ref($filtersref->{'hiddenresource'}) eq 'ARRAY')) {
+                push(@{$filtersref->{'hiddenresource'}},$orderidx);
+            }
+        }
+        $formhidden = 'edit_hiddenresource_'.$orderidx;
+        $line.=(<<ENDPARMS);
   <td class="LC_docs_entry_parameter">
-    $form_start
-    <label><input type="checkbox" name="hiddenresource_$orderidx" onclick="this.form.changeparms.value='hiddenresource';this.form.submit()" $hidtext /> $lt{'hd'}</label>
+    <form action="/adm/coursedocs" method="post" name="$formhidden">
+    $form_param
+    $form_common
+    <label><input type="checkbox" name="hiddenresource_$orderidx" id="hiddenresource_$orderidx" onclick="checkForSubmit(this.form,'hiddenresource','settings');" $hidtext $disabled /> $lt{'hd'}</label>
     $form_end
+ENDPARMS
+        if ($folder =~/^supplemental/) {
+            $line.= "\n    <td>";
+        } else {
+            if ((&LONCAPA::map::getparameter($orderidx,'parameter_encrypturl'))[0]=~/^yes$/i) {
+                $enctext = ' checked="checked"';
+                if (($ishash) && (ref($filtersref->{'encrypturl'}) eq 'ARRAY')) {
+                    push(@{$filtersref->{'encrypturl'}},$orderidx);
+                }
+            }
+            $formurlhidden = 'edit_encrypturl_'.$orderidx;
+	    $line.=(<<ENDPARMS);
     <br />
-    $form_start
-    <label><input type="checkbox" name="encrypturl_$orderidx" onclick="this.form.changeparms.value='encrypturl';this.form.submit()" $enctext /> $lt{'ec'}</label>
+    <form action="/adm/coursedocs" method="post" name="$formurlhidden">
+    $form_param
+    $form_common
+    <label><input type="checkbox" name="encrypturl_$orderidx" id="encrypturl_$orderidx" onclick="checkForSubmit(this.form,'encrypturl','settings');" $enctext $disabled /> $lt{'ec'}</label>
     $form_end
   </td>
-  <td class="LC_docs_entry_parameter">$form_start $parameterset $form_end<br />
-                                      $form_start $rand_order_text $form_end</td>
+  <td class="LC_docs_entry_parameter">$rand_pick_text<br />
+                                      $rand_order_text</td>
 ENDPARMS
+        }
     }
     $line.=&Apache::loncommon::end_data_table_row();
     return $line;
 }
 
+sub action_restrictions {
+    my ($cnum,$cdom,$url,$folderpath,$currgroups) = @_;
+    my %denied = (
+                   cut    => 0,
+                   copy   => 0,
+                   remove => 0,
+                 );
+    if ($url=~ m{^/res/.+\.(page|sequence)$}) {
+        # no copy for published maps
+        $denied{'copy'} = 1;
+    } elsif ($url=~m{^/res/lib/templates/([^/]+)\.problem$}) {
+        unless ($1 eq 'simpleproblem') {
+            $denied{'copy'} = 1;
+        }
+        $denied{'cut'} = 1;
+    } elsif ($url eq "/uploaded/$cdom/$cnum/group_allfolders.sequence") {
+        if ($folderpath =~ /^default&[^\&]+$/) {
+            if ((ref($currgroups) eq 'HASH') && (keys(%{$currgroups}) > 0)) {
+                $denied{'remove'} = 1;
+            }
+            $denied{'cut'} = 1;
+            $denied{'copy'} = 1;
+        }
+    } elsif ($url =~ m{^\Q/uploaded/$cdom/$cnum/group_folder_\E(\w+)\.sequence$}) {
+        my $group = $1;
+        if ($folderpath =~ /^default&[^\&]+\&group_allfolders\&[^\&]+$/) {
+            if ((ref($currgroups) eq 'HASH') && (exists($currgroups->{$group}))) {
+                $denied{'remove'} = 1;
+            }
+        }
+        $denied{'cut'} = 1;
+        $denied{'copy'} = 1;
+    } elsif ($url =~ m{^\Q/adm/$cdom/$cnum/\E(\w+)/smppg$}) {
+        my $group = $1;
+        if ($folderpath =~ /^default&[^\&]+\&group_allfolders\&[^\&]+\&\Qgroup_folder_$group\E\&[^\&]+$/) {
+            if ((ref($currgroups) eq 'HASH') && (exists($currgroups->{$group}))) {
+                my %groupsettings = &Apache::longroup::get_group_settings($currgroups->{$group});
+                if (keys(%groupsettings) > 0) {
+                    $denied{'remove'} = 1;
+                }
+                $denied{'cut'} = 1;
+                $denied{'copy'} = 1;
+            }
+        }
+    } elsif ($folderpath =~ /^default&[^\&]+\&group_allfolders\&[^\&]+\&group_folder_(\w+)\&/) {
+        my $group = $1;
+        if ($url =~ /group_boards_\Q$group\E/) {
+            if ((ref($currgroups) eq 'HASH') && (exists($currgroups->{$group}))) {
+                my %groupsettings = &Apache::longroup::get_group_settings($currgroups->{$group});
+                if (keys(%groupsettings) > 0) {
+                    if (ref($groupsettings{'functions'}) eq 'HASH') {
+                        if ($groupsettings{'functions'}{'discussion'} eq 'on') {
+                            $denied{'remove'} = 1;
+                        }
+                    }
+                }
+                $denied{'cut'} = 1;
+                $denied{'copy'} = 1;
+            }
+        }
+    }
+    return %denied;
+}
+
+sub new_timebased_suffix {
+    my ($dom,$num,$type,$area,$container) = @_;
+    my ($prefix,$namespace,$idtype,$errtext,$locknotfreed);
+    if ($type eq 'paste') {
+        $prefix = $type;
+        $namespace = 'courseeditor';
+        $idtype = 'addcode';
+    } elsif ($type eq 'map') {
+        $prefix = 'docs';
+        if ($area eq 'supplemental') {
+            $prefix = 'supp';
+        }
+        $prefix .= $container;
+        $namespace = 'uploadedmaps';
+    } else {
+        $prefix = $type;
+        $namespace = 'templated';
+    }
+    my ($suffix,$freedlock,$error) =
+        &Apache::lonnet::get_timebased_id($prefix,'num',$namespace,$dom,$num,$idtype);
+    if (!$suffix) {
+        if ($type eq 'paste') {
+            $errtext = &mt('Failed to acquire a unique timestamp-based suffix when adding to the paste buffer.');
+        } elsif ($type eq 'map') {
+            $errtext = &mt('Failed to acquire a unique timestamp-based suffix for the new folder/page.');
+        } elsif ($type eq 'smppg') {
+            $errtext = &mt('Failed to acquire a unique timestamp-based suffix for the new simple page.');
+        } elsif ($type eq 'exttool') {
+            $errtext = &mt('Failed to acquire a unique timestamp-based suffix for the new external tool.');
+        } else {
+            $errtext = &mt('Failed to acquire a unique timestamp-based suffix for the new discussion board.');
+        }
+        if ($error) {
+            $errtext .= '<br />'.$error;
+        }
+    }
+    if ($freedlock ne 'ok') {
+        $locknotfreed =
+            '<div class="LC_error">'.
+            &mt('There was a problem removing a lockfile.').' ';
+        if ($type eq 'paste') {
+            if ($freedlock eq 'nolock') {
+                $locknotfreed =
+                    '<div class="LC_error">'.
+                    &mt('A lockfile was not released when you added content to the clipboard earlier in this session.').' '.
+ 
+                    &mt('As a result addition of items to the clipboard will be unavailable until your next log-in.');
+            } else { 
+                $locknotfreed .=
+                    &mt('This will prevent addition of items to the clipboard until your next log-in.');
+            }
+        } elsif ($type eq 'map') {
+            $locknotfreed .=
+                &mt('This will prevent creation of additional folders or composite pages in this course.');
+        } elsif ($type eq 'smppg') {
+            $locknotfreed .=
+                &mt('This will prevent creation of additional simple pages in this course.');
+        } elsif ($type eq 'exttool') {
+            $locknotfreed .=
+                &mt('This will prevent creation of additional external tools in this course.');
+        } else {
+            $locknotfreed .=
+                &mt('This will prevent creation of additional discussion boards in this course.');
+        }
+        unless ($type eq 'paste') {
+            $locknotfreed .=
+                ' '.&mt('Please contact the [_1]helpdesk[_2] for assistance.',
+                        '<a href="/adm/helpdesk" target="_helpdesk">','</a>');
+        }
+        $locknotfreed .= '</div>';
+    }
+    return ($suffix,$errtext,$locknotfreed);
+}
+
 =pod
 
 =item tiehash()
@@ -1500,7 +6260,7 @@ sub untiehash {
 
 
 sub checkonthis {
-    my ($r,$url,$level,$title)=@_;
+    my ($r,$url,$level,$title,$checkstale)=@_;
     $url=&unescape($url);
     $alreadyseen{$url}=1;
     $r->rflush();
@@ -1515,10 +6275,22 @@ sub checkonthis {
        $r->print('<a href="'.$url.'" target="cat">'.
 		 ($title?$title:$url).'</a> ');
        if ($url=~/^\/res\//) {
+          my $updated;
+          if (($checkstale) && ($url !~ m{^/res/lib/templates/}) &&
+              ($url !~ /\.\d+\.\w+$/)) {
+              $updated = &Apache::lonnet::remove_stale_resfile($url);
+          }
 	  my $result=&Apache::lonnet::repcopy(
                               &Apache::lonnet::filelocation('',$url));
           if ($result eq 'ok') {
              $r->print('<span class="LC_success">'.&mt('ok').'</span>');
+             if ($updated) {
+                 $r->print('<br />');
+                 for (my $i=0;$i<=$level*5;$i++) {
+                     $r->print('&nbsp;');
+                 }
+                 $r->print('- '.&mt('Outdated copy removed'));
+             }
              $r->rflush();
              &Apache::lonnet::countacc($url);
              $url=~/\.(\w+)$/;
@@ -1552,20 +6324,23 @@ sub checkonthis {
                 &Apache::lonnet::metadata($url,'dependencies');
              foreach my $dep (split(/\,/,$dependencies)) {
 		 if (($dep=~/^\/res\//) && (!$alreadyseen{$dep})) {
-                    &checkonthis($r,$dep,$level+1);
+                    &checkonthis($r,$dep,$level+1,'',$checkstale);
                  }
              }
           } elsif ($result eq 'unavailable') {
              $r->print('<span class="LC_error">'.&mt('connection down').'</span>');
           } elsif ($result eq 'not_found') {
 	      unless ($url=~/\$/) {
-		  $r->print('<span class="LC_error">'.&mt('not found').'</b></span>');
+		  $r->print('<span class="LC_error">'.&mt('not found').'</span>');
 	      } else {
 		  $r->print('<span class="LC_error">'.&mt('unable to verify variable URL').'</span>');
 	      }
           } else {
              $r->print('<span class="LC_error">'.&mt('access denied').'</span>');
           }
+          if (($updated) && ($result ne 'ok')) {
+              $r->print('<br />'.&mt('Outdated copy removed'));
+          }
        }
     }
 }
@@ -1576,7 +6351,7 @@ sub checkonthis {
 
 =item list_symbs()
 
-List Symbs
+List Content Identifiers
 
 =cut
 
@@ -1584,9 +6359,9 @@ sub list_symbs {
     my ($r) = @_;
 
     my $crstype = &Apache::loncommon::course_type();
-    $r->print(&Apache::loncommon::start_page('Symb List'));
-    $r->print(&Apache::lonhtmlcommon::breadcrumbs('Symb List'));
-    &startContentScreen($r,'tools');
+    $r->print(&Apache::loncommon::start_page('List of Content Identifiers'));
+    $r->print(&Apache::lonhtmlcommon::breadcrumbs('Content Identifiers'));
+    $r->print(&startContentScreen('tools'));
     my $navmap = Apache::lonnavmaps::navmap->new();
     if (!defined($navmap)) {
         $r->print('<h2>'.&mt('Retrieval of List Failed').'</h2>'.
@@ -1595,25 +6370,104 @@ sub list_symbs {
                   '</div>');
         &Apache::lonnet::logthis('Symb list failed - could not create navmap object in '.lc($crstype).':'.$env{'request.course.id'});
     } else {
-        $r->print("<pre>\n");
+        $r->print('<h4 class="LC_info">'.&mt("$crstype Content Identifiers").'</h4>'.
+                  &Apache::loncommon::start_data_table().
+                  &Apache::loncommon::start_data_table_header_row().
+                  '<th>'.&mt('Title').'</th><th>'.&mt('Identifier').'</th>'.
+                  &Apache::loncommon::end_data_table_header_row()."\n");
+        my $count;
         foreach my $res ($navmap->retrieveResources()) {
-            $r->print($res->compTitle()."\t".$res->symb()."\n");
+            $r->print(&Apache::loncommon::start_data_table_row().
+                      '<td>'.$res->compTitle().'</td>'.
+                      '<td>'.$res->symb().'</td>'.
+                      &Apache::loncommon::end_data_table_row());
+            $count ++;
         }
-        $r->print("\n</pre>\n");
+        if (!$count) {
+            $r->print(&Apache::loncommon::start_data_table_row().
+                      '<td colspan="2">'.&mt("$crstype is empty").'</td>'.
+                      &Apache::loncommon::end_data_table_row()); 
+        }
+        $r->print(&Apache::loncommon::end_data_table());
     }
+    $r->print(&endContentScreen());
 }
 
+sub short_urls {
+    my ($r,$canedit) = @_;
+    my $crstype = &Apache::loncommon::course_type();
+    my $formname = 'shortenurl';
+    $r->print(&Apache::loncommon::start_page('Display/Set Shortened URLs'));
+    $r->print(&Apache::lonhtmlcommon::breadcrumbs('Shortened URLs'));
+    $r->print(&startContentScreen('tools'));
+    my ($navmap,$errormsg) =
+        &Apache::loncourserespicker::get_navmap_object($crstype,'shorturls');
+    my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+    my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+    my (%maps,%resources,%titles);
+    if (!ref($navmap)) {
+        $r->print($errormsg.
+                  &endContentScreen());
+        return '';
+    } else {
+        $r->print('<h4 class="LC_info">'.&mt('Tiny URLs for deep-linking into course').'</h4>'."\n");
+        $r->rflush();
+        my $readonly;
+        if ($canedit) {
+            my ($numnew,$errors) = &Apache::loncommon::get_requested_shorturls($cdom,$cnum,$navmap);
+            if ($numnew) {
+                $r->print('<p class="LC_info">'.&mt('Created [quant,_1,URL]',$numnew).'</p>');
+            }
+            if ((ref($errors) eq 'ARRAY') && (@{$errors} > 0)) {
+                $r->print(&mt('The following errors occurred when processing your request to create shortened URLs:').'<br /><ul>');
+                foreach my $error (@{$errors}) {
+                    $r->print('<li>'.$error.'</li>');
+                }
+                $r->print('</ul><br />');
+            }
+        } else {
+            $readonly = 1;
+        }
+        my %currtiny = &Apache::lonnet::dump('tiny',$cdom,$cnum);
+        $r->print(&Apache::loncourserespicker::create_picker($navmap,'shorturls',$formname,$crstype,undef,
+                                                             undef,undef,undef,undef,undef,\%currtiny,undef,$readonly));
+    }
+    $r->print(&endContentScreen());
+}
 
-sub verifycontent {
+sub contentverifyform {
     my ($r) = @_;
     my $crstype = &Apache::loncommon::course_type();
-   $r->print(&Apache::loncommon::start_page('Verify '.$crstype.' Documents'));
-   $r->print(&Apache::lonhtmlcommon::breadcrumbs('Verify '.$crstype.' Documents'));
-   &startContentScreen($r,'tools');
+    $r->print(&Apache::loncommon::start_page('Verify '.$crstype.' Content'));
+    $r->print(&Apache::lonhtmlcommon::breadcrumbs('Verify '.$crstype.' Content'));
+    $r->print(&startContentScreen('tools'));
+    $r->print('<h4 class="LC_info">'.&mt($crstype.' content verification').'</h4>');
+    $r->print('<form method="post" action="/adm/coursedocs"><p>'.
+              &mt('Include a check if files copied from elsewhere are up to date (will increase verification time)?').
+              '&nbsp;<span class="LC_nobreak">'.
+              '<label><input type="radio" name="checkstale" value="0" checked="checked" />'.
+              &mt('No').'</label>'.('&nbsp;'x2).
+              '<label><input type="radio" name="checkstale" value="1" />'.
+              &mt('Yes').'</label></span></p><p>'.
+              '<input type="submit" value="'.&mt('Verify Content').' "/>'.
+              '<input type="hidden" value="1" name="tools" />'.
+              '<input type="hidden" value="1" name="verify" /></p></form>');
+    $r->print(&endContentScreen());
+    return;
+}
+
+sub verifycontent {
+    my ($r,$checkstale) = @_;
+    my $crstype = &Apache::loncommon::course_type();
+    $r->print(&Apache::loncommon::start_page('Verify '.$crstype.' Content'));
+    $r->print(&Apache::lonhtmlcommon::breadcrumbs('Verify '.$crstype.' Content'));
+    $r->print(&startContentScreen('tools'));
+    $r->print('<h4 class="LC_info">'.&mt($crstype.' content verification').'</h4>'); 
    $hashtied=0;
    undef %alreadyseen;
    %alreadyseen=();
    &tiehash();
+   
    foreach my $key (keys(%hash)) {
        if ($hash{$key}=~/\.(page|sequence)$/) {
 	   if (($key=~/^src_/) && ($alreadyseen{&unescape($hash{$key})})) {
@@ -1624,14 +6478,14 @@ sub verifycontent {
 	   }
        }
        if (($key=~/^src\_(.+)$/) && (!$alreadyseen{&unescape($hash{$key})})) {
-           &checkonthis($r,$hash{$key},0,$hash{'title_'.$1});
+           &checkonthis($r,$hash{$key},0,$hash{'title_'.$1},$checkstale);
        }
    }
    &untiehash();
    $r->print('<p class="LC_success">'.&mt('Done').'</p>');
+    $r->print(&endContentScreen());
 }
 
-
 sub devalidateversioncache {
     my $src=shift;
     &Apache::lonnet::devalidate_cache_new('courseresversion',$env{'request.course.id'}.'_'.
@@ -1639,11 +6493,11 @@ sub devalidateversioncache {
 }
 
 sub checkversions {
-    my ($r) = @_;
+    my ($r,$canedit) = @_;
     my $crstype = &Apache::loncommon::course_type();
-    $r->print(&Apache::loncommon::start_page("Check $crstype Document Versions"));
-    $r->print(&Apache::lonhtmlcommon::breadcrumbs("Check $crstype Document Versions"));
-    &startContentScreen($r,'tools');
+    $r->print(&Apache::loncommon::start_page("Check $crstype Resource Versions"));
+    $r->print(&Apache::lonhtmlcommon::breadcrumbs("Check $crstype Resource Versions"));
+    $r->print(&startContentScreen('tools'));
 
     my $header='';
     my $startsel='';
@@ -1660,53 +6514,57 @@ sub checkversions {
 
     $hashtied=0;
     &tiehash();
-    my %newsetversions=();
-    if ($env{'form.setmostrecent'}) {
-	$haschanged=1;
-	foreach my $key (keys(%hash)) {
-	    if ($key=~/^ids\_(\/res\/.+)$/) {
-		$newsetversions{$1}='mostrecent';
-                &devalidateversioncache($1);
+    if ($canedit) {
+        my %newsetversions=();
+        if ($env{'form.setmostrecent'}) {
+	    $haschanged=1;
+	    foreach my $key (keys(%hash)) {
+	        if ($key=~/^ids\_(\/res\/.+)$/) {
+		    $newsetversions{$1}='mostrecent';
+                    &devalidateversioncache($1);
+	        }
 	    }
-	}
-    } elsif ($env{'form.setcurrent'}) {
-	$haschanged=1;
-	foreach my $key (keys(%hash)) {
-	    if ($key=~/^ids\_(\/res\/.+)$/) {
-		my $getvers=&Apache::lonnet::getversion($1);
-		if ($getvers>0) {
-		    $newsetversions{$1}=$getvers;
-		    &devalidateversioncache($1);
-		}
+        } elsif ($env{'form.setcurrent'}) {
+	    $haschanged=1;
+	    foreach my $key (keys(%hash)) {
+	        if ($key=~/^ids\_(\/res\/.+)$/) {
+		    my $getvers=&Apache::lonnet::getversion($1);
+		    if ($getvers>0) {
+		        $newsetversions{$1}=$getvers;
+		        &devalidateversioncache($1);
+		    }
+	        }
 	    }
-	}
-    } elsif ($env{'form.setversions'}) {
-	$haschanged=1;
-	foreach my $key (keys(%env)) {
-	    if ($key=~/^form\.set_version_(.+)$/) {
-		my $src=$1;
-		if (($env{$key}) && ($env{$key} ne $setversions{$src})) {
-		    $newsetversions{$src}=$env{$key};
-		    &devalidateversioncache($src);
-		}
+        } elsif ($env{'form.setversions'}) {
+	    $haschanged=1;
+	    foreach my $key (keys(%env)) {
+	        if ($key=~/^form\.set_version_(.+)$/) {
+		    my $src=$1;
+		    if (($env{$key}) && ($env{$key} ne $setversions{$src})) {
+		        $newsetversions{$src}=$env{$key};
+		        &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 Saved').'</h1>');
-	} else {
-	    $r->print('<h1><span class="LC_error">'.&mt('An Error Occured while Attempting to Save your Version Settings').'</span></h1>');
-	}
-	&mark_hash_old();
+        }
+        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(&Apache::loncommon::confirmwrapper(
+                    &Apache::lonhtmlcommon::confirm_success(&mt('Your Version Settings have been Saved'))));
+	    } else {
+	        $r->print(&Apache::loncommon::confirmwrapper(
+                    &Apache::lonhtmlcommon::confirm_success(&mt('An Error Occured while Attempting to Save your Version Settings'),1)));
+	    }
+	    &mark_hash_old();
+        }
+        &changewarning($r,'');
     }
-    &changewarning($r,'');
     if ($env{'form.timerange'} eq 'all') {
 # show all documents
-	$header=&mt('All Documents in '.$crstype);
-	$allsel=1;
+	$header=&mt('All content in '.$crstype);
+	$allsel=' selected="selected"';
 	foreach my $key (keys(%hash)) {
 	    if ($key=~/^ids\_(\/res\/.+)$/) {
 		my $src=$1;
@@ -1727,19 +6585,19 @@ sub checkversions {
 		.&mt('seconds');
 	    if ($env{'form.timerange'}==-1) {
 		$seltext='since start of course';
-		$startsel='selected';
+		$startsel=' selected="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';
+		$monthsel=' selected="selected"';
 	    } elsif ($env{'form.timerange'}==604800) {
 		$seltext=&mt('during the last week').' ('.&Apache::lonlocal::locallocaltime($starttime).')';
-		$weeksel='selected';
+		$weeksel=' selected="selected"';
 	    } elsif ($env{'form.timerange'}==86400) {
 		$seltext=&mt('since yesterday').' ('.&Apache::lonlocal::locallocaltime($starttime).')';
-		$daysel='selected';
+		$daysel=' selected="selected"';
 	    }
 	    $header=&mt('Content changed').' '.$seltext;
 	} else {
@@ -1755,6 +6613,7 @@ sub checkversions {
 	       'lw' => 'Version changes since last Week',
 	       'sy' => 'Version changes since Yesterday',
                'al' => 'All Resources (possibly large output)',
+               'cd' => 'Change display', 
 	       'sd' => 'Display',
 	       'fi' => 'File',
 	       'md' => 'Modification Date',
@@ -1764,125 +6623,151 @@ sub checkversions {
 'sv' => 'Set Versions to be used in '.$crstype.' 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');
+	       'di' => 'Differences',
+	       'save' => 'Save changes',
+               'vers' => 'Version choice(s) for specific resources', 
+	       'act' => 'Actions');
+    my ($disabled,$readonly);
+    unless ($canedit) {
+        $disabled = 'disabled="disabled"';
+        $readonly = 1;
+    }
     $r->print(<<ENDHEADERS);
+<h4 class="LC_info">$header</h4>
 <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 />
+<div class="LC_left_float">
+<fieldset>
+<legend>$lt{'cd'}</legend>
 <select name="timerange">
-<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>
+<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="display" value="$lt{'sd'}" />
-<h3>$header</h3>
-<input type="submit" name="setversions" value="$lt{'sv'}" />
-<table border="0">
+</fieldset>
+</div>
+<div class="LC_left_float">
+<fieldset>
+<legend>$lt{'act'}</legend>
+$lt{'sm'}: <input type="submit" name="setmostrecent" value="Go" $disabled /><br />
+$lt{'sc'}: <input type="submit" name="setcurrent" value="Go" $disabled />
+</fieldset>
+</div>
+<br clear="all" />
+<hr />
+<h4>$lt{'vers'}</h4>
 ENDHEADERS
-    foreach my $key (sort(keys(%changes))) {
-	if ($changes{$key}>$starttime) {
-	    my ($root,$extension)=($key=~/^(.*)\.(\w+)$/);
-	    my $currentversion=&Apache::lonnet::getversion($key);
-	    if ($currentversion<0) {
-		$currentversion=&mt('Could not be determined.');
-	    }
-	    my $linkurl=&Apache::lonnet::clutter($key);
-	    $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'}.'"><span class="LC_nobreak">Most Recent: '.
-                      '<font size="+1">'.$currentversion.'</font>'.
-                      '</span></td>'.
-                      '<td title="'.$lt{'ve'}.'"><span class="LC_nobreak">In '.$crstype.': '.
-                      '<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></span></td><td title="'.$lt{'vu'}.'">'.
-                      '<span class="LC_nobreak">Use: ');
-# Set version
-	    $r->print(&Apache::loncommon::select_form($setversions{$linkurl},
-						      'set_version_'.$linkurl,
-						      {'select_form_order' =>
-						       ['',1..$currentversion,'mostrecent'],
-						       '' => '',
-						       'mostrecent' => &mt('most recent'),
-						       map {$_,$_} (1..$currentversion)}));
-	    $r->print('</span></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;
+    #number of columns for version history
+    my %changedbytime;
+    foreach my $key (keys(%changes)) {
+        #excludes not versionable problems from resource version history:
+        next if ($key =~ /^\/res\/lib\/templates/);
+        my $chg;
+        if ($env{'form.timerange'} eq 'all') {
+            my ($root,$extension)=($key=~/^(.*)\.(\w+)$/);
+            $chg = &Apache::lonnet::metadata($root.'.'.$extension,'lastrevisiondate');
+        } else {
+            $chg = $changes{$key};
+            next if ($chg < $starttime);
+        }
+        push(@{$changedbytime{$chg}},$key);
+    }
+    if (keys(%changedbytime) == 0) {
+        &untiehash();
+        $r->print(&mt('No content changes in imported content in specified time frame').
+                  &endContentScreen());
+        return;
+    }
+    $r->print(
+       '<input type="submit" name="setversions" value="'.$lt{'save'}.'"'.$disabled.' />'.
+        &Apache::loncommon::start_data_table().
+        &Apache::loncommon::start_data_table_header_row().
+        '<th>'.&mt('Resources').'</th>'.
+        "<th>$lt{'mr'}</th>".
+        "<th>$lt{'ve'}</th>".
+        "<th>$lt{'vu'}</th>".
+        '<th>'.&mt('History').'</th>'.
+        &Apache::loncommon::end_data_table_header_row()
+    );
+    foreach my $chg (sort {$b <=> $a } keys(%changedbytime)) {
+        foreach my $key (sort(@{$changedbytime{$chg}})) {
+            my ($root,$extension)=($key=~/^(.*)\.(\w+)$/);
+            my $currentversion=&Apache::lonnet::getversion($key);
+            if ($currentversion<0) {
+                $currentversion='<span class="LC_error">'.&mt('Could not be determined.').'</span>';
+            }
+            my $linkurl=&Apache::lonnet::clutter($key);
+            $r->print(
+                &Apache::loncommon::start_data_table_row().
+                '<td><b>'.&Apache::lonnet::gettitle($linkurl).'</b><br />'.
+                '<a href="'.$linkurl.'" target="cat">'.$linkurl.'</a></td>'.
+                '<td align="right">'.$currentversion.'<span class="LC_fontsize_medium"><br />('.
+                &Apache::lonlocal::locallocaltime($chg).')</span></td>'.
+                '<td align="right">'
+            );
+            # Used in course
+            my $usedversion=$hash{'version_'.$linkurl};
+            if (($usedversion) && ($usedversion ne 'mostrecent')) {
+                if ($usedversion != $currentversion) {
+                    $r->print('<span class="LC_warning">'.$usedversion.'</span>');
+                } else {
+                    $r->print($usedversion);
+                }
+            } else {
+                $r->print($currentversion);
+            }
+            $r->print('</td><td title="'.$lt{'vu'}.'">');
+            # Set version
+            $r->print(&Apache::loncommon::select_form(
+                      $setversions{$linkurl},
+                      'set_version_'.$linkurl,
+                      {'select_form_order' => ['',1..$currentversion,'mostrecent'],
+                      '' => '',
+                      'mostrecent' => &mt('most recent'),
+                      map {$_,$_} (1..$currentversion)},'',$readonly));
+            my $lastold=1;
+            for (my $prevvers=1;$prevvers<$currentversion;$prevvers++) {
+                my $url=$root.'.'.$prevvers.'.'.$extension;
+                if (&Apache::lonnet::metadata($url,'lastrevisiondate')<$starttime) {
+                    $lastold=$prevvers;
+                }
+            }
+            $r->print('</td>');
+            # List all available versions
+            $r->print('<td valign="top"><span class="LC_fontsize_medium">');
             for (my $prevvers=$lastold;$prevvers<$currentversion;$prevvers++) {
-		my $url=$root.'.'.$prevvers.'.'.$extension;
-		$r->print('<span class="LC_nobreak"><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.
-			      '" target="diffs">'.&mt('Diffs').'</a>');
-		}
-		$r->print('</span><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++;
-                    }
+                my $url=$root.'.'.$prevvers.'.'.$extension;
+                $r->print(
+                    '<span class="LC_nobreak">'
+                   .'<a href="'.&Apache::lonnet::clutter($url).'">'
+                   .&mt('Version [_1]',$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).
+                        &HTML::Entities::encode('&versionone='.$prevvers,'"<>&').
+                        '" target="diffs">'.&mt('Diffs').'</a>');
                 }
-	    }
-            while($cols_output++ < 4) {
-                $r->print('</font></td><td><font>')
+                $r->print('</span><br />');
             }
-	    $r->print('</font></td></tr>'."\n");
-	}
+            $r->print('</span></td>'.&Apache::loncommon::end_data_table_row());
+        }
     }
-    $r->print('</table></form>');
-    $r->print('<p class="LC_success">'.&mt('Done').'</p>');
+    $r->print(
+        &Apache::loncommon::end_data_table().
+        '<input type="submit" name="setversions" value="'.$lt{'save'}.'"'.$disabled.' />'.
+        '</form>'
+    );
 
     &untiehash();
+    $r->print(&endContentScreen());
+    return;
 }
 
 sub mark_hash_old {
@@ -1914,24 +6799,23 @@ sub changewarning {
     my $pathvar='folderpath';
     my $path=&escape($env{'form.folderpath'});
     if (!defined($url)) {
-	if (defined($env{'form.pagepath'})) {
-	    $pathvar='pagepath';
-	    $path=&escape($env{'form.pagepath'});
-	    $path.='&amp;pagesymb='.&escape($env{'form.pagesymb'});
-	}
 	$url='/adm/coursedocs?'.$pathvar.'='.$path;
     }
     my $course_type = &Apache::loncommon::course_type();
     if (!defined($message)) {
 	$message='Changes will become active for your current session after [_1], or the next time you log in.';
     }
+    my $windowname = 'loncapaclient';
+    if ($env{'request.lti.login'}) {
+        $windowname .= 'lti';
+    }
     $r->print("\n\n".
 '<script type="text/javascript">'."\n".
 '// <![CDATA['."\n".
 'function reinit(tf) { tf.submit();'.$postexec.' }'."\n".
 '// ]]>'."\n".
 '</script>'."\n".
-'<form name="reinitform" method="post" action="/adm/roles" target="loncapaclient">'.
+'<form name="reinitform" method="post" action="/adm/roles" target="'.$windowname.'">'.
 '<input type="hidden" name="orgurl" value="'.$url.
 '" /><input type="hidden" name="selectrole" value="1" /><p class="LC_warning">'.
 &mt($message,' <input type="hidden" name="'.
@@ -1942,13 +6826,13 @@ $help{'Caching'}.'</p></form>'."\n\n");
 
 
 sub init_breadcrumbs {
-    my ($form,$text)=@_;
+    my ($form,$text,$help)=@_;
     &Apache::lonhtmlcommon::clear_breadcrumbs();
-    &Apache::lonhtmlcommon::add_breadcrumb({href=>"/adm/coursedocs",
+    &Apache::lonhtmlcommon::add_breadcrumb({href=>"/adm/coursedocs?tools=1",
 					    text=>&Apache::loncommon::course_type().' Editor',
 					    faq=>273,
 					    bug=>'Instructor Interface',
-                                            help => 'Docs_Adding_Course_Doc'});
+                                            help => $help});
     &Apache::lonhtmlcommon::add_breadcrumb({href=>"/adm/coursedocs?".$form.'=1',
 					    text=>$text,
 					    faq=>273,
@@ -1959,9 +6843,9 @@ sub init_breadcrumbs {
 sub create_list_elements {
    my @formarr = @_;
    my $list = '';
-   for my $button (@formarr){
-        for my $picture(keys %$button) {
-            $list .= &Apache::lonhtmlcommon::htmltag('li', $picture.' '.$button->{$picture}, {class => 'LC_menubuttons_inline_text'});
+   foreach my $button (@formarr){
+        foreach my $picture (keys(%{$button})) {
+            $list .= &Apache::lonhtmlcommon::htmltag('li', $picture.' '.$button->{$picture}, {class => 'LC_menubuttons_inline_text', id => ''});
         }
    }
    return $list;
@@ -1979,23 +6863,25 @@ sub create_form_ul {
 #
 
 sub startContentScreen {
-    my ($r,$mode)=@_;
-    $r->print('<ul class="LC_TabContentBigger" id="mainnav">');
+    my ($mode) = @_;
+    my $output = '<div class="LC_landmark" role="main">'.
+                 '<ul class="LC_TabContentBigger" id="mainnav">';
     if (($mode eq 'navmaps') || ($mode eq 'supplemental')) {
-        $r->print('<li'.(($mode eq 'navmaps')?' class="active"':'').'><a href="/adm/navmaps"><b>&nbsp;&nbsp;&nbsp;&nbsp;'.&mt('Content Overview').'&nbsp;&nbsp;&nbsp;&nbsp;</b></a></li>'."\n");
-        $r->print('<li'.(($mode eq 'coursesearch')?' class="active"':'').'><a href="/adm/searchcourse"><b>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'.&mt('Content Search').'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b></a></li>'."\n");
-        $r->print('<li'.(($mode eq 'courseindex')?' class="active"':'').'><a href="/adm/indexcourse"><b>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'.&mt('Content Index').'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b></a></li>'."\n");
-        $r->print('<li '.(($mode eq 'suppdocs')?' class="active"':'').'><a href="/adm/supplemental"><b>'.&mt('Supplemental Content').'</b></a></li>');
-    } else {
-        $r->print('<li '.(($mode eq 'docs')?' class="active"':'').
-               ' id="tabbededitor"><a href="/adm/coursedocs?forcestandard=1"><b>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'.&mt('Content Editor').'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b></a></li>');
-        $r->print('<li '.(($mode eq 'suppdocs')?' class="active"':'').
-                  '><a href="/adm/coursedocs?forcesupplement=1"><b>'.&mt('Supplemental Content Editor').'</b></a></li>');
-    }
-    $r->print("\n".'</ul>'."\n");
-    $r->print('<div class="LC_DocsBox" style="clear:both;margin:0;" id="contenteditor">'.
-              '<div id="maincoursedoc" style="margin:0 0;padding:0 0;">'.
-              '<div class="LC_ContentBox" id="mainCourseDocuments" style="display: block;">');
+        $output .= '<li'.(($mode eq 'navmaps')?' class="active"':'').'><a href="/adm/navmaps"><b>&nbsp;&nbsp;&nbsp;&nbsp;'.&mt('Content Overview').'&nbsp;&nbsp;&nbsp;&nbsp;</b></a></li>'."\n";
+        $output .= '<li'.(($mode eq 'coursesearch')?' class="active"':'').'><a href="/adm/searchcourse"><b>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'.&mt('Content Search').'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b></a></li>'."\n";
+        $output .= '<li'.(($mode eq 'courseindex')?' class="active"':'').'><a href="/adm/indexcourse"><b>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'.&mt('Content Index').'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b></a></li>'."\n";
+        $output .= '<li '.(($mode eq 'suppdocs')?' class="active"':'').'><a href="/adm/supplemental"><b>'.&mt('Supplemental Content').'</b></a></li>';
+    } else {
+        $output .= '<li '.(($mode eq 'docs')?' class="active"':'').' id="tabbededitor"><a href="/adm/coursedocs?forcestandard=1"><b>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'.&mt('Main Content Editor').'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b></a></li>'."\n";
+        $output .= '<li '.(($mode eq 'suppdocs')?' class="active"':'').'><a href="/adm/coursedocs?forcesupplement=1"><b>'.&mt('Supplemental Content Editor').'</b></a></li>'."\n";
+        $output .= '<li '.(($mode eq 'tools')?' class="active"':'').'><a href="/adm/coursedocs?tools=1"><b>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'.&mt('Content Utilities').'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b></a></li>'."\n";
+                   '><a href="/adm/coursedocs?tools=1"><b>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'.&mt('Content Utilities').'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b></a></li>';
+    }
+    $output .= "\n".'</ul>'."\n";
+    $output .= '<div class="LC_DocsBox" style="clear:both;margin:0;" id="contenteditor">'.
+               '<div id="maincoursedoc" style="margin:0 0;padding:0 0;">'.
+               '<div class="LC_ContentBox" id="mainCourseDocuments" style="display: block;">';
+    return $output;
 }
 
 #
@@ -2003,12 +6889,11 @@ sub startContentScreen {
 #
 
 sub endContentScreen {
-   my ($r)=@_;
-   $r->print('</div></div></div>');
+    return '</div></div></div></div>';
 }
 
 sub supplemental_base {
-    return 'supplemental&'.&escape(&mt('Supplemental '.&Apache::loncommon::course_type().' Content'));
+    return 'supplemental&'.&escape(&mt('Supplemental Content'));
 }
 
 sub handler {
@@ -2016,16 +6901,30 @@ sub handler {
     &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;
     return OK if $r->header_only;
+
+# get course data
     my $crstype = &Apache::loncommon::course_type();
+    my $coursenum=$env{'course.'.$env{'request.course.id'}.'.num'};
+    my $coursedom=$env{'course.'.$env{'request.course.id'}.'.domain'};
+    my $coursehome=$env{'course.'.$env{'request.course.id'}.'.home'};
+
+# get docroot
+    my $londocroot = $r->dir_config('lonDocRoot');
+
+# graphics settings
+    $iconpath = &Apache::loncommon::lonhttpdurl($r->dir_config('lonIconsURL').'/');
 
 #
 # --------------------------------------------- Initialize help topics for this
     foreach my $topic ('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') {
+	               'Adding_External_Resource','Adding_External_Tool',
+                       'Navigate_Content','Adding_Folders','Docs_Overview',
+	               'Load_Map','Supplemental','Score_Upload_Form',
+	               'Adding_Pages','Importing_LON-CAPA_Resource',
+	               'Importing_IMS_Course','Uploading_From_Harddrive',
+                       'Course_Roster','Web_Page','Dropbox','Simple_Problem',
+                       'Standard_Problem','Course_Resources',
+                       'Search_LON-CAPA_Resource','Import_Stored_Links') {
 	$help{$topic}=&Apache::loncommon::help_open_topic('Docs_'.$topic);
     }
     # Composite help files
@@ -2033,309 +6932,573 @@ sub handler {
 		    '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 Information Page'} = &Apache::loncommon::help_open_topic(
 		  'Docs_About_My_Personal_Info,Docs_Editing_Templated_Pages');
     $help{'Group Portfolio'} = &Apache::loncommon::help_open_topic('Docs_About_Group_Files');
     $help{'Caching'} = &Apache::loncommon::help_open_topic('Caching');
-
-    
-    my $allowed;
+ 
+    my ($allowed,$canedit,$canview,$noendpage,$disabled);
+# does this user have privileges to modify content.
+    if (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) {
+# URI is /adm/supplemental when viewing supplemental docs in non-edit mode.
+        unless ($r->uri eq '/adm/supplemental') {
+            $allowed = 1;
+        }
+        $canedit = 1;
+        $canview = 1;
+    } elsif (&Apache::lonnet::allowed('cev',$env{'request.course.id'})) {
 # URI is /adm/supplemental when viewing supplemental docs in non-edit mode.
-    unless ($r->uri eq '/adm/supplemental') {
-        # does this user have privileges to modify content.  
-        $allowed = &Apache::lonnet::allowed('mdc',$env{'request.course.id'});
+        unless ($r->uri eq '/adm/supplemental') {
+            $allowed = 1;
+        }
+        $canview = 1;
+    }
+    unless ($canedit) {
+        $disabled = ' disabled="disabled"';
+    }
+    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['inhibitmenu']);
+    if ($env{'form.inhibitmenu'}) {
+        unless ($env{'form.inhibitmenu'} eq 'yes') {
+            delete($env{'form.inhibitmenu'});
+        }
     }
 
   if ($allowed && $env{'form.verify'}) {
-      &init_breadcrumbs('verify','Verify Content');
-      &verifycontent($r);
+      &init_breadcrumbs('verify','Verify Content','Docs_Verify_Content');
+      if (!$canedit) {
+          &verifycontent($r);
+      } elsif (($env{'form.checkstale'} ne '') && ($env{'form.checkstale'} =~ /^\d$/)) {
+          &Apache::lonhtmlcommon::add_breadcrumb({href=>"/adm/coursedocs?tools=1&verify=1&checkstale=$env{'form.checkstale'}",
+                                                  text=>'Results',
+                                                  faq=>273,
+                                                  bug=>'Instructor Interface'});
+          &verifycontent($r,$env{'form.checkstale'});
+      } else {
+          &contentverifyform($r);
+      }
   } elsif ($allowed && $env{'form.listsymbs'}) {
-      &init_breadcrumbs('listsymbs','List Symbs');
+      &init_breadcrumbs('listsymbs','List Content IDs');
       &list_symbs($r);
+  } elsif ($allowed && $env{'form.shorturls'}) {
+      &init_breadcrumbs('shorturls','Set/Display Shortened URLs','Docs_Short_URLs');
+      &short_urls($r,$canedit);
   } elsif ($allowed && $env{'form.docslog'}) {
       &init_breadcrumbs('docslog','Show Log');
-      &docs_change_log($r);
+      my $folder = $env{'form.folder'};
+      if ($folder eq '') {
+          $folder='default';
+      }
+      &docs_change_log($r,$coursenum,$coursedom,$folder,$allowed,$crstype,$iconpath,$canedit);
   } elsif ($allowed && $env{'form.versions'}) {
-      &init_breadcrumbs('versions','Check/Set Resource Versions');
-      &checkversions($r);
-  } elsif ($allowed && $env{'form.dumpcourse'}) {
-      &init_breadcrumbs('dumpcourse','Dump '.&Apache::loncommon::course_type().' Documents to Construction Space');
+      &init_breadcrumbs('versions','Check/Set Resource Versions','Docs_Check_Resource_Versions');
+      &checkversions($r,$canedit);
+  } elsif ($canedit && $env{'form.dumpcourse'}) {
+      &init_breadcrumbs('dumpcourse','Copy uploaded content to Authoring Space');
       &dumpcourse($r);
-  } elsif ($allowed && $env{'form.exportcourse'}) {
+  } elsif (($canedit || $canview) && ($env{'form.copyauthored'})) {
+      &init_breadcrumbs('copyauthored','Copy from Course Authoring to User Authoring');
+      my $readonly;
+      if (!$canedit) {
+          $readonly = 1;
+      }
+      &copycrsauthored($r,$coursenum,$coursedom,$coursehome,$readonly);
+  } elsif ($canedit && $env{'form.exportcourse'}) {
       &init_breadcrumbs('exportcourse','IMS Export');
       &Apache::imsexport::exportcourse($r);
   } else {
+      if ($canedit && $env{'form.authorrole'}) {
+          $noendpage = 1;
+          my ($redirect,$error) = &makenewproblem($r,$coursedom,$coursenum);
+          if ($redirect) {
+              if (($env{'form.newresourceadd'}) && ($env{'form.folderpath'})) {
+                  my $container = 'sequence'; 
+                  my ($breadcrumbtrail,$randompick,$ishidden,$isencrypted,$plain,
+                      $is_random_order,$container) =
+                      &Apache::lonhtmlcommon::docs_breadcrumbs($allowed,$crstype,1);
+                  my (@folders)=split('&',$env{'form.folderpath'});
+                  $env{'form.foldername'}=&unescape(pop(@folders));
+                  my $folder=pop(@folders);
+                  my ($errtext,$fatal) = &mapread($coursenum,$coursedom,
+                                                  $folder.'.'.$container);
+                  my $warning;
+                  if ($fatal) {
+                      if ($container eq 'page') {
+                          $warning = &mt('An error occurred retrieving the contents of the current page.');
+                      } else {
+                          $warning = &mt('An error occurred retrieving the contents of the current folder.');
+                      }
+                  } else {
+                      my $url = $redirect;
+                      my $srcfile = $londocroot.$url;
+                      $url =~ s{^/priv/}{/res/};
+                      my $targetfile = $londocroot.$url;
+                      my $nokeyref = &Apache::lonpublisher::getnokey($r->dir_config('lonIncludes'));
+                      my $output = &Apache::lonpublisher::batchpublish($r,$srcfile,$targetfile,$nokeyref,1);
+                      $env{'form.folder'} = $folder;
+                      &snapshotbefore();
+                      my $title = &LONCAPA::map::qtunescape($env{'form.newresourcetitle'});
+                      my $ext = 'false';
+                      my $newidx = &LONCAPA::map::getresidx(&LONCAPA::map::qtunescape($url));
+                      $LONCAPA::map::resources[$newidx]=$title.':'.&LONCAPA::map::qtunescape($url).
+                                                        ':'.$ext.':normal:res';
+                      push(@LONCAPA::map::order,$newidx);
+                      &LONCAPA::map::storeparameter($newidx,'parameter_hiddenresource','yes',
+                                                   'string_yesno');
+                      &remember_parms($newidx,'hiddenresource','set','yes');
+                      ($errtext,$fatal) =
+                          &storemap($coursenum, $coursedom, $folder.'.'.$container,1);
+                      &log_differences($plain);
+                      &mark_hash_old();
+                      $r->internal_redirect($redirect);
+                      return OK;
+                  }
+              } else {
+                  $r->internal_redirect($redirect);
+              }
+          }
+      }
 #
 # Done catching special calls
-# The whole rest is for course and supplemental documents
+# The whole rest is for course and supplemental documents and utilities menu
 # Get the parameters that may be needed
 #
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
-                                            ['folderpath','pagepath',
-                                             'pagesymb','forcesupplement','forcestandard',
-                                             'symb','command']);
+                                            ['folderpath','title',
+                                             'forcesupplement','forcestandard',
+                                             'tools','symb','command','supppath']);
+
+    foreach my $item ('forcesupplement','forcestandard','tools') {
+        next if ($env{'form.'.$item} eq '');
+        unless ($env{'form.'.$item} eq '1') {
+            delete($env{'form.'.$item});
+        }
+    }
+
+    if ($env{'form.command'}) {
+        unless ($env{'form.command'} =~ /^(direct|directnav|editdocs|editsupp|contents|home)$/) {
+            delete($env{'form.command'});
+        }
+    }
+
+    if ($env{'form.symb'}) {
+        my ($mapurl,$id,$resurl) = &Apache::lonnet::decode_symb($env{'form.symb'});
+        unless (($id =~ /^\d+$/) && (&Apache::lonnet::is_on_map($resurl))) { 
+            delete($env{'form.symb'});
+        }
+    }
 
 # standard=1: this is a "new-style" course with an uploaded map as top level
 # standard=2: this is a "old-style" course, and there is nothing we can do
 
     my $standard=($env{'request.course.uri'}=~/^\/uploaded\//);
 
-# Decide whether this should display supplemental or main content
+# Decide whether this should display supplemental or main content or utilities
 # supplementalflag=1: show supplemental documents
 # supplementalflag=0: show standard documents
+# toolsflag=1: show utilities
 
-
-    my $supplementalflag=($env{'form.folderpath'}=~/^supplemental/);
-    if (($env{'form.folderpath'}=~/^default/) || $env{'form.folderpath'} eq "" || ($env{'form.pagepath'})) {
+    my $unesc_folderpath = &unescape($env{'form.folderpath'});
+    my $supplementalflag=($unesc_folderpath=~/^supplemental/);
+    if (($unesc_folderpath=~/^default/) || ($unesc_folderpath eq "")) {
        $supplementalflag=0;
     }
     if ($env{'form.forcesupplement'}) { $supplementalflag=1; }
     if ($env{'form.forcestandard'})   { $supplementalflag=0; }
-    unless ($allowed) { $supplementalflag=1; }
-    unless ($standard) { $supplementalflag=1; }
+    unless (($supplementalflag) ||
+            ($r->uri =~ m{^/adm/coursedocs/showdoc/uploaded/\Q$coursedom\E/\Q$coursenum\E/docs/})) {
+        unless ($allowed) { $supplementalflag=1; }
+        unless ($standard) { $supplementalflag=1; }
+    }
+    my $toolsflag=0;
+    if ($env{'form.tools'}) { $toolsflag=1; }
+
+    if ($env{'form.folderpath'} ne '') {
+        &Apache::loncommon::validate_folderpath($supplementalflag,$allowed,$coursenum,$coursedom);
+    }
+
+    my $backto_supppath;
+    if ($env{'form.supppath'} ne '') {
+        if ($supplementalflag && $allowed) {
+            $backto_supppath = &validate_supppath($coursenum,$coursedom);
+        }
+    }
 
     my $script='';
     my $showdoc=0;
     my $addentries = {};
     my $container;
     my $containertag;
-    my $uploadtag;
+    my $pathitem;
+    my %ltitools;
+    my $posslti;
+    my $hiddentop;
+    my $navmap;
+    my $filterFunc = sub { my $res = shift; return (!$res->randomout() && !$res->is_map()) };
 
 # Do we directly jump somewhere?
-
-   if ($env{'form.command'} eq 'direct') {
-       my ($mapurl,$id,$resurl);
+   if (($env{'form.command'} eq 'direct') || ($env{'form.command'} eq 'directnav')) {
        if ($env{'form.symb'} ne '') {
-           ($mapurl,$id,$resurl) = &Apache::lonnet::decode_symb($env{'form.symb'});
-           if ($resurl=~/\.(sequence|page)$/) {
-               $mapurl=$resurl;
-           } elsif ($resurl eq 'adm/navmaps') {
-               $mapurl=$env{'course.'.$env{'request.course.id'}.'.url'};
-           }
-           my $mapresobj;
-           my $navmap = Apache::lonnavmaps::navmap->new();
-           if (ref($navmap)) {
-               $mapresobj = $navmap->getResourceByUrl($mapurl);
-           }
-           $mapurl=~s{^.*/([^/]+)\.(\w+)$}{$1};
-           my $type=$2;
-           my $path;
-           if (ref($mapresobj)) {
-               my $pcslist = $mapresobj->map_hierarchy();
-               if ($pcslist ne '') {
-                   foreach my $pc (split(/,/,$pcslist)) {
-                       next if ($pc <= 1);
-                       my $res = $navmap->getByMapPc($pc);
-                       if (ref($res)) {
-                           my $thisurl = $res->src();
-                           $thisurl=~s{^.*/([^/]+)\.\w+$}{$1}; 
-                           my $thistitle = $res->title();
-                           $path .= '&'.
-                                    &Apache::lonhtmlcommon::entity_encode($thisurl).'&'.
-                                    &Apache::lonhtmlcommon::entity_encode($thistitle).
-                                    ':'.$res->randompick().
-                                    ':'.$res->randomout().
-                                    ':'.$res->encrypted().
-                                    ':'.$res->randomorder();
-                       }
-                   }
-               }
-               $path .= '&'.&Apache::lonhtmlcommon::entity_encode($mapurl).'&'.
-                    &Apache::lonhtmlcommon::entity_encode($mapresobj->title()).
-                    ':'.$mapresobj->randompick().
-                    ':'.$mapresobj->randomout().
-                    ':'.$mapresobj->encrypted().
-                    ':'.$mapresobj->randomorder();
-           } else {
-               my $maptitle = &Apache::lonnet::gettitle($mapurl);
-               $path = '&default&...::::'.
-                   '&'.&Apache::lonhtmlcommon::entity_encode($mapurl).'&'.
-                   &Apache::lonhtmlcommon::entity_encode($maptitle).'::::';
-           }
-           $path = 'default&'.
-                   &Apache::lonhtmlcommon::entity_encode('Main Course Documents').
-                   $path;
-           if ($type eq 'sequence') {
-               $env{'form.folderpath'}=$path;
-               $env{'form.pagepath'}='';
-           } else {
-               $env{'form.pagepath'}=$path;
-               $env{'form.folderpath'}='';
-           }
-       } elsif ($env{'form.supppath'} ne '') {
+           $env{'form.folderpath'}=
+               &Apache::loncommon::symb_to_docspath($env{'form.symb'},\$navmap);
+           &Apache::lonnet::appenv({'docs.exit.'.$env{'request.course.id'} =>
+               $env{'form.command'}.'_'.$env{'form.symb'}});
+       } elsif (($env{'form.supppath'} ne '') && $supplementalflag && $allowed) {
            $env{'form.folderpath'}=$env{'form.supppath'};
+           &Apache::lonnet::appenv({'docs.exit.'.$env{'request.course.id'} =>
+               $env{'form.command'}.'_'.$backto_supppath});
        }
    } elsif ($env{'form.command'} eq 'editdocs') {
-        $env{'form.folderpath'} = 'default&'.
-                                  &Apache::lonhtmlcommon::entity_encode('Main Course Content');
-        $env{'form.pagepath'}='';
+       $env{'form.folderpath'} = &default_folderpath($coursenum,$coursedom,\$navmap);
+       &Apache::lonnet::appenv({'docs.exit.'.$env{'request.course.id'} => $env{'form.command'}});
    } elsif ($env{'form.command'} eq 'editsupp') {
-        $env{'form.folderpath'} = 'default&'.
-                                  &Apache::lonhtmlcommon::entity_encode('Supplemental Content');
-        $env{'form.pagepath'}='';
+       $env{'form.folderpath'} = &supplemental_base();
+       &Apache::lonnet::appenv({'docs.exit.'.$env{'request.course.id'} => '/adm/supplemental'});
+   } elsif ($env{'form.command'} eq 'contents') {
+       &Apache::lonnet::appenv({'docs.exit.'.$env{'request.course.id'} => '/adm/navmaps'});
+   } elsif ($env{'form.command'} eq 'home') {
+       &Apache::lonnet::appenv({'docs.exit.'.$env{'request.course.id'} => '/adm/menu'});
    }
 
+
 # Where do we store these for when we come back?
     my $stored_folderpath='docs_folderpath';
     if ($supplementalflag) {
        $stored_folderpath='docs_sup_folderpath';
     }
 
-# No folderpath, no pagepath, see if we have something stored
-    if ((!$env{'form.folderpath'}) && (!$env{'form.pagepath'})) {
+# No folderpath, and in edit mode, see if we have something stored
+    if ((!$env{'form.folderpath'}) && $allowed) {
         &Apache::loncommon::restore_course_settings($stored_folderpath,
-                                              {'folderpath' => 'scalar'});
+                                          {'folderpath' => 'scalar'});
+
+        if (&unescape($env{'form.folderpath'}) =~ m{^(default|supplemental)&}) {
+            if ($supplementalflag) {
+                undef($env{'form.folderpath'}) if ($1 eq 'default'); 
+            } else {
+                undef($env{'form.folderpath'}) if ($1 eq 'supplemental');
+            }
+        } else {
+            undef($env{'form.folderpath'});
+        }
+        if ($env{'form.folderpath'} ne '') {
+            &Apache::loncommon::validate_folderpath($supplementalflag,$allowed,$coursenum,$coursedom);
+        }
     }
-   
-# If we are not allowed to make changes, all we can see are supplemental docs
-    if (!$allowed) {
-        $env{'form.pagepath'}='';
+
+# Set folderpath if we are not allowed to make changes and this is supplemental content
+    if ((!$allowed) && ($supplementalflag)) {
         unless ($env{'form.folderpath'} =~ /^supplemental/) {
             $env{'form.folderpath'} = &supplemental_base();
         }
     }
-# If we still not have a folderpath, see if we can resurrect at pagepath
-    if (!$env{'form.folderpath'} && $allowed) {
-        &Apache::loncommon::restore_course_settings($stored_folderpath,
-                                              {'pagepath' => 'scalar'});
-    }
 # Make the zeroth entry in supplemental docs page paths, so we can get to top level
     if ($env{'form.folderpath'} =~ /^supplemental_\d+/) {
         $env{'form.folderpath'} = &supplemental_base()
                                   .'&'.
                                   $env{'form.folderpath'};
     }
+# If allowed and user's role is not advanced check folderpath is not hidden
+    my $hidden_and_empty;
+    if (($allowed) && (!$env{'request.role.adv'}) && ($env{'form.folderpath'} ne '')) {
+        my ($folderurl,$foldername,$hiddenfolder);
+        my @pathitems = split(/\&/,$env{'form.folderpath'});
+        my $folder = $pathitems[-2];
+        if ($folder eq '') {
+            undef($env{'form.folderpath'});
+        } else {
+            $folderurl = "uploaded/$coursedom/$coursenum/$folder";
+            if ((split(/\:/,$pathitems[-1]))[5]) {
+                $folderurl .= '.page';
+            } else {
+                $folderurl .= '.sequence';
+            }
+            if ($supplementalflag) {
+                ($foldername,$hiddenfolder) = ($pathitems[-1] =~ /^([^:]*)::(|1):::$/);
+                $foldername = &HTML::Entities::decode(&unescape($foldername));
+                my ($supplemental) = &Apache::loncommon::get_supplemental($coursenum,$coursedom);
+                if (ref($supplemental) eq 'HASH') {
+                    my ($suppmap,$suppmapnum);
+                    if ($folder eq 'supplemental') {
+                        $suppmap = 'default';
+                        $suppmapnum = 0;
+                    } elsif ($folder =~ /^supplemental_(\d+)$/) {
+                        $suppmap = $1;
+                        $suppmapnum = $suppmap;
+                    }
+                    if ($hiddenfolder) {
+                        my $hascontent;
+                        foreach my $key (reverse(sort(keys(%{$supplemental->{'ids'}})))) {
+                            if ($key =~ m{^\Q/uploaded/$coursedom/$coursenum/supplemental/$suppmap/\E}) {
+                                $hascontent = 1;
+                            } elsif (ref($supplemental->{'ids'}->{$key}) eq 'ARRAY') {
+                                foreach my $id (@{$supplemental->{'ids'}->{$key}}) {
+                                    if ($id =~ /^$suppmapnum\:/) {
+                                        $hascontent = 1;
+                                        last;
+                                    }
+                                }
+                            }
+                            last if ($hascontent);
+                        }
+                        unless ($hascontent) {
+                            if ($foldername ne '') {
+                                $hidden_and_empty = $foldername;
+                            } else {
+                                $hidden_and_empty = $folder;
+                            }
+                        }
+                    }
+                }
+            } else {
+                unless (ref($navmap)) {
+                    $navmap = Apache::lonnavmaps::navmap->new();
+                }
+                ($foldername,$hiddenfolder) = ($pathitems[-1] =~ /^([^:]*):|\d+:|1:(|1):|1:|1$/);
+                $foldername = &HTML::Entities::decode(&unescape($foldername));
+                if (ref($navmap)) {
+                    if ($hiddenfolder ||
+                        (lc($navmap->get_mapparam(undef,$folderurl,"0.hiddenresource")) eq 'yes')) {
+                        my @resources = $navmap->retrieveResources($folderurl,$filterFunc,1,1);
+                        unless (@resources) {
+                            if ($foldername ne '') {
+                                $hidden_and_empty = $foldername;
+                            } else {
+                                $hidden_and_empty = $folder;
+                            }
+                        }
+                    }
+                }
+            }
+            if ($hidden_and_empty ne '') {
+                splice(@pathitems,-2);
+                if (@pathitems) {
+                    $env{'form.folderpath'} = join('&',@pathitems);
+                } else {
+                    undef($env{'form.folderpath'});
+                }
+            }
+        }
+    }
+
 # If after all of this, we still don't have any paths, make them
-    unless (($env{'form.pagepath'}) || ($env{'form.folderpath'})) {
+    unless ($env{'form.folderpath'}) {
        if ($supplementalflag) {
           $env{'form.folderpath'}=&supplemental_base();
-       } else {
-          $env{'form.folderpath'}='default';
+       } elsif ($allowed) {
+          ($env{'form.folderpath'},$hiddentop) = &default_folderpath($coursenum,$coursedom,\$navmap);
        }
     }
 
 # Store this
-    &Apache::loncommon::store_course_settings($stored_folderpath,
-                                                {'pagepath' => 'scalar',
-                                                 'folderpath' => 'scalar'});
-
-    if ($env{'form.folderpath'}) {
-	my (@folderpath)=split('&',$env{'form.folderpath'});
-	$env{'form.foldername'}=&unescape(pop(@folderpath));
-	$env{'form.folder'}=pop(@folderpath);
-        $container='sequence';
-    }
-    if ($env{'form.pagepath'}) {
-        my (@pagepath)=split('&',$env{'form.pagepath'});
-        $env{'form.pagename'}=&unescape(pop(@pagepath));
-        $env{'form.folder'}=pop(@pagepath);
-        $container='page';
-        $containertag = '<input type="hidden" name="pagepath" value="" />'.
-	                '<input type="hidden" name="pagesymb" value="" />';
-        $uploadtag = 
-            '<input type="hidden" name="pagepath" value="'.&HTML::Entities::encode($env{'form.pagepath'},'<>&"').'" />'.
-	    '<input type="hidden" name="pagesymb" value="'.&HTML::Entities::encode($env{'form.pagesymb'},'<>&"').'" />'.
-            '<input type="hidden" name="folderpath" value="" />';
-    } else {
-        my $folderpath=$env{'form.folderpath'};
-        if (!$folderpath) {
+    unless ($toolsflag) {
+        if (($allowed) && ($env{'form.folderpath'} ne '')) {
+            &Apache::loncommon::store_course_settings($stored_folderpath,
+                                                      {'folderpath' => 'scalar'});
+        }
+        my $folderpath;
+        if ($env{'form.folderpath'}) {
+            $folderpath = $env{'form.folderpath'};
+	    my (@folders)=split('&',$env{'form.folderpath'});
+	    $env{'form.foldername'}=&unescape(pop(@folders));
+            if ($env{'form.foldername'} =~ /\:1$/) {
+                $container = 'page';
+            } else {
+                $container = 'sequence';
+            }
+	    $env{'form.folder'}=pop(@folders);
+        } else {
             if ($env{'form.folder'} eq '' ||
                 $env{'form.folder'} eq 'supplemental') {
-                $folderpath='default&'.
-                    &escape(&mt('Main '.$crstype.' Documents'));
+                if ($env{'form.folder'} eq 'supplemental') {
+                    $folderpath=&supplemental_base();
+                } elsif (!$hiddentop) {
+                    $folderpath='default&'.
+                                 &escape(&mt('Main Content').':::::');
+                }
             }
         }
         $containertag = '<input type="hidden" name="folderpath" value="" />';
-        $uploadtag = '<input type="hidden" name="folderpath" value="'.&HTML::Entities::encode($folderpath,'<>&"').'" />';
-    }
-    if ($r->uri=~/^\/adm\/coursedocs\/showdoc\/(.*)$/) {
-       $showdoc='/'.$1;
-    }
-    if ($showdoc) { # got called in sequence from course
-	$allowed=0; 
-    } else {
-       if ($allowed) {
-         &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['cmd']);
-         $script=&Apache::lonratedt::editscript('simple');
-       }
+        $pathitem = '<input type="hidden" name="folderpath" value="'.&HTML::Entities::encode($folderpath,'<>&"').'" />';
+        if ($r->uri=~/^\/adm\/coursedocs\/showdoc\/(.*)$/) {
+           $showdoc='/'.$1;
+        }
+        if ($showdoc) { # got called in sequence from course
+	    $allowed=0; 
+        } else {
+            if ($canedit) {
+                &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['cmd']);
+                $script=&Apache::lonratedt::editscript('simple');
+            }
+        }
     }
 
-# get course data
-    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 $plainname=&escape(&Apache::loncommon::plainname($uname,$udom));
 
-# graphics settings
-
-    $iconpath = &Apache::loncommon::lonhttpdurl($r->dir_config('lonIconsURL') . "/");
-
     if ($allowed) {
-        my @tabids;
-        if ($supplementalflag) {
-            @tabids = ('002','ee2','ff2');
+        if ($toolsflag) {
+            $script .= &inject_data_js();
+            my ($home,$other,%outhash)=&authorhosts();
+            if (!$home && $other) {
+                my @hosts;
+                foreach my $aurole (keys(%outhash)) {
+                    unless(grep(/^\Q$outhash{$aurole}\E/,@hosts)) {
+                        push(@hosts,$outhash{$aurole});
+                    }
+                }
+                $script .= &dump_switchserver_js(@hosts); 
+            }
         } else {
-            @tabids = ('aa1','bb1','cc1','ff1');
-            unless ($env{'form.pagepath'}) {
-                unshift(@tabids,'001');
-                push(@tabids,('dd1','ee1'));
+            my $tid = 1;
+            my @tabids;
+            if ($supplementalflag) {
+                @tabids = ('002','dd2','ee2','ff2');
+                $tid = 2;
+            } else {
+                @tabids = ('aa1','bb1','cc1','dd1','ff1');
+                unless ($env{'form.folderpath'} =~ /\:1$/) {
+                    unshift(@tabids,'001');
+                    push(@tabids,'ee1');
+                }
             }
-        }
-        my $tabidstr = join("','",@tabids);
-	$script .= &editing_js($udom,$uname,$supplementalflag).
-                   &resize_contentdiv_js($tabidstr);
-        $addentries = {
-                        onload   => "javascript:resize_contentdiv('contentscroll','1','1');",
-                      };
+            my $tabidstr = join("','",@tabids);
+            my (%domtools,%crstools);
+            my %tooltypes = &Apache::loncommon::usable_exttools();
+            if ($tooltypes{'dom'}) {
+                %domtools = &Apache::lonnet::get_domain_lti($coursedom,'consumer');
+            }
+            if ($tooltypes{'crs'}) {
+                %crstools = &Apache::lonnet::get_course_lti($coursenum,$coursedom,'consumer');
+            }
+            %ltitools = (
+                          dom => \%domtools,
+                          crs => \%crstools,
+                        );
+            $posslti = scalar(keys(%domtools)) + scalar(keys(%crstools));
+            my $hostname = $r->hostname();
+	    $script .= &editing_js($udom,$uname,$supplementalflag,$coursedom,$coursenum,$posslti,
+                                   $londocroot,$canedit,$hostname,\$navmap).
+                       &history_tab_js().
+                       &inject_data_js().
+                       &Apache::lonhtmlcommon::resize_scrollbox_js('docs',$tabidstr,$tid).
+                       &Apache::lonextresedit::extedit_javascript(\%ltitools);
+            my $onload = "javascript:resize_scrollbox('contentscroll','1','1');";
+            if ($hidden_and_empty ne '') {
+                my $alert = &mt("Additional privileges required to edit empty and hidden folder: '[_1]'",
+                                $hidden_and_empty);
+                $onload .= "javascript:alert('".&js_escape($alert)."');";
+            }
+            $addentries = {
+                            onload => $onload,
+                          };
+        }
+        $script .= &paste_popup_js(); 
+        my $confirm_switch = &mt("Editing requires switching to the resource's home server.").'\n'.
+                             &mt('Switch server?');
+        
+
     }
 # -------------------------------------------------------------------- Body tag
     $script = '<script type="text/javascript">'."\n"
               .'// <![CDATA['."\n"
               .$script."\n"
               .'// ]]>'."\n"
-              .'</script>'."\n";
+              .'</script>'."\n"
+              .'<script type="text/javascript" 
+                src="/res/adm/includes/file_upload.js"></script>'."\n";
 
     # Breadcrumbs
     &Apache::lonhtmlcommon::clear_breadcrumbs();
-    unless ($showdoc) {
-        &Apache::lonhtmlcommon::add_breadcrumb({
-            href=>"/adm/coursedocs",text=>"$crstype Contents"});
 
+    if ($showdoc) {
+        my $args;
+        if ($supplementalflag) {
+            my $title = &HTML::Entities::encode($env{'form.title'},'\'"<>&');
+            my $brcrum = &Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype,undef,$title,1);
+            $args = {'bread_crumbs' => $brcrum,
+                     'bread_crumbs_nomenu' => 1};
+        } else {
+            $args = {'force_register' => $showdoc};
+        }
+        $r->print(&Apache::loncommon::start_page("$crstype documents",undef,$args));
+    } elsif ($toolsflag) {
+        my ($breadtext,$breadtitle);
+        $breadtext = "$crstype Editor";
+        if ($canedit) {
+            $breadtitle = 'Editing '.$crstype.' Contents';
+        } else {
+            $breadtext .= ' (View-only mode)';
+            $breadtitle = 'Viewing '.$crstype.' Contents';
+        }
+        &Apache::lonhtmlcommon::add_breadcrumb({
+            href=>"/adm/coursedocs",text=>$breadtext});
+        $r->print(&Apache::loncommon::start_page("$crstype Contents", $script)
+                 .&Apache::loncommon::help_open_menu('','',273,'RAT')
+                 .&Apache::lonhtmlcommon::breadcrumbs(
+                     $breadtitle)
+                 );
+    } elsif ($r->uri eq '/adm/supplemental') {
+        unless ($env{'request.role.adv'}) {
+            unless (&Apache::lonnet::has_unhidden_suppfiles($coursenum,$coursedom)) {
+                $r->internal_redirect('/adm/navmaps');
+                return OK;
+            }
+        }
+        my $brcrum = &Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype);
+        my $args = {'bread_crumbs' => $brcrum};
+        unless (($env{'form.folderpath'} eq '') ||
+                ($env{'form.folder'} eq 'supplemental')) {
+            $args->{'bread_crumbs_nomenu'} = 1;
+        }
+        $r->print(&Apache::loncommon::start_page("Supplemental $crstype Content",undef,
+                                                 $args));
+    } else {
+        my ($breadtext,$breadtitle,$helpitem);
+        $breadtext = "$crstype Editor";
+        if ($canedit) {
+            $breadtitle = 'Editing '.$crstype.' Contents';
+            $helpitem = 'Docs_Adding_Course_Doc';
+        } else {
+            $breadtext .= ' (View-only mode)';
+            $breadtitle = 'Viewing '.$crstype.' Contents';
+            $helpitem = 'Docs_Viewing_Course_Doc';
+        }
+        &Apache::lonhtmlcommon::add_breadcrumb({
+            href=>"/adm/coursedocs",text=>$breadtext});
         $r->print(&Apache::loncommon::start_page("$crstype Contents", $script,
-                                                 {'force_register' => $showdoc,
-                                                  'add_entries'    => $addentries,
-                                                 })
+                                                 {'add_entries'    => $addentries}
+                                                )
                  .&Apache::loncommon::help_open_menu('','',273,'RAT')
                  .&Apache::lonhtmlcommon::breadcrumbs(
-                     'Editing the Table of Contents for your '.$crstype,
-                     'Docs_Adding_Course_Doc')
+                     $breadtitle,
+                     $helpitem)
         );
-    } else {
-        $r->print(&Apache::loncommon::start_page("$crstype documents",undef,
-                                                {'force_register' => $showdoc,}));
     }
 
   my %allfiles = ();
   my %codebase = ();
   my ($upload_result,$upload_output,$uploadphase);
-  if ($allowed) {
+  if ($canedit) {
+      undef($suppchanges);
       if (($env{'form.uploaddoc.filename'}) &&
 	  ($env{'form.cmd'}=~/^upload_(\w+)/)) {
           my $context = $1; 
           # Process file upload - phase one - upload and parse primary file.
 	  undef($hadchanges);
           $uploadphase = &process_file_upload(\$upload_output,$coursenum,$coursedom,
-                                              \%allfiles,\%codebase,$context);
+                                              \%allfiles,\%codebase,$context,$crstype);
+          undef($navmap);
 	  if ($hadchanges) {
 	      &mark_hash_old();
 	  }
+          if ($suppchanges) {
+              &Apache::lonnet::update_supp_caches($coursedom,$coursenum);
+              undef($suppchanges);
+          }
           $r->print($upload_output);
       } elsif ($env{'form.phase'} eq 'upload_embedded') {
           # Process file upload - phase two - upload embedded objects 
@@ -2348,7 +7511,7 @@ sub handler {
           my ($destination,$dir_root) = &embedded_destination();
           my $url_root = '/uploaded/'.$docudom.'/'.$docuname;
           my $actionurl = '/adm/coursedocs';
-          my ($result,$flag) = 
+          my ($result,$flag) =
               &Apache::loncommon::upload_embedded('coursedoc',$destination,
                   $docuname,$docudom,$dir_root,$url_root,undef,undef,undef,$state,
                   $actionurl);
@@ -2359,123 +7522,298 @@ sub handler {
           my $docuname=$env{'course.'.$env{'request.course.id'}.'.num'};
           my $docudom=$env{'course.'.$env{'request.course.id'}.'.domain'};
           my ($destination,$dir_root) = &embedded_destination();
-          $r->print(&Apache::loncommon::modify_html_refs('coursedoc',$destination,
-                                                         $docuname,$docudom,undef,
-                                                         $dir_root).
-                   &return_to_editor());
+          my $result =
+              &Apache::loncommon::modify_html_refs('coursedoc',$destination,
+                                                   $docuname,$docudom,undef,
+                                                   $dir_root);
+          $r->print($result.&return_to_editor());
+      } elsif ($env{'form.phase'} eq 'decompress_uploaded') {
+          $uploadphase = 'decompress_phase_one';
+          $r->print(&decompression_phase_one().
+                    &return_to_editor());
+      } elsif ($env{'form.phase'} eq 'decompress_cleanup') {
+          $uploadphase = 'decompress_phase_two';
+          $r->print(&decompression_phase_two().
+                    &return_to_editor());
       }
   }
 
-  unless ($showdoc || $uploadphase) {  
+  if ($allowed && $toolsflag) {
+      $r->print(&startContentScreen('tools'));
+      $r->print(&generate_admin_menu($crstype,$canedit,$coursenum,$coursedom));
+      $r->print(&endContentScreen());
+  } elsif ((!$showdoc) && (!$uploadphase)) {
 # -----------------------------------------------------------------------------
        my %lt=&Apache::lonlocal::texthash(
-                'uplm' => 'Upload a new main '.lc($crstype).' document',
-                'upls' => 'Upload a new supplemental '.lc($crstype).' document',
-                'impp' => 'Import a document',
 		'copm' => 'All documents out of a published map into this folder',
-                'upld' => 'Import Document',
-                'srch' => 'Search',
-                'impo' => 'Import',
-		'wish' => 'Import from Wishlist',
+                'upfi' => 'Upload File',
+                'upld' => 'Upload Content',
+                'srch' => 'Search Repository',
+                'impo' => 'Import from Repository',
+		'lnks' => 'Import from Stored Links',
+                'impm' => 'Import from Assembled Map',
+                'imcr' => 'Import from Course Resources',
+                'extr' => 'External Resource',
+                'extt' => 'External Tool',
                 'selm' => 'Select Map',
                 'load' => 'Load Map',
-                'reco' => 'Recover Deleted Documents',
                 'newf' => 'New Folder',
                 'newp' => 'New Composite Page',
-                'extr' => 'External Resource',
                 'syll' => 'Syllabus',
                 'navc' => 'Table of Contents',
                 'sipa' => 'Simple Course Page',
                 'sipr' => 'Simple Problem',
+                'webp' => 'Blank Web Page (editable)',
+                'stpr' => 'Standard Problem',
+                'news' => 'New sub-directory',
+                'crpr' => 'Create Problem',
+                'swit' => 'Switch Server',
                 'drbx' => 'Drop Box',
                 'scuf' => 'External Scores (handgrade, upload, clicker)',
                 'bull' => 'Discussion Board',
                 'mypi' => 'My Personal Information Page',
                 'grpo' => 'Group Portfolio',
                 'rost' => 'Course Roster',
-				'abou' => 'Personal Information Page for a User',
-                'imsf' => 'IMS Import',
-                'imsl' => 'Import IMS package',
+                'abou' => 'Personal Information Page for a User',
+                'imsf' => 'IMS Upload',
+                'imsl' => 'Upload IMS package',
+                'cms'  => 'Origin of IMS package',
+                'se'   => 'Select',
                 'file' =>  'File',
                 'title' => 'Title',
+                'addp' => 'Add Placeholder to course?',
+                'uste' => 'Use Template?',
+                'fnam' => 'File Name:',
+                'loca' => 'Location:',
+                'dire' => 'Directory:',
+                'cate' => 'Category:',
+                'tmpl' => 'Template:',
+                'empd' => 'No resources found',
                 'comment' => 'Comment',
                 'parse' => 'Upload embedded images/multimedia files if HTML file',
-		'nd' => 'Upload Document',
-		'pm' => 'Published Map',
-		'sd' => 'Special Document',
-		'mo' => 'More Options',
-					  );
+                'bb5'      => 'Blackboard 5',
+                'bb6'      => 'Blackboard 6',
+                'angel5'   => 'ANGEL 5.5',
+                'webctce4' => 'WebCT 4 Campus Edition',
+                'yes'      => 'Yes',
+                'no'       => 'No',
+                'er' => 'Editing rights unavailable for your current role.',
+        );
 # -----------------------------------------------------------------------------
-	my $fileupload=(<<FIUP);
-	$lt{'file'}:<br />
-	<input type="file" name="uploaddoc" size="40" />
-FIUP
+
+    # Calculate free quota space for a user or course. A javascript function checks
+    # file size to determine if upload should be allowed.
+    my $quotatype = 'unofficial';
+    if ($crstype eq 'Community') {
+        $quotatype = 'community';
+    } elsif ($crstype eq 'Placement') {
+        $quotatype = 'placement';
+    } elsif ($env{'course.'.$coursedom.'_'.$coursenum.'.internal.coursecode'}) {
+        $quotatype = 'official';
+    } elsif ($env{'course.'.$coursedom.'_'.$coursenum.'.internal.textbook'}) {
+        $quotatype = 'textbook';
+    }
+    my $disk_quota = &Apache::loncommon::get_user_quota($coursenum,$coursedom,
+                     'course',$quotatype); # expressed in MB
+    my $current_disk_usage = 0;
+    foreach my $subdir ('docs','supplemental') {
+        $current_disk_usage += &Apache::lonnet::diskusage($coursedom,$coursenum,
+                               "userfiles/$subdir",1); # expressed in kB
+    }
+    my $free_space = 1024 * ((1024 * $disk_quota) - $current_disk_usage);
+    my $usage = $current_disk_usage/1024; # in MB
+    my $quota = $disk_quota;
+    my $percent;
+    if ($disk_quota == 0) {
+        $percent = 100.0;
+    } else {
+        $percent = 100*($usage/$disk_quota);
+    }
+    $usage = sprintf("%.2f",$usage);
+    $quota = sprintf("%.2f",$quota);
+    $percent = sprintf("%.0f",$percent);
+    my $quotainfo = '<p>'.&mt('Currently using [_1] of the [_2] available.',
+                              $percent.'%',$quota.' MB').'</p>';
 
 	my $checkbox=(<<CHBO);
 	<!-- <label>$lt{'parse'}?
 	<input type="checkbox" name="parserflag" />
 	</label> -->
 	<label>
-	<input type="checkbox" name="parserflag" checked="checked" /> $lt{'parse'}
+	<input type="checkbox" name="parserflag" checked="checked" $disabled /> $lt{'parse'}
 	</label>
 CHBO
+        my $imsfolder = $env{'form.folder'};
+        if ($imsfolder eq '') {
+            $imsfolder = 'default';  
+        }
+        my $imspform=(<<IMSFORM);
+        <a class="LC_menubuttons_link" href="javascript:toggleUpload('ims');">
+        $lt{'imsf'}</a> $help{'Importing_IMS_Course'}
+        <form name="uploadims" action="/adm/imsimportdocs" method="post" enctype="multipart/form-data" target="IMSimport">
+        <fieldset id="uploadimsform" style="display: none;">
+        <legend>$lt{'imsf'}</legend>
+        $quotainfo
+        <label>$lt{'file'}:<br />
+        <input type="file" name="uploaddoc" id="uploaddocims" class="LC_flUpload LC_uploaddoc" size="40" $disabled /></label>
+        <input type="hidden" id="LC_free_space_ims" value="$free_space" />
+        <br />
+        <p>
+        $lt{'cms'}:&nbsp; 
+        <select name="source" $disabled>
+        <option value="-1" selected="selected">$lt{'se'}</option>
+        <option value="bb5">$lt{'bb5'}</option>
+        <option value="bb6">$lt{'bb6'}</option>
+        <option value="angel5">$lt{'angel5'}</option>
+        <option value="webctce4">$lt{'webctce4'}</option>
+        </select>
+        <input type="hidden" name="folder" value="$imsfolder" />
+        </p>
+        <input type="hidden" name="phase" value="one" />
+        <input type="button" value="$lt{'imsl'}" onclick="makeims(this.form);" $disabled />
+        </fieldset>
+        </form>
+IMSFORM
 
-    my $fileuploada = "<br clear='all' /><input type='submit' value='".$lt{'upld'}."' /> $help{'Uploading_From_Harddrive'}";
 	my $fileuploadform=(<<FUFORM);
-	<form name="uploaddocument" action="/adm/coursedocs" method="post" enctype="multipart/form-data">
+        <a class="LC_menubuttons_link" href="javascript:toggleUpload('doc');">
+        $lt{'upfi'}</a> $help{'Uploading_From_Harddrive'}
+        <form name="uploaddocument" action="/adm/coursedocs" method="post" enctype="multipart/form-data">
+        <fieldset id="uploaddocform" style="display: none;">
+        <legend>$lt{'upfi'}</legend>
 	<input type="hidden" name="active" value="aa" />
-	$fileupload
+        $quotainfo
+        <label>$lt{'file'}:<br />
+        <input type="file" name="uploaddoc" class="LC_flUpload" size="40" $disabled /></label>
+        <input type="hidden" id="LC_free_space" value="$free_space" />
 	<br />
+        <label>
 	$lt{'title'}:<br />
-	<input type="text" size="60" name="comment" />
-	$uploadtag
+	<input type="text" size="60" name="comment" $disabled /></label>
+	$pathitem
 	<input type="hidden" name="cmd" value="upload_default" />
 	<br />
 	<span class="LC_nobreak" style="float:left">
 	$checkbox
 	</span>
+        <br clear="all" />
+        <input type="submit" value="$lt{'upld'}" $disabled />
+        </fieldset>
+        </form>
 FUFORM
-    $fileuploadform .= $fileuploada.'</form>';
 
-	my $simpleeditdefaultform=(<<SEDFFORM);
-	<form action="/adm/coursedocs" method="post" name="simpleeditdefault">
+        my $mapimportjs;
+        if ($canedit) {
+            $mapimportjs = "javascript:openbrowser('mapimportform','importmap','sequence,page','');"; 
+        } else {
+            $mapimportjs = "javascript:alert('".&js_escape($lt{'er'})."');";
+        }
+	my $importpubform=(<<SEDFFORM);
+        <a class="LC_menubuttons_link" href="javascript:toggleMap('map');">
+        $lt{'impm'}</a>$help{'Load_Map'}
+	<form action="/adm/coursedocs" method="post" name="mapimportform">
+        <fieldset id="importmapform" style="display: none;">
+        <legend>$lt{'impm'}</legend>
 	<input type="hidden" name="active" value="bb" />
-SEDFFORM
-	my @simpleeditdefaultforma = ( 
-	{ '<img class="LC_noBorder LC_middle" src="/res/adm/pages/src.png" alt="'.$lt{srch}.'"  onclick="javascript:groupsearch()" />' => "$uploadtag<a class='LC_menubuttons_link' href='javascript:groupsearch()'>$lt{'srch'}</a>" },
-	{ '<img class="LC_noBorder LC_middle" src="/res/adm/pages/res.png" alt="'.$lt{impo}.'"  onclick="javascript:groupimport();"/>' => "<a class='LC_menubuttons_link' href='javascript:groupimport();'>$lt{'impo'}</a>$help{'Importing_LON-CAPA_Resource'}" },
-	{ '<img class="LC_noBorder LC_middle" src="/res/adm/pages/wishlist.png" alt="'.$lt{wish}.'" onclick="javascript:open_Wishlist_Import();" />' => "<a class='LC_menubuttons_link' href='javascript:open_Wishlist_Import();'>$lt{'wish'}</a>" },
-	);
-	$simpleeditdefaultform .= &create_form_ul(&create_list_elements(@simpleeditdefaultforma));
-	$simpleeditdefaultform .=(<<SEDFFORM);
-	<hr id="bb_hrule" style="width:0px;text-align:left;margin-left:0" />
-	$lt{'copm'}<br />
-	<input type="text" size="40" name="importmap" /><br />
-	<span class="LC_nobreak" style="float:left"><input type="button"
-	onclick="javascript:openbrowser('simpleeditdefault','importmap','sequence,page','')"
-	value="$lt{'selm'}" /> <input type="submit" name="loadmap" value="$lt{'load'}" />
-	$help{'Load_Map'}</span>
-	</form>
-SEDFFORM
+        <label>$lt{'copm'}<br />
+        <span class="LC_nobreak">
+        <input type="text" name="importmap" size="40" value="" 
+        onfocus="this.blur();$mapimportjs" $disabled />
+        &nbsp;<a href="$mapimportjs">$lt{'selm'}</a></span></label><br />
+        <input type="submit" name="loadmap" value="$lt{'load'}" $disabled />
+        </fieldset>
+        </form>
 
-      my $extresourcesform=(<<ERFORM);
-      <form action="/adm/coursedocs" method="post" name="newext">
-      $uploadtag
-      <input type="hidden" name="importdetail" value="" />
-      <a class="LC_menubuttons_link" href="javascript:makenewext('newext');">$lt{'extr'}</a>$help{'Adding_External_Resource'}
-      </form>
-ERFORM
+SEDFFORM
+        my ($importcrsresform,$checkcrsres);
+        if ($env{'course.'.$coursedom.'_'.$coursenum.'.internal.crsauthor'}) {
+            $checkcrsres = 1;
+        } elsif ($env{'course.'.$coursedom.'_'.$coursenum.'.internal.crsauthor'} ne '0') {
+            my %domdefs=&Apache::lonnet::get_domain_defaults($coursedom);
+            my $type = lc($env{'course.'.$env{'request.course.id'}.'.type'});
+            unless (($type eq 'community') || ($type eq 'placement')) {
+                $type = 'unofficial';
+                if ($env{'course.'.$env{'request.course.id'}.'internal.coursecode'} ne '') {
+                    $type = 'official';
+                } elsif ($env{'course.'.$env{'request.course.id'}.'internal.textbook'} ne '') {
+                    $type = 'textbook';
+                } else {
+                    $type = 'unofficial';
+                }
+            }
+            if ($domdefs{$type.'crsauthor'}) {
+                $checkcrsres = 1;
+            }
+        }
+        if ($checkcrsres) {
+            my ($numdirs,$pickfile) = 
+                &Apache::loncommon::import_crsauthor_form('coursepath','coursefile',
+                                                          "resize_scrollbox('contentscroll','1','0');",
+                                                          undef,'res');
+            if ($pickfile) {
+                $importcrsresform=(<<CRSFORM);
+        <a class="LC_menubuttons_link" href="javascript:toggleImportCrsres('res');">
+        $lt{'imcr'}</a>$help{'Course_Resources'}
+        <form action="/adm/coursedocs" method="post" name="crsresimportform" onsubmit="return validImportCrsRes();">
+        <fieldset id="importcrsresform" style="display: none;">
+        <legend>$lt{'imcr'}</legend>
+        <div id="importcrsrescontent" style="display: none;">
+        <input type="hidden" name="active" value="bb" />
+        $pickfile
+        <p><label>
+        $lt{'title'}: <input type="text" name="crsrestitle" value="" $disabled />
+        </label></p>
+        <input type="hidden" name="importdetail" value="" />
+        <input type="submit" name="crsres" value="$lt{'impo'}" $disabled /><br />
+        </div>
+        <div id="importcrsresempty" style="display: none;">
+        <p>
+        $lt{'empd'}
+        </p>
+        </div>
+        </fieldset>
+        </form>
+CRSFORM
+            }
+        }
 
+        my $fromstoredjs;
+        if ($canedit) {
+            $fromstoredjs = 'open_StoredLinks_Import()'; 
+        } else {
+            $fromstoredjs = "alert('".&js_escape($lt{'er'})."')";
+        }
 
+	my @importpubforma = (
+	{ '<img class="LC_noBorder LC_middle" src="/res/adm/pages/src.png" alt="'.$lt{srch}.'"  onclick="javascript:groupsearch()" />' => $pathitem."<a class='LC_menubuttons_link' href='javascript:groupsearch()'>$lt{'srch'}</a>$help{'Search_LON-CAPA_Resource'}" },
+	{ '<img class="LC_noBorder LC_middle" src="/res/adm/pages/res.png" alt="'.$lt{impo}.'"  onclick="javascript:groupimport();"/>' => "<a class='LC_menubuttons_link' href='javascript:groupimport();'>$lt{'impo'}</a>$help{'Importing_LON-CAPA_Resource'}" },
+	{ '<img class="LC_noBorder LC_middle" src="/res/adm/pages/wishlist.png" alt="'.$lt{lnks}.'" onclick="javascript:'.$fromstoredjs.';" />' => '<a class="LC_menubuttons_link" href="javascript:'.$fromstoredjs.';">'.$lt{'lnks'}.'</a>'.$help{'Import_Stored_Links'} },
+        { '<img class="LC_noBorder LC_middle" src="/res/adm/pages/sequence.png" alt="'.$lt{impm}.'" onclick="javascript:toggleMap(\'map\');" />' => $importpubform },
+        );
+        if ($importcrsresform) {
+            push(@importpubforma,{ '<img class="LC_noBorder LC_middle" src="/res/adm/pages/impcrsau.png" alt="'.$lt{imcr}.'"  onclick="javascript:toggleImportCrsres(\'res\');" />' => $importcrsresform});
+	}
+	$importpubform = &create_form_ul(&create_list_elements(@importpubforma));
+        my $extresourcesform =
+            &Apache::lonextresedit::extedit_form(0,0,undef,undef,$pathitem,
+                                                 $help{'Adding_External_Resource'},
+                                                 undef,undef,undef,undef,undef,undef,$disabled);
+        my $exttoolform =
+            &Apache::lonextresedit::extedit_form(0,0,undef,undef,$pathitem,
+                                                 $help{'Adding_External_Tool'},undef,
+                                                 undef,'tool',$coursedom,$coursenum,
+                                                 \%ltitools,$disabled);
     if ($allowed) {
-	&update_paste_buffer($coursenum,$coursedom);
-       my %lt=&Apache::lonlocal::texthash(
-					 'vc' => 'Verify Content',
-					 'cv' => 'Check/Set Resource Versions',
-					 'ls' => 'List Symbs',
-                                         'sl' => 'Show Log'
-					  );
-
+        my $folder = $env{'form.folder'};
+        if ($folder eq '') {
+            $folder='default';
+        }
+        if ($canedit) {
+	    my $output = &update_paste_buffer($coursenum,$coursedom,$folder);
+            if ($output) {
+                $r->print($output);
+            }
+        }
 	$r->print(<<HIDDENFORM);
 	<form name="renameform" method="post" action="/adm/coursedocs">
    <input type="hidden" name="title" />
@@ -2484,84 +7822,78 @@ ERFORM
    <input type="hidden" name="copyfolder" />
    $containertag
  </form>
- <form name="simpleedit" method="post" action="/adm/coursedocs">
-   <input type="hidden" name="importdetail" value="" />
-   $uploadtag
+ <form name="aliasform" method="post" action="/adm/coursedocs">
+   <input type="hidden" name="alias" />
+   <input type="hidden" name="cmd" />
+   $containertag
  </form>
+
 HIDDENFORM
+        $r->print(&makesimpleeditform($pathitem)."\n".
+                  &makedocslogform($pathitem."\n".
+                                   '<input type="hidden" name="folder" value="'.
+                                   $env{'form.folder'}.'" />'."\n"));
     }
 
 # Generate the tabs
-    my $mode;
+    my ($mode,$needs_end);
     if (($supplementalflag) && (!$allowed)) {
-        &Apache::lonnavdisplay::startContentScreen($r,'supplemental');
+        my @folders = split('&',$env{'form.folderpath'});
+        unless (@folders > 2) {
+            &Apache::lonnavdisplay::startContentScreen($r,'supplemental');
+            $needs_end = 1;
+        }
     } else {
-        &startContentScreen($r,($supplementalflag?'suppdocs':'docs'));
+        $r->print(&startContentScreen(($supplementalflag?'suppdocs':'docs')));
+        $needs_end = 1;
     }
 
 #
-
+    my $hostname = $r->hostname();
     my $savefolderpath;
 
     if ($allowed) {
        my $folder=$env{'form.folder'};
-       if ($folder eq '' || $supplementalflag) {
+       if ((($folder eq '') && (!$hiddentop)) || ($supplementalflag)) {
            $folder='default';
 	   $savefolderpath = $env{'form.folderpath'};
-	   $env{'form.folderpath'}='default&'.&escape(&mt('Content'));
-           $uploadtag = '<input type="hidden" name="folderpath" value="'.
+	   $env{'form.folderpath'}='default&'.&escape(&mt('Main Content'));
+           $pathitem = '<input type="hidden" name="folderpath" value="'.
 	       &HTML::Entities::encode($env{'form.folderpath'},'<>&"').'" />';
        }
        my $postexec='';
        if ($folder eq 'default') {
+           my $windowname = 'loncapaclient';
+           if ($env{'request.lti.login'}) {
+               $windowname .= 'lti';
+           }
            $r->print('<script type="text/javascript">'."\n"
                     .'// <![CDATA['."\n"
-                    .'this.window.name="loncapaclient";'."\n"
+                    .'this.window.name="'.$windowname.'";'."\n"
                     .'// ]]>'."\n"
                     .'</script>'."\n"
        );
        } else {
            #$postexec='self.close();';
        }
-       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 $folderseq='/uploaded/'.$coursedom.'/'.$coursenum.'/default_new.sequence';
+       my $pageseq = '/uploaded/'.$coursedom.'/'.$coursenum.'/default_new.page';
 	my $readfile='/uploaded/'.$coursedom.'/'.$coursenum.'/'.$folder.'.'.$container;
 
-
-
-	my $recoverform=(<<RFORM);
-	<form action="/adm/groupsort" method="post" name="recover">
-	<a class="LC_menubuttons_link" href="javascript:groupopen('$readfile',1)">$lt{'reco'}</a>
-	</form>
-RFORM
-
-	my $imspform=(<<IMSPFORM);
-	<form action="/adm/imsimportdocs" method="post" name="ims">
-	<input type="hidden" name="folder" value="$folder" />
-	<a class="LC_menubuttons_link" href="javascript:makeims();">$lt{'imsf'}</a>
-	</form>
-IMSPFORM
-
 	my $newnavform=(<<NNFORM);
 	<form action="/adm/coursedocs" method="post" name="newnav">
-	<input type="hidden" name="active" value="cc" />
-	$uploadtag
+	<input type="hidden" name="active" value="ff" />
+	$pathitem
 	<input type="hidden" name="importdetail" 
 	value="$lt{'navc'}=/adm/navmaps" />
-	<a class="LC_menubuttons_link" href="javascript:document.newnav.submit()">$lt{'navc'}</a>
+	<a class="LC_menubuttons_link" href="javascript:makenew(document.newnav);">$lt{'navc'}</a>
 	$help{'Navigate_Content'}
 	</form>
 NNFORM
 	my $newsmppageform=(<<NSPFORM);
 	<form action="/adm/coursedocs" method="post" name="newsmppg">
-	<input type="hidden" name="active" value="cc" />
-	$uploadtag
+	<input type="hidden" name="active" value="ff" />
+	$pathitem
 	<input type="hidden" name="importdetail" value="" />
 	<a class="LC_menubuttons_link" href="javascript:makesmppage();"> $lt{'sipa'}</a>
 	$help{'Simple Page'}
@@ -2570,28 +7902,29 @@ NSPFORM
 
 	my $newsmpproblemform=(<<NSPROBFORM);
 	<form action="/adm/coursedocs" method="post" name="newsmpproblem">
-	<input type="hidden" name="active" value="cc" />
-	$uploadtag
+	<input type="hidden" name="active" value="dd" />
+	$pathitem
 	<input type="hidden" name="importdetail" value="" />
 	<a class="LC_menubuttons_link" href="javascript:makesmpproblem();">$lt{'sipr'}</a>
-	$help{'Simple Problem'}
+	$help{'Simple_Problem'}
 	</form>
 
 NSPROBFORM
 
 	my $newdropboxform=(<<NDBFORM);
 	<form action="/adm/coursedocs" method="post" name="newdropbox">
-	<input type="hidden" name="active" value="cc" />
-	$uploadtag
+	<input type="hidden" name="active" value="dd" />
+	$pathitem
 	<input type="hidden" name="importdetail" value="" />
 	<a class="LC_menubuttons_link" href="javascript:makedropbox();">$lt{'drbx'}</a>
+        $help{'Dropbox'}
 	</form>
 NDBFORM
 
 	my $newexuploadform=(<<NEXUFORM);
 	<form action="/adm/coursedocs" method="post" name="newexamupload">
-	<input type="hidden" name="active" value="cc" />
-	$uploadtag
+	<input type="hidden" name="active" value="dd" />
+	$pathitem
 	<input type="hidden" name="importdetail" value="" />
 	<a class="LC_menubuttons_link" href="javascript:makeexamupload();">$lt{'scuf'}</a>
 	$help{'Score_Upload_Form'}
@@ -2600,8 +7933,8 @@ NEXUFORM
 
 	my $newbulform=(<<NBFORM);
 	<form action="/adm/coursedocs" method="post" name="newbul">
-	<input type="hidden" name="active" value="cc" />
-	$uploadtag
+	<input type="hidden" name="active" value="ee" />
+	$pathitem
 	<input type="hidden" name="importdetail" value="" />
 	<a class="LC_menubuttons_link" href="javascript:makebulboard();" >$lt{'bull'}</a>
 	$help{'Bulletin Board'}
@@ -2610,36 +7943,219 @@ NBFORM
 
 	my $newaboutmeform=(<<NAMFORM);
 	<form action="/adm/coursedocs" method="post" name="newaboutme">
-	<input type="hidden" name="active" value="cc" />
-	$uploadtag
+	<input type="hidden" name="active" value="ee" />
+	$pathitem
 	<input type="hidden" name="importdetail" 
 	value="$plainname=/adm/$udom/$uname/aboutme" />
-	<a class="LC_menubuttons_link" href="javascript:document.newaboutme.submit()">$lt{'mypi'}</a>
+	<a class="LC_menubuttons_link" href="javascript:makenew(document.newaboutme);">$lt{'mypi'}</a>
 	$help{'My Personal Information Page'}
 	</form>
 NAMFORM
 
 	my $newaboutsomeoneform=(<<NASOFORM);
 	<form action="/adm/coursedocs" method="post" name="newaboutsomeone">
-	<input type="hidden" name="active" value="cc" />
-	$uploadtag
+	<input type="hidden" name="active" value="ee" />
+	$pathitem
 	<input type="hidden" name="importdetail" value="" />
 	<a class="LC_menubuttons_link" href="javascript:makeabout();">$lt{'abou'}</a>
 	</form>
 NASOFORM
 
-
 	my $newrosterform=(<<NROSTFORM);
 	<form action="/adm/coursedocs" method="post" name="newroster">
-	<input type="hidden" name="active" value="cc" />
-	$uploadtag
+	<input type="hidden" name="active" value="ee" />
+	$pathitem
 	<input type="hidden" name="importdetail" 
 	value="$lt{'rost'}=/adm/viewclasslist" />
-	<a class="LC_menubuttons_link" href="javascript:document.newroster.submit()">$lt{'rost'}</a>
-	$help{'Course Roster'}
+	<a class="LC_menubuttons_link" href="javascript:makenew(document.newroster);">$lt{'rost'}</a>
+	$help{'Course_Roster'}
 	</form>
 NROSTFORM
 
+        my $newwebpage;
+        if ($folder =~ /^default_?(\d*)$/) {
+            $newwebpage = "/uploaded/$coursedom/$coursenum/docs/";
+            if ($1) {
+                $newwebpage .= $1;
+            } else {
+                $newwebpage .= 'default';
+            }
+            $newwebpage .= '/new.html';
+        }
+        my $newwebpageform =(<<NWEBFORM);
+        <form action="/adm/coursedocs" method="post" name="newwebpage">
+        <input type="hidden" name="active" value="ff" />
+        $pathitem
+        <input type="hidden" name="importdetail" value="$newwebpage" />
+        <a class="LC_menubuttons_link" href="javascript:makewebpage();">$lt{'webp'}</a>
+        $help{'Web_Page'}
+        </form>
+NWEBFORM
+        my $showpath = &HTML::Entities::encode($env{'form.folderpath'},'<>&"');
+        my @ids=&Apache::lonnet::current_machine_ids();
+        my $machines_str = "'".join("','",@ids)."'";
+        my (%is_home,%toppath,$rolehomes);
+        if ($env{'user.author'}) {
+            if (grep(/^\Q$env{'user.home'}\E$/,@ids)) {
+                $is_home{'author'} = 1;
+            }
+            $rolehomes = '<input type="hidden" id="rolehome_author" name="rolehome_author" value="'.$env{'user.home'}.'" />'."\n";
+        }
+        my %roleshash = &Apache::lonnet::get_my_roles($env{'user.name'},$env{'user.domain'},'userroles',
+                                                      ['active'],['ca','aa']);
+        my %by_roletype;
+        if (keys(%roleshash)) {
+            foreach my $entry (keys(%roleshash)) {
+                my ($auname,$audom,$roletype) = split(/:/,$entry);
+                my $key = $entry;
+                $key =~ s/:/___/g;
+                my $author = $auname.'___'.$audom;
+                $by_roletype{$roletype}{$author} = 1;
+                my $rolehome = &Apache::lonnet::homeserver($auname,$audom);
+                $toppath{$author} = "/priv/$audom/$auname";
+                if (grep(/^\Q$rolehome\E$/,@ids)) {
+                    $is_home{$author} = 1;
+                }
+                $rolehomes .= '<input type="hidden" id="rolehome_coauthor_'.$roletype.'_'.$audom.'/'.$auname.'" '.
+                              'name="rolehome_coauthor" value="'.$roletype.'='.$audom.'/'.$auname.'='.$rolehome.'" />'."\n";
+            }
+        }
+        my $crshome = $env{'course.'.$env{'request.course.id'}.'.home'};
+        if (grep(/^\Q$crshome\E$/,@ids)) {
+            $is_home{'course'} = 1;
+        }
+        $rolehomes .= '<input type="hidden" id="rolehome_course" name="rolehome_course" value="'.$crshome.'" />'."\n";
+        my $pickdir = '<label>'.$lt{'loca'}.
+                   '<select name="authorrole" onchange="populateDirSelects(this.form,'."'authorrole','authorpath'".',1,1,0);">'."\n".
+                   '<option value="" selected="selected">'.&mt('Select').'</option>'."\n";
+        if ($env{'user.author'}) {
+            $pickdir .= '<option value="author">'.&Apache::lonnet::plaintext('au').'</option>'."\n";
+        }
+        if (keys(%by_roletype)) {
+            foreach my $possrole ('ca','aa') {
+                if (ref($by_roletype{$possrole}) eq 'HASH') {
+                    my $roletitle = &Apache::lonnet::plaintext($possrole);
+                    foreach my $author (sort { lc($a) cmp lc($b) } (keys(%{$by_roletype{$possrole}}))) {
+                        my ($none,$where,$auname,$audom) = split(/\//,$toppath{$author});
+                        $pickdir .= '<option value="'.$author.'___'.$possrole.'">'.
+                                     $roletitle." ($audom/$auname)</option>\n";
+                    }
+                }
+            }
+        }
+        if ($checkcrsres) {
+            $pickdir .= '<option value="course">'.&mt('Course Resource').'</option>'."\n";
+        }
+        $pickdir .= '</select></label><br />'."\n".
+                    '<label>'.$lt{'dire'}.
+                    '<select name="authorpath" onchange="toggleCrsResTitle();">'.
+                    '<option value=""></option>'.
+                    '</select></label><br />'."\n";
+        my %seltemplate_menus;
+        my @files = &Apache::lonhomework::get_template_list('problem');
+        my @noexamplelink = ('blank.problem','blank.library','script.library');
+        my $currentcategory = '';
+        my @ordered = ('');
+        my %templatehelp;
+        my $defcategory = '';
+        my @catorder = ($defcategory);
+        $seltemplate_menus{$defcategory}->{'order'} = [''];
+        $seltemplate_menus{$defcategory}->{'text'} = '';
+        foreach my $file (@files) {
+            if (ref($file) eq 'ARRAY') {
+                my ($path,$title,$category,$help) = @{$file};
+                next if ($title !~ /\S/);
+                if (&js_escape($category) ne $currentcategory) {
+                    $currentcategory = &js_escape($category);
+                    push(@catorder,&js_escape($currentcategory));
+                    $seltemplate_menus{$currentcategory}->{'text'} = $category;
+                    $seltemplate_menus{$currentcategory}->{'default'} = '';
+                    $seltemplate_menus{$currentcategory}->{'select2'}->{''} = '';
+                    push(@{$seltemplate_menus{$currentcategory}->{'order'}},'');
+                }
+                if ($path) {
+                    $seltemplate_menus{$currentcategory}->{'select2'}->{&js_escape($path)} = $title;
+                    push(@{$seltemplate_menus{$currentcategory}->{'order'}},&js_escape($path));
+                    if ($help) {
+                        $templatehelp{$path} = $help;
+                    }
+                }
+            }
+        }
+
+        my ($templates,$haslabel);
+        if ($lt{'cate'} ne '') {
+            $templates = '<label>';
+            $haslabel = 1;
+        }
+        $templates .= $lt{'cate'}.' '.
+                      &Apache::loncommon::linked_select_forms('courseresform','<br />'.$lt{'tmpl'}.' ',
+                                                              $defcategory,'tempcategory','template',
+                                                              \%seltemplate_menus,\@catorder,
+                                                              "resize_scrollbox('contentscroll','1','0');",
+                                                              "toggleExampleText();",'template',$haslabel).'<br />';
+        my $templatepreview =  '<a href="#" target="sample" onclick="javascript:getExample(600,420,\'yes\',true);  return false;">'.
+                               '<span id="newresexample">'.&mt('Example').'</span></a>';
+        my $crsresform;
+        if (($env{'user.author'}) || ($checkcrsres)) {
+            $crsresform=(<<RESFORM);
+        <a class="LC_menubuttons_link" href="javascript:toggleCrsRes('res');">
+        $lt{'stpr'}</a>$help{'Standard_Problem'}
+        <form action="/adm/coursedocs" method="post" name="courseresform">
+        <fieldset id="crsresform" style="display:none;">
+        <legend>$lt{'stpr'}</legend>
+        <input type="hidden" name="active" value="bb" />
+        <p>
+        $pickdir
+        </p>
+        <div id="newstdproblem" style="display:none;">
+        <p>
+        <span class="LC_nobreak">$lt{'news'}?&nbsp;
+        <label><input type="radio" name="newsubdir" value="0" onclick="toggleNewsubdir(this.form);" checked="checked" $disabled />No</label>
+        &nbsp;
+        <label><input type="radio" name="newsubdir" value="1" onclick="toggleNewsubdir(this.form);" $disabled />Yes</label>
+        </span><label for="newsubdirname"><span id="newsubdir"></span></label>
+        <input type="hidden" name="newsubdirname" id="newsubdirname" value="" autocomplete="off" />
+        </p>
+        </div>
+        <label>$lt{'fnam'}
+        <input type="text" size="20" name="newresourcename" autocomplete="off" $disabled /></label>
+        <div id="newresource" style="display:none">
+        <p>
+        $lt{'addp'}
+        <label><input type="radio" name="newresourceadd" value="0" checked="checked" onclick="toggleNewInCourse(this.form);" $disabled />
+        $lt{'no'}</label>&nbsp;&nbsp;
+        <label><input type="radio" name="newresourceadd" value="1" onclick="toggleNewInCourse(this.form);" $disabled />
+        $lt{'yes'}</label>
+        <label for="newresourcetitle"><span id="newrestitle"></span></label>
+        <input type="hidden" size="20" name="newresourcetitle" id="newresourcetitle" autocomplete="off" $disabled />
+        </p>
+        </div>
+        <p>
+        $lt{'uste'}
+        <label><input type="radio" name="newresusetemp" value="0" checked="checked" onclick="toggleWithTemplate(this.form);" $disabled />
+        $lt{'no'}</label>&nbsp;&nbsp;
+        <label><input type="radio" name="newresusetemp" value="1" onclick="toggleWithTemplate(this.form);" $disabled />
+        $lt{'yes'}</label>
+        </p>
+        <div id="newrestemplate" style="display:none">
+        $templates
+        $templatepreview
+        </div>
+        <span class="LC_nobreak">
+        <input type="hidden" name="folderpath" value="$showpath" />
+        <input type="submit" name="newcrs" value="$lt{'crpr'}" $disabled />
+        </span>
+        <div id="stdprobswitch" style="display:none;">
+        $rolehomes
+        <input type="button" name="switchfornewprob" value="$lt{'swit'}" onclick="switchForProb();" />
+        </div>
+        </fieldset>
+        </form>
+
+RESFORM
+        }
+
 my $specialdocumentsform;
 my @specialdocumentsforma;
 my $gradingform;
@@ -2655,7 +8171,7 @@ my $newfolderb;
 	<form action="/adm/coursedocs" method="post" name="newpage">
 	<input type="hidden" name="folderpath" value="$path" />
 	<input type="hidden" name="importdetail" value="" />
-	<input type="hidden" name="active" value="cc" />
+	<input type="hidden" name="active" value="ee" />
 	<a class="LC_menubuttons_link" href="javascript:makenewpage(document.newpage,'$pageseq');">$lt{'newp'}</a>
 	$help{'Adding_Pages'}
 	</form>
@@ -2664,20 +8180,20 @@ NPFORM
 
 	$newfolderform=(<<NFFORM);
 	<form action="/adm/coursedocs" method="post" name="newfolder">
-	<input type="hidden" name="folderpath" value="$path" />
+	$pathitem
 	<input type="hidden" name="importdetail" value="" />
-	<input type="hidden" name="active" value="aa" />
+	<input type="hidden" name="active" value="" />
 	<a href="javascript:makenewfolder(document.newfolder,'$folderseq');">$lt{'newf'}</a>$help{'Adding_Folders'}
 	</form>
 NFFORM
 
 	my $newsylform=(<<NSYLFORM);
 	<form action="/adm/coursedocs" method="post" name="newsyl">
-	<input type="hidden" name="active" value="cc" />
-	$uploadtag
+	<input type="hidden" name="active" value="ee" />
+	$pathitem
 	<input type="hidden" name="importdetail" 
 	value="$lt{'syll'}=/public/$coursedom/$coursenum/syllabus" />
-	<a class="LC_menubuttons_link" href="javascript:document.newsyl.submit()">$lt{'syll'}</a>
+	<a class="LC_menubuttons_link" href="javascript:makenew(document.newsyl);">$lt{'syll'}</a>
 	$help{'Syllabus'}
 
 	</form>
@@ -2685,75 +8201,97 @@ NSYLFORM
 
 	my $newgroupfileform=(<<NGFFORM);
 	<form action="/adm/coursedocs" method="post" name="newgroupfiles">
-	<input type="hidden" name="active" value="cc" />
-	$uploadtag
+	<input type="hidden" name="active" value="ee" />
+	$pathitem
 	<input type="hidden" name="importdetail"
 	value="$lt{'grpo'}=/adm/$coursedom/$coursenum/aboutme" />
-	<a class="LC_menubuttons_link" href="javascript:document.newgroupfiles.submit()">$lt{'grpo'}</a>
+	<a class="LC_menubuttons_link" href="javascript:makenew(document.newgroupfiles);">$lt{'grpo'}</a>
 	$help{'Group Portfolio'}
 	</form>
 NGFFORM
-	@specialdocumentsforma=(
+        if ($container eq 'page') {
+            @specialdocumentsforma=(
+        {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/webpage.png" alt="'.$lt{webp}.'" onclick="javascript:makewebpage();" />'=>$newwebpageform},
+            );
+        } else {
+	    @specialdocumentsforma=(
 	{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/page.png" alt="'.$lt{newp}.'"  onclick="javascript:makenewpage(document.newpage,\''.$pageseq.'\');" />'=>$newpageform},
-	{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/syllabus.png" alt="'.$lt{syll}.'" onclick="document.newsyl.submit()" />'=>$newsylform},
-	{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/navigation.png" alt="'.$lt{navc}.'" onclick="document.newnav.submit()" />'=>$newnavform},
+	{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/syllabus.png" alt="'.$lt{syll}.'" onclick="javascript:makenew(document.newsyl);" />'=>$newsylform},
+	{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/navigation.png" alt="'.$lt{navc}.'" onclick="javascript:makenew(document.newnav);" />'=>$newnavform},
         {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/simple.png" alt="'.$lt{sipa}.'" onclick="javascript:makesmppage();" />'=>$newsmppageform},
-        );
+        {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/webpage.png" alt="'.$lt{webp}.'" onclick="javascript:makewebpage();" />'=>$newwebpageform},
+            );
+        }
         $specialdocumentsform = &create_form_ul(&create_list_elements(@specialdocumentsforma));
 
+        my @external = (
+        {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/extres.png" alt="'.$lt{extr}.'" onclick="toggleExternal(\'ext\');" />'=>$extresourcesform}
+        );
+        if ($posslti) {
+            push(@external,
+                 {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/exttool.png" alt="'.$lt{extt}.'" onclick="toggleExternal(\'tool\');" />'=>$exttoolform},
+            );
+        }
+        my $externalform = &create_form_ul(&create_list_elements(@external));
 
-        my @importdoc = (
-        {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/extres.png" alt="'.$lt{extr}.'" onclick="javascript:makenewext(\'newext\');" />'=>$extresourcesform},
-        {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/ims.png" alt="'.$lt{imsf}.'" onclick="javascript:makeims();" />'=>$imspform},);
-        $fileuploadform =  &create_form_ul(&create_list_elements(@importdoc)) . '<hr id="cc_hrule" style="width:0px;text-align:left;margin-left:0" />' . $fileuploadform;
+        my @importdoc = ();
+        unless ($container eq 'page') {
+            push(@importdoc,
+                {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/ims.png" alt="'.$lt{imsf}.'" onclick="javascript:toggleUpload(\'ims\');" />'=>$imspform}
+            );
+        }
+        push(@importdoc,
+            {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/pdfupload.png" alt="'.$lt{upl}.'" onclick="javascript:toggleUpload(\'doc\');" />'=>$fileuploadform}
+        );
+        $fileuploadform =  &create_form_ul(&create_list_elements(@importdoc));
 
         @gradingforma=(
         {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/simpprob.png" alt="'.$lt{sipr}.'" onclick="javascript:makesmpproblem();" />'=>$newsmpproblemform},
         {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/dropbox.png" alt="'.$lt{drbx}.'" onclick="javascript:makedropbox();" />'=>$newdropboxform},
-        {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/scoreupfrm.png" alt="'.$lt{scuf}.'" onclick="javascript:makeexamupload();" />'=>$newexuploadform},
-
+        {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/scoreupfrm.png" alt="'.$lt{scuf}.'" onclick="javascript:makeexamupload();" />'=>$newexuploadform}
         );
+        if ($crsresform) {
+            push(@gradingforma,
+                 {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/simpprob.png" alt="'.$lt{stpr}.'" onclick="javascript:toggleCrsRes(\'res\');" />'=>$crsresform}
+            );
+        }
         $gradingform = &create_form_ul(&create_list_elements(@gradingforma));
 
         @communityforma=(
        {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/bchat.png" alt="'.$lt{bull}.'" onclick="javascript:makebulboard();" />'=>$newbulform},
         {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/myaboutme.png" alt="'.$lt{mypi}.'" onclick="javascript:makebulboard();" />'=>$newaboutmeform},
         {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/aboutme.png" alt="'.$lt{abou}.'" onclick="javascript:makeabout();" />'=>$newaboutsomeoneform},
-        {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/clst.png" alt="'.$lt{rost}.'" onclick="document.newroster.submit()" />'=>$newrosterform},
-        {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/groupportfolio.png" alt="'.$lt{grpo}.'" onclick="document.newgroupfiles.submit()" />'=>$newgroupfileform},
+        {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/clst.png" alt="'.$lt{rost}.'" onclick="javascript:makenew(document.newroster);" />'=>$newrosterform},
+        {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/groupportfolio.png" alt="'.$lt{grpo}.'" onclick="javascript:makenew(document.newgroupfiles);" />'=>$newgroupfileform},
         );
         $communityform = &create_form_ul(&create_list_elements(@communityforma));
 
-
-
-my @tools = (
-#	{'<img class="LC_noBorder LC_middle" align="left" src="/res/adm/pages/extres.png" alt="'.$lt{extr}.'" />'=>$extresourcesform},
-#	{'<img class="LC_noBorder LC_middle" align="left" src="/res/adm/pages/ims.png" alt="'.$lt{imsf}.'" />'=>$imspform},
-	{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/recover.png" alt="'.$lt{reco}.'" onclick="javascript:groupopen(\''.$readfile.'\',1)" />'=>$recoverform},
-	);
-
 my %orderhash = (
-                'aa' => ['Import Documents',$fileuploadform],
-                'bb' => ['Published Resources',$simpleeditdefaultform],
-                'cc' => ['Grading Resources',$gradingform],
-		'ff' => ['Tools', &create_form_ul(&create_list_elements(@tools)).&generate_admin_options(\%help,\%env)],
+                'aa' => ['Upload',$fileuploadform],
+                'bb' => ['External',$externalform],
+                'cc' => ['Import',$importpubform],
+                'dd' => ['Assessment',$gradingform],
+                'ff' => ['Other',$specialdocumentsform],
                 );
-unless ($env{'form.pagepath'}) {
+unless ($container eq 'page') {
     $orderhash{'00'} = ['Newfolder',$newfolderform];
-    $orderhash{'dd'} = ['Community Resources',$communityform];
-    $orderhash{'ee'} = ['Special Documents',$specialdocumentsform];
+    $orderhash{'ee'} = ['Collaboration',$communityform];
 }
 
  $hadchanges=0;
-       unless ($supplementalflag) {
+       unless (($supplementalflag || $toolsflag)) {
           my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$crstype,
-                              $supplementalflag,\%orderhash,$iconpath);
+                              $supplementalflag,\%orderhash,$iconpath,$pathitem,
+                              \%ltitools,$canedit,$hostname,\$navmap,$hiddentop);
+          undef($navmap);
           if ($error) {
              $r->print('<p><span class="LC_error">'.$error.'</span></p>');
           }
           if ($hadchanges) {
-             &mark_hash_old();
-          }
+              unless (&is_hash_old()) {
+                  &mark_hash_old();
+              }
+	  }
 
           &changewarning($r,'');
         }
@@ -2765,66 +8303,74 @@ unless ($env{'form.pagepath'}) {
        unless ($supplementalflag) {
 	   $folder='supplemental';
        }
-       if ($folder =~ /^supplemental$/ &&
+       if (($folder eq 'supplemental') &&
 	   (($env{'form.folderpath'} =~ /^default\&/) || ($env{'form.folderpath'} eq ''))) {
           $env{'form.folderpath'} = &supplemental_base();
        } elsif ($allowed) {
 	  $env{'form.folderpath'} = $savefolderpath;
        }
-       $env{'form.pagepath'} = '';
+       $pathitem = '<input type="hidden" name="folderpath" value="'.
+                    &HTML::Entities::encode($env{'form.folderpath'},'<>&"').'" />';
        if ($allowed) {
 	   my $folderseq=
-	       '/uploaded/'.$coursedom.'/'.$coursenum.'/supplemental_'.time.
-	       '.sequence';
-
-	   my $path = &HTML::Entities::encode($env{'form.folderpath'},'<>&"');
+	       '/uploaded/'.$coursedom.'/'.$coursenum.'/supplemental_new.sequence';
 
-	my $supupdocformbtn = "<input type='submit' value='".$lt{'upld'}."' />$help{'Uploading_From_Harddrive'}";
 	my $supupdocform=(<<SUPDOCFORM);
+        <a class="LC_menubuttons_link" href="javascript:toggleUpload('suppdoc');">
+        $lt{'upfi'}</a> $help{'Uploading_From_Harddrive'}
 	<form action="/adm/coursedocs" method="post" name="supuploaddocument" enctype="multipart/form-data">
-	<input type="hidden" name="active" value="ee" />	
-	$fileupload
+        <fieldset id="uploadsuppdocform" style="display: none;">
+        <legend>$lt{'upfi'}</legend>
+	<input type="hidden" name="active" value="ee" />
+	$quotainfo
+        <label>$lt{'file'}:<br />
+        <input type="file" name="uploaddoc" id="uploaddocsupp" class="LC_flUpload LC_uploaddoc" size="40" $disabled /></label>
+        <input type="hidden" id="LC_free_space_supp" value="$free_space" />
 	<br />
 	<br />
 	<span class="LC_nobreak">
 	$checkbox
 	</span>
 	<br /><br />
-	$lt{'comment'}:<br />
-	<textarea cols="50" rows="4" name="comment"></textarea>
+	<label>$lt{'comment'}:<br />
+	<textarea cols="50" rows="4" name="comment"></textarea></label>
 	<br />
-	<input type="hidden" name="folderpath" value="$path" />
+	$pathitem
 	<input type="hidden" name="cmd" value="upload_supplemental" />
+        <input type='submit' value="$lt{'upld'}" />
+        </fieldset>
+        </form>
 SUPDOCFORM
-	$supupdocform .=  &create_form_ul(&Apache::lonhtmlcommon::htmltag('li',$supupdocformbtn,{class => 'LC_menubuttons_inline_text'}))."</form>";
 
 	my $supnewfolderform=(<<SNFFORM);
 	<form action="/adm/coursedocs" method="post" name="supnewfolder">
-	<input type="hidden" name="active" value="ee" />
-	<input type="hidden" name="folderpath" value="$path" />
+	<input type="hidden" name="active" value="" />
+        $pathitem
 	<input type="hidden" name="importdetail" value="" />
 	<a class="LC_menubuttons_link" href="javascript:makenewfolder(document.supnewfolder,'$folderseq');">$lt{'newf'}</a> 
 	$help{'Adding_Folders'}
 	</form>
 SNFFORM
 	
-
-	my $supnewextform=(<<SNEFORM);
-	<form action="/adm/coursedocs" method="post" name="supnewext">
-	<input type="hidden" name="active" value="ff" />
-	<input type="hidden" name="folderpath" value="$path" />
-	<input type="hidden" name="importdetail" value="" />
-	<a class="LC_menubuttons_link" href="javascript:makenewext('supnewext');">$lt{'extr'}</a> $help{'Adding_External_Resource'}
-	</form>
-SNEFORM
+        my $supextform =
+            &Apache::lonextresedit::extedit_form(1,0,undef,undef,$pathitem,
+                                                 $help{'Adding_External_Resource'},
+                                                 undef,undef,undef,undef,undef,undef,
+                                                 $disabled);
+
+        my $supexttoolform =
+            &Apache::lonextresedit::extedit_form(1,0,undef,undef,$pathitem,
+                                                 $help{'Adding_External_Tool'},
+                                                 undef,undef,'tool',$coursedom,
+                                                 $coursenum,\%ltitools,$disabled);
 
 	my $supnewsylform=(<<SNSFORM);
 	<form action="/adm/coursedocs" method="post" name="supnewsyl">
 	<input type="hidden" name="active" value="ff" />
-	<input type="hidden" name="folderpath" value="$path" />
+        $pathitem
 	<input type="hidden" name="importdetail" 
 	value="Syllabus=/public/$coursedom/$coursenum/syllabus" />
-	<a class="LC_menubuttons_link" href="javascript:document.supnewsyl.submit()">$lt{'syll'}</a>
+	<a class="LC_menubuttons_link" href="javascript:makenew(document.supnewsyl);">$lt{'syll'}</a>
 	$help{'Syllabus'}
 	</form>
 SNSFORM
@@ -2832,47 +8378,88 @@ SNSFORM
 	my $supnewaboutmeform=(<<SNAMFORM);
 	<form action="/adm/coursedocs" method="post" name="supnewaboutme">
 	<input type="hidden" name="active" value="ff" />
-	<input type="hidden" name="folderpath" value="$path" />
+        $pathitem
 	<input type="hidden" name="importdetail" 
 	value="$plainname=/adm/$udom/$uname/aboutme" />
-	<a class="LC_menubuttons_link" href="javascript:document.supnewaboutme.submit()">$lt{'mypi'}</a>
+	<a class="LC_menubuttons_link" href="javascript:makenew(document.supnewaboutme);">$lt{'mypi'}</a>
 	$help{'My Personal Information Page'}
 	</form>
 SNAMFORM
 
+        my $supwebpage;
+        if ($folder =~ /^supplemental_?(\d*)$/) {
+            $supwebpage = "/uploaded/$coursedom/$coursenum/supplemental/";
+            if ($1) {
+                $supwebpage .= $1;
+            } else {
+                $supwebpage .= 'default';
+            }
+            $supwebpage .= '/new.html';
+        }
+        my $supwebpageform =(<<SWEBFORM);
+        <form action="/adm/coursedocs" method="post" name="supwebpage">
+        <input type="hidden" name="active" value="cc" />
+        $pathitem
+        <input type="hidden" name="importdetail" value="$supwebpage" />
+        <a class="LC_menubuttons_link" href="javascript:makewebpage('supp');">$lt{'webp'}</a>
+        $help{'Web_Page'}
+        </form>
+SWEBFORM
+
 
 my @specialdocs = (
-		{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/syllabus.png" alt="'.$lt{syll}.'" onclick="document.supnewsyl.submit()" />'
+		{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/syllabus.png" alt="'.$lt{syll}.'" onclick="javascript:makenew(document.supnewsyl);" />'
             =>$supnewsylform},
-		{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/myaboutme.png" alt="'.$lt{mypi}.'" onclick="document.supnewaboutme.submit()" />'
+		{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/myaboutme.png" alt="'.$lt{mypi}.'" onclick="javascript:makenew(document.supnewaboutme);" />'
             =>$supnewaboutmeform},
+                {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/webpage.png" alt="'.$lt{webp}.'" onclick="javascript:makewebpage('."'supp'".');" />'=>$supwebpageform},
+
 		);
-my @supimportdoc = (
-		{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/extres.png" alt="'.$lt{extr}.'" onclick="javascript:makenewext(\'supnewext\');" />'
-            =>$supnewextform},
+        my @supexternal = (
+            {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/extres.png" alt="'.$lt{extr}.'" onclick="javascript:toggleExternal(\'suppext\')" />'
+             =>$supextform});
+        if ($posslti) {
+            push(@supexternal,
+                 {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/exttool.png" alt="'.$lt{extt}.'" onclick="javascript:toggleExternal(\'supptool\')" />'
+            =>$supexttoolform});
+        }
+        my @supimportdoc = (
+            {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/pdfupload.png" alt="'.$lt{upl}.'" onclick="javascript:toggleUpload(\'suppdoc\');" />'
+            =>$supupdocform},
         );
-$supupdocform =  &create_form_ul(&create_list_elements(@supimportdoc)) . '<hr id="ee_hrule" style="width:0px;text-align:left;margin-left:0" />' . $supupdocform;
+
+$supupdocform =  &create_form_ul(&create_list_elements(@supimportdoc));
 my %suporderhash = (
 		'00' => ['Supnewfolder', $supnewfolderform],
-                'ee' => ['Import Documents',$supupdocform],
-                'ff' => ['Special Documents',&create_form_ul(&create_list_elements(@specialdocs))]
+                'dd' => ['Upload',$supupdocform],
+                'ee' => ['External',&create_form_ul(&create_list_elements(@supexternal))],
+                'ff' => ['Other',&create_form_ul(&create_list_elements(@specialdocs))]
                 );
         if ($supplementalflag) {
-           my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$crstype,
-                               $supplementalflag,\%suporderhash,$iconpath);
-           if ($error) {
-              $r->print('<p><span class="LC_error">'.$error.'</span></p>');
-           }
+            $suppchanges = 0;
+            my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$crstype,
+                                $supplementalflag,\%suporderhash,$iconpath,$pathitem,
+                                \%ltitools,$canedit,$hostname);
+            if ($error) {
+                $r->print('<p><span class="LC_error">'.$error.'</span></p>');
+            }
+            if ($suppchanges) {
+                &Apache::lonnet::update_supp_caches($coursedom,$coursenum);
+                undef($suppchanges);
+            }
         }
     } elsif ($supplementalflag) {
         my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$crstype,
-                            $supplementalflag,'',$iconpath);
+                            $supplementalflag,'',$iconpath,$pathitem,'',$canedit,
+                            $hostname);
         if ($error) {
             $r->print('<p><span class="LC_error">'.$error.'</span></p>');
         }
     }
 
-    &endContentScreen($r);
+    if ($needs_end) {
+        $r->print(&endContentScreen());
+    }
 
     if ($allowed) {
 	$r->print('
@@ -2883,23 +8470,24 @@ my %suporderhash = (
   <input type="hidden" name="residx" />
 </form>');
     }
-  } else {
-      unless ($uploadphase) {
+  } elsif ($showdoc) {
 # -------------------------------------------------------- This is showdoc mode
-          $r->print("<h1>".&mt('Uploaded Document').' - '.
-		&Apache::lonnet::gettitle($r->uri).'</h1><p>'.
+      $r->print("<h1>".&mt('Uploaded Document').' - '.
+		&Apache::lonnet::gettitle($r->uri).'</h1><p class="LC_warning">'.
 &mt('It is recommended that you use an up-to-date virus scanner before handling this file.')."</p><table>".
-          &entryline(0,&mt("Click to download or use your browser's Save Link function"),$showdoc).'</table>');
-      }
+                &entryline(0,&mt("Click to download or use your browser's Save Link function"),$showdoc).'</table>');
   }
  }
- $r->print(&Apache::loncommon::end_page());
+ unless ($noendpage) {
+     $r->print(&Apache::loncommon::end_page());
+ }
  return OK;
 }
 
 sub embedded_form_elems {
     my ($phase,$primaryurl,$newidx) = @_;
     my $folderpath = &HTML::Entities::encode($env{'form.folderpath'},'<>&"');
+    $newidx =~s /\D+//g;
     return <<STATE;
     <input type="hidden" name="folderpath" value="$folderpath" />
     <input type="hidden" name="cmd" value="upload_embedded" />
@@ -2920,7 +8508,11 @@ sub embedded_destination {
     } elsif ($folder =~ /^(default|supplemental)_(\d+)$/) {
         $destination .=  $2.'/';
     }
-    $destination .= $env{'form.newidx'};
+    my $newidx = $env{'form.newidx'};
+    $newidx =~s /\D+//g;
+    if ($newidx) {
+        $destination .= $newidx;
+    }
     my $dir_root = '/userfiles';
     return ($destination,$dir_root);
 }
@@ -2933,59 +8525,303 @@ sub return_to_editor {
            '</a></p>';
 }
 
-sub generate_admin_options {
-  my ($help_ref,$env_ref) = @_;
-  my %lt=&Apache::lonlocal::texthash(
-                                         'vc' => 'Verify Content',
-                                         'cv' => 'Check/Set Resource Versions',
-                                         'ls' => 'List Symbs',
-                                         'sl' => 'Show Log',
-                                         'imse' => 'IMS Export',
-                                         'dcd' => 'Dump Course Documents to Construction Space: available on other servers'
-                                          );
-  my %help = %{$help_ref};
-  my %env = %{$env_ref};
-  my $dumpbut=&dumpbutton();
-  my $exportbut=&exportbutton();
-  my @list = (
-	{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/verify.png" alt="'.$lt{vc}.'"  onclick=\'javascript:injectData(document.courseverify, "dummy", "verify", "'.$lt{'vc'}.'")\' />' 
-        => "<a class='LC_menubuttons_link' href='javascript:injectData(document.courseverify, \"dummy\", \"verify\", \"$lt{'vc'}\")'>$lt{'vc'}</a>$help{'Verify_Content'}"},
-	{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/resversion.png" alt="'.$lt{cv}.'"  onclick=\'javascript:injectData(document.courseverify, "dummy", "versions", "'.$lt{'cv'}.'")\' />'
-        =>"<a class='LC_menubuttons_link' href='javascript:injectData(document.courseverify, \"dummy\", \"versions\", \"$lt{'cv'}\")'>$lt{'cv'}</a>$help{'Check_Resource_Versions'}"},
-	);
-  if($dumpbut ne ''){
-  push @list, {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/dump.png" alt="'.$lt{dcd}.'" />'=>$dumpbut};
-  }
-  push @list, ({'<img class="LC_noBorder LC_middle" src="/res/adm/pages/imsexport.png" alt="'.$lt{imse}.'" onclick="javascript:injectData(document.courseverify, \'dummy\', \'exportcourse\', \''.&mt('IMS Export').'\');" />'
-          =>$exportbut},
-	{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/symbs.png" alt="'.$lt{ls}.'"  onclick=\'javascript:injectData(document.courseverify, "dummy", "listsymbs", "'.$lt{'ls'}.'")\'  />'
-        =>"<a class='LC_menubuttons_link' href='javascript:injectData(document.courseverify, \"dummy\", \"listsymbs\", \"$lt{'ls'}\")'>$lt{'ls'}</a><input type='hidden' name='folder' value='$env{'form.folder'}' />"},
-	{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/document-properties.png" alt="'.$lt{sl}.'"  onclick=\'javascript:injectData(document.courseverify, "dummy", "docslog", "'.$lt{'sl'}.'")\'  />'
-        =>"<a class='LC_menubuttons_link' href='javascript:injectData(document.courseverify, \"dummy\", \"docslog\", \"$lt{'sl'}\")'>$lt{'sl'}</a>"},
-	);
-  return '<form action="/adm/coursedocs" method="post" name="courseverify"><input type="hidden" id="dummy" />'.&create_form_ul(&create_list_elements(@list)).'</form>';
-
+sub decompression_info {
+    my ($destination,$dir_root) = &embedded_destination();
+    my $londocroot = $Apache::lonnet::perlvar{'lonDocRoot'};
+    my $docudom=$env{'course.'.$env{'request.course.id'}.'.domain'};
+    my $docuname=$env{'course.'.$env{'request.course.id'}.'.num'};
+    my $container='sequence';
+    my ($pathitem,$hiddenelem);
+    my @hiddens = ('newidx','comment','position','folderpath','archiveurl');
+    if ($env{'form.folderpath'} =~ /\:1$/) {
+        $container='page';
+    }
+    unshift(@hiddens,$pathitem);
+    foreach my $item (@hiddens) {
+        if ($item eq 'newidx') {
+            next if ($env{'form.'.$item} =~ /\D/);
+        }
+        if ($env{'form.'.$item}) {
+            $hiddenelem .= '<input type="hidden" name="'.$item.'" value="'.
+                           &HTML::Entities::encode($env{'form.'.$item},'<>&"').'" />'."\n";
+        }
+    }
+    return ($destination,$dir_root,$londocroot,$docudom,$docuname,$container,
+            $hiddenelem);
+}
+
+sub decompression_phase_one {
+    my ($dir,$file,$warning,$error,$output);
+    my ($destination,$dir_root,$londocroot,$docudom,$docuname,$container,$hiddenelem)=
+        &decompression_info();
+    if ($env{'form.archiveurl'} !~ m{^/uploaded/\Q$docudom/$docuname/\E(?:docs|supplemental)/(?:default|\d+).*/([^/]+)$}) {
+        $error = &mt('Archive file "[_1]" not in the expected location.',$env{'form.archiveurl'});
+    } else {
+        my $file = $1;
+        $output =
+            &Apache::loncommon::process_decompression($docudom,$docuname,$file,
+                                                      $destination,$dir_root,
+                                                      $hiddenelem);
+        if ($env{'form.autoextract_camtasia'}) {
+            $output .= &remove_archive($docudom,$docuname,$container);
+        }
+    }
+    if ($error) {
+        $output .= '<p class="LC_error">'.&mt('Not extracted.').'<br />'.
+                   $error.'</p>'."\n";
+    }
+    if ($warning) {
+        $output .= '<p class="LC_warning">'.$warning.'</p>'."\n";
+    }
+    return $output;
+}
+
+sub decompression_phase_two {
+    my ($destination,$dir_root,$londocroot,$docudom,$docuname,$container,$hiddenelem)=
+        &decompression_info();
+    my $output;
+    if ($env{'form.archivedelete'}) {
+        $output = &remove_archive($docudom,$docuname,$container);
+    }
+    $output .= 
+        &Apache::loncommon::process_extracted_files('coursedocs',$docudom,$docuname,
+                                                    $destination,$dir_root,$hiddenelem);
+    return $output;
+}
+
+sub remove_archive {
+    my ($docudom,$docuname,$container) = @_;
+    my $map = $env{'form.folder'}.'.'.$container;
+    my ($output,$delwarning,$delresult,$url);
+    my ($errtext,$fatal) = &mapread($docuname,$docudom,$map);
+    if ($fatal) {
+        if ($container eq 'page') {
+            $delwarning = &mt('An error occurred retrieving the contents of the current page.');
+        } else {
+            $delwarning = &mt('An error occurred retrieving the contents of the current folder.');
+        }
+        $delwarning .= ' '.&mt('As a result the archive file has not been removed.');
+    } else {
+        my $currcmd = $env{'form.cmd'};
+        my $position = $env{'form.position'};
+        my $archiveidx = $position;
+        if ($position > 0) {
+            if (($env{'form.autoextract_camtasia'}) && (scalar(@LONCAPA::map::order) == 2)) {
+                $archiveidx = $position-1;
+            }
+            $env{'form.cmd'} = 'remove_'.$archiveidx;
+            my ($title,$url,@rrest) =
+                split(/:/,$LONCAPA::map::resources[$LONCAPA::map::order[$archiveidx]]);
+            if ($url eq $env{'form.archiveurl'}) {
+                if (&handle_edit_cmd($docuname,$docudom)) {
+                    ($errtext,$fatal) = &storemap($docuname,$docudom,$map,1);
+                    if ($suppchanges) {
+                        &Apache::lonnet::update_supp_caches($docudom,$docuname);
+                        undef($suppchanges);
+                    }
+                    if ($fatal) {
+                        if ($container eq 'page') {
+                            $delwarning = &mt('An error occurred updating the contents of the current page.');
+                        } else {
+                            $delwarning = &mt('An error occurred updating the contents of the current folder.');
+                        }
+                    } else {
+                        $delresult = &mt('Archive file removed.');
+                    }
+                }
+            } else {
+                $delwarning .=  &mt('Archive file had unexpected item number in folder.').
+                                ' '.&mt('As a result the archive file has not been removed.');
+            }
+        }
+        $env{'form.cmd'} = $currcmd;
+    }
+    if ($delwarning) {
+        $output = '<p class="LC_warning">'.
+                   $delwarning.
+                   '</p>';
+    }
+    if ($delresult) {
+        $output .= '<p class="LC_info">'.
+                   $delresult.
+                   '</p>';
+    }
+    return $output;
 }
 
+sub generate_admin_menu {
+    my ($crstype,$canedit,$coursenum,$coursedom) = @_;
+    my $lc_crstype = lc($crstype);
+    my ($home,$other,%outhash)=&authorhosts();
+    my %lt= ( # do not translate here
+                                         'vc'   => 'Verify Content',
+                                         'cv'   => 'Check/Set Resource Versions',
+                                         'ls'   => 'List Resource Identifiers',
+                                         'ct'   => 'Display/Set Shortened URLs for Deep-linking',
+                                         'ca'   => "Enter $crstype Authoring Space",
+                                         'imse' => 'Export contents to IMS Archive',
+                                         'dcd'  => 'Copy uploaded content to Authoring Space',
+                                         'cpc'  => 'Copy from Course Authoring to User Authoring',
+            );
+    my ($candump,$dumpurl,$exportcrsurl);
+    if ($home + $other > 0) {
+        $candump = 'F';
+        if ($home) {
+            $dumpurl = "javascript:injectData(document.courseverify,'dummy','dumpcourse','$lt{'dcd'}')";
+            $exportcrsurl = "javascript:injectData(document.courseverify,'dummy','copyauthored','$lt{'cpc'}')";
+        } else {
+            my @hosts;
+            foreach my $aurole (keys(%outhash)) {
+                unless(grep(/^\Q$outhash{$aurole}\E/,@hosts)) {
+                    push(@hosts,$outhash{$aurole});
+                }
+            }
+            if (@hosts == 1) {
+                my $switchto = '/adm/switchserver?otherserver='.$hosts[0].
+                               '&amp;role='.
+                               &HTML::Entities::encode($env{'request.role'},'"<>&').'&amp;origurl='.
+                               &HTML::Entities::encode('/adm/coursedocs?dumpcourse=1','"<>&');
+                $dumpurl = "javascript:dump_needs_switchserver('$switchto')";
+                $exportcrsurl = $dumpurl;
+            } else {
+                $dumpurl = "javascript:choose_switchserver_window()";
+                $exportcrsurl = $dumpurl;
+            }
+        }
+    }
+    my @menu=
+        ({  categorytitle=>'Administration',
+            items =>[
+                {   linktext   => $lt{'vc'},
+                    url        => "javascript:injectData(document.courseverify,'dummy','verify','$lt{'vc'}')",
+                    permission => 'F',
+                    help       => 'Docs_Verify_Content',
+                    icon       => 'verify.png',
+                    linktitle  => 'Verify contents can be retrieved/rendered',
+                },
+                {   linktext => $lt{'cv'},
+                    url => "javascript:injectData(document.courseverify,'dummy','versions','$lt{'cv'}')",
+                    permission => 'F',
+                    help       => 'Docs_Check_Resource_Versions',
+                    icon       => 'resversion.png',
+                    linktitle  => "View version information for resources in your $lc_crstype, and fix/unfix use of specific versions",
+                },
+                {   linktext   => $lt{'ls'},
+                    url        => "javascript:injectData(document.courseverify,'dummy','listsymbs','$lt{'ls'}')",
+                    permission => 'F',
+                    #help => '',
+                    icon       => 'symbs.png',
+                    linktitle  => "List the unique identifier used for each resource instance in your $lc_crstype"
+                },
+                {   linktext   => $lt{'ct'},
+                    url        => "javascript:injectData(document.courseverify,'dummy','shorturls','$lt{'ct'}')",
+                    permission => 'F',
+                    help       => 'Docs_Short_URLs',
+                    icon       => 'shorturls.png',
+                    linktitle  => "Set shortened URLs for a resource or folder in your $lc_crstype for use in deep-linking"
+                },
+                ]
+        });
+    if ($canedit) {
+        my ($crsauname,$crsaudom,$crshome);
+        if (($coursenum ne '') && ($coursedom ne '')) {
+            my $crsauthorurl = "/priv/$coursedom/$coursenum/";
+            ($crsauname,$crsaudom,$crshome) = &Apache::lonnet::constructaccess($crsauthorurl);
+            if (($crsauname eq $coursenum) && ($crsaudom eq $coursedom)) {
+                my @ids=&Apache::lonnet::current_machine_ids();
+                my $linkurl;
+                if (grep(/^\Q$crshome\E$/,@ids)) {
+                    $linkurl = $crsauthorurl;
+                } else {
+                    my $jscall = &Apache::lonhtmlcommon::jump_to_editres($crsauthorurl,$crshome,1);
+                    if ($jscall) {
+                        $linkurl = 'javascript:'.$jscall;
+                    }
+                }
+                if ((ref($menu[0]) eq 'HASH') && (ref($menu[0]->{'items'}) eq 'ARRAY') && ($linkurl)) {
+                     push(@{$menu[0]->{items}},
+                     {   linktext   => $lt{'ca'},
+                         url        => $linkurl,
+                         permission => 'F',
+                         help       => 'Docs_Course_Authorspace',
+                         icon       => 'impcrsau.png',
+                         linktitle  => $lt{'ca'},
+                     });
+                }
+            }
+        }
+        push(@menu,
+        {   categorytitle=>'Export',
+            items =>[
+                {   linktext   => $lt{'imse'},
+                    url => "javascript:injectData(document.courseverify,'dummy','exportcourse','$lt{'imse'}')",
+                    permission => 'F',
+                    help       => 'Docs_Export_Course_Docs',
+                    icon       => 'imsexport.png',
+                    linktitle  => $lt{'imse'},
+                },
+                {   linktext   => $lt{'dcd'},
+                    url        => $dumpurl,
+                    permission => $candump,
+                    help       => 'Docs_Dump_Course_Docs',
+                    icon       => 'dump.png',
+                    linktitle  => $lt{'dcd'},
+                },
+                ]
+        });
+        if (($crsauname eq $coursenum) && ($crsaudom eq $coursedom)) {
+            if ((ref($menu[1]) eq 'HASH') && (ref($menu[1]->{'items'}) eq 'ARRAY')) {
+                push(@{$menu[1]->{items}},
+                     {   linktext   => $lt{'cpc'},
+                         url        => $exportcrsurl,
+                         permission => 'F',
+                         help       => 'Docs_Export_Course_Author',
+                         icon       => 'res.png',
+                         linktitle  => $lt{'cpc'},
+                     });
+            }
+        }
+    }
+    return '<form action="/adm/coursedocs" method="post" name="courseverify">'."\n".
+           '<input type="hidden" id="dummy" />'."\n".
+           &Apache::lonhtmlcommon::generate_menu(@menu)."\n".
+           '</form>';
+}
 
 sub generate_edit_table {
-    my ($tid,$orderhash_ref,$to_show,$iconpath,$jumpto) = @_;
+    my ($tid,$orderhash_ref,$to_show,$iconpath,$jumpto,$readfile,
+        $need_save,$copyfolder,$canedit) = @_;
     return unless(ref($orderhash_ref) eq 'HASH');
     my %orderhash = %{$orderhash_ref};
-    my $form;
-    my $activetab;
-    my $active;
-    if($env{'form.active'} ne ''){
+    my ($form, $activetab, $active, $disabled);
+    if (($env{'form.active'} ne '') && ($env{'form.active'} ne '00')) {
         $activetab = $env{'form.active'};
     }
+    unless ($canedit) {
+        $disabled = ' disabled="disabled"';
+    }
     my $backicon = $iconpath.'clickhere.gif';
-    my $backtext = &mt('Back to Overview');
+    my $backtext = &mt('Exit Editor');
     $form = '<div class="LC_Box" style="margin:0;">'.
-             '<ul id="navigation'.$tid.'" class="LC_TabContent">'.
-             '<li class="goback">'.
-             '<a href="javascript:toContents('."'$jumpto'".');">'.
-             '<img src="'.$backicon.'" class="LC_icon" style="border: none; vertical-align: top;"'.
-             '  alt="'.$backtext.'" />'.$backtext.'</a></li>';
+            '<ul id="navigation'.$tid.'" class="LC_TabContent">'."\n".
+            '<li class="goback">'.
+            '<a href="javascript:toContents('."'$jumpto'".');">'.
+            '<img src="'.$backicon.'" class="LC_icon" style="border: none; vertical-align: top;"'.
+            '  alt="'.$backtext.'" />'.$backtext.'</a></li>'."\n".
+            '<li>'.
+            '<a href="javascript:groupopen('."'$readfile'".',1);">'.
+            &mt('Undo Delete').'</a></li>'."\n";
+    if ($env{'form.docslog'}) {
+        $form .= '<li class="active">';
+    } else {
+        $form .= '<li>';
+    }
+    $form .= '<a href="javascript:toggleHistoryDisp(1);">'.
+             &mt('History').'</a></li>'."\n";
+    if ($env{'form.docslog'}) {
+        $form .= '<li><a href="javascript:toggleHistoryDisp(0);">'.
+                 &mt('Edit').'</a></li>'."\n";
+    }
     foreach my $name (reverse(sort(keys(%orderhash)))) {
         if($name ne '00'){
             if($activetab eq '' || $activetab ne $name){
@@ -2994,18 +8830,45 @@ sub generate_edit_table {
                $active = 'class="active"';
             }
             $form .= '<li style="float:right" '.$active
-                .' onmouseover="javascript:showPage(this, \''.$name.$tid.'\', \'navigation'.$tid.'\',\'content'.$tid.'\');"'
-                .' onclick="javascript:showPage(this, \''.$name.$tid.'\', \'navigation'.$tid.'\',\'content'.$tid.'\');"><a href="javascript:;"><b>'.&mt(${$orderhash{$name}}[0]).'</b></a></li>';
+                .' onclick="javascript:showPage(this, \''.$name.$tid.'\', \'navigation'.$tid.'\',\'content'.$tid.'\');"><a href="javascript:;"><b>'.&mt(${$orderhash{$name}}[0]).'</b></a></li>'."\n";
         } else {
-	    $form .= '<li '.$active.' style="float:right">'.${$orderhash{$name}}[1].'</li>';
+	    $form .= '<li style="float:right">'.${$orderhash{$name}}[1].'</li>'."\n";
 
 	}
     }
-    $form .= '</ul>';
-    $form .= '<div id="content'.$tid.'" style="padding: 0 0; margin: 0 0; overflow: hidden; clear:right">';
+    $form .= '</ul>'."\n";
+    $form .= '<div id="content'.$tid.'" style="padding: 0 0; margin: 0 0; overflow: hidden; clear:right">'."\n";
 
     if ($to_show ne '') {
-        $form .= '<div style="padding:0;margin:0;float:left">'.$to_show.'</div>';
+        my $saveform;
+        if ($need_save) {
+            my $button = &mt('Make changes');
+            my $path;
+            if ($env{'form.folderpath'}) {
+                $path =
+                    &HTML::Entities::encode($env{'form.folderpath'},'<>&"');
+            }
+            $saveform = <<"END";
+<div id="multisave" style="display:none; clear:both;" >
+<form name="saveactions" method="post" action="/adm/coursedocs" onsubmit="return checkSubmits();">
+<input type="hidden" name="folderpath" value="$path" />
+<input type="hidden" name="symb" value="$env{'form.symb'}" />
+<input type="hidden" name="allhiddenresource" value="" />
+<input type="hidden" name="allencrypturl" value="" />
+<input type="hidden" name="allrandompick" value="" />
+<input type="hidden" name="allrandomorder" value="" />
+<input type="hidden" name="changeparms" value="" />
+<input type="hidden" name="multiremove" value="" />
+<input type="hidden" name="multicut" value="" />
+<input type="hidden" name="multicopy" value="" />
+<input type="hidden" name="multichange" value="" />
+<input type="hidden" name="copyfolder" value="$copyfolder" />
+<input type="submit" name="savemultiples" value="$button" $disabled />
+</form>
+</div>
+END
+        }
+        $form .= '<div style="padding:0;margin:0;float:left">'.$to_show.'</div>'.$saveform."\n";
     }
     foreach my $field (keys(%orderhash)){
 	if($field ne '00'){
@@ -3016,18 +8879,19 @@ sub generate_edit_table {
             }
             $form .= '<div id="'.$field.$tid.'"'
                     .' class="LC_ContentBox" '.$active.'>'.${$orderhash{$field}}[1]
-                    .'</div>';
+                    .'</div>'."\n";
         }
     }
-    $form .= '</div></div>';
-
+    unless ($env{'form.docslog'}) {
+        $form .= '</div></div>'."\n";
+    }
     return $form;
 }
 
 sub editing_js {
-    my ($udom,$uname,$supplementalflag) = @_;
-    my $now = time();
-    my %lt = &Apache::lonlocal::texthash(
+    my ($udom,$uname,$supplementalflag,$coursedom,$coursenum,$posslti,
+        $londocroot,$canedit,$hostname,$navmapref) = @_;
+    my %js_lt = &Apache::lonlocal::texthash(
                                           p_mnf => 'Name of New Folder',
                                           t_mnf => 'New Folder',
                                           p_mnp => 'Name of New Page',
@@ -3037,209 +8901,1073 @@ sub editing_js {
                                           p_msb => 'Title for the Problem',
                                           p_mdb => 'Title for the Drop Box',
                                           p_mbb => 'Title for the Discussion Board',
+                                          p_mwp => 'Title for Web Page',
+                                          p_mnr => 'Title for the Resource',
                                           p_mab => "Enter user:domain for User's Personal Information Page",
                                           p_mab2 => 'Personal Information Page of ',
                                           p_mab_alrt1 => 'Not a valid user:domain',
                                           p_mab_alrt2 => 'Please enter both user and domain in the format user:domain',
                                           p_chn => 'New Title',
                                           p_rmr1 => 'WARNING: Removing a resource makes associated grades and scores inaccessible!',
-                                          p_rmr2a => 'Remove[_99]',
-                                          p_rmr2b => '?[_99]',
+                                          p_rmr2a => 'Remove',
+                                          p_rmr2b => '?',
+                                          p_rmr3a => 'Remove those',
+                                          p_rmr3b => 'items?',
+                                          p_rmr4  => 'WARNING: Removing a resource uploaded to a course cannot be undone via "Undo Delete".',
+                                          p_rmr5  => 'Push "Cancel" and then use "Cut" instead if you might need to undo this change.',
                                           p_ctr1a => 'WARNING: Cutting a resource makes associated grades and scores inaccessible!',
                                           p_ctr1b => 'Grades remain inaccessible if resource is pasted into another folder.',
-                                          p_ctr2a => 'Cut[_98]',
-                                          p_ctr2b => '?[_98]'
+                                          p_ctr2a => 'Cut',
+                                          p_ctr2b => '?',
+                                          p_ctr3a => 'Cut those',
+                                          p_ctr3b => 'items?',
+                                          setal   => 'Enter a (unique) alias',
+                                          delal   => 'Are you sure you want to eliminate the alias?',
+                                          rpck    => 'Enter number to pick (e.g., 3)',
+                                          imsfile => 'You must choose an IMS package for import',
+                                          imscms  => 'You must select which Course Management System was the source of the IMS package',
+                                          invurl  => 'Invalid URL',
+                                          titbl   => 'Title is blank',
+                                          more    => '(More ...)',
+                                          less    => '(Less ...)',
+                                          noor    => 'No actions selected or changes to settings specified.',
+                                          noch    => 'No changes to settings specified.',
+                                          noac    => 'No actions selected.',
+                                          nofi    => 'No file selected',
+                                          tinc    => 'Title in course',
+                                          sunm    => 'Sub-directory name',
+                                          edri    => 'Editing rights unavailable for your current role.',
+                                          sele    => 'Select',
+                                          swit    => 'Switch server required',
                                         );
-
+    &js_escape(\%js_lt);
     my $crstype = &Apache::loncommon::course_type();
     my $docs_folderpath = &HTML::Entities::encode($env{'environment.internal.'.$env{'request.course.id'}.'.docs_folderpath.folderpath'},'<>&"');
-    my $docs_pagepath = &HTML::Entities::encode($env{'environment.internal.'.$env{'request.course.id'}.'.docs_folderpath.pagepath'},'<>&"');
     my $main_container_page;
-    if ($docs_folderpath eq '') {
-        if ($docs_pagepath ne '') {
-            $main_container_page = 1;
-        }
+    if (&HTML::Entities::decode($env{'environment.internal.'.$env{'request.course.id'}.'.docs_folderpath.folderpath'}) =~ /\:1$/) {
+        $main_container_page = 1;
     }
-    my $toplevelmain = 'default&Main%20'.$crstype.'%20Documents';
+    my $backtourl;
+    my $toplevelmain = &escape(&default_folderpath($coursenum,$coursedom,$navmapref));
     my $toplevelsupp = &supplemental_base();
+    my $showfile_js = &Apache::loncommon::show_crsfiles_js();
+    my @ids=&Apache::lonnet::current_machine_ids();
+    my $machines_str = "'".join("','",@ids)."'";
+    if ($env{'docs.exit.'.$env{'request.course.id'}} =~ /^direct_(.+)$/) {
+        my $caller = $1;
+        if ($caller =~ /^supplemental/) {
+            $backtourl = '/adm/supplemental?folderpath='.&escape($caller);
+        } else {
+            my ($map,$id,$res)=&Apache::lonnet::decode_symb($caller);
+            $res = &Apache::lonnet::clutter($res);
+            if (&Apache::lonnet::is_on_map($res)) {
+                my ($url,$anchor);
+                if ($res =~ /^([^#]+)#([^#]+)$/) {
+                    $url = $1;
+                    $anchor = $2;
+                    if (($caller =~ m{^([^#]+)\Q#$anchor\E$})) {
+                        $caller = $1.&escape('#').$anchor;
+                    }
+                } else {
+                    $url = $res;
+                }
+                $backtourl = &HTML::Entities::encode(&Apache::lonnet::clutter($url),'<>&"');
+                if ($backtourl =~ m{^\Q/uploaded/$coursedom/$coursenum/\Edefault_\d+\.sequence$}) {
+                    $backtourl .= '?navmap=1';
+                } else {
+                    $backtourl .= '?symb='.
+                                  &HTML::Entities::encode($caller,'<>&"');
+                }
+                if ($backtourl =~ m{^\Q/public/$coursedom/$coursenum/syllabus\E}) {
+                    if (($ENV{'SERVER_PORT'} == 443) &&
+                        ($env{'course.'.$env{'request.course.id'}.'.externalsyllabus'} =~ m{^http://})) {
+                        unless ((&Apache::lonnet::uses_sts()) || (&Apache::lonnet::waf_allssl($hostname))) {
+                            if ($hostname ne '') {
+                                $backtourl = 'http://'.$hostname.$backtourl;
+                            }
+                            $backtourl .= (($backtourl =~ /\?/) ? '&amp;':'?').'usehttp=1';
+                        }
+                    }
+                } elsif ($backtourl =~ m{^/adm/wrapper/ext/(?!https:)}) {
+                    if (($ENV{'SERVER_PORT'} == 443) && ($hostname ne '')) {
+                        unless ((&Apache::lonnet::uses_sts()) || (&Apache::lonnet::waf_allssl($hostname))) {
+                            if ($hostname ne '') {
+                                $backtourl = 'http://'.$hostname.$backtourl;
+                            }
+                            $backtourl .= (($backtourl =~ /\?/) ? '&amp;':'?').'usehttp=1';
+                        }
+                    }
+                }
+                if ($anchor ne '') {
+                    $backtourl .= '#'.&HTML::Entities::encode($anchor,'<>&"');
+                }
+                $backtourl = &Apache::loncommon::escape_single($backtourl);
+            } else {
+                $backtourl = '/adm/navmaps';
+            }
+        }
+    } elsif ($env{'docs.exit.'.$env{'request.course.id'}} eq '/adm/menu') {
+        $backtourl = '/adm/menu';
+    } elsif ($supplementalflag) {
+        if (($env{'request.role.adv'}) ||
+            (&Apache::lonnet::has_unhidden_suppfiles($coursenum,$coursedom))) {
+            $backtourl = '/adm/supplemental';
+        } else {
+            $backtourl = '/adm/navmaps';
+        }
+    } else {
+        $backtourl = '/adm/navmaps';
+    }
 
-    my $backtourl = '/adm/navmaps';
+    my $fieldsets = "'doc'";
+    unless ($main_container_page) {
+        $fieldsets .=",'ims'";
+    }
+    my $extfieldsets = "'ext'";
+    if ($posslti) {
+        $extfieldsets .= ",'tool'";
+    }
     if ($supplementalflag) {
-        $backtourl = '/adm/supplemental';
+        $fieldsets = "'suppdoc'";
+        $extfieldsets = "'suppext'";
+        if ($posslti) {
+            $extfieldsets .= ",'supptool'";
+        }
     }
 
-    return <<ENDNEWSCRIPT;
+    my $jsmakefunctions;
+    if ($canedit) {
+        $jsmakefunctions = <<ENDNEWSCRIPT;
 function makenewfolder(targetform,folderseq) {
-    var foldername=prompt('$lt{"p_mnf"}','$lt{"t_mnf"}');
+    var foldername=prompt('$js_lt{"p_mnf"}','$js_lt{"t_mnf"}');
     if (foldername) {
-       targetform.importdetail.value=escape(foldername)+"="+folderseq;
+       targetform.importdetail.value=encodeURIComponent(foldername)+"="+folderseq;
         targetform.submit();
     }
 }
 
 function makenewpage(targetform,folderseq) {
-    var pagename=prompt('$lt{"p_mnp"}','$lt{"t_mnp"}');
+    var pagename=prompt('$js_lt{"p_mnp"}','$js_lt{"t_mnp"}');
     if (pagename) {
-        targetform.importdetail.value=escape(pagename)+"="+folderseq;
+        targetform.importdetail.value=encodeURIComponent(pagename)+"="+folderseq;
         targetform.submit();
     }
 }
 
-function makenewext(targetname) {
-    this.document.forms.extimport.useform.value=targetname;
-    this.document.forms.extimport.title.value='';
-    this.document.forms.extimport.url.value='';
-    this.document.forms.extimport.residx.value='';
-    window.open('/adm/rat/extpickframe.html');
-}
-
-function edittext(targetname,residx,title,url) {
-    this.document.forms.extimport.useform.value=targetname;
-    this.document.forms.extimport.residx.value=residx;
-    this.document.forms.extimport.url.value=url;
-    this.document.forms.extimport.title.value=title;
-    window.open('/adm/rat/extpickframe.html');
-}
-
 function makeexamupload() {
-   var title=prompt('$lt{"p_mxu"}');
+   var title=prompt('$js_lt{"p_mxu"}');
    if (title) {
     this.document.forms.newexamupload.importdetail.value=
-	escape(title)+'=/res/lib/templates/examupload.problem';
+	encodeURIComponent(title)+'=/res/lib/templates/examupload.problem';
     this.document.forms.newexamupload.submit();
    }
 }
 
 function makesmppage() {
-   var title=prompt('$lt{"p_msp"}');
+   var title=prompt('$js_lt{"p_msp"}');
    if (title) {
     this.document.forms.newsmppg.importdetail.value=
-	escape(title)+'=/adm/$udom/$uname/$now/smppg';
+	encodeURIComponent(title)+'=/adm/$udom/$uname/new/smppg';
     this.document.forms.newsmppg.submit();
    }
 }
 
+function makewebpage(type) {
+   var title=prompt('$js_lt{"p_mwp"}');
+   var formname;
+   if (type == 'supp') {
+       formname = this.document.forms.supwebpage;
+   } else {
+       formname = this.document.forms.newwebpage;
+   }
+   if (title) {
+       var webpage = formname.importdetail.value; 
+       formname.importdetail.value = encodeURIComponent(title)+'='+webpage;
+       formname.submit();
+   }
+}
+
 function makesmpproblem() {
-   var title=prompt('$lt{"p_msb"}');
+   var title=prompt('$js_lt{"p_msb"}');
    if (title) {
     this.document.forms.newsmpproblem.importdetail.value=
-	escape(title)+'=/res/lib/templates/simpleproblem.problem';
+	encodeURIComponent(title)+'=/res/lib/templates/simpleproblem.problem';
     this.document.forms.newsmpproblem.submit();
    }
 }
 
 function makedropbox() {
-   var title=prompt('$lt{"p_mdb"}');
+   var title=prompt('$js_lt{"p_mdb"}');
    if (title) {
     this.document.forms.newdropbox.importdetail.value=
-        escape(title)+'=/res/lib/templates/DropBox.problem';
+        encodeURIComponent(title)+'=/res/lib/templates/DropBox.problem';
     this.document.forms.newdropbox.submit();
    }
 }
 
 function makebulboard() {
-   var title=prompt('$lt{"p_mbb"}');
+   var title=prompt('$js_lt{"p_mbb"}');
    if (title) {
     this.document.forms.newbul.importdetail.value=
-	escape(title)+'=/adm/$udom/$uname/$now/bulletinboard';
+	encodeURIComponent(title)+'=/adm/$udom/$uname/new/bulletinboard';
     this.document.forms.newbul.submit();
    }
 }
 
 function makeabout() {
-   var user=prompt("$lt{'p_mab'}");
+   var user=prompt("$js_lt{'p_mab'}");
    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=
-		   '$lt{"p_mab2"}'+escape(user)+'=/adm/'+comp[1]+'/'+comp[0]+'/aboutme';
-       this.document.forms.newaboutsomeone.submit();
-   } else {
-       alert("$lt{'p_mab_alrt1'}");
-   }
-} else {
-   alert("$lt{'p_mab_alrt2'}");
+		   '$js_lt{"p_mab2"}'+escape(user)+'=/adm/'+comp[1]+'/'+comp[0]+'/aboutme';
+               this.document.forms.newaboutsomeone.submit();
+           } else {
+               alert("$js_lt{'p_mab_alrt1'}");
+           }
+       } else {
+           alert("$js_lt{'p_mab_alrt2'}");
+       }
+    }
 }
+
+function makenew(targetform) {
+    targetform.submit();
 }
+
+function changename(folderpath,index,oldtitle) {
+    var title=prompt('$js_lt{"p_chn"}',oldtitle);
+    if (title) {
+        this.document.forms.renameform.markcopy.value='';
+        this.document.forms.renameform.title.value=title;
+        this.document.forms.renameform.cmd.value='rename_'+index;
+        this.document.forms.renameform.folderpath.value=folderpath;
+        this.document.forms.renameform.submit();
+    }
+}
+
+function setalias(folderpath,index) {
+    var alias = prompt('$js_lt{"setal"}');
+    if ((alias != null) && (alias != '')) {
+        this.document.forms.aliasform.alias.value=alias;
+        this.document.forms.aliasform.cmd.value='setalias_'+index;
+        this.document.forms.aliasform.folderpath.value=folderpath;
+        this.document.forms.aliasform.submit();
+    }
+}
+
+function delalias(folderpath,index) {
+    if (confirm('$js_lt{"delal"}')) {
+        this.document.forms.aliasform.cmd.value='delalias_'+index;
+        this.document.forms.aliasform.folderpath.value=folderpath;
+        this.document.forms.aliasform.submit();
+    }
 }
 
-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;
+ENDNEWSCRIPT
+    } else {
+        $jsmakefunctions = <<ENDNEWSCRIPT;
+
+function makenewfolder() {
+    alert("$js_lt{'edri'}");
+}
+
+function makenewpage() {
+    alert("$js_lt{'edri'}");
+}
+
+function makeexamupload() {
+    alert("$js_lt{'edri'}");
 }
 
+function makesmppage() {
+    alert("$js_lt{'edri'}");
+}
+
+function makewebpage(type) {
+    alert("$js_lt{'edri'}");
+}
+
+function makesmpproblem() {
+    alert("$js_lt{'edri'}");
+}
+
+function makedropbox() {
+    alert("$js_lt{'edri'}");
+}
+
+function makebulboard() {
+    alert("$js_lt{'edri'}");
+}
+
+function makeabout() {
+    alert("$js_lt{'edri'}");
+}
+
+function changename() {
+    alert("$js_lt{'edri'}");
+}
+
+function setalias() {
+    alert("$js_lt{'edri'}");
+}
+
+function delalias() {
+    alert("$js_lt{'edri'}");
+}
+
+function makenew() {
+    alert("$js_lt{'edri'}");
+}
+
+function groupimport() {
+    alert("$js_lt{'edri'}");
+}
+
+function groupsearch() {
+    alert("$js_lt{'edri'}");
+}
+
+function groupopen(url,recover) {
+   var options="scrollbars=1,resizable=1,menubar=0";
+   idxflag=1;
+   idx=open("/adm/groupsort?inhibitmenu=yes&mode=simple&recover="+recover+"&readfile="+url,"idxout",options);
+   idx.focus();
+}
+
+ENDNEWSCRIPT
+
+    }
+    return <<ENDSCRIPT;
+
+$jsmakefunctions
 
-function finishpick() {
-var title=this.document.forms.extimport.title.value;
-var url=this.document.forms.extimport.url.value;
-var form=this.document.forms.extimport.useform.value;
-var residx=this.document.forms.extimport.residx.value;
-eval('this.document.forms.'+form+'.importdetail.value="'+title+'='+url+'='+residx+'";this.document.forms.'+form+'.submit();');
+function toggleUpload(caller) {
+    var blocks = Array($fieldsets);
+    for (var i=0; i<blocks.length; i++) {
+        var disp = 'none';
+        if (caller == blocks[i]) {
+            var curr = document.getElementById('upload'+caller+'form').style.display;
+            if (curr == 'none') {
+                disp='block';
+            }
+        }
+        document.getElementById('upload'+blocks[i]+'form').style.display=disp;
+    }
+    resize_scrollbox('contentscroll','1','1');
+    return;
 }
 
-function changename(folderpath,index,oldtitle,container,pagesymb) {
-var title=prompt('$lt{"p_chn"}',oldtitle);
-if (title) {
-this.document.forms.renameform.markcopy.value=-1;
-this.document.forms.renameform.title.value=title;
-this.document.forms.renameform.cmd.value='rename_'+index;
-if (container == 'sequence') {
-    this.document.forms.renameform.folderpath.value=folderpath;
+function toggleExternal(caller) {
+    var blocks = Array($extfieldsets);
+    for (var i=0; i<blocks.length; i++) {
+        var disp = 'none';
+        if (caller == blocks[i]) {
+            var curr = document.getElementById('external'+caller+'form').style.display;
+            if (curr == 'none') {
+                disp='block';
+            }
+        }
+        document.getElementById('external'+blocks[i]+'form').style.display=disp;
+        if ((caller == 'tool') || (caller == 'supptool')) {
+            if (disp == 'block') {
+                if (document.getElementById('LC_exttoolid')) {
+                    var toolselector = document.getElementById('LC_exttoolid');
+                    var suppflag = 0;
+                    if (caller == 'supptool') {
+                        suppflag = 1;
+                    }
+                    currForm = document.getElementById('new'+caller);
+                    updateExttool(toolselector,currForm,suppflag);
+                }
+            }
+        }
+    }
+    resize_scrollbox('contentscroll','1','1');
+    return;
 }
-if (container == 'page') {
-    this.document.forms.renameform.pagepath.value=folderpath;
-    this.document.forms.renameform.pagesymb.value=pagesymb;
+
+function toggleMap(caller) {
+    var disp = 'none';
+    if (document.getElementById('importmapform')) {
+        if (caller == 'map') {
+            var curr = document.getElementById('importmapform').style.display;
+            if (curr == 'none') {
+                disp='block';
+            }
+        }
+        document.getElementById('importmapform').style.display=disp;
+        if (disp == 'block') {
+            if (document.getElementById('importcrsresform')) {
+                if (document.getElementById('importcrsresform').style.display == 'block') {
+                    document.getElementById('importcrsresform').style.display = 'none';
+                }
+            }
+        }
+        resize_scrollbox('contentscroll','1','1');
+    }
+    return;
 }
-this.document.forms.renameform.submit();
+
+function toggleCrsRes(caller) {
+    var disp = 'none';
+    if (document.getElementById('crsresform')) {
+        if (caller == 'res') {
+            var form = document.getElementById('crsresform');
+            var curr = form.style.display;
+            if (curr == 'none') {
+                disp='block';
+                document.courseresform.authorrole.selectedIndex = 0;
+                document.courseresform.authorpath.selectedIndex = 0;
+                document.courseresform.newresourceadd.selectedIndex = 0;
+                populateDirSelects(form,'authorrole','authorpath',1,0,0);
+                toggleNewInCourse(document.courseresform);
+                if (document.getElementById('newresource')) {
+                    document.getElementById('newresource').style.display = 'none';
+                }
+                if (document.courseresform.newresusetemp.length) {
+                    document.courseresform.newresusetemp[0].checked = true;
+                    toggleWithTemplate(document.courseresform);
+                }
+                document.courseresform.newresourcename.value = ''; 
+            }
+        }
+        if (document.courseresform.newsubdir.length) {
+            for (var j=0; j<document.courseresform.newsubdir.length; j++) {
+                if (document.courseresform.newsubdir[j].value == 0) {
+                    document.courseresform.newsubdir[j].checked = true;
+                }
+                break;
+            }
+            if (document.getElementById('newsubdirname')) {
+                document.getElementById('newsubdirname').type = "hidden";
+                document.getElementById('newsubdirname').value = "";
+            }
+            if (document.getElementById('newsubdir')) {
+                document.getElementById('newsubdir').innerHTML = "";
+            }
+        }
+        document.getElementById('crsresform').style.display=disp;
+        resize_scrollbox('contentscroll','1','0');
+    }
+    return;
 }
+
+function toggleNewsubdir(form) {
+    if (form.newsubdir.length) {
+        for (var j=0; j<form.newsubdir.length; j++) {
+            if (form.newsubdir[j].checked) {
+                if (document.getElementById('newsubdirname')) {
+                    if (form.newsubdir[j].value == '1') {
+                        document.getElementById('newsubdirname').type = "text"; 
+                        if (document.getElementById('newsubdir')) {
+                            document.getElementById('newsubdir').innerHTML = '<br />$js_lt{'sunm'}';
+                        }
+                    } else {
+                        document.getElementById('newsubdirname').type = "hidden";
+                        document.getElementById('newsubdirname').value = "";
+                        document.getElementById('newsubdir').innerHTML = "";
+                    }
+                }
+                break;
+            }
+        }
+    }
 }
 
-function removeres(folderpath,index,oldtitle,container,pagesymb,skip_confirm) {
-if (skip_confirm || confirm('$lt{"p_rmr1"}\\n\\n$lt{"p_rmr2a"} "'+oldtitle+'" $lt{"p_rmr2b"}')) {
-this.document.forms.renameform.markcopy.value=-1;
-this.document.forms.renameform.cmd.value='del_'+index;
-if (container == 'sequence') {
-    this.document.forms.renameform.folderpath.value=folderpath;
+function toggleCrsResTitle() {
+    if (document.getElementById('newresource')) {
+        var selloc = document.courseresform.authorrole.options[document.courseresform.authorrole.selectedIndex].value;
+        if (selloc == 'course') {
+            document.getElementById('newresource').style.display = 'inline';
+            document.courseresform.newresourceadd[0].checked = true;
+            toggleNewInCourse(document.courseresform);
+        } else {
+            document.getElementById('newresource').style.display = 'none';
+        }
+    }
+    if (document.getElementById('newstdproblem')) {
+        if (document.courseresform.authorpath.options[document.courseresform.authorpath.selectedIndex].value == 'switch') {
+            document.getElementById('newstdproblem').style.display = 'none'; 
+            if (document.getElementById('stdprobswitch')) {
+                document.getElementById('stdprobswitch').style.display = 'block'; 
+            }
+        } else {
+            document.getElementById('newstdproblem').style.display = 'block';
+            if (document.getElementById('stdprobswitch')) {
+                document.getElementById('stdprobswitch').style.display = 'none';
+            }
+        }
+    }
 }
-if (container == 'page') {
-    this.document.forms.renameform.pagepath.value=folderpath;
-    this.document.forms.renameform.pagesymb.value=pagesymb;
+
+function toggleNewInCourse(form) {
+    if (form.newresourceadd.length) {
+        for (var i=0; i<form.newresourceadd.length; i++) {
+            if (form.newresourceadd[i].checked) {
+                if (document.getElementById('newresourcetitle')) {
+                    if (form.newresourceadd[i].value == '1') {
+                        document.getElementById('newresourcetitle').type = 'text';
+                        if (document.getElementById('newrestitle')) {
+                            document.getElementById('newrestitle').innerHTML = "<br />$js_lt{'tinc'}";
+                        }
+                    } else {
+                        document.getElementById('newresourcetitle').type = 'hidden';
+                        document.getElementById('newresourcetitle').value = '';
+                        if (document.getElementById('newrestitle')) { 
+                            document.getElementById('newrestitle').innerHTML = '';
+                        }
+                    }
+                }
+                break;
+            }
+        }
+    }
 }
-this.document.forms.renameform.submit();
+
+function toggleWithTemplate(form) {
+    if (form.newresusetemp.length) {
+        for (var i=0; i<form.newresusetemp.length; i++) {
+            if (form.newresusetemp[i].checked) {
+                if (document.getElementById('newrestemplate')) { 
+                    if (form.newresusetemp[i].value == '1') {
+                        document.getElementById('newrestemplate').style.display = 'inline';
+                        toggleExampleText();
+                    } else {
+                        form.tempcategory.selectedIndex = 0;
+                        select1template_changed();
+                        document.getElementById('newrestemplate').style.display = 'none';
+                    }
+                }
+            }
+        }
+    }
 }
+
+function toggleExampleText() {
+    if (document.getElementById('newresexample')) {
+        var url = document.courseresform.template.options[document.courseresform.template.selectedIndex].value;
+        if (url == '') {
+            document.getElementById('newresexample').style.fontWeight = 'normal';
+        } else {
+            document.getElementById('newresexample').style.fontWeight = 'bold';
+        }
+    }
 }
 
-function cutres(folderpath,index,oldtitle,container,pagesymb,folder,skip_confirm) {
-if (skip_confirm || confirm('$lt{"p_ctr1a"}\\n$lt{"p_ctr1b"}\\n\\n$lt{"p_ctr2a"} "'+oldtitle+'" $lt{"p_ctr2b"}')) {
-this.document.forms.renameform.cmd.value='cut_'+index;
-this.document.forms.renameform.markcopy.value=index;
-this.document.forms.renameform.copyfolder.value=folder+'.'+container;
-if (container == 'sequence') {
-    this.document.forms.renameform.folderpath.value=folderpath;
+function getExample(width,height,scrolling,transparency) {
+    var url;
+    if (document.courseresform.newresusetemp.length) {
+        for (var i=0; i<document.courseresform.newresusetemp.length; i++) {
+            if (document.courseresform.newresusetemp[i].checked) {
+                if (document.courseresform.newresusetemp[i].value == '1') {
+                    var url = document.courseresform.template.options[document.courseresform.template.selectedIndex].value;
+                    if (url == '') {
+                        alert('Pick a category and template');
+                    } else {
+                        url = url.replace("$londocroot",""); 
+                        url += '?inhibitmenu=yes';
+                    }
+                }
+                break;
+            }
+        }
+    }
+    if (url != '') {
+        openMyModal(url,width,height,scrolling,transparency,'');
+    }
 }
-if (container == 'page') {
-    this.document.forms.renameform.pagepath.value=folderpath;
-    this.document.forms.renameform.pagesymb.value=pagesymb;
+
+function toggleImportCrsres(caller) {
+    var disp = 'none';
+    if (document.getElementById('importcrsresform')) {
+        if (caller == 'res') {
+            var curr = document.getElementById('importcrsresform').style.display;
+            if (curr == 'none') {
+                disp='block';
+                populateCrsSelects(document.crsresimportform,'coursepath','coursefile',1,'',1,0,1,1,0);
+                if ((document.getElementById('importcrsrescontent')) &&
+                    (document.getElementById('importcrsresempty'))) {
+                    var selelem = document.crsresimportform.elements['coursepath'];
+                    var numdirs = 0;
+                    if (selelem.options.length) {
+                        numdirs = selelem.options.length - 1;
+                    }
+                    if (numdirs) {
+                        document.getElementById('importcrsrescontent').style.display='block';
+                        document.getElementById('importcrsresempty').style.display='none';
+                    } else {
+                        document.getElementById('importcrsrescontent').style.display='none';
+                        document.getElementById('importcrsresempty').style.display='block';
+                    }
+                }
+            }
+        }
+        document.getElementById('importcrsresform').style.display=disp;
+        if (disp == 'block') {
+            if (document.getElementById('importmapform')) {
+                if (document.getElementById('importmapform').style.display == 'block') {
+                    document.getElementById('importmapform').style.display = 'none';
+                }
+            }
+        }
+        resize_scrollbox('contentscroll','1','0');
+    }
+    return;
 }
-this.document.forms.renameform.submit();
+
+$showfile_js
+
+function populateDirSelects(form,locsel,dirsel,setdir,recurse,nonemptydir) {
+    var location = form.elements[locsel].options[form.elements[locsel].selectedIndex].value;
+    if ((setdir) && (dirsel != null) && (dirsel != 'undefined') && (dirsel != '')) {
+        var selelem = form.elements[dirsel];
+        var i, numfiles = selelem.options.length -1;
+        if (numfiles >=0) {
+            for (i = numfiles; i >= 0; i--) {
+                selelem.remove(i);
+            }
+        }
+        if ((location == '') || (location == null) || (location == 'undefined')) {
+             if (selelem.options.length == 0) {
+                 selelem.options[selelem.options.length] = new Option('','');
+                 selelem.selectedIndex = 0;
+             }
+             if (document.getElementById('newstdproblem')) {
+                 document.getElementById('newstdproblem').style.display = 'none';
+             }
+             return;
+        }
+        var machineIds = new Array($machines_str);
+        var athome = 0;
+        var role = location;
+        if ((location == 'author') || (location == 'course')) {
+            if (document.getElementById('rolehome_'+location)) {
+                var currhome = document.getElementById('rolehome_'+location).value;
+                if ((currhome != '') && (currhome != null) && (currhome != 'undefined')) {
+                    if (machineIds.includes(currhome)) {
+                        athome = 1;
+                    }
+                }
+            }
+        } else {
+            const roleinfo = location.split('___');
+            role = encodeURIComponent(roleinfo[0]+'./'+roleinfo[1]);
+            if (document.getElementById('rolehome_coauthor_'+roleinfo[1]+'_'+roleinfo[0])) {
+                var currhome = document.getElementById('rolehome_coauthor_'+roleinfo[1]+'_'+roleinfo[0]).value;
+                if ((currhome != '') && (currhome != null) && (currhome != 'undefined')) {
+                    if (machineIds.includes(currhome)) {
+                        athome = 1;
+                    }
+                }
+            }
+        }
+        var templateradio = document.courseresform.elements['newresusetemp'];
+        if (athome) {
+            if (document.getElementById('stdprobswitch')) {
+                document.getElementById('stdprobswitch').style.display = 'none';
+            }
+            if (document.getElementById('newstdproblem')) {
+                document.getElementById('newstdproblem').style.display = 'none';
+            }
+            var canedit = '$canedit';
+            if (canedit) {
+                if (templateradio.length > 1) {
+                    for (var i=0; i<templateradio.length; i++) {
+                        templateradio[i].disabled = false;
+                    }
+                }
+                document.courseresform.newresourcename.disabled = false;
+                document.courseresform.newcrs.disabled = false;
+            }
+            var http = new XMLHttpRequest();
+            var url = "/adm/courseauthor";
+            var params = "role="+role+"&rec="+recurse+"&nonempty="+nonemptydir+"&addtop=1";
+            http.open("POST", url, true);
+            http.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
+            http.onreadystatechange = function() {
+                if (http.readyState == 4 && http.status == 200) {
+                    var data = JSON.parse(http.responseText);
+                    if (Array.isArray(data.dirs)) {
+                        var len = data.dirs.length;
+                        if (len) {
+                            if (len > 1) {
+                                selelem.options[selelem.options.length] = new Option('$js_lt{sele}','');
+                            }
+                        }
+                        if (len) {
+                            var j;
+                            for (j = 0; j < len; j++) {
+                                selelem.options[selelem.options.length] = new Option(data.dirs[j],data.dirs[j]);
+                            }
+                            selelem.selectedIndex = 0;
+                            if (len == 1) {
+                                toggleCrsResTitle();
+                            }
+                        }
+                    }
+                }
+            }
+            http.send(params);
+        } else {
+            selelem.options[selelem.options.length] = new Option('$js_lt{swit}','switch');
+            selelem.selectedIndex = 0;
+            if (document.getElementById('stdprobswitch')) {
+                document.getElementById('stdprobswitch').style.display = 'block';
+            }
+            if (document.getElementById('newstdproblem')) {
+                document.getElementById('newstdproblem').style.display = 'none';
+            }
+            if (templateradio.length > 1) {
+                for (var i=0; i<templateradio.length; i++) {
+                    templateradio[i].disabled = true;
+                }
+            }
+            document.courseresform.newresourcename.disabled = true;
+            document.courseresform.newcrs.disabled = true;
+        }
+    }
+    return;
 }
+
+function switchForProb() {
+    if (document.courseresform.authorpath.options[document.courseresform.authorpath.selectedIndex].value == 'switch') {
+        var url = '/adm/switchserver?otherserver=';
+        var newhostid = '';
+        var role = '';
+        var selloc = document.courseresform.authorrole.options[document.courseresform.authorrole.selectedIndex].value;
+        if (selloc == 'author') {
+            newhostid = document.courseresform.rolehome_author.value;
+            role = "au./&js_escape($env{'user.domain'})/";
+        } else if (selloc == 'course') {
+            newhostid = document.courseresform.rolehome_course.value;
+            role = "&js_escape($env{'request.role'})";
+        } else {
+            var items = new Array();
+            items = selloc.split('___');
+            var len = document.courseresform.rolehome_coauthor.length;
+            if (null == len) {
+                var currval = document.courseresform.rolehome_coauthor.value;
+                if (null != currval) {
+                    var info = new Array();
+                    info = currval.split('=');
+                    newhostid = info[2];
+                    role = info[0]+'./'+info[1];
+                }
+            } else {
+                for (var i=0; i<len; i++) {
+                    var currval = document.courseresform.rolehome_coauthor[i].value;
+                    if (null != currval) {
+                        var info = new Array();
+                        info = currval.split('=');
+                        if ((info[1] == items[1]+'/'+items[0]) && (info[0] == items[2])) {
+                            newhostid = info[2];
+                            role = info[0]+'./'+info[1];
+                            break;
+                        }
+                    }
+                }
+            }
+        }
+        if (newhostid != '') {
+            url += newhostid;
+            if (role != '') {
+                url += '&role='+role;
+            }
+            document.location.href = url;
+        }
+    }
+    return;
 }
 
-function markcopy(folderpath,index,oldtitle,container,pagesymb,folder) {
-this.document.forms.renameform.markcopy.value=index;
-this.document.forms.renameform.copyfolder.value=folder+'.'+container;
-if (container == 'sequence') {
-this.document.forms.renameform.folderpath.value=folderpath;
+function makeims(imsform) {
+    if ((imsform.uploaddoc.value == '')  || (!imsform.uploaddoc.value)) {
+        alert("$js_lt{'imsfile'}");
+        return;
+    }
+    if (imsform.source.selectedIndex == 0) {
+        alert("$js_lt{'imscms'}");
+        return;
+    }
+    newWindow = window.open('', 'IMSimport',"HEIGHT=700,WIDTH=750,scrollbars=yes");
+    imsform.submit();
 }
-if (container == 'page') {
-this.document.forms.renameform.pagepath.value=folderpath;
-this.document.forms.renameform.pagesymb.value=pagesymb;
+
+function updatePick(targetform,index,caller) {
+    var pickitem;
+    var picknumitem;
+    var picknumtext;
+    if (index == 'all') {
+        pickitem = document.getElementById('randompickall');
+        picknumitem = document.getElementById('rpicknumall');
+        picknumtext = document.getElementById('rpicktextall');
+    } else {
+        pickitem = document.getElementById('randompick_'+index);
+        picknumitem = document.getElementById('rpicknum_'+index);
+        picknumtext = document.getElementById('randompicknum_'+index);
+    }
+    if (pickitem.checked) {
+        var picknum=prompt('$js_lt{"rpck"}',picknumitem.value);
+        if (picknum == '' || picknum == null) {
+            if (caller == 'check') {
+                pickitem.checked=false;
+                if (index == 'all') {
+                    picknumtext.innerHTML = '';
+                    if (caller == 'link') {
+                        propagateState(targetform,'rpicknum');
+                    }
+                } else {
+                    checkForSubmit(targetform,'randompick','settings');
+                }
+            }
+        } else {
+            picknum.toString();
+            var regexdigit=/^\\d+\$/;
+            if (regexdigit.test(picknum)) {
+                picknumitem.value = picknum;
+                if (index == 'all') {
+                    picknumtext.innerHTML = '&nbsp;<a href="javascript:updatePick(document.cumulativesettings,\\'all\\',\\'link\\');">'+picknum+'</a>';
+                    if (caller == 'link') {
+                        propagateState(targetform,'rpicknum');
+                    }
+                } else {
+                    picknumtext.innerHTML = '&nbsp;<a href="javascript:updatePick(document.edit_randompick_'+index+',\\''+index+'\\',\\'link\\');">'+picknum+'</a>';
+                    checkForSubmit(targetform,'randompick','settings');
+                }
+            } else {
+                if (caller == 'check') {
+                    if (index == 'all') {
+                        picknumtext.innerHTML = '';
+                        if (caller == 'link') {
+                            propagateState(targetform,'rpicknum');
+                        }
+                    } else {
+                        pickitem.checked=false;
+                        checkForSubmit(targetform,'randompick','settings');
+                    }
+                }
+                return;
+            }
+        }
+    } else {
+        picknumitem.value = '';
+        picknumtext.innerHTML = '';
+        if (index == 'all') {
+            if (caller == 'link') {
+                propagateState(targetform,'rpicknum');
+            }
+        } else {
+            checkForSubmit(targetform,'randompick','settings');
+        }
+    }
 }
-this.document.forms.renameform.submit();
+
+function propagateState(form,param) {
+    if (document.getElementById(param+'all')) {
+        var setcheck = 0;
+        var rpick = 0;
+        if (param == 'rpicknum') {
+            if (document.getElementById('randompickall')) {
+                if (document.getElementById('randompickall').checked) {
+                    if (document.getElementById('rpicknumall')) {
+                        rpick = document.getElementById('rpicknumall').value;
+                    }
+                }
+            }
+        } else {
+            if (document.getElementById(param+'all').checked) {
+                setcheck = 1;
+            }
+        }
+        var allidxlist;
+        if ((param == 'remove') || (param == 'cut') || (param == 'copy')) {
+            if (document.getElementById('all'+param+'idx')) {
+                allidxlist = document.getElementById('all'+param+'idx').value;
+            }
+            var actions = new Array ('remove','cut','copy');
+            for (var i=0; i<actions.length; i++) {
+                if (actions[i] != param) {
+                    if (document.getElementById(actions[i]+'all')) {
+                        document.getElementById(actions[i]+'all').checked = false; 
+                    }
+                }
+            }
+        }
+        if ((param == 'encrypturl') || (param == 'hiddenresource')) {
+            allidxlist = form.allidx.value;
+        }
+        if ((param == 'randompick') || (param == 'rpicknum') || (param == 'randomorder')) {
+            allidxlist = form.allmapidx.value;
+        }
+        if ((allidxlist != '') && (allidxlist != null)) {
+            var allidxs = allidxlist.split(',');
+            if (allidxs.length > 1) {
+                for (var i=0; i<allidxs.length; i++) {
+                    if (document.getElementById(param+'_'+allidxs[i])) {
+                        if (param == 'rpicknum') {
+                            if (document.getElementById('randompick_'+allidxs[i])) {
+                                if (document.getElementById('randompick_'+allidxs[i]).checked) {
+                                    document.getElementById(param+'_'+allidxs[i]).value = rpick;
+                                    if (rpick > 0) {
+                                        document.getElementById('randompicknum_'+allidxs[i]).innerHTML = ':&nbsp;<a href="javascript:updatePick(document.edit_randompick_'+allidxs[i]+',\\''+allidxs[i]+'\\',\\'link\\')">'+rpick+'</a>';
+                                    } else {
+                                        document.getElementById('randompicknum_'+allidxs[i]).innerHTML =  '';
+                                    }
+                                }
+                            }
+                        } else {
+                            if (setcheck == 1) {
+                                document.getElementById(param+'_'+allidxs[i]).checked = true;
+                            } else {
+                                document.getElementById(param+'_'+allidxs[i]).checked = false;
+                                if (param == 'randompick') {
+                                    document.getElementById('randompicknum_'+allidxs[i]).innerHTML =  '';
+                                }
+                            }
+                        }
+                    }
+                }
+                if (setcheck == 1) {
+                    if ((param == 'remove') || (param == 'cut') || (param == 'copy')) {
+                        var actions = new Array('copy','cut','remove');
+                        for (var i=0; i<actions.length; i++) {
+                            var otheractions;
+                            var otheridxs;
+                            if (actions[i] === param) {
+                                continue;
+                            } else {
+                                if (document.getElementById('all'+actions[i]+'idx')) {
+                                    otheractions = document.getElementById('all'+actions[i]+'idx').value;
+                                    otheridxs = otheractions.split(',');
+                                    if (otheridxs.length > 1) {
+                                        for (var j=0; j<otheridxs.length; j++) {
+                                            if (document.getElementById(actions[i]+'_'+otheridxs[j])) {
+                                                document.getElementById(actions[i]+'_'+otheridxs[j]).checked = false;
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        } 
+                    }
+                }
+            }
+        }
+    }
+    return;
+}
+
+function checkForSubmit(targetform,param,context,idx,folderpath,index,oldtitle,skip_confirm,container,folder,confirm_removal) {
+    var canedit = '$canedit';
+    if (canedit == '') {
+        alert("$js_lt{'edri'}");
+        return;
+    }
+    var dosettings;
+    var doaction;
+    var control = document.togglemultsettings;
+    if (context == 'actions') {
+        control = document.togglemultactions;
+        doaction = 1; 
+    } else {
+        dosettings = 1;
+    }
+    if (control) {
+        if (control.showmultpick.length) {
+            for (var i=0; i<control.showmultpick.length; i++) {
+                if (control.showmultpick[i].checked) {
+                    if (control.showmultpick[i].value == 1) {
+                        if (context == 'settings') {
+                            dosettings = 0;
+                        } else {
+                            doaction = 0;
+                        }
+                    }
+                }
+            }
+        }
+    }
+    if (context == 'settings') {
+        if (dosettings == 1) {
+            targetform.changeparms.value=param;
+            targetform.submit();
+        }
+    }
+    if (context == 'actions') {
+        if (doaction == 1) {
+            targetform.cmd.value=param+'_'+index;
+            targetform.folderpath.value=folderpath;
+            targetform.markcopy.value=idx+':'+param;
+            targetform.copyfolder.value=folder+'.'+container;
+            if (param == 'remove') {
+                var doremove = 0;
+                if (skip_confirm) {
+                    if (confirm_removal) {
+                        if (confirm('$js_lt{"p_rmr4"}\\n$js_lt{"p_rmr5"}\\n\\n$js_lt{"p_rmr2a"} "'+oldtitle+'"$js_lt{"p_rmr2b"}')) {
+                            doremove = 1;
+                        }
+                    } else {
+                        doremove = 1;
+                    }
+                } else {
+                    if (confirm('$js_lt{"p_rmr1"}\\n\\n$js_lt{"p_rmr2a"} "'+oldtitle+'" $js_lt{"p_rmr2b"}')) {
+                        doremove = 1;
+                    }
+                }
+                if (doremove) {
+                    targetform.markcopy.value='';
+                    targetform.copyfolder.value='';
+                    targetform.submit();
+                }
+            }
+            if (param == 'cut') {
+                if (skip_confirm || confirm('$js_lt{"p_ctr1a"}\\n$js_lt{"p_ctr1b"}\\n\\n$js_lt{"p_ctr2a"} "'+oldtitle+'" $js_lt{"p_ctr2b"}')) {
+                    targetform.submit();
+                    return;
+                }
+            }
+            if (param == 'copy') {
+                targetform.submit();
+                return;
+            }
+            targetform.markcopy.value='';
+            targetform.copyfolder.value='';
+            targetform.cmd.value='';
+            targetform.folderpath.value='';
+            return;
+        } else {
+            if (document.getElementById(param+'_'+idx)) {
+                item = document.getElementById(param+'_'+idx);
+                if (item.type == 'checkbox') {
+                    if (item.checked) {
+                        item.checked = false;
+                    } else {
+                        item.checked = true;
+                        singleCheck(item,idx,param);
+                    }
+                }
+            }
+        }
+    }
+    return;
+}
+
+function singleCheck(caller,idx,action) {
+    actions = new Array('cut','copy','remove');
+    if (caller.checked) {
+        for (var i=0; i<actions.length; i++) {
+            if (actions[i] != action) {
+                if (document.getElementById(actions[i]+'_'+idx)) {
+                    if (document.getElementById(actions[i]+'_'+idx).checked) {
+                        document.getElementById(actions[i]+'_'+idx).checked = false;
+                    }
+                }
+            }
+        }
+    }
+    return;
 }
 
 function unselectInactive(nav) {
@@ -3260,10 +9988,12 @@ for (i = 0; i < currentLis.length; i++)
 
 function hideAll(current, nav, data) {
 unselectInactive(nav);
-if(current.className == 'right'){
-	current.className = 'right active'
-	}else{
-	current.className = 'active';
+if (current) { 
+    if (current.className == 'right'){
+        current.className = 'right active'
+    } else {
+        current.className = 'active';
+    }
 }
 currentData = document.getElementById(data);
 currentDivs = currentData.getElementsByTagName('DIV');
@@ -3294,18 +10024,37 @@ function openTabs(pageId) {
 }
 
 function showPage(current, pageId, nav, data) {
+        currstate = current.className;
 	hideAll(current, nav, data);
 	openTabs(pageId);
 	unselectInactive(nav);
-	current.className = 'active';
+        if ((currstate == 'active') || (currstate == 'right active')) {
+            if (currstate == 'active') {
+	        current.className = '';
+            } else {
+                current.className = 'right';
+            }
+            activeTab = ''; 
+            toggleExternal();
+            toggleUpload();
+            toggleMap();
+            toggleCrsRes();
+            toggleImportCrsres();
+            resize_scrollbox('contentscroll','1','0');
+            return;
+        } else {
+            current.className = 'active';
+        }
 	currentData = document.getElementById(pageId);
 	currentData.style.display = 'block';
         activeTab = pageId;
+        toggleExternal();
+        toggleUpload();
+        toggleMap();
+        toggleCrsRes();
+        toggleImportCrsres();
         if (nav == 'mainnav') {
             var storedpath = "$docs_folderpath";
-            if (storedpath == '') {
-                storedpath = "$docs_pagepath";
-            }
             var storedpage = "$main_container_page";
             var reg = new RegExp("^supplemental");
             if (pageId == 'mainCourseDocuments') {
@@ -3335,217 +10084,699 @@ function showPage(current, pageId, nav,
                 }
             }
         }
-        resize_contentdiv('contentscroll','1','0');
+        resize_scrollbox('contentscroll','1','0');
 	return false;
 }
 
-function injectData(current, hiddenField, name, value) {
-	currentElement = document.getElementById(hiddenField);
-	currentElement.name = name;
-	currentElement.value = value;
-	current.submit();
-}
-
 function toContents(jumpto) {
     var newurl = '$backtourl';
-    if (jumpto != '') {
+    if ((newurl == '/adm/navmaps') && (jumpto != '')) {
         newurl = newurl+'?postdata='+jumpto;
-;
     }
     location.href=newurl;
 }
 
-ENDNEWSCRIPT
-}
-
-sub resize_contentdiv_js {
-    my ($tabidstr) = @_;
-    my $viewport_js = &Apache::loncommon::viewport_geometry_js();
-    return <<ENDRESIZESCRIPT;
-
-window.onresize=resizeContentEditor;
-
-var activeTab;
-
-$viewport_js
-
-function resize_contentdiv(scrollboxname,chkw,chkh) {
-    var scrollboxid = 'div_'+scrollboxname;
-    var scrolltableid = 'table_'+scrollboxname;
-    var scrollbox;
-    var scrolltable;
-
-    if (document.getElementById("contenteditor") == null) {
-        return;
+function togglePick(caller,value) {
+    var disp = 'none';
+    if (document.getElementById('multi'+caller)) {
+        var curr = document.getElementById('multi'+caller).style.display;
+        if (value == 1) {
+            disp='block';
+        }
+        if (curr == disp) {
+            return; 
+        }
+        document.getElementById('multi'+caller).style.display=disp;
+        if (value == 1) {
+            document.getElementById('more'+caller).innerHTML = '&nbsp;&nbsp;<a href="javascript:toggleCheckUncheck(\\''+caller+'\\',1);" style="text-decoration:none;">$js_lt{'more'}</a>'; 
+        } else {
+            document.getElementById('more'+caller).innerHTML = '';
+        }
+        if (caller == 'actions') { 
+            setClass(value);
+            setBoxes(value);
+        }
     }
-
-    if (document.getElementById(scrollboxid) == null) {
-        return;
-    } else {
-        scrollbox = document.getElementById(scrollboxid);
+    var showButton = multiSettings();
+    if (showButton != 1) {
+        showButton = multiActions();
     }
+    if (document.getElementById('multisave')) {
+        if (showButton == 1) {
+            document.getElementById('multisave').style.display='block';
+        } else {
+            document.getElementById('multisave').style.display='none';
+        }
+    }
+    resize_scrollbox('contentscroll','1','1');
+    return;
+}
 
-    if (document.getElementById(scrolltableid) == null) {
-        return;
+function toggleCheckUncheck(caller,more) {
+    if (more == 1) {
+        document.getElementById('more'+caller).innerHTML = '&nbsp;&nbsp;<a href="javascript:toggleCheckUncheck(\\''+caller+'\\',0);" style="text-decoration:none;">$js_lt{'less'}</a>';
+        document.getElementById('allfields'+caller).style.display='block';
     } else {
-        scrolltable = document.getElementById(scrolltableid);
+        document.getElementById('more'+caller).innerHTML = '&nbsp;&nbsp;<a href="javascript:toggleCheckUncheck(\\''+caller+'\\',1);" style="text-decoration:none;">$js_lt{'more'}</a>';
+        document.getElementById('allfields'+caller).style.display='none';
     }
+    resize_scrollbox('contentscroll','1','1');
+}
 
-    init_geometry();
-    var vph = Geometry.getViewportHeight();
-    var vpw = Geometry.getViewportWidth();
-
-    var alltabs = ['$tabidstr'];
-    var listwchange;
-    if (chkw == 1) {
-        var contenteditorw = document.getElementById("contenteditor").offsetWidth;
-        var contentlistw;
-        var contentlistid = document.getElementById("contentlist");
-        if (contentlistid != null) {
-            contentlistw = document.getElementById("contentlist").offsetWidth;
+function multiSettings() {
+    var inuse = 0;
+    var settingsform = document.togglemultsettings;
+    if (settingsform.showmultpick.length > 1) {
+        for (var i=0; i<settingsform.showmultpick.length; i++) {
+            if (settingsform.showmultpick[i].checked) {
+                if (settingsform.showmultpick[i].value == 1) {
+                    inuse = 1;  
+                }
+            }
         }
-        var contentlistwstart = contentlistw;
-
-        var scrollboxw = scrollbox.offsetWidth;
-        var scrollboxscrollw = scrollbox.scrollWidth;
-
-        var offsetw = parseInt(vpw * 0.015);
-        var paddingw = parseInt(vpw * 0.09);
+    }
+    return inuse;
+}
 
-        var minscrollboxw = 250;
+function multiActions() {
+    var inuse = 0;
+    var actionsform = document.togglemultactions;
+    if (actionsform.showmultpick.length > 1) {
+        for (var i=0; i<actionsform.showmultpick.length; i++) {
+            if (actionsform.showmultpick[i].checked) {
+                if (actionsform.showmultpick[i].value == 1) {
+                    inuse = 1;
+                }
+            }
+        }
+    }
+    return inuse;
+} 
 
-        var maxtabw = 0;
-        var actabw = 0;
-        for (var i=0; i<alltabs.length; i++) {
-            if (activeTab == alltabs[i]) {
-                actabw = document.getElementById(alltabs[i]).offsetWidth;
-                if (actabw > maxtabw) {
-                    maxtabw = actabw;
+function checkSubmits() {
+    var numchanges = 0;
+    var form = document.saveactions;
+    var doactions = multiActions();
+    var cutwarnings = 0;
+    var remwarnings = 0;
+    var removalinfo = 0;
+    if (doactions == 1) {
+        var remidxlist = document.cumulativeactions.allremoveidx.value;
+        if ((remidxlist != '') && (remidxlist != null)) {
+            var remidxs = remidxlist.split(',');
+            for (var i=0; i<remidxs.length; i++) {
+                if (document.getElementById('remove_'+remidxs[i])) {
+                    if (document.getElementById('remove_'+remidxs[i]).checked) {
+                        form.multiremove.value += remidxs[i]+',';
+                        numchanges ++;
+                        if (document.getElementById('skip_remove_'+remidxs[i])) {
+                            if (document.getElementById('skip_remove_'+remidxs[i]).value == 0) {
+                                remwarnings ++;
+                            }
+                        }
+                        if (document.getElementById('confirm_removal_'+remidxs[i])) {
+                            if (document.getElementById('confirm_removal_'+remidxs[i]).value == 1) {
+                                removalinfo ++;
+                            }
+                        }
+                    }
                 }
-            } else {
-                if (document.getElementById(alltabs[i]) != null) {
-                    var thistab = document.getElementById(alltabs[i]);
-                    thistab.style.visibility = 'hidden';
-                    thistab.style.display = 'block';
-                    var tabw = document.getElementById(alltabs[i]).offsetWidth;
-                    thistab.style.display = 'none';
-                    thistab.style.visibility = '';
-                    if (tabw > maxtabw) {
-                        maxtabw = tabw;
+            }
+        }
+        var cutidxlist = document.cumulativeactions.allcutidx.value;
+        if ((cutidxlist != '') && (cutidxlist != null)) {
+            var cutidxs = cutidxlist.split(',');
+            for (var i=0; i<cutidxs.length; i++) {
+                if (document.getElementById('cut_'+cutidxs[i])) {
+                    if (document.getElementById('cut_'+cutidxs[i]).checked == true) {
+                        form.multicut.value += cutidxs[i]+',';
+                        numchanges ++;
+                        if (document.getElementById('skip_cut_'+cutidxs[i])) {
+                            if (document.getElementById('skip_cut_'+cutidxs[i]).value == 0) {
+                                cutwarnings ++;
+                            }
+                        }
                     }
                 }
             }
         }
-
-        if (maxtabw > 0) {
-            var newscrollboxw;
-            if (maxtabw+paddingw+scrollboxscrollw<contenteditorw) {
-                newscrollboxw = contenteditorw-paddingw-maxtabw;
-                if (newscrollboxw < minscrollboxw) {
-                    newscrollboxw = minscrollboxw;
+        var copyidxlist = document.cumulativeactions.allcopyidx.value;
+        if ((copyidxlist != '') && (copyidxlist != null)) {
+            var copyidxs = copyidxlist.split(',');
+            for (var i=0; i<copyidxs.length; i++) {
+                if (document.getElementById('copy_'+copyidxs[i])) {
+                    if (document.getElementById('copy_'+copyidxs[i]).checked) {
+                        form.multicopy.value += copyidxs[i]+',';
+                        numchanges ++;
+                    }
                 }
-                scrollbox.style.width = newscrollboxw+"px";
-                if (newscrollboxw != scrollboxw) {
-                    var newcontentlistw = newscrollboxw-offsetw;
-                    contentlistid.style.width = newcontentlistw+"px";
+            }
+        }
+        if (numchanges > 0) {
+            form.multichange.value = numchanges;
+        }
+    }
+    var dosettings = multiSettings();
+    var haschanges = 0;
+    if (dosettings == 1) {
+        form.allencrypturl.value = '';
+        form.allhiddenresource.value = '';
+        form.changeparms.value = 'all';
+        var patt=new RegExp(",\$");
+        var allidxlist = document.cumulativesettings.allidx.value;
+        if ((allidxlist != '') && (allidxlist != null)) {
+            var allidxs = allidxlist.split(',');
+            if (allidxs.length > 1) {
+                for (var i=0; i<allidxs.length; i++) {
+                    if (document.getElementById('hiddenresource_'+allidxs[i])) {
+                        if (document.getElementById('hiddenresource_'+allidxs[i]).checked) {
+                            form.allhiddenresource.value += allidxs[i]+',';
+                        }
+                    }
+                    if (document.getElementById('encrypturl_'+allidxs[i])) {
+                        if (document.getElementById('encrypturl_'+allidxs[i]).checked) {
+                            form.allencrypturl.value += allidxs[i]+',';
+                        }
+                    }
                 }
-            } else {
-                newscrollboxw = contenteditorw-paddingw-maxtabw;
-                if (newscrollboxw < minscrollboxw) {
-                    newscrollboxw = minscrollboxw;
+                form.allhiddenresource.value = form.allhiddenresource.value.replace(patt,"");
+                form.allencrypturl.value = form.allencrypturl.value.replace(patt,"");
+            }
+        }
+        form.allrandompick.value = '';
+        form.allrandomorder.value = '';
+        var allmapidxlist = document.cumulativesettings.allmapidx.value;
+        if ((allmapidxlist != '') && (allmapidxlist != null)) {
+            var allmapidxs = allmapidxlist.split(',');
+            for (var i=0; i<allmapidxs.length; i++) {
+                var randompick = document.getElementById('randompick_'+allmapidxs[i]);
+                var rpicknum = document.getElementById('rpicknum_'+allmapidxs[i]);
+                var randorder = document.getElementById('randomorder_'+allmapidxs[i]);
+                if ((randompick.checked) && (rpicknum.value != '')) {
+                    form.allrandompick.value += allmapidxs[i]+':'+rpicknum.value+',';
                 }
-                scrollbox.style.width = newscrollboxw+"px";
-                if (newscrollboxw != scrollboxw) {
-                    var newcontentlistw = newscrollboxw-offsetw;
-                    contentlistid.style.width = newcontentlistw+"px";
+                if (randorder.checked) {
+                    form.allrandomorder.value += allmapidxs[i]+',';
                 }
             }
-
-            if (newscrollboxw != scrollboxw) {
-                var newscrolltablew = newscrollboxw+offsetw;
-                scrolltable.style.width = newscrolltablew+"px";
+            form.allrandompick.value = form.allrandompick.value.replace(patt,"");
+            form.allrandomorder.value = form.allrandomorder.value.replace(patt,"");
+        }
+        if (document.cumulativesettings.currhiddenresource.value != form.allhiddenresource.value) {
+            haschanges = 1;
+        }
+        if (document.cumulativesettings.currencrypturl.value != form.allencrypturl.value) {
+            haschanges = 1;
+        }
+        if (document.cumulativesettings.currrandomorder.value != form.allrandomorder.value) {
+            haschanges = 1;
+        }
+        if (document.cumulativesettings.currrandompick.value != form.allrandompick.value) {
+            haschanges = 1;
+        }
+    }
+    if (doactions == 1) {
+        if (numchanges > 0) {
+            if ((cutwarnings > 0) || (remwarnings > 0) || (removalinfo > 0)) {
+                if (remwarnings > 0) {
+                    if (!confirm('$js_lt{"p_rmr1"}\\n\\n$js_lt{"p_rmr3a"} '+remwarnings+' $js_lt{"p_rmr3b"}')) {
+                        return false;
+                    }
+                }
+                if (removalinfo > 0) {
+                    if (!confirm('$js_lt{"p_rmr4"}\\n$js_lt{"p_rmr5"}\\n\\n$js_lt{"p_rmr3a"} '+removalinfo+' $js_lt{"p_rmr3b"}')) {
+                        return false;
+                    }
+                }
+                if (cutwarnings > 0) {
+                    if (!confirm('$js_lt{"p_ctr1a"}\\n$js_lt{"p_ctr1b"}\\n\\n$js_lt{"p_ctr3a"} '+cutwarnings+' $js_lt{"p_ctr3b"}')) {
+                        return false;
+                    }
+                }
             }
+            form.submit();
+            return true;
         }
-
-        if (contentlistid.offsetWidth != contentlistwstart) {
-            listwchange = 1;
+    }
+    if (dosettings == 1) {
+        if (haschanges == 1) {
+            form.submit();
+            return true;
         }
+    }
+    if ((dosettings == 1) && (doactions == 1)) {
+        alert("$js_lt{'noor'}");
+    } else {
+        if (dosettings == 1) {
+            alert("$js_lt{'noch'}");
+        } else {
+            alert("$js_lt{'noac'}");
+        }
+    }
+    return false;
+}
 
-        if (activeTab == 'cc1') {
-            if (document.getElementById('cc_hrule') != null) {
-                document.getElementById('cc_hrule').style.width=actabw+"px";
+function setClass(value) {
+    var cutclass = 'LC_docs_cut';
+    var copyclass = 'LC_docs_copy';
+    var removeclass = 'LC_docs_remove';
+    var cutreg = new RegExp("\\\\b"+cutclass+"\\\\b");
+    var copyreg = new RegExp("\\\\b"+copyclass+"\\\\b");
+    var removereg = new RegExp("\\\\"+removeclass+"\\\\b");
+    var links = document.getElementsByTagName('a');
+    for (var i=0; i<links.length; i++) {
+        var classes = links[i].className;
+        if (cutreg.test(classes)) {
+            links[i].className = cutclass;
+            if (value == 1) {
+                links[i].className += " LC_menubuttons_link";
             }
         } else {
-            if (activeTab == 'bb1') {
-                if (document.getElementById('bb_hrule') != null) {
-                    document.getElementById('bb_hrule').style.width=actabw+"px";
-                }
+            if (copyreg.test(classes)) {
+                links[i].className = copyclass;
+                if (value == 1) {
+                    links[i].className += " LC_menubuttons_link";
+                } 
             } else {
-                if (activeTab == 'ee2') {
-                    if (document.getElementById('ee_hrule') != null) {
-                        document.getElementById('ee_hrule').style.width=actabw+"px";
+                if (removereg.test(classes)) {
+                    links[i].className = removeclass;
+                    if (value == 1) {
+                        links[i].className += " LC_menubuttons_link";
                     }
                 }
             }
         }
     }
-    if ((chkh == 1) || (listwchange)) {
-        var primaryheight = document.getElementById("LC_nav_bar").offsetHeight;
-        var secondaryheight = document.getElementById("LC_secondary_menu").offsetHeight;
-        var crumbsheight = document.getElementById("LC_breadcrumbs").offsetHeight;
-        var dccidheight = document.getElementById("dccid").offsetHeight;
+    return;
+}
 
-        var uploadresultheight = 0;
-        if (document.getElementById("uploadfileresult") != null) {
-            uploadresultheight = document.getElementById("uploadfileresult").offsetHeight;
+function setBoxes(value) {
+    var remidxlist = document.cumulativeactions.allremoveidx.value;
+    if ((remidxlist != '') && (remidxlist != null)) {
+        var remidxs = remidxlist.split(',');
+        for (var i=0; i<remidxs.length; i++) {
+            if (document.getElementById('remove_'+remidxs[i])) {
+                var item = document.getElementById('remove_'+remidxs[i]);
+                if (value == 1) {
+                    item.className = 'LC_docs_remove';
+                } else {
+                    item.className = 'LC_hidden';
+                }
+            }
         }
-        var tabbedheight = document.getElementById("tabbededitor").offsetHeight;
-        var contenteditorheight = document.getElementById("contenteditor").offsetHeight;
-        var scrollboxheight = scrollbox.offsetHeight;
-        var scrollboxscrollheight = scrollbox.scrollHeight;
-        var freevspace = vph-(primaryheight+secondaryheight+crumbsheight+dccidheight+uploadresultheight+tabbedheight+contenteditorheight);
-
-        var minvscrollbox = 200;
-        var offsetv = 20;
-        var newscrollboxheight;
-        if (freevspace < 0) {
-            newscrollboxheight = scrollboxheight+freevspace-offsetv;
-            if (newscrollboxheight < minvscrollbox) {
-                newscrollboxheight = minvscrollbox;
+    }
+    var cutidxlist = document.cumulativeactions.allcutidx.value;
+    if ((cutidxlist != '') && (cutidxlist != null)) {
+        var cutidxs = cutidxlist.split(',');
+        for (var i=0; i<cutidxs.length; i++) {
+            if (document.getElementById('cut_'+cutidxs[i])) {
+                var item = document.getElementById('cut_'+cutidxs[i]);
+                if (value == 1) {
+                    item.className = 'LC_docs_cut';
+                } else {
+                    item.className = 'LC_hidden';
+                }
             }
-            scrollbox.style.height = newscrollboxheight + "px";
-        } else {
-            if (scrollboxscrollheight > scrollboxheight) {
-                if (freevspace > offsetv) {
-                    newscrollboxheight = scrollboxheight+freevspace-offsetv;
-                    if (newscrollboxheight < minvscrollbox) {
-                        newscrollboxheight = minvscrollbox;
-                    }
-                    scrollbox.style.height = newscrollboxheight+"px";
+        }
+    }
+    var copyidxlist = document.cumulativeactions.allcopyidx.value;
+    if ((copyidxlist != '') && (copyidxlist != null)) {
+        var copyidxs = copyidxlist.split(',');
+        for (var i=0; i<copyidxs.length; i++) {
+            if (document.getElementById('copy_'+copyidxs[i])) {
+                var item = document.getElementById('copy_'+copyidxs[i]);
+                if (value == 1) {
+                    item.className = 'LC_docs_copy';
+                } else {
+                    item.className = 'LC_hidden';
                 }
             }
         }
-        scrollboxheight = scrollbox.offsetHeight;
-        var contentlistheight = document.getElementById("contentlist").offsetHeight;
+    }
+    return;
+}
 
-        if (scrollboxscrollheight <= scrollboxheight) {
-            if ((contentlistheight+offsetv)<scrollboxheight) {
-                newscrollheight = contentlistheight+offsetv;
-                scrollbox.style.height = newscrollheight+"px";
+function validImportCrsRes() {
+    var path =  document.crsresimportform.coursepath.options[document.crsresimportform.coursepath.selectedIndex].value;
+    var fname = document.crsresimportform.coursefile.options[document.crsresimportform.coursefile.selectedIndex].value;
+    if ((fname == '') || (fname == null)) {
+        alert("$js_lt{'nofi'}");
+        return false;
+    }
+    var url = '/res/$coursedom/$coursenum/';
+    if (path && path != '/') {
+        url += path+'/';
+    }
+    if (fname != '') {
+        url += fname;
+    }
+    var title = document.crsresimportform.crsrestitle.value;
+    document.crsresimportform.importdetail.value=encodeURIComponent(title)+'='+encodeURIComponent(url);
+    return true;
+}
+
+function validateNewRes(caller) {
+    if (caller == 'single') {
+        var role = document.courseresform.authorrole.options[document.courseresform.authorrole.selectedIndex].value; 
+        var authorpath = document.courseresform.authorpath.options[document.courseresform.authorpath.selectedIndex].value;
+        var resname = document.courseresform.newresourcename.value;
+    }
+}
+
+ENDSCRIPT
+}
+
+sub history_tab_js {
+    return <<"ENDHIST";
+function toggleHistoryDisp(choice) {
+    document.docslogform.docslog.value = choice;
+    document.docslogform.submit();
+    return;
+}
+
+ENDHIST
+}
+
+sub inject_data_js {
+    return <<ENDINJECT;
+
+function injectData(current, hiddenField, name, value) {
+        currentElement = document.getElementById(hiddenField);
+        currentElement.name = name;
+        currentElement.value = value;
+        current.submit();
+}
+
+ENDINJECT
+}
+
+sub dump_switchserver_js {
+    my @hosts = @_;
+    my %js_lt = &Apache::lonlocal::texthash(
+        dump => 'Copying content to Authoring Space requires switching server.',
+        swit => 'Switch server?',
+    );
+    my %html_js_lt = &Apache::lonlocal::texthash(
+        swit => 'Switch server?',
+        duco => 'Copying uploaded content to Authoring Space',
+        yone => 'You need to switch to a server housing an Authoring Space for which you are author or co-author.',
+        chos => 'Choose server',
+    );
+    &js_escape(\%js_lt);
+    &html_escape(\%html_js_lt);
+    &js_escape(\%html_js_lt);
+    my $role = $env{'request.role'};
+    my $js = <<"ENDSWJS";
+<script type="text/javascript">
+function write_switchserver() {
+    var server;
+    if (document.setserver.posshosts.length > 0) {
+        for (var i=0; i<document.setserver.posshosts.length; i++) {
+            if (document.setserver.posshosts[i].checked) {
+                server = document.setserver.posshosts[i].value;
             }
+       }
+       opener.document.location.href="/adm/switchserver?otherserver="+server+"&role=$role&origurl=/adm/coursedocs";
+    }
+    window.close();
+}
+</script>
+
+ENDSWJS
+
+    my $startpage = &Apache::loncommon::start_page('Choose server',$js,
+                                                   {'only_body' => 1,
+                                                    'js_ready'  => 1,});
+    my $endpage = &Apache::loncommon::end_page({'js_ready'  => 1});
+
+    my $hostpicker;
+    my $count = 0;
+    foreach my $host (sort(@hosts)) {
+        my $checked;
+        if ($count == 0) {
+            $checked = ' checked="checked"';
+        }
+        $hostpicker .= '<label><input type="radio" name="posshosts" value="'.
+                       $host.'"'.$checked.' />'.$host.'</label>&nbsp;&nbsp;';
+        $count++;
+    }
+    
+    return <<"ENDSWITCHJS";
+
+function dump_needs_switchserver(url) {
+    if (url!='' && url!= null) {
+        if (confirm("$js_lt{'dump'}\\n$js_lt{'swit'}")) {
+            go(url);
         }
     }
     return;
 }
 
-function resizeContentEditor() {
-    var timer;
-    clearTimeout(timer)
-    timer=setTimeout('resize_contentdiv("contentscroll","1","1")',500);
+function choose_switchserver_window() {
+    newWindow = window.open('','ChooseServer','height=400,width=500,scrollbars=yes')
+    newWindow.document.open();
+    newWindow.document.writeln('$startpage');
+    newWindow.document.write('<h3>$html_js_lt{'duco'}<\\/h3>\\n'+
+       '<p>$html_js_lt{'yone'}<\\/p>\\n'+
+       '<div class="LC_left_float"><fieldset><legend>$html_js_lt{'chos'}<\\/legend>\\n'+
+       '<form name="setserver" method="post" action="" \\/>\\n'+
+       '$hostpicker\\n'+
+       '<br \\/><br \\/>\\n'+
+       '<input type="button" name="makeswitch" value="$html_js_lt{'swit'}" '+
+       'onclick="write_switchserver();" \\/>\\n'+
+       '<\\/form><\\/fieldset><\\/div><br clear="all" \\/>\\n');
+    newWindow.document.writeln('$endpage');
+    newWindow.document.close();
+    newWindow.focus();
+}
+
+ENDSWITCHJS
+}
+
+sub makedocslogform {
+    my ($formelems,$docslog) = @_;
+    return <<"LOGSFORM";
+ <form action="/adm/coursedocs" method="post" name="docslogform">
+   <input type="hidden" name="docslog" value="$docslog" />
+   $formelems
+ </form>
+LOGSFORM
 }
 
-ENDRESIZESCRIPT
-    return;
+sub makesimpleeditform {
+    my ($formelems) = @_;
+    return <<"SIMPFORM";
+ <form name="simpleedit" method="post" action="/adm/coursedocs">
+   <input type="hidden" name="importdetail" value="" />
+   $formelems
+ </form>
+SIMPFORM
+}
+
+sub makenewproblem {
+    my ($r,$coursedom,$coursenum) = @_;
+# Creating a new problem
+    my ($redirect,$error);
+    if ($env{'form.authorrole'}) {
+        my ($newsubdir,$filename);
+        if ($env{'form.newsubdir'}) {
+            if ($env{'form.newsubdirname'} ne '') {
+                $newsubdir = $env{'form.newsubdirname'};
+            }
+        }
+        if ($env{'form.newresourcename'}) {
+            $filename = $env{'form.newresourcename'};
+            $filename =~ s/\.(\d+)(\.\w+)$/$2/;
+            $filename =~ s/`//g;
+            $filename =~ s{/\.\./}{_}g;
+            $filename =~ s/\.+/./g;
+            $filename =~ s{/+}{_}g;
+            if ($filename ne '') {
+                my ($name,$ext) = ($filename =~ /(.+)\.([^.]+)$/);
+                if (($ext) && ($ext ne '.problem')) {
+                    $filename = $name.'.problem';
+                } elsif ($ext eq '') {
+                    $filename .= '.problem';
+                }
+                my $docroot = $r->dir_config('lonDocRoot');
+                my @ids=&Apache::lonnet::current_machine_ids();
+                if ($env{'form.authorrole'} eq 'author') {
+                    if ($env{'user.author'}) {
+                        if ($env{'user.home'} && grep(/^\Q$env{'user.home'}\E$/,@ids)) {
+                            my $url = "/priv/$env{'user.domain'}/$env{'user.name'}";
+                            my $path = $docroot.$url;
+                            my $subdir = $env{'form.authorpath'};
+                            $redirect = &finishnewprob($url,$path,$subdir,$newsubdir,$filename);
+                        }
+                    }
+                } elsif ($env{'form.authorrole'} eq 'course') {
+                    my $chome = $env{'course.'.$env{'request.course.id'}.'.home'};
+                    if ($chome && grep(/^\Q$chome\E$/,@ids)) {
+                        my $url = "/priv/$coursedom/$coursenum";
+                        my $path=$docroot.$url;
+                        my $subdir = $env{'form.authorpath'};
+                        $redirect = &finishnewprob($url,$path,$subdir,$newsubdir,$filename);
+                        if ($redirect) {
+                            my $rightsfile = 'default.rights';
+                            my $sourcerights = "$path/$rightsfile";
+                            &Apache::loncommon::crsauthor_rights($rightsfile,$path,$docroot,$coursenum,$coursedom);
+                            my $targetrights = $docroot."/res/$coursedom/$coursenum/$rightsfile";
+                            if ((-e $sourcerights) && (-e "$sourcerights.meta")) {
+                                if (!-e "$docroot/res/$coursedom") {
+                                    mkdir("$docroot/res/$coursedom",0755);
+                                }
+                                if (!-e "$docroot/res/$coursedom/$coursenum") {
+                                    mkdir("$docroot/res/$coursedom/$coursenum",0755);
+                                }
+                                if ((-e "$docroot/res/$coursedom/$coursenum") && (!-e $targetrights)) {
+                                    my $nokeyref = &Apache::lonpublisher::getnokey($r->dir_config('lonIncludes'));
+                                    my $output = &Apache::lonpublisher::batchpublish($r,$sourcerights,$targetrights,$nokeyref,1);
+                                }
+                            }
+                            my $source = $docroot.$redirect;
+                            if (!-e "$source.meta") {
+                                my $cid = $coursedom.'_'.$coursenum;
+                                my $now = time;
+                                if (open(my $fh,">$source.meta")) {
+                                    my $author=$env{'environment.firstname'}.' '.
+                                               $env{'environment.middlename'}.' '.
+                                               $env{'environment.lastname'}.' '.
+                                               $env{'environment.generation'};
+                                    $author =~ s/\s+$//;
+                                    my $title = $env{'form.newresourcetitle'};
+                                    $title =~ s/^\s+|\s+$//g;
+                                    print $fh <<END;
+
+<abstract></abstract>
+<author>$author</author>
+<authorspace>$coursenum:$coursedom</authorspace>
+<copyright>custom</copyright>
+<creationdate>$now</creationdate>
+<customdistributionfile>/res/$coursedom/$coursenum/default.rights</customdistributionfile>
+<dependencies></dependencies>
+<domain>$coursedom</domain>
+<highestgradelevel>0</highestgradelevel>
+<keywords></keywords>
+<language>notset </language>
+<lastrevisiondate>$now</lastrevisiondate>
+<lowestgradelevel>0</lowestgradelevel>
+<mime>problem</mime>
+<modifyinguser>$coursenum:$coursedom</modifyinguser>
+<notes></notes>
+<obsolete></obsolete>
+<obsoletereplacement></obsoletereplacement>
+<owner>$coursenum:$coursedom</owner>
+<sourceavail></sourceavail>
+<standards></standards>
+<subject></subject>
+<title>$title</title>
+END
+                                    close($fh);
+                                }
+                            }
+                        }
+                    }
+                } else {
+                    my ($auname,$audom,$role) = split('___',$env{'form.authorrole'});
+                    my $rolehome = &Apache::lonnet::homeserver($auname,$audom);
+                    if (grep(/^\Q$rolehome\E$/,@ids)) {
+                        my $now = time;
+                        if (exists($env{'user.role.'.$role.'./'.$audom.'/'.$auname})) {
+                            my ($start,$end) = split(/\./,$env{'user.role.'.$role.'./'.$audom.'/'.$auname});
+                            if (($start <= $now) && (($end == 0) || ($end >= $now))) { 
+                                my $url = "/priv/$audom/$auname";  
+                                my $path = $r->dir_config('lonDocRoot').$url;
+                                my $subdir = $env{'form.authorpath'};
+                                $redirect = &finishnewprob($url,$path,$subdir,$newsubdir,$filename);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+    return ($redirect,$error);
+}
+
+sub finishnewprob {
+    my ($url,$path,$subdir,$newsubdir,$filename,$context) = @_;
+    unless (-d $path) {
+        unless (mkdir($path,02770)) {
+            return;
+        }
+    }
+    my $redirect;
+    if ($subdir ne '/') {
+        $subdir = &cleandir($subdir);
+        if (($subdir ne '') && (-d "$path/$subdir")) {
+            $path .= "/$subdir";
+            $url .= "/$subdir";
+        }
+    }
+    my $dest;
+    if ($newsubdir ne '') {
+        $newsubdir = &cleandir($newsubdir);
+    }
+    if ($newsubdir ne '') {
+        if (-d "$path/$newsubdir") {
+            $dest = "$path/$newsubdir/$filename";
+        } else {
+            my $dirok;
+            unless (-e "$path/$newsubdir") {
+                if (mkdir("$path/$newsubdir",02770)) {
+                    if (chmod(02770,"$path/$newsubdir")) {
+                        $dirok = 1;
+                    }
+                }
+            }
+            if ($dirok) {
+                $dest = "$path/$newsubdir/$filename";
+            }
+        }
+        if (($dest ne '') && (!-e $dest)) {
+            $redirect = "$url/$newsubdir/$filename";
+        }
+    } else {
+        $dest = "$path/$filename";
+        if (($dest ne '') && (!-e $dest)) {
+            $redirect = "$url/$filename";
+        }
+    }
+    if ((!-e $dest) && ($context ne 'upload')) {
+        my $template = $env{'form.template'};
+        my $copyfrom;
+        if ($template ne '') {
+            my %templates;
+            my @files = &Apache::lonhomework::get_template_list('problem');
+            foreach my $poss (@files) {
+                if (ref($poss) eq 'ARRAY') {
+                    if ($template eq $poss->[0]) {
+                        $templates{$template} = 1;
+                        last;
+                    }
+                }
+            }
+            if ($templates{$template}) {
+                $copyfrom = $template;
+            }
+        }
+        if ($filename =~ /\.problem$/) {
+            unless ($copyfrom) {
+                $copyfrom = $Apache::lonnet::perlvar{'lonIncludes'}.'/templates/blank.problem';
+            }
+            &File::Copy::copy($copyfrom,$dest);
+        }
+    }
+    return $redirect;
+}
+
+sub cleandir {
+    my ($dir) = @_;
+    $dir =~ s/^\s+//;
+    $dir =~ s/\s+$//;
+    $dir =~ s/\.+//g;
+    $dir =~ s/[\#\?&%\":]//g;
+    return $dir;
 }
 
 1;
@@ -3580,21 +10811,12 @@ sets @resources - array with the resourc
 
 Return hash with valid author names
 
-=item dumpbutton()
-
-Generate "dump" button
-
 =item clean()
 
 =item dumpcourse()
 
     Actually dump course
 
-
-=item exportbutton()
-
-    Generate "export" button
-
 =item group_import()
 
     Imports the given (name, url) resources into the course
@@ -3612,6 +10834,24 @@ Generate "dump" button
 
 =item do_paste_from_buffer()
 
+=item do_buffer_empty() 
+
+=item clear_from_buffer()
+
+=item get_newmap_url()
+
+=item dbcopy()
+
+=item uniqueness_check()
+
+=item contained_map_check()
+
+=item url_paste_fixups()
+
+=item apply_fixups()
+
+=item copy_dependencies()
+
 =item update_parameter()
 
 =item handle_edit_cmd()
@@ -3624,8 +10864,6 @@ Generate "dump" button
 
 =item is_supplemental_title()
 
-=item parse_supplemental_title()
-
 =item entryline()
 
 =item tiehash()
@@ -3640,7 +10878,9 @@ check on this
 
 Verify Content
 
-=item devalidateversioncache() & checkversions()
+=item devalidateversioncache() 
+
+=item checkversions()
 
 Check Versions
 
@@ -3654,6 +10894,48 @@ Check Versions
 
 Breadcrumbs for special functions
 
+=item create_list_elements()
+
+=item create_form_ul()
+
+=item startContentScreen() 
+
+=item endContentScreen()
+
+=item supplemental_base()
+
+=item embedded_form_elems()
+
+=item embedded_destination()
+
+=item return_to_editor()
+
+=item decompression_info()
+
+=item decompression_phase_one()
+
+=item decompression_phase_two()
+
+=item remove_archive()
+
+=item generate_admin_menu()
+
+=item generate_edit_table()
+
+=item editing_js()
+
+=item history_tab_js()
+
+=item inject_data_js()
+
+=item dump_switchserver_js()
+
+=item resize_scrollbox_js()
+
+=item makedocslogform()
+
+=item makesimpleeditform()
+
 =back
 
 =cut