--- loncom/interface/londocs.pm	2012/12/13 02:45:27	1.484.2.15
+++ loncom/interface/londocs.pm	2012/06/30 23:11:11	1.488
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.484.2.15 2012/12/13 02:45:27 raeburn Exp $
+# $Id: londocs.pm,v 1.488 2012/06/30 23:11:11 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -69,14 +69,10 @@ sub mapread {
 }
 
 sub storemap {
-    my ($coursenum,$coursedom,$map,$contentchg)=@_;
-    my $report;
-    if (($contentchg) && ($map =~ /^default/)) {
-       $report = 1;
-    }
+    my ($coursenum,$coursedom,$map)=@_;
     my ($outtext,$errtext)=
       &LONCAPA::map::storemap('/uploaded/'.$coursedom.'/'.$coursenum.'/'.
-			      $map,1,$report);
+			      $map,1);
     if ($errtext) { return ($errtext,2); }
 
     $hadchanges=1;
@@ -309,7 +305,7 @@ sub group_import {
 		join(':', ($name, $url, $ext, 'normal', 'res'));
 	}
     }
-    return &storemap($coursenum, $coursedom, $folder.'.'.$container,1);
+    return &storemap($coursenum, $coursedom, $folder.'.'.$container);
 }
 
 sub breadcrumbs {
@@ -322,6 +318,7 @@ sub breadcrumbs {
         @folders=split('&',$env{'form.folderpath'});
     }
     my $folderpath;
+    my $cpinfo='';
     my $plain='';
     my $randompick=-1;
     my $isencrypted=0;
@@ -354,7 +351,7 @@ sub breadcrumbs {
             $name = &mt('Supplemental '.$crstype.' Content');
         }
 	&Apache::lonhtmlcommon::add_breadcrumb(
-		      {'href'=>$url,
+		      {'href'=>$url.$cpinfo,
 		       'title'=>$name,
 		       'text'=>$name,
 		       'no_mt'=>1,
@@ -368,7 +365,7 @@ sub breadcrumbs {
 }
 
 sub log_docs {
-    return &Apache::lonnet::write_log('course','docslog',@_);
+    return &Apache::lonnet::instructor_log('docslog',@_);
 }
 
 {
@@ -441,7 +438,7 @@ sub docs_change_log {
              '</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')));
+    $r->print(&startContentScreen('docs'));
     my %orderhash;
     my $container='sequence';
     my $pathitem;
@@ -460,9 +457,6 @@ sub docs_change_log {
     my $jumpto = $readfile;
     $jumpto =~ s{^/}{};
     my $tid = 1;
-    if ($supplementalflag) {
-        $tid = 2;
-    }
     my ($breadcrumbtrail) = &breadcrumbs($allowed,$crstype);
     $r->print($breadcrumbtrail.
               &generate_edit_table($tid,\%orderhash,undef,$iconpath,$jumpto,
@@ -537,7 +531,7 @@ sub docs_change_log {
                                   ':'.$docslog{$id}{'exe_udom'}.'</tt>'.
                   $send_msg_link.'</td><td>'.
                   $docslog{$id}{'logentry'}{'folder'}.'</td><td>');
-        my $is_supp = 0;
+        my $is_supp = 0; 
         if ($docslog{$id}{'logentry'}{'currentfolder'} =~ /^supplemental/) {
             $is_supp = 1;
         }
@@ -560,7 +554,7 @@ sub docs_change_log {
                 if ($is_supp) {
                     $shown = &Apache::loncommon::parse_supplemental_title($shown);
                 }
-                $r->print('<li>'.$shown.'</li>');
+		$r->print('<li>'.$shown.'</li>');
 	    }
 	}
 	$r->print('</ul>');
@@ -615,7 +609,7 @@ sub docs_change_log {
 }
 
 sub update_paste_buffer {
-    my ($coursenum,$coursedom,$folder) = @_;
+    my ($coursenum,$coursedom) = @_;
 
     return if (!defined($env{'form.markcopy'}));
     return if (!defined($env{'form.copyfolder'}));
@@ -636,121 +630,47 @@ sub update_paste_buffer {
     }
     $url=~s{http(&colon;|:)//https(&colon;|:)//}{https$2//};
 
-    (my $cmd,undef)=split('_',$env{'form.cmd'});
-
-    my %addtoenv = (
-                    'docs.markedcopy_title' => $title,
-                    'docs.markedcopy_url'   => $url,
-                    'docs.markedcopy_cmd'   => $cmd,
-                   );
-    &Apache::lonnet::delenv('docs.markedcopy_nested');
-    &Apache::lonnet::delenv('docs.markedcopy_nestednames');
-    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,\%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'} = $nested;
-            }
-            if ($nestednames ne '') {
-                $addtoenv{'docs.markedcopy_nestednames'} = $nestednames;
-            }
-        }
-    }
-    &Apache::lonnet::appenv(\%addtoenv);
+    &Apache::lonnet::appenv({'docs.markedcopy_title' => $title,
+			    'docs.markedcopy_url'   => $url});
     delete($env{'form.markcopy'});
 }
 
-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,$folder,$coursedom,$coursenum) = @_;
+    my ($r,$container,$folder) = @_;
     return if (!defined($env{'docs.markedcopy_url'}));
 
-    my ($is_external,$othercourse,$fromsupp,$is_uploaded_map,$parent);
+    my $is_external;
     my $extension = (split(/\./,$env{'docs.markedcopy_url'}))[-1];
     if ($env{'docs.markedcopy_url'} =~ m{^(?:/adm/wrapper/ext|(?:http|https)(?:&colon;|:))//} ) {
         $is_external = 1;
     }
 
-    my ($canpaste,$nopaste,$othercrs,$areachange,$is_uploaded_map);
+    my $canpaste;
     if ($folder =~ /^supplemental/) {
-        $canpaste = &supp_pasteable($env{'docs.markedcopy_url'});
-        unless ($canpaste) {
-            $nopaste = &mt('Paste into Supplemental Content unavailable for this type of content.');
-        }
+        $canpaste = &supp_pasteable($env{'docs.markedcopy_url'}); 
     } else {
         $canpaste = 1;
     }
 
+    my $pasteinfo;
     if ($canpaste) {
-        if ($env{'docs.markedcopy_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/) {
-                    if ($canpaste) {
-                        $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;
-            }
-        }
+        $pasteinfo = '<form name="pasteform" action="/adm/coursedocs" method="post">'
+                    .'<input type="submit" name="pastemarked" value="'.&mt('Paste').'" /> ';
+    } else {
+        $pasteinfo = &mt('Paste buffer contains:').' ';
     }
 
     $r->print('<fieldset>'
-             .'<legend>'.&mt('Clipboard').'</legend>');
-    my ($type,$buffer);
+             .'<legend>'.&mt('Clipboard').'</legend>'
+             .$pasteinfo
+             );
+
+    my $type;
     if ($is_external) {
 	$type = &mt('External Resource');
-	$buffer = $type.': '.
+	$r->print($type.': '.
 		  &LONCAPA::map::qtescape($env{'docs.markedcopy_title'}).' ('.
-                  &LONCAPA::map::qtescape($env{'docs.markedcopy_url'}).')';
+		  &LONCAPA::map::qtescape($env{'docs.markedcopy_url'}).')');
     }  else {
 	my $icon = &Apache::loncommon::icon($extension);
 	if ($extension eq 'sequence' &&
@@ -759,60 +679,9 @@ sub print_paste_buffer {
 	    $icon .= '/navmap.folder.closed.gif';
 	}
 	$icon = '<img src="'.$icon.'" alt="" class="LC_icon" />';
-        $buffer = $icon.$type.': '.  &Apache::loncommon::parse_supplemental_title(&LONCAPA::map::qtescape($env{'docs.markedcopy_title'}));
+	$r->print($icon.$type.': '.  &Apache::loncommon::parse_supplemental_title(&LONCAPA::map::qtescape($env{'docs.markedcopy_title'})));
     }
     if ($canpaste) {
-        $r->print('<form name="pasteform" action="/adm/coursedocs" method="post">'.$buffer);
-        if (($is_uploaded_map) && (!$areachange)) {
-            if ((!$othercourse) && ($env{'docs.markedcopy_cmd'} eq 'cut')) {
-                $r->print(('&nbsp;'x 4).'<span id="pasteoptionstext">'.
-                          '<a href="javascript:showPasteOptions();" class="LC_menubuttons_link">'.
-                          &mt('Show Paste Options').'</a></span><br />'.
-                          '<div id="pasteoptions" class="LC_dccid">'.('&nbsp;'x 4).
-                          '<label>'.
-                          '<input type="radio" name="docs.markedcopy_options" value="new" checked="checked" />'.
-                          &mt('Copy to new folder').'</label>'.('&nbsp;' x2).
-                          '<label>'.
-                          '<input type="radio" name="docs.markedcopy_options" value="move" />'.
-                          &mt('Move old folder').'</label><br />');
-                if ($env{'docs.markedcopy_nested'}) {
-                    $r->print('<br />'.&mt('Folder to paste contains sub-folders').
-                              '<br /><table border="0">');
-                    my @pastemaps = split(/\&/,$env{'docs.markedcopy_nested'});
-                    my @titles = split(/\Q___&&&___\E/,$env{'docs.markedcopy_nestednames'});
-                    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_'.$subfolders[$j].'" value="new" checked="checked" />'.&mt('Copy to new').'</label>'.('&nbsp;' x2).
-                                  '<label>'.
-                                  '<input type="radio" name="docs.markedcopy_'.$subfolders[$j].'" value="move" />'.
-                                  &mt('Move old').'</label>'.
-                                  '</td></tr>';
-                        }
-                    }
-                    &recurse_print($r,$parent,\%deps,\%display);
-                    $r->print('</table>');
-                }
-                $r->print('</div>');
-            }
-        }
-        $r->print('<br /><input type="submit" name="pastemarked" value="'.&mt('Paste').'" />'.$othercrs);
         if ($container eq 'page') {
 	    $r->print('
 	<input type="hidden" name="pagepath" value="'.&HTML::Entities::encode($env{'form.pagepath'},'<>&"').'" />
@@ -825,22 +694,11 @@ sub print_paste_buffer {
         }
         $r->print('</form>');
     } else {
-        $r->print(&mt('Paste buffer contains:').' '.$buffer.
-                  '<br /><p class="LC_info">'.$nopaste.'</p>');
+        $r->print('<br /><p class="LC_info">'.&mt('Paste into Supplemental Content unavailable for this type of content.').'</p>');
     }
     $r->print('</fieldset>');
 }
 
-sub recurse_print {
-    my ($r,$dir,$deps,$display) = @_;
-    $r->print($display->{$dir}."\n");
-    if (ref($deps->{$dir}) eq 'ARRAY') {
-        foreach my $subdir (@{$deps->{$dir}}) {
-            &recurse_print($r,$subdir,$deps,$display);
-        }
-    }
-}
-
 sub supp_pasteable {
     my ($url) = @_;
     if (($url =~ m{^(?:/adm/wrapper/ext|(?:http|https)(?:&colon;|:))//}) ||
@@ -853,338 +711,172 @@ sub supp_pasteable {
     return;
 }
 
-sub paste_popup_js {
-    my %lt = &Apache::lonlocal::texthash(
-                                          show => 'Show Paste Options',
-                                          hide => 'Hide Paste Options',
-                                        );
-    return <<"END";
-
-function showPasteOptions() {
-    document.getElementById('pasteoptions').style.display='block';
-    document.getElementById('pasteoptions').style.textAlign='left';
-    document.getElementById('pasteoptions').style.textFace='normal';
-    document.getElementById('pasteoptionstext').innerHTML ='<a href="javascript:hidePasteOptions();" class="LC_menubuttons_link">$lt{'hide'}</a><br />';
-    return;
-}
-
-function hidePasteOptions() {
-    document.getElementById('pasteoptions').style.display='none';
-    document.getElementById('pasteoptionstext').innerHTML ='<a href="javascript:showPasteOptions()" class="LC_menubuttons_link">$lt{'show'}</a>';
-    return;
-}
-
-END
-
-}
-
-
 sub do_paste_from_buffer {
-    my ($coursenum,$coursedom,$folder,$container,$errors) = @_;
+    my ($coursenum,$coursedom,$folder) = @_;
 
-# Early out if paste buffer is empty
     if (!$env{'form.pastemarked'}) {
-        return ();
+        return;
     }
 
 # 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($env{'docs.markedcopy_url'})) {
-            return (&mt('Paste failed: content type is not supported within Supplemental Content'));
+            return &mt('Paste failed: content type is not supported within Supplemental Content'); 
         }
     }
 
-# Prepare to paste resource at end of list
+# paste resource to end of list
     my $url=&LONCAPA::map::qtescape($env{'docs.markedcopy_url'});
     my $title=&LONCAPA::map::qtescape($env{'docs.markedcopy_title'});
-
-    my ($is_map,$srcdom,$srcnum,$prefixchg,%before,%after,%mapchanges,%tomove);
+# Maps need to be copied first
+    my ($oldurl,%removefrommap,%addedmaps,%rewrites,%copies,%dbcopies,%zombies,%params);
     if ($url=~/\.(page|sequence)$/) {
-        $is_map = 1;
-    }
-    if ($url =~ m{^/uploaded/($match_domain)/($match_courseid)/([^/]+)}) {
-        $srcdom = $1;
-        $srcnum = $2;
-        my $oldprefix = $3;
-# 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 (($srcdom ne $coursedom) || ($srcnum ne $coursenum)) {
-            unless ($env{"user.priv.cm./$srcdom/$srcnum"} =~ /\Q:mdc&F\E/) {
-                return (&mt('Paste failed: Item is from a different course which you do not have rights to edit.'));
-            }
-        }
-# 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 = 1;
-            %before = ( map => 'default',
-                        doc => 'docs');
-            %after =  ( map => 'supplemental',
-                        doc => 'supplemental' );
-        } elsif (($folder =~ /^default/) && ($oldprefix =~ /^supplemental/)) {
-            $prefixchg = 1;
-            %before = ( map => 'supplemental',
-                        doc => 'supplemental');
-            %after  = ( map => 'default',
-                        doc => 'docs');
-        }
-
-# If pasting an uploaded map, get list of contained uploaded maps.
-        my @nested;
-        if ($env{'docs.markedcopy_nested'}) {
-            my ($type) = ($oldprefix =~ /^(default|supplemental)/);
-            my @items = split(/\&/,$env{'docs.markedcopy_nested'});
-            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_'.$item} eq 'move') {
-                    $tomove{$type.'_'.$item} = 1;
-                }
+        # If pasting a map, check if map contains other maps
+        &contained_map_check($url,$folder,\%removefrommap,\%addedmaps);
+        if (keys(%addedmaps) > 0) {
+            &reinit_role($coursedom,$coursenum,$env{"course.$env{'request.course.id'}.home"});
+        }
+        my %allmaps;
+        my $navmap = Apache::lonnavmaps::navmap->new();
+        if (defined($navmap)) {
+            foreach my $res ($navmap->retrieveResources(undef,sub { $_[0]->is_map() },1,0,1)) {
+                $allmaps{$res->src()} = 1;
             }
         }
-    }
-
-# Maps need to be copied first
-    my ($oldurl,%removefrommap,%removeparam,%addedmaps,%rewrites,%retitles,%copies,
-        %dbcopies,%zombies,%params,%docmoves,%mapmoves,%newsubdir,%newurls);
-    $oldurl = $url;
-    if ($is_map) {
-        if ($folder =~ /^default/) {
-            my $lastchange = &Apache::lonnet::get_coursechange($coursedom,$coursenum);
-            if ($lastchange > $env{'request.course.tied'}) {
-                &reinit_role($coursedom,$coursenum,$env{"course.$env{'request.course.id'}.home"});
-            }
+        if ($url=~ m{^/uploaded/}) {
+	    $title=&mt('Copy of').' '.$title;
         }
-# If pasting a map, check if map contains other maps
-        my (%allmaps,%hierarchy,%titles);
-        if ($folder =~ /^default/) {
-            my $navmap = Apache::lonnavmaps::navmap->new();
-            if (defined($navmap)) {
-                foreach my $res ($navmap->retrieveResources(undef,sub { $_[0]->is_map() },1,0,1)) {
-                    $allmaps{$res->src()} = 1;
-                }
+	my $newid=$$.int(rand(100)).time;
+	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);
+            }
+            $oldid = $path.$prefix.$ancestor;
+            my $counter = 0;
+            my $newurl=$oldid.$newid.'.'.$ext;
+            my $is_unique = &uniqueness_check($newurl);
+            if ($allmaps{$newurl}) {
+                $is_unique = 0;
             }
-        }
-        &contained_map_check($url,$folder,\%removefrommap,\%removeparam,
-                             \%addedmaps,\%hierarchy,\%titles,\%allmaps);
-        if ($url=~ m{^/uploaded/}) {
-            my $newurl;
-            unless ($env{'form.docs.markedcopy_options'} eq 'move') {
-                ($newurl,my $error) =
-                    &get_newmap_url($url,$folder,$prefixchg,$coursedom,$coursenum,
-                                    $srcdom,$srcnum,\$title,\%allmaps,\%newurls);
-                if ($error) {
-                    return ($error);
-                }
-                if ($newurl ne '') {
-                    if ($newurl ne $url) {
-                        if ($newurl =~ /(?:default|supplemental)_(\d+).(?:sequence|page)$/) {
-                            $newsubdir{$url} = $1;
+            while (!$is_unique && $allmaps{$newurl} && $counter < 100) {
+                $counter ++;
+                $newid ++;
+                $newurl = $oldid.$newid;
+                $is_unique = &uniqueness_check($newurl);
+            }
+            if ($is_unique) {
+                if ($path =~ m{^/uploaded/($match_domain)/($match_courseid)/$}) {
+                    my $srcdom = $1;
+                    my $srcnum = $2;
+                    if (($srcdom ne $coursedom) && ($srcnum ne $coursenum)) {
+                        if (&Apache::lonnet::allowed('mdc',$srcdom.'_'.$srcnum)) {
+                            &url_paste_fixups($oldid,$ext,$coursedom,$coursenum,
+                                              \%allmaps, \%rewrites,\%copies,\%dbcopies,\%zombies,\%params);
+                        } else {
+                            return &mt('Paste failed: Item is from a different course which you do not have rights to edit');
                         }
-                        $mapchanges{$url} = 1;
                     }
                 }
+            } else {
+                if ($url=~/\.page$/) {
+                    return &mt('Paste failed: an error occurred creating a unique URL for the composite page');
+                } else {
+                    return &mt('Paste failed: an error occurred creating a unique URL for the folder');
+                }
             }
-            if (($srcdom ne $coursedom) || ($srcnum ne $coursenum) || ($prefixchg) ||
-                (($newurl ne '') && ($newurl ne $url))) {
-                unless (&url_paste_fixups($url,$folder,$prefixchg,$coursedom,$coursenum,
-                                          \%allmaps,\%rewrites,\%retitles,\%copies,\%dbcopies,
-                                          \%zombies,\%params,\%mapmoves,\%mapchanges,\%tomove,
-                                          \%newsubdir,\%newurls)) {
-                    $mapmoves{$url} = 1;
+	    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 ($url=~/\.page$/) {
+                    return &mt('Paste failed: an error occurred saving the composite page');
+                } else {
+                    return &mt('Paste failed: an error occurred saving the folder');
                 }
-                $url = $newurl;
-            } elsif ($env{'docs.markedcopy_nested'}) {
-                &url_paste_fixups($url,$folder,$prefixchg,$coursedom,$coursenum,\%allmaps,\%rewrites,
-                                  \%retitles,\%copies,\%dbcopies,\%zombies,\%params,\%mapmoves,
-                                  \%mapchanges,\%tomove,\%newsubdir,\%newurls);
             }
+	    $url = $newurl;
         } elsif ($url=~m {^/res/}) {
 # published maps can only exists once, so remove it from paste buffer when done
             &Apache::lonnet::delenv('docs.markedcopy');
-# if pasting published map (main content are only) check map is not already in course
-            if ($folder =~ /^default/) {
-                if ($allmaps{$url}) {
-                    return (&mt('Paste failed: only one instance of a particular published sequence or page is allowed within each course.'));
-                }
+            if ($allmaps{$url}) {
+                return &mt('Paste failed: only one instance of a particular published sequence or page is allowed within each course.');
             }
         }
     }
     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 $dbresult=&Apache::lonnet::put($db_name,\%contents,
-                                            $coursedom,$coursenum);
-            if ($dbresult eq 'ok') {
-                $url =~ s{/(\d*)/smppg$ }{/$now/smppg}x;
-                $title=&mt('Copy of').' '.$title;
-            } else {
-                return (&mt('Paste failed: An error occurred when copying the simple page.'));
-            }
-        }
+	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);
-
-# 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.
-
-    my $newidx;
-    unless ($is_map) {
 # Now insert the URL at the bottom
-        $newidx = &LONCAPA::map::getresidx($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) || ($srcdom ne $coursedom) || ($srcnum ne $coursenum)) {
-                    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') {
-                        return (&mt('Paste failed: an error occurred saving the file.'));
-                    } else {
-                        my ($newsubpath) = ($newpath =~ m{^(.*/)[^/]*$});
-                        $newsubpath =~ s{/+$}{/};
-                        $docmoves{$oldurl} = $newsubpath;
-                    }
-                }
-            }
-        }
+    my $newidx = &LONCAPA::map::getresidx($url);
+    my $relpath;
+    if (($folder =~ /^supplemental/) && 
+        ($url =~ m{^/uploaded/$coursedom/$coursenum/docs/(.+)})) {
+        $relpath = $1;
+    } elsif (($folder =~ /^default/) &&
+             ($url =~ m{^/uploaded/$coursedom/$coursenum/supplemental/(.+)})) {
+        $relpath = $1;
+    }
+    if ($relpath ne '') {
+        my ($prefix,$subdir,$rem) = ($relpath =~ m{^(default|\d+)/(\d+)/(.+)$});
+        my ($newloc,$newsubdir) = ($folder =~ /^(default|supplemental)_?(\d*)/);
+        my $newprefix = $newloc;
+        if ($newloc eq 'default') {
+            $newprefix = 'docs';
+        }
+        if ($newsubdir eq '') {
+            $newsubdir = 'default';
+        }
+        my $newpath = "$newprefix/$newsubdir/$newidx/$rem";
+        $url =
+            &Apache::lonclonecourse::writefile($env{'request.course.id'},$newpath,
+                                               &Apache::lonnet::getfile($url));
+        if ($url eq '/adm/notfound.html') {
+            return &mt('Paste failed: an error occurred saving the file.');
+        }
+    }
+    my $noparams = 0;
+    if ((ref($params{$oldurl}) eq 'HASH') && ($relpath ne '') && ($folder =~ /^supplemental/)) {
+        $noparams = 1;
     }
-# Apply any changes to maps, or copy dependencies for uploaded HTML pages
-    my ($result,$save_err);
-    $result =
-        &apply_fixups($folder,$is_map,$prefixchg,$coursedom,$coursenum,$oldurl,
-                      $url,\%removefrommap,\%removeparam,\%rewrites,\%retitles,
-                      \%copies,\%dbcopies,\%zombies,\%params,\%docmoves,
-                      \%mapmoves,\%newsubdir,$errors,\%before,\%after);
-    if ($result eq 'ok') {
-        if ($is_map) {
-            my ($errtext,$fatal) = &mapread($coursenum,$coursedom,
-                                            $folder.'.'.$container);
-            return $errtext if ($fatal);
-
-            if ($#LONCAPA::map::order<1) {
-                my $idx=&LONCAPA::map::getresidx();
-                if ($idx<=0) { $idx=1; }
-                $LONCAPA::map::order[0]=$idx;
-                $LONCAPA::map::resources[$idx]='';
-            }
-            $newidx = &LONCAPA::map::getresidx($url);
-        }
-        if ($env{'docs.markedcopy_supplemental'}) {
-            if ($folder !~ /^supplemental/) {
-                (undef,undef,$title) =
-                    &Apache::loncommon::parse_supplemental_title($env{'docs.markedcopy_supplemental'});
-            }
+    &apply_fixups($coursedom,$coursenum,$oldurl,$url,$noparams,\%rewrites,\%copies,\%dbcopies,\%zombies,\%params);
+    if ($env{'docs.markedcopy_supplemental'}) {
+        if ($folder =~ /^supplemental/) {
+            $title = $env{'docs.markedcopy_supplemental'};
         } else {
-            if ($folder=~/^supplemental/) {
-                $title=time.'___&&&___'.$env{'user.name'}.'___&&&___'.
-                       $env{'user.domain'}.'___&&&___'.$title;
-            }
+            (undef,undef,$title) =
+                &Apache::loncommon::parse_supplemental_title($env{'docs.markedcopy_supplemental'});
         }
-        $LONCAPA::map::resources[$newidx]=      $title.':'.$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;
+    } else {
+        if ($folder=~/^supplemental/) {
+           $title=time.'___&&&___'.$env{'user.name'}.'___&&&___'.
+                  $env{'user.domain'}.'___&&&___'.$title;
         }
     }
 
-    if ($env{'form.docs.markedcopy_options'} eq 'move') {
-        &Apache::lonnet::delenv('docs.markedcopy');
-        &Apache::lonnet::delenv('docs.markedcopy_nested');
-        &Apache::lonnet::delenv('docs.markedcopy_nestednames');
-    }
-    return ($result,$save_err);
-}
-
-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 $is_unique = &uniqueness_check($newurl);
-        if ($folder =~ /^default/) {
-            if ($allmaps->{$newurl}) {
-                $is_unique = 0;
-            }
-        }
-        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 {
-                $newurl = "/uploaded/$coursedom/$coursenum/$prefix".$ancestor.$suffix.'.'.$ext;
-            }
-            $is_unique = &uniqueness_check($newurl);
-        }
-        if ($is_unique) {
-            $newurls->{$newurl} = 1;
-        } else {
-            if ($url=~/\.page$/) {
-                return (undef,&mt('Paste failed: an error occurred creating a unique URL for the composite page'));
-            } else {
-                return (undef,&mt('Paste failed: an error occurred creating a unique URL for the folder'));
-            }
-        }
-    }
-    return ($newurl);
+    $LONCAPA::map::resources[$newidx]= 	$title.':'.$url.':'.$ext.':normal:res';
+    push(@LONCAPA::map::order, $newidx);
+    return 'ok';
+# Store the result
 }
 
 sub dbcopy {
@@ -1219,8 +911,7 @@ sub uniqueness_check {
 }
 
 sub contained_map_check {
-    my ($url,$folder,$removefrommap,$removeparam,$addedmaps,$hierarchy,$titles,
-        $allmaps) = @_;
+    my ($url,$folder,$removefrommap,$addedmaps) = @_;
     my $content = &Apache::lonnet::getfile($url);
     unless ($content eq '-1') {
         my $parser = HTML::TokeParser->new(\$content);
@@ -1232,33 +923,21 @@ sub contained_map_check {
                 my $ressrc = $token->[2]->{'src'};
                 if ($folder =~ /^supplemental/) {
                     unless (&supp_pasteable($ressrc)) {
-                        $removefrommap->{$url}{$token->[2]->{'id'}} = $ressrc;
+                        $removefrommap->{$url}{$token->[2]->{'id'}};
                         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'};
+                if ($ressrc =~ /\.(sequence|page)$/) {
+                    if (ref($addedmaps->{$ressrc}) eq 'ARRAY') {
+                        push(@{$addedmaps->{$ressrc}},$url);
                     } 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];
-                        }
+                        $addedmaps->{$ressrc} = [$url];
                     }
-                    &contained_map_check($ressrc,$folder,$removefrommap,$removeparam,
-                                         $addedmaps,$hierarchy,$titles,$allmaps);
+                    &contained_map_check($ressrc,$folder,$removefrommap,$addedmaps);
                 }
-            } elsif ($token->[1] eq 'param') {
+            } elsif ($token->[1] !~ /^resource|map|link$/) {
                 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'}];
-                    }
+                    $removefrommap->{$url}{$token->[1]};
                 }
             }
         }
@@ -1276,396 +955,139 @@ sub reinit_role {
 }
 
 sub url_paste_fixups {
-    my ($oldurl,$folder,$prefixchg,$cdom,$cnum,$allmaps,$rewrites,$retitles,$copies,
-        $dbcopies,$zombies,$params,$mapmoves,$mapchanges,$tomove,$newsubdir,$newurls) = @_;
-    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);
+    my ($oldurl,$ext,$cdom,$cnum,$allmaps,$rewrites,$copies,$dbcopies,$zombies,$params) = @_;
+    my $file = &Apache::lonnet::getfile("$oldurl.$ext");
     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}{$ressrc} = $id;
-                }
-            }
             next if ($token->[2]->{'type'} eq 'external');
+            my $id = $token->[2]->{'id'};
             if ($token->[2]->{'type'} eq 'zombie') {
-                next if ($skip);
                 $zombies->{$oldurl}{$ressrc} = $id;
-                $changed = 1;
-            } elsif ($ressrc =~ m{^/uploaded/($match_domain)/($match_courseid)/(.+)$}) {
-                my $srcdom = $1;
-                my $srcnum = $2;
+            } elsif ($ressrc =~ m{^/uploaded/($match_domain)/($match_courseid)/(.+)}) {
+                my $srccdom = $1;
+                my $srccnum = $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,$allmaps,
-                                          $rewrites,$retitles,$copies,$dbcopies,$zombies,
-                                          $params,$mapmoves,$mapchanges,$tomove,$newsubdir,
-                                          $newurls);
-                        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 (($srccdom ne $cdom) || ($srccnum ne $cnum)) {
                     if ($rem =~ /^(default|supplemental)(_?\d*).(sequence|page)$/) {
                         $rewrites->{$oldurl}{$ressrc} = $id;
-                        $mapchanges->{$ressrc} = 1;
-                        unless (&url_paste_fixups($ressrc,$folder,$prefixchg,$cdom,$cnum,$allmaps,
-                                                  $rewrites,$retitles,$copies,$dbcopies,$zombies,
-                                                  $params,$mapmoves,$mapchanges,$tomove,$newsubdir,
-                                                  $newurls)) {
-                            $mapmoves->{$ressrc} = 1;
-                        }
-                        $changed = 1;
+                        &url_paste_fixups($ressrc,$3,$cdom,$cnum,$allmaps,$rewrites,$copies,$dbcopies,$zombies,$params);
                     } else {
-                        $rewrites->{$oldurl}{$ressrc} = $id;
                         $copies->{$oldurl}{$ressrc} = $id;
-                        $changed = 1;
                     }
                 }
             } elsif ($ressrc =~ m{^/adm/($match_domain)/($match_courseid)/(.+)$}) {
-                next if ($skip);
-                my $srcdom = $1;
-                my $srcnum = $2;
-                if (($srcdom ne $cdom) || ($srcnum ne $cnum)) {
+                my $srccdom = $1;
+                my $srccnum = $2;
+                if (($srccdom ne $cdom) || ($srccnum ne $cnum)) {
                     $rewrites->{$oldurl}{$ressrc} = $id;
                     $dbcopies->{$oldurl}{$ressrc} = $id;
-                    $changed = 1;
                 }
             } elsif ($ressrc =~ m{^/public/($match_domain)/($match_courseid)/(.+)$}) {
-                next if ($skip);
-                my $srcdom = $1;
-                my $srcnum = $2;
-                if (($srcdom ne $cdom) || ($srcnum ne $cnum)) {
+                my $srccdom = $1;
+                my $srccnum = $2;
+                if (($srccdom ne $cdom) || ($srccnum ne $cnum)) {
                     $rewrites->{$oldurl}{$ressrc} = $id;
                     $dbcopies->{$oldurl}{$ressrc} = $id;
-                    $changed = 1;
                 }
             }
         } elsif ($token->[1] eq 'param') {
-            next if ($skip);
-            my $to = $token->[2]->{'to'};
+            my $to = $token->[2]->{'to'}; 
             if ($to ne '') {
                 if (ref($params->{$oldurl}{$to}) eq 'ARRAY') {
-                    push(@{$params->{$oldurl}{$to}},$token->[2]->{'name'});
+                    push (@{$params->{$oldurl}{$to}},$token->[2]->{'name'});
                 } else {
                     @{$params->{$oldurl}{$to}} = ($token->[2]->{'name'});
                 }
             }
         }
     }
-    return $changed;
+    return;
 }
 
 sub apply_fixups {
-    my ($folder,$is_map,$prefixchg,$cdom,$cnum,$oldurl,$url,$removefrommap,
-        $removeparam,$rewrites,$retitles,$copies,$dbcopies,$zombies,$params,
-        $docmoves,$mapmoves,$newsubdir,$errors,$before,$after) = @_;
-    foreach my $key (keys(%{$copies}),keys(%{$docmoves})) {
-        my @allcopies;
-        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) && (ref($docmoves) eq 'HASH') && (exists($docmoves->{$key}))) {
-                            $storefn = $docmoves->{$key};
-                        } else {
-                            $storefn = $relpath;
-                            $storefn =~s{^/uploaded/$match_domain/$match_courseid/}{};
-                            if ($prefixchg) {
-                                $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 ((ref($docmoves) eq 'HASH') && (exists($docmoves->{$oldurl}))) {
-                                return &mt('Paste failed: an error occurred copying the file.');
-                            } elsif (ref($errors) eq 'HASH') {
-                                $errors->{$item} = 1;
-                            }
-                        }
+    my ($cdom,$cnum,$oldurl,$url,$noparams,$rewrites,$copies,$dbcopies,$zombies,$params) = @_;
+    my (%newdb,%newdoc);
+    if (ref($dbcopies->{$oldurl}) eq 'HASH') {
+        foreach my $item (keys(%{$dbcopies->{$oldurl}})) {
+            $newdb{$item} = &dbcopy($item);
+        }
+    }
+    if (ref($copies->{$oldurl}) eq 'HASH') {
+        foreach my $item (keys(%{$copies->{$oldurl}})) {
+            my $content = &Apache::lonnet::getfile($item);
+            my $newcontent;
+            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 ($embedded,$num,$delnum) =
+                        &Apache::loncommon::ask_for_embedded_content(
+                            '/adm/dependencies',$state,\%allfiles,\%codebase,
+                            {'error_on_invalid_names'   => 1,
+                             'ignore_remote_references' => 1,
+                             'docs_url'                 => $oldurl});
+                    if ($embedded) {
+                        #FIXME Need to check for dependencies and copy and update refs.
                     }
+                    $newcontent = $content;
+                } else {
+                    $newcontent = $content;
                 }
+                my $storefn=$item;
+                $storefn=~s{^/\w+/$match_domain/$match_courseid/}{};
+                $newdoc{$item} = &Apache::lonclonecourse::writefile($env{'request.course.id'},$storefn,$newcontent); 
             }
         }
     }
-    foreach my $key (keys(%{$mapmoves})) {
-        my $storefn=$key;
-        $storefn=~s{^/uploaded/$match_domain/$match_courseid/}{};
-        if ($prefixchg) {
-            $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') {
-            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) {
-        foreach my $key (keys(%{$rewrites})) {
-            $updates{$key} = 1;
-        }
-        foreach my $key (keys(%{$zombies})) {
-            $updates{$key} = 1;
-        }
-        foreach my $key (keys(%{$removefrommap})) {
-            $updates{$key} = 1;
-        }
-        foreach my $key (keys(%{$removeparam})) {
-            $updates{$key} = 1;
-        }
-        foreach my $key (keys(%{$dbcopies})) {
-            $updates{$key} = 1;
-        }
-        foreach my $key (keys(%{$retitles})) {
-            $updates{$key} = 1;
-        }
-        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 $item (keys(%{$dbcopies->{$key}})) {
-                    $newdb{$item} = &dbcopy($item);
-                }
-            }
-            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{$src} eq $i) {
-                        undef($LONCAPA::map::zombies[$i]);
-                    }
-                }
-            }
-            for (my $i=0; $i<@LONCAPA::map::resources; $i++) {
-                if (defined($LONCAPA::map::resources[$i])) {
-                    my $changed;
-                    my ($title,$src,$ext,$type)=split(/\:/,$LONCAPA::map::resources[$i]);
-                    if ($toremove{$src} eq $i) {
-                        splice(@LONCAPA::map::order,$i,1);
-                        if (ref($currparam{$i}) eq 'ARRAY') {
-                            foreach my $name (@{$currparam{$i}}) {
-                                &LONCAPA::map::delparameter($i,'parameter_'.$name);
-                            }
-                        }
-                        next;
-                    }
-                    my $origsrc = $src;
-                    if ((exists($toretitle{$src})) && ($toretitle{$src} eq $i)) {
-                        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{$src})) && ($torewrite{$src} eq $i)) {
-                        $src =~ s{^/(uploaded|adm|public)/$match_domain/$match_courseid/}{/$1/$cdom/$cnum/};
-                        if ($origsrc =~ m{^/uploaded/}) {
-                            if ($prefixchg) {
-                                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 (((ref($rewrites->{$oldurl}) eq 'HASH') || (ref($zombies->{$oldurl}) eq 'HASH')) || 
+        ($noparams) || (keys(%newdb) > 0) || (keys(%newdoc) > 0)) {
+        my $map = &Apache::lonnet::getfile($url);
+        my $newcontent;
+        unless ($map eq '-1') {
+            my $parser = HTML::TokeParser->new(\$map);
+            $parser->attr_encoded(1);
+            while (my $token = $parser->get_token) {
+                if ($token->[0] eq 'S') {
+                    next if ($token->[2]->{'type'} eq 'zombie');
+                    next if (($token->[1] eq 'param') && $noparams);
+                    if ($token->[1] eq 'resource') {
+                        my $src = $token->[2]->{'src'};
+                        my $id = $token->[2]->{'id'};
+                        if (($rewrites->{$oldurl}{$src} eq $id) || ($newdb{$src} ne '')
+                            || ($newdoc{$src} ne '')) {
+                            if (ref($rewrites->{$oldurl}) eq 'HASH') {
+                                if ($rewrites->{$oldurl}{$src} eq $id) {
+                                    $token->[2]->{'src'} =~ s{^(/uploaded|adm|public)/$match_domain/$match_courseid/}{$1/$cdom/$cnum};
                                 }
+                            } elsif ($newdb{$src} ne '') {
+                                $token->[2]->{'src'} = $newdb{$src};
                             }
-                            if ($newsubdir->{$origsrc}) {
-                                if ($src =~ /\.(page|sequence)$/) {
-                                    $src =~ s#^(/uploaded/$match_domain/$match_courseid/(?:default|supplemental)_)(\d+)#$1$newsubdir->{$origsrc}#;
-                                } else {
-                                    $src =~ s#^(/uploaded/$match_domain/$match_courseid/\w+/)(\d+)#$1$newsubdir->{$origsrc}#;
-                                }
-                            }
-                        }
-                        $changed = 1;
-                    } elsif ($newdb{$src} ne '') {
-                        $src = $newdb{$src};
-                        $changed = 1;
-                    }
-                    if ($changed) {
-                        $LONCAPA::map::resources[$i] = join(':',($title,$src,$ext,$type));
-                    }
-                }
-            }
-            foreach my $idx (keys(%remparam)) {
-                if (ref($remparam{$idx}) eq 'ARRAY') {
-                    foreach my $name (@{$remparam{$idx}}) {
-                        &LONCAPA::map::delparameter($idx,'parameter_'.$name);
-                    }
-                }
-            }
-            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) {
-                    $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) {
-                return &mt('Paste failed: an error occurred saving the folder or page.');
-            }
-        }
-    }
-    return 'ok';
-}
-
-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);
-                                }
+                            $newcontent .= "<$token->[1] "; 
+                            foreach my $attr (@{$token->[3]}) {
+                                $newcontent .=  ' '.$attr.'="'.$token->[2]->{$attr},'"'
                             }
+                            $newcontent .= ' />';
+                        } else {
+                            $newcontent .= $token->[4]."\n";
                         }
                     }
+                } elsif ($token->[0] eq 'E') {
+                    $newcontent .= $token->[2]."\n";
                 }
             }
         }
+        my $storefn=$url;
+        $storefn=~s{^/\w+/$match_domain/$match_courseid/}{};
+        my $storeres =
+            &Apache::lonclonecourse::writefile($env{'request.course.id'},$storefn,
+                                               $newcontent);
     }
     return;
 }
@@ -1743,7 +1165,7 @@ sub handle_edit_cmd {
 
 sub editor {
     my ($r,$coursenum,$coursedom,$folder,$allowed,$upload_output,$crstype,
-        $supplementalflag,$orderhash,$iconpath,$uploadtag)=@_;
+        $supplementalflag,$orderhash,$iconpath)=@_;
     my $container= ($env{'form.pagepath'}) ? 'page'
 		                           : 'sequence';
 
@@ -1790,35 +1212,20 @@ sub editor {
 	}
 
 	if ($env{'form.pastemarked'}) {
-            my %paste_errors;
-            my ($paste_res,$save_error) =
-                &do_paste_from_buffer($coursenum,$coursedom,$folder,$container,
-                                      \%paste_errors);
-                if ($save_error ne '') {
-                    return $save_error;
-                }
-            if ($paste_res ne 'ok') {
+            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>');
             }
-            if (keys(%paste_errors) > 0) {
-                $r->print('<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 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");
-            }
 	}
 
 	$r->print($upload_output);
 
 	if (&handle_edit_cmd()) {
-            my $contentchg;
-            if ($env{'form.cmd'} =~ /^(del|cut)_/) {
-                $contentchg = 1;
-            }
-	    ($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container,$contentchg);
+	    ($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container);
 	    return $errtext if ($fatal);
 	}
 # Group import/search
@@ -1828,18 +1235,6 @@ sub editor {
 		if (defined($item)) {
 		    my ($name,$url,$residx)=
 			map {&unescape($_)} split(/\=/,$item);
-                    if ($url=~ m{^\Q/uploaded/$coursedom/$coursenum/\E(default|supplemental)_new\.(sequence|page)$}) {
-                        my ($suffix,$errortxt,$locknotfreed) =
-                            &newmap_suffix($1,$2,$coursedom,$coursenum);
-                        if ($locknotfreed) {
-                            $r->print($locknotfreed);
-                        }
-                        if ($suffix) {
-                            $url =~ s/_new\./_$suffix./;
-                        } else {
-                            return $errortxt;
-                        }
-                    }
 		    push(@imports, [$name, $url, $residx]);
 		}
 	    }
@@ -1857,7 +1252,7 @@ sub editor {
 		    $LONCAPA::map::order[$#LONCAPA::map::order+1]=$idx;
 		}
 		($errtext,$fatal)=&storemap($coursenum,$coursedom,
-					    $folder.'.'.$container,1);
+					    $folder.'.'.$container);
 		return $errtext if ($fatal);
 	    } else {
 		$r->print('<p><span class="LC_error">'.&mt('No map selected.').'</span></p>');
@@ -1911,8 +1306,7 @@ sub editor {
         unless ($name) {  $name=(split(/\//,$url))[-1]; }
         unless ($name) { $idx++; next; }
         $output .= &entryline($idx,$name,$url,$folder,$allowed,$res,
-                              $coursenum,$coursedom,$crstype,
-                              $uploadtag,$supplementalflag);
+                              $coursenum,$crstype);
         $idx++;
         $shown++;
     }
@@ -1950,7 +1344,7 @@ sub editor {
         my $readfile="/uploaded/$coursedom/$coursenum/$folder.$container";
         $r->print(&generate_edit_table($tid,$orderhash,$to_show,$iconpath,$jumpto,
                                        $readfile));
-        &print_paste_buffer($r,$container,$folder,$coursedom,$coursenum);
+        &print_paste_buffer($r,$container,$folder);
     } else {
         if (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) {
             #Function Box for Supplemental Content for users with mdc priv.
@@ -2038,7 +1432,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,1);
+				    $folder.'.'.$container);
         if ($fatal) {
             $$upload_output = '<div class="LC_error" id="uploadfileresult">'.$errtext.'</div>';
             return;
@@ -2129,8 +1523,7 @@ sub is_supplemental_title {
 # --------------------------------------------------------------- An entry line
 
 sub entryline {
-    my ($index,$title,$url,$folder,$allowed,$residx,$coursenum,$coursedom,
-        $crstype,$uploadtag,$supplementalflag)=@_;
+    my ($index,$title,$url,$folder,$allowed,$residx,$coursenum,$crstype)=@_;
     my ($foldertitle,$pagetitle,$renametitle);
     if (&is_supplemental_title($title)) {
 	($title,$foldertitle,$renametitle) = &Apache::loncommon::parse_supplemental_title($title);
@@ -2144,6 +1537,7 @@ sub entryline {
 
     my $orderidx=$LONCAPA::map::order[$index];
 
+
     $renametitle=~s/\\/\\\\/g;
     $renametitle=~s/\&quot\;/\\\"/g;
     $renametitle=~s/ /%20/g;
@@ -2162,18 +1556,9 @@ sub entryline {
         $type = $container = 'page';
         $esc_path=&escape($env{'form.pagepath'});
 	$path = &HTML::Entities::encode($env{'form.pagepath'},'<>&"');
+        $symb=&escape($env{'form.pagesymb'});
     }
-    if (!$supplementalflag && $residx) {
-        my $currurl = $url;
-        $currurl =~ s{^http(|s)(&colon;|:)//}{/adm/wrapper/ext/};
-        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 %lt;
+    my $cpinfo='';
     if ($allowed) {
 	my $incindex=$index+1;
 	my $selectbox='';
@@ -2196,83 +1581,35 @@ sub entryline {
 	    }
 	    $selectbox.='</select>';
 	}
-	%lt=&Apache::lonlocal::texthash(
+	my %lt=&Apache::lonlocal::texthash(
                 'up' => 'Move Up',
 		'dw' => 'Move Down',
 		'rm' => 'Remove',
                 'ct' => 'Cut',
 		'rn' => 'Rename',
-		'cp' => 'Copy',
-                'ex' => 'External Resource',
-                'ed' => 'Edit',
-                'pr' => 'Preview',
-                'sv' => 'Save',
-                'ul' => 'URL',
-                'ti' => 'Title', 
-                );
+		'cp' => 'Copy');
 	my $nocopy=0;
         my $nocut=0;
-        my $noremove=0;
-        if ($url=~ m{^/res/.+\.(page|sequence)$}) {
-            # no copy for published maps
-            $nocopy=1;
-        }
+        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 $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
-        my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
-        if ($url eq "/uploaded/$cdom/$cnum/group_allfolders.sequence") {
-            if ($env{'form.folderpath'} =~ /^default&[^\&]+$/) {
-                my %curr_groups = &Apache::longroup::coursegroups();
-                if (keys(%curr_groups) > 0) {
-                    $noremove=1;
-                }
-                $nocut=1;
-                $nocopy=1;
-            }
-        } elsif ($url =~ m{^\Q/uploaded/$cdom/$cnum/group_folder_\E(\w+)\.sequence$}) {
-            my $group = $1;
-            if ($env{'form.folderpath'} =~ /^default&[^\&]+\&group_allfolders\&[^\&]+$/) {
-                my %curr_group = &Apache::longroup::coursegroups($cdom,$cnum,$group);
-                if (keys(%curr_group) > 0) {
-                    $noremove=1;
-                }
-            }
-            $nocut=1;
-            $nocopy=1;
-        } elsif ($url =~ m{^\Q/adm/$cdom/$cnum/\E(\w+)/smppg$}) {
-            my $group = $1;
-            if ($env{'form.folderpath'} =~ /^default&[^\&]+\&group_allfolders\&[^\&]+\&\Qgroup_folder_$group\E\&[^\&]+$/) {
-                my %curr_group = &Apache::longroup::coursegroups($cdom,$cnum,$group);
-                my %groupsettings = &Apache::longroup::get_group_settings($curr_group{$group});
-                if (keys(%groupsettings) > 0) {
-                    $noremove=1;
-                }
-                $nocut=1;
-                $nocopy=1;
-            }
-        } elsif ($env{'form.folderpath'} =~ /^default&[^\&]+\&group_allfolders\&[^\&]+\&group_folder_(\w+)\&/) {
-            my $group = $1;
-            my %curr_group = &Apache::longroup::coursegroups($cdom,$cnum,$group);
-            if ($url =~ /group_boards_\Q$group\E/) {
-                my %curr_group = &Apache::longroup::coursegroups($cdom,$cnum,$group);
-                my %groupsettings = &Apache::longroup::get_group_settings($curr_group{$group});
-                if (keys(%groupsettings) > 0) {
-                    if (ref($groupsettings{'functions'}) eq 'HASH') {
-                        if ($groupsettings{'functions'}{'discussion'} eq 'on') {
-                            $noremove=1;
-                        }
-                    }
-                }
-                $nocut=1;
-                $nocopy=1;
-            }
-        }
         my $copylink='&nbsp;';
         my $cutlink='&nbsp;';
-        my $removelink='&nbsp;';
 
 	my $skip_confirm = 0;
 	if ( $folder =~ /^supplemental/
@@ -2296,11 +1633,6 @@ ENDCOPY
 <a href="javascript:cutres('$esc_path','$index','$renametitle','$container','$symb','$folder',$skip_confirm);" class="LC_docs_cut">$lt{'ct'}</a>
 ENDCUT
         }
-        if (!$noremove) {
-            $removelink=(<<ENDREM);
-<a href='javascript:removeres("$esc_path","$index","$renametitle","$container","$symb",$skip_confirm);' class="LC_docs_remove">$lt{'rm'}</a>
-ENDREM
-        }
 	$form_start = '
    <form action="/adm/coursedocs" method="post">
 ';
@@ -2314,13 +1646,13 @@ END
 	$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'>
-    <img src="${iconpath}move_up.gif" alt="$lt{'up'}" class="LC_icon" />
+  <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>
 </div>
 <div class="LC_docs_entry_move">
-  <a href='/adm/coursedocs?cmd=down_$index&amp;${type}path=$esc_path&amp;${type}symb=$symb'>
-    <img src="${iconpath}move_down.gif" alt="$lt{'dw'}" class="LC_icon" />
+  <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>
 </div>
 </td>
@@ -2331,7 +1663,7 @@ END
    $form_end
 </td>
 <td class="LC_docs_entry_commands">
-$removelink
+   <a href='javascript:removeres("$esc_path","$index","$renametitle","$container","$symb",$skip_confirm);' class="LC_docs_remove">$lt{'rm'}</a>
 $cutlink
    <a href='javascript:changename("$esc_path","$index","$renametitle","$container","$symb");' class="LC_docs_rename">$lt{'rn'}</a>
 $copylink
@@ -2371,38 +1703,44 @@ END
 	}
     }
 
-    my $editlink;
     my $orig_url = $url;
     $orig_url=~s{http(&colon;|:)//https(&colon;|:)//}{https$2//};
     my $external = ($url=~s{^http(|s)(&colon;|:)//}{/adm/wrapper/ext/});
-    if (!$supplementalflag && $residx && $symb) {
-        if ($container eq 'page') {
-            $url=&Apache::lonnet::clutter((&Apache::lonnet::decode_symb($symb))[2]);
-            $url.=(($url=~/\?/)?'&':'?').'symb='.&escape($symb);
-        } 
-        if ((!$isfolder) && (!$ispage)) {
-	    (undef,undef,$url)=&Apache::lonnet::decode_symb($symb);
-	    $url=&Apache::lonnet::clutter($url);
-	    if ($url=~/^\/*uploaded\//) {
-	        $url=~/\.(\w+)$/;
-	        my $embstyle=&Apache::loncommon::fileembstyle($1);
-	        if (($embstyle eq 'img') || ($embstyle eq 'emb')) {
-		    $url='/adm/wrapper'.$url;
-	        } elsif ($embstyle eq 'ssi') {
-		    #do nothing with these
-	        } elsif ($url!~/\.(sequence|page)$/) {
-		    $url='/adm/coursedocs/showdoc'.$url;
-	        }
-	    } elsif ($url=~m|^/ext/|) {
-	        $url='/adm/wrapper'.$url;
-	        $external = 1;
- 	    }
-            if (&Apache::lonnet::symbverify($symb,$url)) {
-                $url.=(($url=~/\?/)?'&':'?').'symb='.&escape($symb);
-            } else {
-                $url='';
-            }
+    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')) {
+		$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;
+	}
+        if (&Apache::lonnet::symbverify($symb,$url)) {
+	    $url.=(($url=~/\?/)?'&':'?').'symb='.&escape($symb);
+        } else {
+            $url='';
         }
+	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 ($rand_pick_text,$rand_order_text);
     if ($isfolder || $extension eq 'sequence') {
@@ -2419,7 +1757,7 @@ END
                                               'parameter_encrypturl'))[0]=~/^yes$/i)
                                                .':'.((&LONCAPA::map::getparameter($orderidx,
                                               'parameter_randomorder'))[0]=~/^yes$/i);
-	$url.='folderpath='.&escape($folderpath);
+	$url.='folderpath='.&escape($folderpath).$cpinfo;
         my $rpicknum = (&LONCAPA::map::getparameter($orderidx,
                                                    'parameter_randompick'))[0];
         my $rpckchk;
@@ -2448,51 +1786,23 @@ $form_common.'
         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);
+	    '&amp;pagesymb='.&escape($symb).$cpinfo;
     }
-    if ($allowed) {
-        my $fileloc =
-            &Apache::lonnet::declutter(&Apache::lonnet::filelocation('',$orig_url));
-
-        if ($external) {
-            $editlink = <<"EXTLNK";
-            &nbsp;
-            <a class="LC_docs_ext_edit" href="javascript:editext('$residx');">
-            $lt{'ed'}</a>
-            <form action="/adm/coursedocs" method="post" name="editext_$residx">
-            <fieldset id="uploadext$residx" style="display: none;" />
-            <input type="hidden" name="active" value="aa" />
-            <span class="LC_nobreak">
-            <span class="LC_docs_ext_edit">$lt{'ul'}&nbsp;</span>
-            <input type="text" size="40" name="exturl" id="exturl_$residx" value="$orig_url" />&nbsp;
-            <a class="LC_docs_ext_edit" href="javascript:extUrlPreview('exturl_$residx');">$lt{'pr'}</a></span>
-            </span><br />
-            <span class="LC_nobreak">
-            <span class="LC_docs_ext_edit">$lt{'ti'}&nbsp;</span>
-            <input type="text" size="40" name="exttitle" value="$title" />
-            $uploadtag
-            <input type="hidden" name="importdetail" value="" />
-            <input type="button" value="$lt{'sv'}" onclick="javascript:setExternal(this.form,'$residx')" />
-            </span>
-            </fieldset>
-            </form>
-EXTLNK
-        } else {
-            my ($cfile,$home,$switchserver,$forceedit,$forceview) =
-                &Apache::lonnet::can_edit_resource($fileloc,$coursenum,$coursedom,$orig_url);
-            if (($cfile ne '') && ($symb ne '')) {
-                my $jscall =
-                    &Apache::lonhtmlcommon::jump_to_editres($cfile,$home,
-                                                            $switchserver,
-                                                            $forceedit,
-                                                            undef,$symb);
-                if ($jscall) {
-                    $editlink = '&nbsp;<a class="LC_docs_ext_edit" href="javascript:'.
-                                $jscall.'" >'.&mt('Edit').'</a>';
-                }
-            }
-        }
+    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);
     }
     my $reinit;
     if ($crstype eq 'Community') {
@@ -2518,7 +1828,7 @@ EXTLNK
     } else {
        $line.=$title.' <span class="LC_docs_reinit_warn">'.$reinit.'</span>';
     }
-    $line.=$editlink."</td>";
+    $line.=$external."</td>";
     $rand_pick_text = '&nbsp;' if ($rand_pick_text eq '');
     $rand_order_text = '&nbsp;' if ($rand_order_text eq '');
     if (($allowed) && ($folder!~/^supplemental/)) {
@@ -2549,30 +1859,6 @@ ENDPARMS
     return $line;
 }
 
-sub newmap_suffix {
-    my ($area,$container,$coursedom,$coursenum) = @_;
-    my ($prefix,$idtype,$errtext,$locknotfreed);
-    $prefix = 'docs';
-    if ($area eq 'supplemental') {
-        $prefix = 'supp';
-    }
-    $prefix .= $container;
-    $idtype = 'concat';
-    my ($suffix,$freedlock,$error) =
-        &Apache::lonnet::get_timebased_id($prefix,'num','uploadedmaps',
-                                          $coursedom,$coursenum);
-    if (!$suffix) {
-        $errtext = &mt('Failed to acquire a unique timestamp-based suffix for the new folder/page.');
-        if ($error) {
-            $errtext .= '<br />'.$error;
-        }
-    }
-    if ($freedlock ne 'ok') {
-        $locknotfreed = '<div class="LC_error">'.&mt('There was a problem removing a lockfile. This will prevent creation of additional folders or composite pages in this course.  Please contact the domain coordinator for your LON-CAPA domain.').'</div>';
-    }
-    return ($suffix,$errtext,$locknotfreed);
-}
-
 =pod
 
 =item tiehash()
@@ -2938,8 +2224,7 @@ ENDHEADERS
     '<th colspan="'.$num_ver_col.'">'.&mt('History').'</th>'.
     '</b>');
     foreach my $key (sort(keys(%changes))) {
-        #excludes not versionable problems from resource version history:
-        next unless ($changes{$key}>$starttime && $key !~ /^\/res\/lib\/templates/);
+	if ($changes{$key}>$starttime) {
 	    my ($root,$extension)=($key=~/^(.*)\.(\w+)$/);
 	    my $currentversion=&Apache::lonnet::getversion($key);
 	    if ($currentversion<0) {
@@ -3105,9 +2390,9 @@ sub init_breadcrumbs {
 sub create_list_elements {
    my @formarr = @_;
    my $list = '';
-   foreach my $button (@formarr){
-        foreach my $picture (keys(%{$button})) {
-            $list .= &Apache::lonhtmlcommon::htmltag('li', $picture.' '.$button->{$picture}, {class => 'LC_menubuttons_inline_text', id => ''});
+   for my $button (@formarr){
+        for my $picture(keys %$button) {
+            $list .= &Apache::lonhtmlcommon::htmltag('li', $picture.' '.$button->{$picture}, {class => 'LC_menubuttons_inline_text'});
         }
    }
    return $list;
@@ -3130,6 +2415,7 @@ sub startContentScreen {
     if (($mode eq 'navmaps') || ($mode eq 'supplemental')) {
         $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('Content Editor').'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b></a></li>'."\n";
@@ -3176,8 +2462,7 @@ sub handler {
 	               'Adding_External_Resource','Navigate_Content',
 	               'Adding_Folders','Docs_Overview', 'Load_Map',
 	               'Supplemental','Score_Upload_Form','Adding_Pages',
-                       'Importing_LON-CAPA_Resource','Importing_IMS_Course',
-                       'Uploading_From_Harddrive',
+	               'Importing_LON-CAPA_Resource','Uploading_From_Harddrive',
 	               'Check_Resource_Versions','Verify_Content') {
 	$help{$topic}=&Apache::loncommon::help_open_topic('Docs_'.$topic);
     }
@@ -3468,11 +2753,6 @@ sub handler {
                             onload   => "javascript:resize_scrollbox('contentscroll','1','1');",
                           };
         }
-        if ($env{'docs.markedcopy_url'}) {
-            $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"
@@ -3565,12 +2845,10 @@ sub handler {
                 'upls' => 'Upload a new supplemental '.lc($crstype).' document',
                 'impp' => 'Import a document',
 		'copm' => 'All documents out of a published map into this folder',
-                'upfi' => 'Upload File',
-                'upld' => 'Import Content',
+                'upld' => 'Import Document',
                 'srch' => 'Search',
                 'impo' => 'Import',
-                'lnks' => 'Import from Stored Links',
-                'impm' => 'Import from Assembled Map',
+		'lnks' => 'Import from Stored Links',
                 'selm' => 'Select Map',
                 'load' => 'Load Map',
                 'reco' => 'Recover Deleted Documents',
@@ -3590,14 +2868,9 @@ sub handler {
 				'abou' => 'Personal Information Page for a User',
                 'imsf' => 'IMS Import',
                 'imsl' => 'Import IMS package',
-                'cms'  => 'Origin of IMS package',
                 'file' =>  'File',
-                'se'   => 'Select',
                 'title' => 'Title',
                 'comment' => 'Comment',
-                'url'  => 'URL',
-                'prev' => 'Preview',
-                'lnk'  => 'Add Link',
                 'parse' => 'Upload embedded images/multimedia files if HTML file',
 		'nd' => 'Upload Document',
 		'pm' => 'Published Map',
@@ -3618,41 +2891,10 @@ FIUP
 	<input type="checkbox" name="parserflag" checked="checked" /> $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>
-        $fileupload
-        <br />
-        <p>
-        $lt{'cms'}:&nbsp;
-        <select name="source">
-        <option value="-1" selected="selected">$lt{'se'}</option>
-        <option value="bb5">Blackboard 5</option>
-        <option value="bb6">Blackboard 6</option>
-        <option value="angel5">ANGEL 5.5</option>
-        <option value="webctce4">WebCT 4 Campus Edition</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);" />
-        </fieldset>
-        </form>
-IMSFORM
-
-        my $fileuploadform=(<<FUFORM);
-        <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>
+
+    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">
 	<input type="hidden" name="active" value="aa" />
 	$fileupload
 	<br />
@@ -3664,64 +2906,41 @@ IMSFORM
 	<span class="LC_nobreak" style="float:left">
 	$checkbox
 	</span>
-        <br clear="all" />
-        <input type="submit" value="$lt{'upld'}" />
-        </fieldset>
-        </form>
 FUFORM
+    $fileuploadform .= $fileuploada.'</form>';
 
-        my $importpubform=(<<SEDFFORM);
-        <a class="LC_menubuttons_link" href="javascript:toggleMap();">
-        $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" />
-        $lt{'copm'}<br />
-        <span class="LC_nobreak">
-        <input type="text" name="importmap" size="40" value=""
-        onfocus="this.blur();openbrowser('mapimportform','importmap','sequence,page','');" />
-        &nbsp;<a href="javascript:openbrowser('mapimportform','importmap','sequence,page','');">$lt{'selm'}</a><br />
-        <input type="submit" name="loadmap" value="$lt{'load'}" />
-        </fieldset>
-        </form>
-
+	my $simpleeditdefaultform=(<<SEDFFORM);
+	<form action="/adm/coursedocs" method="post" name="simpleeditdefault">
+	<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{lnks}.'" onclick="javascript:open_StoredLinks_Import();" />' => "<a class='LC_menubuttons_link' href='javascript:open_StoredLinks_Import();'>$lt{'lnks'}</a>" },
-        { '<img class="LC_noBorder LC_middle" src="/res/adm/pages/sequence.png" alt="'.$lt{impm}.'" onclick="javascript:toggleMap();" />' => $importpubform }
-        );
-        $importpubform = &create_form_ul(&create_list_elements(@importpubforma));
+	{ '<img class="LC_noBorder LC_middle" src="/res/adm/pages/wishlist.png" alt="'.$lt{lnks}.'" onclick="javascript:open_StoredLinks_Import();" />' => "<a class='LC_menubuttons_link' href='javascript:open_StoredLinks_Import();'>$lt{'lnks'}</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
 
       my $extresourcesform=(<<ERFORM);
-      <a class="LC_menubuttons_link" href="javascript:toggleUpload('ext');">$lt{'extr'}</a>$help{'Adding_External_Resource'}
       <form action="/adm/coursedocs" method="post" name="newext">
-      <fieldset id="uploadextform" style="display: none;" />
-      <legend>$lt{'extr'}</legend>
-      <input type="hidden" name="active" value="aa" />
-      $lt{'url'}:<br />
-      <input type="text" size="60" name="exturl" id="exturl" value="http://" />
-      <input type="button" name="view" value="$lt{'prev'}" onclick="javascript:extUrlPreview('exturl');" /><br />
-      $lt{'title'}:<br />
-      <input type="text" size="60" name="exttitle" value="$lt{'extr'}" />
       $uploadtag
-      <br />
       <input type="hidden" name="importdetail" value="" />
-      <input type="button" value="$lt{'lnk'}" onclick="javascript:setExternal(this.form,0)" />
-      </fieldset>
+      <a class="LC_menubuttons_link" href="javascript:makenewext('newext');">$lt{'extr'}</a>$help{'Adding_External_Resource'}
       </form>
 ERFORM
 
 
     if ($allowed) {
-        my $folder = $env{'form.folder'};
-        if ($folder eq '') {
-            $folder='default';
-        }
-	&update_paste_buffer($coursenum,$coursedom,$folder);
+	&update_paste_buffer($coursenum,$coursedom);
 	$r->print(<<HIDDENFORM);
 	<form name="renameform" method="post" action="/adm/coursedocs">
    <input type="hidden" name="title" />
@@ -3770,9 +2989,9 @@ HIDDENFORM
        } else {
            #$postexec='self.close();';
        }
-       my $folderseq='/uploaded/'.$coursedom.'/'.$coursenum.'/default_new.sequence';
+       my $folderseq='/uploaded/'.$coursedom.'/'.$coursenum.'/default_'.time.
                      '.sequence';
-       my $pageseq = '/uploaded/'.$coursedom.'/'.$coursenum.'/default_new.page';
+       my $pageseq = '/uploaded/'.$coursedom.'/'.$coursenum.'/default_'.time.
                      '.page';
 	my $container='sequence';
 	if ($env{'form.pagepath'}) {
@@ -3780,6 +2999,13 @@ HIDDENFORM
 	}
 	my $readfile='/uploaded/'.$coursedom.'/'.$coursenum.'/'.$folder.'.'.$container;
 
+	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" />
@@ -3934,13 +3160,10 @@ NGFFORM
         $specialdocumentsform = &create_form_ul(&create_list_elements(@specialdocumentsforma));
 
 
-
         my @importdoc = (
-        {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/extres.png" alt="'.$lt{extr}.'" onclick="toggleUpload(\'ext\');" />'=>$extresourcesform},
-        {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/ims.png" alt="'.$lt{imsf}.'" onclick="javascript:toggleUpload(\'ims\');" />'=>$imspform},
-        {'<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));
+        {'<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;
 
         @gradingforma=(
         {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/simpprob.png" alt="'.$lt{sipr}.'" onclick="javascript:makesmpproblem();" />'=>$newsmpproblemform},
@@ -3961,7 +3184,7 @@ NGFFORM
 
 my %orderhash = (
                 'aa' => ['Import Content',$fileuploadform],
-                'bb' => ['Published Content',$importpubform],
+                'bb' => ['Published Content',$simpleeditdefaultform],
                 'cc' => ['Grading Resources',$gradingform],
                 );
 unless ($env{'form.pagepath'}) {
@@ -3973,7 +3196,7 @@ unless ($env{'form.pagepath'}) {
  $hadchanges=0;
        unless (($supplementalflag || $toolsflag)) {
           my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$crstype,
-                              $supplementalflag,\%orderhash,$iconpath,$uploadtag);
+                              $supplementalflag,\%orderhash,$iconpath);
           if ($error) {
              $r->print('<p><span class="LC_error">'.$error.'</span></p>');
           }
@@ -4000,16 +3223,14 @@ unless ($env{'form.pagepath'}) {
        $env{'form.pagepath'} = '';
        if ($allowed) {
 	   my $folderseq=
-	       '/uploaded/'.$coursedom.'/'.$coursenum.'/supplemental_new.sequence';
+	       '/uploaded/'.$coursedom.'/'.$coursenum.'/supplemental_'.time.
+	       '.sequence';
 
 	   my $path = &HTML::Entities::encode($env{'form.folderpath'},'<>&"');
 
+	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">
-        <fieldset id="uploadsuppdocform" style="display: none;" />
-        <legend>$lt{'upfi'}</legend>
 	<input type="hidden" name="active" value="ee" />	
 	$fileupload
 	<br />
@@ -4023,8 +3244,8 @@ unless ($env{'form.pagepath'}) {
 	<br />
 	<input type="hidden" name="folderpath" value="$path" />
 	<input type="hidden" name="cmd" value="upload_supplemental" />
-        <input type='submit' value="$lt{'upld'}" />
-        </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">
@@ -4036,24 +3257,15 @@ unless ($env{'form.pagepath'}) {
 	</form>
 SNFFORM
 	
-        my $supextform=(<<ERFORM);
-        <a class="LC_menubuttons_link" href="javascript:toggleUpload('suppext');">$lt{'extr'}</a>$help{'Adding_External_Resource'}
-        <form action="/adm/coursedocs" method="post" name="newsuppext">
-        <fieldset id="uploadsuppextform" style="display: none;" />
-        <legend>$lt{'extr'}</legend>
-        <input type="hidden" name="active" value="ee" />
-        $lt{'url'}:<br />
-        <input type="text" size="60" name="exturl" id="exturl" value="http://" />
-        <input type="button" name="view" value="$lt{'prev'}" onclick="javascript:extUrlPreview('exturl');" /><br />
-        $lt{'title'}:<br />
-        <input type="text" size="60" name="exttitle" value="$lt{'extr'}" />
-        $uploadtag
-        <br />
-        <input type="hidden" name="importdetail" value="" />
-        <input type="button" value="$lt{'lnk'}" onclick="javascript:setExternal(this.form,0)" />
-        </fieldset>
-        </form>
-ERFORM
+
+	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 $supnewsylform=(<<SNSFORM);
 	<form action="/adm/coursedocs" method="post" name="supnewsyl">
@@ -4085,12 +3297,10 @@ my @specialdocs = (
             =>$supnewaboutmeform},
 		);
 my @supimportdoc = (
-		{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/extres.png" alt="'.$lt{extr}.'" onclick="javascript:makenewext(\'supext\');" />'
-            =>$supextform},
-                {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/pdfupload.png" alt="'.$lt{upl}.'" onclick="javascript:toggleUpload(\'suppdoc\');" />'
-            =>$supupdocform},
+		{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/extres.png" alt="'.$lt{extr}.'" onclick="javascript:makenewext(\'supnewext\');" />'
+            =>$supnewextform},
         );
-$supupdocform =  &create_form_ul(&create_list_elements(@supimportdoc));
+$supupdocform =  &create_form_ul(&create_list_elements(@supimportdoc)) . '<hr id="ee_hrule" style="width:0px;text-align:left;margin-left:0" />' . $supupdocform;
 my %suporderhash = (
 		'00' => ['Supnewfolder', $supnewfolderform],
                 'ee' => ['Import Content',$supupdocform],
@@ -4098,14 +3308,14 @@ my %suporderhash = (
                 );
         if ($supplementalflag) {
            my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$crstype,
-                               $supplementalflag,\%suporderhash,$iconpath,$uploadtag);
+                               $supplementalflag,\%suporderhash,$iconpath);
            if ($error) {
               $r->print('<p><span class="LC_error">'.$error.'</span></p>');
            }
         }
     } elsif ($supplementalflag) {
         my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$crstype,
-                            $supplementalflag,'',$iconpath,$uploadtag);
+                            $supplementalflag,'',$iconpath);
         if ($error) {
             $r->print('<p><span class="LC_error">'.$error.'</span></p>');
         }
@@ -4125,7 +3335,7 @@ my %suporderhash = (
   } elsif ($showdoc) {
 # -------------------------------------------------------- This is showdoc mode
       $r->print("<h1>".&mt('Uploaded Document').' - '.
-		&Apache::lonnet::gettitle($r->uri).'</h1><p class="LC_warning">'.
+		&Apache::lonnet::gettitle($r->uri).'</h1><p>'.
 &mt('It is recommended that you use an up-to-date virus scanner before handling this file.')."</p><table>".
                 &entryline(0,&mt("Click to download or use your browser's Save Link function"),$showdoc).'</table>');
   }
@@ -4199,7 +3409,7 @@ 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+).*/([^/]+)$}) {
+    if ($env{'form.archiveurl'} !~ m{^/uploaded/\Q$docudom/$docuname/docs/\E(?:default|supplemental|\d+).*/([^/]+)$}) {
         $error = &mt('Archive file "[_1]" not in the expected location.',$env{'form.archiveurl'});
     } else {
         my $file = $1;
@@ -4254,7 +3464,7 @@ sub remove_archive {
             my ($title,$url,@rrest) = 
                 split(/:/,$LONCAPA::map::resources[$LONCAPA::map::order[$position]]);
             if (&handle_edit_cmd($docuname,$docudom)) {
-                ($errtext,$fatal) = &storemap($docuname,$docudom,$map,1);
+                ($errtext,$fatal) = &storemap($docuname,$docudom,$map);
                 if ($fatal) {
                     if ($container eq 'page') {
                         $delwarning = &mt('An error occurred updating the contents of the current page.');
@@ -4378,14 +3588,14 @@ sub generate_edit_table {
     my $backicon = $iconpath.'clickhere.gif';
     my $backtext = &mt('To Overview');
     $form = '<div class="LC_Box" style="margin:0;">'.
-             '<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";
+            '<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 {
@@ -4405,6 +3615,7 @@ 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>'."\n";
         } else {
 	    $form .= '<li '.$active.' style="float:right">'.${$orderhash{$name}}[1].'</li>'."\n";
@@ -4461,10 +3672,6 @@ sub editing_js {
                                           p_ctr2a => 'Cut[_98]',
                                           p_ctr2b => '?[_98]',
                                           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',
                                         );
 
     my $crstype = &Apache::loncommon::course_type();
@@ -4484,15 +3691,6 @@ sub editing_js {
         $backtourl = '/adm/supplemental';
     }
 
-    my $fieldsets = "'ext','doc','ims'";
-    if ($supplementalflag) {
-        $fieldsets = "'suppext','suppdoc'";
-    }
-
-    my $urlregexp = <<'ENDREGEXP';
-/^([a-z]([a-z]|\d|\+|-|\.)*):(\/\/(((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:)*@)?((\[(|(v[\da-f]{1,}\.(([a-z]|\d|-|\.|_|~)|[!\$&'\(\)\*\+,;=]|:)+))\])|((\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5]))|(([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=])*)(:\d*)?)(\/(([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)*)*|(\/((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)+(\/(([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)*)*)?)|((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)+(\/(([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)*)*)|((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)){0})(\?((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|[\uE000-\uF8FF]|\/|\?)*)?(\#((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|\/|\?)*)?$/i
-ENDREGEXP
-
     return <<ENDNEWSCRIPT;
 function makenewfolder(targetform,folderseq) {
     var foldername=prompt('$lt{"p_mnf"}','$lt{"t_mnf"}');
@@ -4510,18 +3708,20 @@ function makenewpage(targetform,folderse
     }
 }
 
-function editext(residx) {
-    if (document.getElementById('uploadext'+residx)) {
-        var curr = document.getElementById('uploadext'+residx).style.display;
-        if (curr == 'none') {
-            disp = 'block';
-        } else {
-            disp = 'none';
-        }
-        document.getElementById('uploadext'+residx).style.display=disp;
-    }
-    resize_scrollbox('contentscroll','1','1');
-    return;
+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() {
@@ -4588,82 +3788,19 @@ function makeabout() {
 }
 }
 
-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 makeims() {
+var caller = document.forms.ims.folder.value;
+var newlocation = "/adm/imsimportdocs?folder="+caller+"&phase=one";
+newWindow = window.open("","IMSimport","HEIGHT=700,WIDTH=750,scrollbars=yes");
+newWindow.location.href = newlocation;
 }
 
-function toggleMap() {
-    var disp = 'none';
-    var curr = document.getElementById('importmapform').style.display;
-    if (curr == 'none') {
-        disp='block';
-    }
-    document.getElementById('importmapform').style.display=disp;
-    resize_scrollbox('contentscroll','1','1');
-    return;
-}
-
-
-function extUrlPreview(caller) {
-    if (document.getElementById(caller)) {
-        var url = document.getElementById(caller).value;
-        var regexp = $urlregexp;
-        if (regexp.test(url)) {
-            openMyModal(url,500,400,'yes');
-        } else {
-            alert("$lt{'invurl'}");
-        }
-    }
-}
-
-function makeims(imsform) {
-    if ((imsform.uploaddoc.value == '')  || (!imsform.uploaddoc.value)) {
-        alert("$lt{'imsfile'}");
-        return;
-    }
-    if (imsform.source.selectedIndex == 0) {
-        alert("$lt{'imscms'}");
-        return;
-    }
-    newWindow = window.open('', 'IMSimport',"HEIGHT=700,WIDTH=750,scrollbars=yes");
-    imsform.submit();
-}
-
-function setExternal(extform,residx) {
-    var title=extform.exttitle.value;
-    if (!String.trim) {
-        String.prototype.trim = function() {return this.replace(\/^\\s+|\\s+$\/g, "");};    }
-    var url=extform.exturl.value;
-    var regexp = $urlregexp;
-    if (title == null || title.trim()=="") {
-        alert("$lt{'titbl'}");
-        extform.exttitle.focus();
-        return;
-    }
-    if (regexp.test(url)) {
-        url = escape(url);
-        if (residx > 0) {
-            eval("extform.importdetail.value=title+'='+url+'='+residx;extform.submit();");
-        } else {
-            eval("extform.importdetail.value=title+'='+url;extform.submit();");
-        }
-    } else {
-        alert("$lt{'invurl'}");
-        extform.exturl.focus();
-        return;
-    }
+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 changename(folderpath,index,oldtitle,container,pagesymb) {
@@ -4817,8 +3954,6 @@ function showPage(current, pageId, nav,
 	currentData = document.getElementById(pageId);
 	currentData.style.display = 'block';
         activeTab = pageId;
-        toggleUpload();
-        toggleMap();
         if (nav == 'mainnav') {
             var storedpath = "$docs_folderpath";
             if (storedpath == '') {
@@ -5045,22 +4180,6 @@ Return hash with valid author names
 
 =item do_paste_from_buffer()
 
-=item get_newmap_url()
-
-=item dbcopy()
-
-=item uniqueness_check()
-
-=item contained_map_check()
-
-=item reinit_role()
-
-=item url_paste_fixups()
-
-=item apply_fixups()
-
-=item copy_dependencies()
-
 =item update_parameter()
 
 =item handle_edit_cmd()