--- loncom/interface/londocs.pm	2012/07/06 22:46:06	1.490
+++ loncom/interface/londocs.pm	2012/11/30 14:46:21	1.512
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.490 2012/07/06 22:46:06 raeburn Exp $
+# $Id: londocs.pm,v 1.512 2012/11/30 14:46:21 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -41,6 +41,7 @@ use Apache::lonclonecourse;
 use Apache::lonnavmaps;
 use Apache::lonnavdisplay();
 use Apache::lonuserstate();
+use Apache::lonextresedit();
 use HTML::Entities;
 use HTML::TokeParser;
 use GDBM_File;
@@ -69,10 +70,14 @@ sub mapread {
 }
 
 sub storemap {
-    my ($coursenum,$coursedom,$map)=@_;
+    my ($coursenum,$coursedom,$map,$contentchg)=@_;
+    my $report;
+    if (($contentchg) && ($map =~ /^default/)) {
+       $report = 1;
+    }
     my ($outtext,$errtext)=
       &LONCAPA::map::storemap('/uploaded/'.$coursedom.'/'.$coursenum.'/'.
-			      $map,1);
+			      $map,1,$report);
     if ($errtext) { return ($errtext,2); }
 
     $hadchanges=1;
@@ -305,67 +310,11 @@ sub group_import {
 		join(':', ($name, $url, $ext, 'normal', 'res'));
 	}
     }
-    return &storemap($coursenum, $coursedom, $folder.'.'.$container);
-}
-
-sub breadcrumbs {
-    my ($allowed,$crstype)=@_;
-    &Apache::lonhtmlcommon::clear_breadcrumbs();
-    my (@folders);
-    if ($env{'form.pagepath'}) {
-        @folders = split('&',$env{'form.pagepath'});
-    } else {
-        @folders=split('&',$env{'form.folderpath'});
-    }
-    my $folderpath;
-    my $cpinfo='';
-    my $plain='';
-    my $randompick=-1;
-    my $isencrypted=0;
-    my $ishidden=0;
-    my $is_random_order=0;
-    while (@folders) {
-	my $folder=shift(@folders);
-    	my $foldername=shift(@folders);
-	if ($folderpath) {$folderpath.='&';}
-	$folderpath.=$folder.'&'.$foldername;
-        my $url;
-        if ($allowed) {
-            $url = '/adm/coursedocs?folderpath=';
-        } else {
-            $url = '/adm/supplemental?folderpath=';
-        }
-	$url .= &escape($folderpath);
-	my $name=&unescape($foldername);
-# randompick number, hidden, encrypted, random order, is appended with ":"s to the foldername
- 	$name=~s/\:(\d*)\:(\w*)\:(\w*):(\d*)$//;
-	if ($1 ne '') {
-           $randompick=$1;
-        } else {
-           $randompick=-1;
-        }
-        if ($2) { $ishidden=1; }
-        if ($3) { $isencrypted=1; }
-	if ($4 ne '') { $is_random_order = 1; }
-        if ($folder eq 'supplemental') {
-            $name = &mt('Supplemental '.$crstype.' Content');
-        }
-	&Apache::lonhtmlcommon::add_breadcrumb(
-		      {'href'=>$url.$cpinfo,
-		       'title'=>$name,
-		       'text'=>$name,
-		       'no_mt'=>1,
-		       });
-	$plain.=$name.' > ';
-    }
-    $plain=~s/\&gt\;\s*$//;
-    return (&Apache::lonhtmlcommon::breadcrumbs(undef,undef,0,'nohelp',
-					       undef, undef, 1 ),$randompick,$ishidden,
-                                               $isencrypted,$plain,$is_random_order);
+    return &storemap($coursenum, $coursedom, $folder.'.'.$container,1);
 }
 
 sub log_docs {
-    return &Apache::lonnet::instructor_log('docslog',@_);
+    return &Apache::lonnet::write_log('course','docslog',@_);
 }
 
 {
@@ -451,7 +400,8 @@ sub docs_change_log {
         if ($folderpath eq '') {
             $folderpath = 'default&'.&escape(&mt('Main '.$crstype.' Documents'));
         }
-        $pathitem = '<input type="hidden" name="folderpath" value="'.&HTML::Entities::encode($folderpath,'<>&"').'" />';
+        $pathitem = '<input type="hidden" name="folderpath" value="'.
+                    &HTML::Entities::encode($folderpath,'<>&"').'" />';
     }
     my $readfile="/uploaded/$coursedom/$coursenum/$folder.$container";
     my $jumpto = $readfile;
@@ -460,7 +410,8 @@ sub docs_change_log {
     if ($supplementalflag) {
         $tid = 2;
     }
-    my ($breadcrumbtrail) = &breadcrumbs($allowed,$crstype);
+    my ($breadcrumbtrail) = 
+        &Apache::lonhtmlcommon::docs_breadcrumbs($allowed,$crstype,1);
     $r->print($breadcrumbtrail.
               &generate_edit_table($tid,\%orderhash,undef,$iconpath,$jumpto,
               $readfile));
@@ -612,7 +563,7 @@ sub docs_change_log {
 }
 
 sub update_paste_buffer {
-    my ($coursenum,$coursedom) = @_;
+    my ($coursenum,$coursedom,$folder) = @_;
 
     return if (!defined($env{'form.markcopy'}));
     return if (!defined($env{'form.copyfolder'}));
@@ -633,75 +584,211 @@ sub update_paste_buffer {
     }
     $url=~s{http(&colon;|:)//https(&colon;|:)//}{https$2//};
 
-    &Apache::lonnet::appenv({'docs.markedcopy_title' => $title,
-			    'docs.markedcopy_url'   => $url});
+    (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);
     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) = @_;
+    my ($r,$container,$folder,$coursedom,$coursenum) = @_;
     return if (!defined($env{'docs.markedcopy_url'}));
 
-    my $is_external;
+    my ($is_external,$othercourse,$fromsupp,$is_uploaded_map,$parent);
     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;
+    my ($canpaste,$nopaste,$othercrs,$areachange,$is_uploaded_map);
     if ($folder =~ /^supplemental/) {
-        $canpaste = &supp_pasteable($env{'docs.markedcopy_url'}); 
+        $canpaste = &supp_pasteable($env{'docs.markedcopy_url'});
+        unless ($canpaste) {
+            $nopaste = &mt('Paste into Supplemental Content unavailable for this type of content.');
+        } 
     } else {
         $canpaste = 1;
     }
 
-    my $pasteinfo;
     if ($canpaste) {
-        $pasteinfo = '<form name="pasteform" action="/adm/coursedocs" method="post">'
-                    .'<input type="submit" name="pastemarked" value="'.&mt('Paste').'" /> ';
-    } else {
-        $pasteinfo = &mt('Paste buffer contains:').' ';
+        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;
+            }
+        }
     }
 
     $r->print('<fieldset>'
-             .'<legend>'.&mt('Clipboard').'</legend>'
-             .$pasteinfo
-             );
-
-    my $type;
+             .'<legend>'.&mt('Clipboard').'</legend>');
+    my ($type,$buffer);
     if ($is_external) {
-	$type = &mt('External Resource');
-	$r->print($type.': '.
-		  &LONCAPA::map::qtescape($env{'docs.markedcopy_title'}).' ('.
-		  &LONCAPA::map::qtescape($env{'docs.markedcopy_url'}).')');
+        $type = &mt('External Resource');
+        $buffer = $type.': '.
+                  &LONCAPA::map::qtescape($env{'docs.markedcopy_title'}).' ('.
+                  &LONCAPA::map::qtescape($env{'docs.markedcopy_url'}).')';
     }  else {
-	my $icon = &Apache::loncommon::icon($extension);
-	if ($extension eq 'sequence' &&
-	    $env{'docs.markedcopy_url'} =~ m{/default_\d+\.sequence$ }x) {
-	    $icon = &Apache::loncommon::lonhttpdurl($r->dir_config('lonIconsURL'));
-	    $icon .= '/navmap.folder.closed.gif';
-	}
-	$icon = '<img src="'.$icon.'" alt="" class="LC_icon" />';
-	$r->print($icon.$type.': '.  &Apache::loncommon::parse_supplemental_title(&LONCAPA::map::qtescape($env{'docs.markedcopy_title'})));
+        my $icon = &Apache::loncommon::icon($extension);
+        if ($extension eq 'sequence' &&
+            $env{'docs.markedcopy_url'} =~ m{/default_\d+\.sequence$ }x) {
+            $icon = &Apache::loncommon::lonhttpdurl($r->dir_config('lonIconsURL'));
+            $icon .= '/navmap.folder.closed.gif';
+        }
+        $icon = '<img src="'.$icon.'" alt="" class="LC_icon" />';
+        $buffer = $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'},'<>&"').'" />
-	<input type="hidden" name="pagesymb" value="'.&HTML::Entities::encode($env{'form.pagesymb'},'<>&"').'" />
+            $r->print('
+        <input type="hidden" name="pagepath" value="'.&HTML::Entities::encode($env{'form.pagepath'},'<>&"').'" />
+        <input type="hidden" name="pagesymb" value="'.&HTML::Entities::encode($env{'form.pagesymb'},'<>&"').'" />
 ');
         } else {
-	    $r->print('
+            $r->print('
         <input type="hidden" name="folderpath" value="'.&HTML::Entities::encode($env{'form.folderpath'},'<>&"').'" />
 ');
         }
         $r->print('</form>');
     } else {
-        $r->print('<br /><p class="LC_info">'.&mt('Paste into Supplemental Content unavailable for this type of content.').'</p>');
+        $r->print(&mt('Paste buffer contains:').' '.$buffer.
+                  '<br /><p class="LC_info">'.$nopaste.'</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;|:))//}) ||
@@ -714,113 +801,168 @@ 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) = @_;
+    my ($coursenum,$coursedom,$folder,$container,$errors) = @_;
 
+# 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'));
         }
     }
 
-# paste resource to end of list
+# Prepare to paste resource at end of list
     my $url=&LONCAPA::map::qtescape($env{'docs.markedcopy_url'});
     my $title=&LONCAPA::map::qtescape($env{'docs.markedcopy_title'});
-# Maps need to be copied first
-    my ($oldurl,%removefrommap,%addedmaps,%rewrites,%copies,%dbcopies,%zombies,%params,
-        %moves,$srcdom,$srcnum);
-    $oldurl = $url;
+
+    my ($is_map,$srcdom,$srcnum,$prefixchg,%before,%after,%mapchanges,%tomove);
     if ($url=~/\.(page|sequence)$/) {
-        # 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;
+        $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.'));
             }
         }
-        if ($url=~ m{^/uploaded/}) {
-	    $title=&mt('Copy of').' '.$title;
+# 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');
         }
-	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;
+
+# 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);
+                }
             }
-            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)/$}) {
-                    $srcdom = $1;
-                    $srcnum = $2;
-                    if (($1 ne $coursedom) && ($2 ne $coursenum)) {
-                        my $srcdom = $1;
-                        my $srcnum = $2;
-                        if ($env{"user.priv.cm./$srcdom/$srcnum"} =~ /\Q:mdc&F\E/) {
-                            &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');
+            foreach my $item (@nested) {
+                if ($env{'form.docs.markedcopy_'.$item} eq 'move') {
+                    $tomove{$type.'_'.$item} = 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 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;
+                }
+            }
+        }
+        &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;
                         }
+                        $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');
-                }
             }
-	    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');
+            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;
                 }
+                $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 ($allmaps{$url}) {
-                return &mt('Paste failed: only one instance of a particular published sequence or page is allowed within each course.');
-            }
-        }
-    } elsif ($url =~ m{^/uploaded/($match_domain)/($match_courseid)/}) {
-        if (($1 ne $coursedom) || ($2 ne $coursenum)) {
-            $srcdom = $1;
-            $srcnum = $2;
-            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');
+# 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.'));
+                }
             }
         }
     }
@@ -831,76 +973,166 @@ sub do_paste_from_buffer {
 	    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,
+	    my $dbresult=&Apache::lonnet::put($db_name,\%contents,
 					    $coursedom,$coursenum);
-	    $url =~ s{/(\d*)/smppg$ }{/$now/smppg}x;
-	    $title=&mt('Copy of').' '.$title;
+            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 ($relpath,$oldprefix,$prefixchg);
-    if ($url =~ m{^/uploaded/$match_domain/$match_courseid/(docs|supplemental)/(.+)$}) {
-        $oldprefix = $1;
-        $relpath = $2;
-        if (($folder =~ /^supplemental/) && ($oldprefix eq 'docs')) { 
-            $prefixchg = 1;
-        } elsif (($folder =~ /^default/) && ($oldprefix eq 'supplemental')) {
-            $prefixchg = 1;
-        }
-    }
     $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
-    my $newidx = &LONCAPA::map::getresidx($url);
-    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';
-        }
-        if (($prefixchg) || ($srcdom ne '') && ($srcnum ne '')) {
-            my $newpath = "$newprefix/$newsubdir/$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{/+$}{/};
-                $moves{$oldurl} = $newsubpath;
+        $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 $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'});
+            }
+        } else {
+            if ($folder=~/^supplemental/) {
+                $title=time.'___&&&___'.$env{'user.name'}.'___&&&___'.
+                       $env{'user.domain'}.'___&&&___'.$title;
+            }
+        }
+        $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;
+        }
     }
-    &apply_fixups($coursedom,$coursenum,$oldurl,$url,$noparams,\%rewrites,\%copies,
-                  \%dbcopies,\%zombies,\%params,\%moves);
-    if ($env{'docs.markedcopy_supplemental'}) {
-        if ($folder =~ /^supplemental/) {
-            $title = $env{'docs.markedcopy_supplemental'};
+   
+    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 {
-            (undef,undef,$title) =
-                &Apache::loncommon::parse_supplemental_title($env{'docs.markedcopy_supplemental'});
+            $newurl = "/uploaded/$coursedom/$coursenum/$prefix".$now.'.'.$ext;
         }
-    } else {
-        if ($folder=~/^supplemental/) {
-           $title=time.'___&&&___'.$env{'user.name'}.'___&&&___'.
-                  $env{'user.domain'}.'___&&&___'.$title;
+        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'));
+            }
         }
     }
-
-    $LONCAPA::map::resources[$newidx]= 	$title.':'.$url.':'.$ext.':normal:res';
-    push(@LONCAPA::map::order, $newidx);
-    return 'ok';
-# Store the result
+    return ($newurl);
 }
 
 sub dbcopy {
@@ -935,7 +1167,8 @@ sub uniqueness_check {
 }
 
 sub contained_map_check {
-    my ($url,$folder,$removefrommap,$addedmaps) = @_;
+    my ($url,$folder,$removefrommap,$removeparam,$addedmaps,$hierarchy,$titles,
+        $allmaps) = @_;
     my $content = &Apache::lonnet::getfile($url);
     unless ($content eq '-1') {
         my $parser = HTML::TokeParser->new(\$content);
@@ -947,21 +1180,33 @@ sub contained_map_check {
                 my $ressrc = $token->[2]->{'src'};
                 if ($folder =~ /^supplemental/) {
                     unless (&supp_pasteable($ressrc)) {
-                        $removefrommap->{$url}{$token->[2]->{'id'}};
+                        $removefrommap->{$url}{$token->[2]->{'id'}} = $ressrc;
                         next;
                     }
                 }
-                if ($ressrc =~ /\.(sequence|page)$/) {
-                    if (ref($addedmaps->{$ressrc}) eq 'ARRAY') {
-                        push(@{$addedmaps->{$ressrc}},$url);
+                if ($ressrc =~ m{^/(res|uploaded)/.+\.(sequence|page)$}) {
+                    if ($1 eq 'uploaded') {
+                        $hierarchy->{$url}{$token->[2]->{'id'}} = $ressrc;
+                        $titles->{$url}{$token->[2]->{'id'}} = $token->[2]->{'title'};
                     } else {
-                        $addedmaps->{$ressrc} = [$url];
+                        if ($allmaps->{$ressrc}) {
+                            $removefrommap->{$url}{$token->[2]->{'id'}} = $ressrc; 
+                        } elsif (ref($addedmaps->{$ressrc}) eq 'ARRAY') {
+                            $removefrommap->{$url}{$token->[2]->{'id'}} = $ressrc;
+                        } else {
+                            $addedmaps->{$ressrc} = [$url];
+                        }
                     }
-                    &contained_map_check($ressrc,$folder,$removefrommap,$addedmaps);
+                    &contained_map_check($ressrc,$folder,$removefrommap,$removeparam,
+                                         $addedmaps,$hierarchy,$titles,$allmaps);
                 }
-            } elsif ($token->[1] !~ /^resource|map|link$/) {
+            } elsif ($token->[1] eq 'param') {
                 if ($folder =~ /^supplemental/) {
-                    $removefrommap->{$url}{$token->[1]};
+                    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'}]; 
+                    }
                 }
             }
         }
@@ -979,170 +1224,396 @@ sub reinit_role {
 }
 
 sub url_paste_fixups {
-    my ($oldurl,$ext,$cdom,$cnum,$allmaps,$rewrites,$copies,$dbcopies,$zombies,$params) = @_;
-    my $file = &Apache::lonnet::getfile("$oldurl.$ext");
+    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);
     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 '');
-            next if ($token->[2]->{'type'} eq 'external');
             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');
             if ($token->[2]->{'type'} eq 'zombie') {
+                next if ($skip);  
                 $zombies->{$oldurl}{$ressrc} = $id;
-            } elsif ($ressrc =~ m{^/uploaded/($match_domain)/($match_courseid)/(.+)}) {
-                my $srccdom = $1;
-                my $srccnum = $2;
+                $changed = 1;
+            } elsif ($ressrc =~ m{^/uploaded/($match_domain)/($match_courseid)/(.+)$}) {
+                my $srcdom = $1;
+                my $srcnum = $2;
                 my $rem = $3;
-                if (($srccdom ne $cdom) || ($srccnum ne $cnum)) {
+                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 ($rem =~ /^(default|supplemental)(_?\d*).(sequence|page)$/) {
                         $rewrites->{$oldurl}{$ressrc} = $id;
-                        &url_paste_fixups($ressrc,$3,$cdom,$cnum,$allmaps,$rewrites,$copies,$dbcopies,$zombies,$params);
+                        $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;
                     } else {
                         $rewrites->{$oldurl}{$ressrc} = $id;
                         $copies->{$oldurl}{$ressrc} = $id;
+                        $changed = 1;
                     }
                 }
             } elsif ($ressrc =~ m{^/adm/($match_domain)/($match_courseid)/(.+)$}) {
-                my $srccdom = $1;
-                my $srccnum = $2;
-                if (($srccdom ne $cdom) || ($srccnum ne $cnum)) {
+                next if ($skip);  
+                my $srcdom = $1;
+                my $srcnum = $2;
+                if (($srcdom ne $cdom) || ($srcnum ne $cnum)) {
                     $rewrites->{$oldurl}{$ressrc} = $id;
                     $dbcopies->{$oldurl}{$ressrc} = $id;
+                    $changed = 1;
                 }
             } elsif ($ressrc =~ m{^/public/($match_domain)/($match_courseid)/(.+)$}) {
-                my $srccdom = $1;
-                my $srccnum = $2;
-                if (($srccdom ne $cdom) || ($srccnum ne $cnum)) {
+                next if ($skip);
+                my $srcdom = $1;
+                my $srcnum = $2;
+                if (($srcdom ne $cdom) || ($srcnum 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'}; 
             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;
+    return $changed;
 }
 
 sub apply_fixups {
-    my ($cdom,$cnum,$oldurl,$url,$noparams,$rewrites,$copies,$dbcopies,$zombies,$params,
-        $moves) = @_;
-    my (%newdb,%newdoc);
-    if (ref($dbcopies->{$oldurl}) eq 'HASH') {
-        foreach my $item (keys(%{$dbcopies->{$oldurl}})) {
-            $newdb{$item} = &dbcopy($item);
-        }
-    }
-    my @allcopies;
-    if (ref($copies->{$oldurl}) eq 'HASH') {
-        push(@allcopies,keys(%{$copies->{$oldurl}}));
-    }
-    if ((ref($moves) eq 'HASH') && (exists($moves->{$oldurl}))) {
-        push(@allcopies,$oldurl);
-    }
-    if (@allcopies > 0) {
-        foreach my $item (@allcopies) {
-            my $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);
-                    if (&Apache::lonnet::extract_embedded_items(undef,\%allfiles,\%codebase,\$content) 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'                 => $oldurl,
-                                 'context'                  => 'paste'});
-                        if ($numexisting > 0) {
-                            if (ref($existing) eq 'HASH') {
-                                my ($relpath) = ($item =~ m{^(/uploaded/$match_domain/$match_courseid/(?:docs|supplemental)/(?:default|\d+)/.*/)[^/]+$});
-                                foreach my $dep (keys(%{$existing})) {
-                                    $dep =~ s{^\Q$relpath\E}{};
-                                    my $depfile = $relpath.$dep;
-                                    my $depstorefn;
-                                    if ((ref($copies->{$oldurl}) eq 'HASH') &&
-                                        ($copies->{$oldurl}{$item})) {
-                                        $depstorefn = $relpath;
-                                        $depstorefn =~s{^/\w+/$match_domain/$match_courseid/}{};
-                                    } elsif ((ref($moves) eq 'HASH') &&
-                                             (exists($moves->{$oldurl}))) {
-                                        $depstorefn = $moves->{$oldurl};
-                                    }
-                                    $depstorefn .= $dep;
-                                    my $depcontent = &Apache::lonnet::getfile($depfile);
-                                    unless ($depcontent eq '-1') {
-                                        &Apache::lonclonecourse::writefile($env{'request.course.id'},$depstorefn,$depcontent);
-                                    }
-                                }
+    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 $storefn=$item;
-                unless (exists($moves->{$oldurl})) {
-                    $storefn=~s{^/\w+/$match_domain/$match_courseid/}{};
-                    $newdoc{$item} = &Apache::lonclonecourse::writefile($env{'request.course.id'},$storefn,$content);
+            }
+        }
+    }
+    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;
                 }
             }
         }
     }
-    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};
+    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'}#;
                                 }
-                            } elsif ($newdb{$src} ne '') {
-                                $token->[2]->{'src'} = $newdb{$src};
                             }
-                            $newcontent .= "<$token->[1] "; 
-                            foreach my $attr (@{$token->[3]}) {
-                                $newcontent .=  ' '.$attr.'="'.$token->[2]->{$attr},'"'
+                            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 .= ' />';
-                        } 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;
 }
@@ -1220,13 +1691,15 @@ sub handle_edit_cmd {
 
 sub editor {
     my ($r,$coursenum,$coursedom,$folder,$allowed,$upload_output,$crstype,
-        $supplementalflag,$orderhash,$iconpath)=@_;
+        $supplementalflag,$orderhash,$iconpath,$pathitem)=@_;
     my $container= ($env{'form.pagepath'}) ? 'page'
 		                           : 'sequence';
-
-    my ($breadcrumbtrail,$randompick,$ishidden,$isencrypted,$plain,$is_random_order) =
-        &breadcrumbs($allowed,$crstype);
-    $r->print($breadcrumbtrail);
+    my ($randompick,$ishidden,$isencrypted,$plain,$is_random_order);
+    if ($allowed) {
+        (my $breadcrumbtrail,$randompick,$ishidden,$isencrypted,$plain,$is_random_order) =
+            &Apache::lonhtmlcommon::docs_breadcrumbs($allowed,$crstype,1);
+        $r->print($breadcrumbtrail);
+    }
 
     my $jumpto = "uploaded/$coursedom/$coursenum/$folder.$container";
 
@@ -1267,20 +1740,35 @@ sub editor {
 	}
 
 	if ($env{'form.pastemarked'}) {
-            my $paste_res =
-                &do_paste_from_buffer($coursenum,$coursedom,$folder);
-            if ($paste_res eq 'ok') {
-                ($errtext,$fatal) = &storemap($coursenum,$coursedom,$folder.'.'.$container);
-                return $errtext if ($fatal);
-            } elsif ($paste_res ne '') {
+            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') {
                 $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()) {
-	    ($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container);
+            my $contentchg;
+            if ($env{'form.cmd'} =~ /^(del|cut)_/) {
+                $contentchg = 1;
+            }
+	    ($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container,$contentchg);
 	    return $errtext if ($fatal);
 	}
 # Group import/search
@@ -1290,6 +1778,18 @@ 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]);
 		}
 	    }
@@ -1307,7 +1807,7 @@ sub editor {
 		    $LONCAPA::map::order[$#LONCAPA::map::order+1]=$idx;
 		}
 		($errtext,$fatal)=&storemap($coursenum,$coursedom,
-					    $folder.'.'.$container);
+					    $folder.'.'.$container,1);
 		return $errtext if ($fatal);
 	    } else {
 		$r->print('<p><span class="LC_error">'.&mt('No map selected.').'</span></p>');
@@ -1361,35 +1861,62 @@ sub editor {
         unless ($name) {  $name=(split(/\//,$url))[-1]; }
         unless ($name) { $idx++; next; }
         $output .= &entryline($idx,$name,$url,$folder,$allowed,$res,
-                              $coursenum,$crstype);
+                              $coursenum,$coursedom,$crstype,
+                              $pathitem,$supplementalflag);
         $idx++;
         $shown++;
     }
     &Apache::loncommon::end_data_table_count();
-    
-    if ($shown) {
-        $to_show = &Apache::loncommon::start_scrollbox('900px','880px','400px','contentscroll')
-                  .&Apache::loncommon::start_data_table(undef,'contentlist');
-        if ($allowed) {
-            $to_show .= &Apache::loncommon::start_data_table_header_row()
-                     .'<th colspan="2">'.&mt('Move').'</th>'
-                     .'<th>'.&mt('Actions').'</th>'
-                     .'<th colspan="2">'.&mt('Document').'</th>';
-            if ($folder !~ /^supplemental/) {
-                $to_show .= '<th colspan="4">'.&mt('Settings').'</th>';
+
+    if (($allowed) || ($supplementalflag && $folder eq 'supplemental')) {
+        if ($shown) {
+            if ($allowed) {
+                $to_show = &Apache::loncommon::start_scrollbox('900px','880px','400px','contentscroll')
+                          .&Apache::loncommon::start_data_table(undef,'contentlist')
+                          .&Apache::loncommon::start_data_table_header_row()
+                          .'<th colspan="2">'.&mt('Move').'</th>'
+                          .'<th>'.&mt('Actions').'</th>'
+                          .'<th colspan="2">'.&mt('Document').'</th>';
+                if ($folder !~ /^supplemental/) {
+                    $to_show .= '<th colspan="4">'.&mt('Settings').'</th>';
+                }
+                $to_show .= &Apache::loncommon::end_data_table_header_row()
+                           .$output.' '
+                           .&Apache::loncommon::end_data_table()
+                           .'<br style="line-height:2px;" />'
+                           .&Apache::loncommon::end_scrollbox();
+            } else {
+                $to_show = '<table><tr><td>'.&Apache::loncommon::help_open_menu('Navigation Screen','Navigation_Screen',undef,'RAT')
+                           .'</td><td class="LC_middle">'.&mt('Tools:').'</td>'
+                           .'<td align="left"><ul id="LC_toolbar">'
+                           .'<li><a href="/adm/coursedocs?forcesupplement=1" '
+                           .'id="LC_content_toolbar_edittoplevel" '
+                           .'class="LC_toolbarItem" '
+                           .'title="'.&mt('Supplemental Content Editor').'">'
+                           .'</a></li></ul></td></tr></table><br />'
+                           .&Apache::loncommon::start_data_table('LC_tableOfContent')
+                           .$output.' '
+                           .&Apache::loncommon::end_data_table();
             }
-            $to_show .= &Apache::loncommon::end_data_table_header_row();
+        } else {
+            $to_show .= &Apache::loncommon::start_scrollbox('400px','380px','200px','contentscroll')
+                       .'<div class="LC_info" id="contentlist">'
+                       .&mt('Currently no documents.')
+                       .'</div>'
+                       .&Apache::loncommon::end_scrollbox();
         }
-        $to_show .= $output.' '
-                 .&Apache::loncommon::end_data_table()
-                 .'<br style="line-height:2px;" />'
-                 .&Apache::loncommon::end_scrollbox();
     } else {
-        $to_show .= &Apache::loncommon::start_scrollbox('400px','380px','200px','contentscroll')
-                 .'<div class="LC_info" id="contentlist">'
-                 .&mt('Currently no documents.')
-                 .'</div>'
-                 .&Apache::loncommon::end_scrollbox();
+        if ($shown) {
+            $to_show = '<div>'
+                      .&Apache::loncommon::start_data_table('LC_tableOfContent')
+                      .$output
+                      .&Apache::loncommon::end_data_table()
+                      .'</div>';
+        } else {
+            $to_show = '<div class="LC_info" id="contentlist">'
+                      .&mt('Currently no documents.')
+                      .'</div>'
+        }
     }
     my $tid = 1;
     if ($supplementalflag) {
@@ -1399,21 +1926,8 @@ 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);
+        &print_paste_buffer($r,$container,$folder,$coursedom,$coursenum);
     } else {
-        if (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) {
-            #Function Box for Supplemental Content for users with mdc priv.
-            my $funcname = &mt('Folder Editor');
-            $r->print(
-                &Apache::loncommon::head_subbox(
-                    &Apache::lonhtmlcommon::start_funclist().
-                    &Apache::lonhtmlcommon::add_item_funclist(
-                        '<a href="/adm/coursedocs?command=direct&forcesupplement=1&'.
-                        'supppath='.&HTML::Entities::encode($env{'form.folderpath'}).'">'.
-                        '<img src="/res/adm/pages/docs.png" alt="'.$funcname.'" class="LC_icon" />'.
-                        '<span class="LC_menubuttons_inline_text">'.$funcname.'</span></a>').
-                          &Apache::lonhtmlcommon::end_funclist()));
-        }
         $r->print($to_show);
     }
     return;
@@ -1487,7 +2001,7 @@ sub process_file_upload {
 	    $comment.':'.$url.':'.$ext.':normal:res';
         $LONCAPA::map::order[$#LONCAPA::map::order+1]= $newidx;
         ($errtext,$fatal)=&storemap($coursenum,$coursedom,
-				    $folder.'.'.$container);
+				    $folder.'.'.$container,1);
         if ($fatal) {
             $$upload_output = '<div class="LC_error" id="uploadfileresult">'.$errtext.'</div>';
             return;
@@ -1578,7 +2092,8 @@ sub is_supplemental_title {
 # --------------------------------------------------------------- An entry line
 
 sub entryline {
-    my ($index,$title,$url,$folder,$allowed,$residx,$coursenum,$crstype)=@_;
+    my ($index,$title,$url,$folder,$allowed,$residx,$coursenum,$coursedom,
+        $crstype,$pathitem,$supplementalflag)=@_;
     my ($foldertitle,$pagetitle,$renametitle);
     if (&is_supplemental_title($title)) {
 	($title,$foldertitle,$renametitle) = &Apache::loncommon::parse_supplemental_title($title);
@@ -1592,7 +2107,6 @@ sub entryline {
 
     my $orderidx=$LONCAPA::map::order[$index];
 
-
     $renametitle=~s/\\/\\\\/g;
     $renametitle=~s/\&quot\;/\\\"/g;
     $renametitle=~s/ /%20/g;
@@ -1611,9 +2125,24 @@ sub entryline {
         $type = $container = 'page';
         $esc_path=&escape($env{'form.pagepath'});
 	$path = &HTML::Entities::encode($env{'form.pagepath'},'<>&"');
-        $symb=&escape($env{'form.pagesymb'});
     }
-    my $cpinfo='';
+    my $isexternal;
+    if ($residx) {
+        my $currurl = $url;
+        $currurl =~ s{^http(|s)(&colon;|:)//}{/adm/wrapper/ext/};
+        if ($currurl =~ m{^/adm/wrapper/ext/}) {
+            $isexternal = 1;
+        }
+        if (!$supplementalflag) {
+            my $path = 'uploaded/'.
+                       $env{'course.'.$env{'request.course.id'}.'.domain'}.'/'.
+                       $env{'course.'.$env{'request.course.id'}.'.num'}.'/';
+            $symb = &Apache::lonnet::encode_symb($path.$folder.".$container",
+                                                 $residx,
+                                                 &Apache::lonnet::declutter($currurl));
+        }
+    }
+    my %lt;
     if ($allowed) {
 	my $incindex=$index+1;
 	my $selectbox='';
@@ -1636,36 +2165,81 @@ sub entryline {
 	    }
 	    $selectbox.='</select>';
 	}
-	my %lt=&Apache::lonlocal::texthash(
+	%lt=&Apache::lonlocal::texthash(
                 'up' => 'Move Up',
 		'dw' => 'Move Down',
 		'rm' => 'Remove',
                 'ct' => 'Cut',
 		'rn' => 'Rename',
-		'cp' => 'Copy');
+		'cp' => 'Copy',
+                'ex' => 'External Resource',
+                'ed' => 'Edit',
+                'pr' => 'Preview',
+                'sv' => 'Save',
+                'ul' => 'URL',
+                'ti' => 'Title', 
+                );
 	my $nocopy=0;
         my $nocut=0;
-        if ($url=~/\.(page|sequence)$/) {
-	    if ($url =~ m{/res/}) {
-		# no copy for published maps
-		$nocopy = 1;
-	    } else {
-		foreach my $item (&Apache::lonsequence::attemptread(&Apache::lonnet::filelocation('',$url),1)) {
-		    my ($title,$url,$ext,$type)=split(/\:/,$item);
-		    if (($url=~/\.(page|sequence)/) && ($type ne 'zombie')) {
-			$nocopy=1;
-			last;
-		    }
-		}
-	    }
+        my $noremove=0;
+        if ($url=~ m{^/res/.+\.(page|sequence)$}) {
+	    # no copy for published maps
+	    $nocopy=1;
 	}
         if ($url=~/^\/res\/lib\/templates\//) {
            $nocopy=1;
            $nocut=1;
         }
-        my $copylink='&nbsp;';
-        my $cutlink='&nbsp;';
-
+        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,$cutlink,$removelink,$renamelink);
 	my $skip_confirm = 0;
 	if ( $folder =~ /^supplemental/
 	     || ($url =~ m{( /smppg$
@@ -1673,21 +2247,41 @@ sub entryline {
 			    |/aboutme$
 			    |/navmaps$
 			    |/bulletinboard$
-			    |\.html$
-			    |^/adm/wrapper/ext)}x)) {
+			    |\.html$)}x)
+             || $isexternal) {
 	    $skip_confirm = 1;
 	}
 
-	if (!$nocopy) {
+	if ($nocopy) {
+            $copylink=(<<ENDCOPY);
+<span style="visibility: hidden;">$lt{'cp'}</span>
+ENDCOPY
+        } else {
 	    $copylink=(<<ENDCOPY);
 <a href="javascript:markcopy('$esc_path','$index','$renametitle','$container','$symb','$folder');" class="LC_docs_copy">$lt{'cp'}</a>
 ENDCOPY
         }
-	if (!$nocut) {
+	if ($nocut) {
+            $cutlink=(<<ENDCUT);
+<span style="visibility: hidden;">$lt{'ct'}</span>
+ENDCUT
+        } else {
 	    $cutlink=(<<ENDCUT);
 <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);
+<span style="visibility: hidden;">$lt{'rm'}</a>
+ENDREM
+        } else {
+            $removelink=(<<ENDREM);
+<a href='javascript:removeres("$esc_path","$index","$renametitle","$container","$symb",$skip_confirm);' class="LC_docs_remove">$lt{'rm'}</a>
+ENDREM
+        }
+        $renamelink=(<<ENDREN);
+<a href='javascript:changename("$esc_path","$index","$renametitle","$container","$symb");' class="LC_docs_rename">$lt{'rn'}</a>
+ENDREN
 	$form_start = '
    <form action="/adm/coursedocs" method="post">
 ';
@@ -1701,13 +2295,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$cpinfo'>
-    <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'>
+    <img src="${iconpath}move_up.gif" alt="$lt{'up'}" class="LC_icon" />
   </a>
 </div>
 <div class="LC_docs_entry_move">
-  <a href='/adm/coursedocs?cmd=down_$index&amp;${type}path=$esc_path&amp;${type}symb=$symb$cpinfo'>
-    <img src="${iconpath}move_down.gif" alt='$lt{'dw'}' class="LC_icon" />
+  <a href='/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>
 </div>
 </td>
@@ -1717,11 +2311,12 @@ END
    $selectbox
    $form_end
 </td>
-<td class="LC_docs_entry_commands">
-   <a href='javascript:removeres("$esc_path","$index","$renametitle","$container","$symb",$skip_confirm);' class="LC_docs_remove">$lt{'rm'}</a>
+<td class="LC_docs_entry_commands"><span class="LC_nobreak">
+$removelink
+$renamelink
 $cutlink
-   <a href='javascript:changename("$esc_path","$index","$renametitle","$container","$symb");' class="LC_docs_rename">$lt{'rn'}</a>
 $copylink
+</span>
 </td>
 END
 
@@ -1758,43 +2353,36 @@ 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 ((!$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;
+    $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;
 	    }
-	} 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);
+            if (&Apache::lonnet::symbverify($symb,$url)) {
+	        $url.=(($url=~/\?/)?'&':'?').'symb='.&escape($symb);
+            } else {
+                $url='';
+            }
 	}
     }
     my ($rand_pick_text,$rand_order_text);
@@ -1802,9 +2390,14 @@ END
 	my $foldername=&escape($foldertitle);
 	my $folderpath=$env{'form.folderpath'};
 	if ($folderpath) { $folderpath.='&' };
+        if (!$allowed && $supplementalflag) {
+            $folderpath.=$folderarg.'&'.$foldername;
+            $url.='folderpath='.&escape($folderpath);
+        } else {
 # Append randompick number, hidden, and encrypted with ":" to foldername,
 # so it gets transferred between levels
-	$folderpath.=$folderarg.'&'.$foldername.':'.(&LONCAPA::map::getparameter($orderidx,
+	    $folderpath.=$folderarg.'&'.$foldername.
+                                              ':'.(&LONCAPA::map::getparameter($orderidx,
                                               'parameter_randompick'))[0]
                                                .':'.((&LONCAPA::map::getparameter($orderidx,
                                               'parameter_hiddenresource'))[0]=~/^yes$/i)
@@ -1812,28 +2405,38 @@ END
                                               'parameter_encrypturl'))[0]=~/^yes$/i)
                                                .':'.((&LONCAPA::map::getparameter($orderidx,
                                               'parameter_randomorder'))[0]=~/^yes$/i);
-	$url.='folderpath='.&escape($folderpath).$cpinfo;
-        my $rpicknum = (&LONCAPA::map::getparameter($orderidx,
-                                                   'parameter_randompick'))[0];
-        my $rpckchk;
-        if ($rpicknum) {
-            $rpckchk = ' checked="checked"';
-        }
-        my $formname = 'edit_rpick_'.$orderidx;
-	$rand_pick_text = 
+	    $url.='folderpath='.&escape($folderpath);
+            my $rpicknum = (&LONCAPA::map::getparameter($orderidx,
+                                                        'parameter_randompick'))[0];
+            my $rpckchk;
+            if ($rpicknum) {
+                $rpckchk = ' checked="checked"';
+            }
+            my $formname = 'edit_rpick_'.$orderidx;
+	    $rand_pick_text = 
 '<form action="/adm/coursedocs" method="post" name="'.$formname.'">'."\n".
 $form_common."\n".
 '<span class="LC_nobreak"><label><input type="checkbox" name="randpickon_'.$orderidx.'" id="rpick_'.$orderidx.'" onclick="'."updatePick(this.form,'$orderidx','check');".'"'.$rpckchk.' /> '.&mt('Randomly Pick').'</label><input type="hidden" name="randompick_'.$orderidx.'" id="rpicknum_'.$orderidx.'" value="'.$rpicknum.'" />';
-        if ($rpicknum ne '') {
-            $rand_pick_text .= ':&nbsp;<a href="javascript:updatePick('."document.$formname,'$orderidx','link'".')">'.$rpicknum.'</a>';
-        }
-        $rand_pick_text .= '</span></form>';
-    	my $ro_set=
-	    ((&LONCAPA::map::getparameter($orderidx,'parameter_randomorder'))[0]=~/^yes$/i?' checked="checked"':'');
-	$rand_order_text = 
+            if ($rpicknum ne '') {
+                $rand_pick_text .= ':&nbsp;<a href="javascript:updatePick('."document.$formname,'$orderidx','link'".')">'.$rpicknum.'</a>';
+            }
+            $rand_pick_text .= '</span></form>';
+    	    my $ro_set=
+	        ((&LONCAPA::map::getparameter($orderidx,'parameter_randomorder'))[0]=~/^yes$/i?' checked="checked"':'');
+	    $rand_order_text = 
 $form_start.
 $form_common.'
 <span class="LC_nobreak"><label><input type="checkbox" name="randomorder_'.$orderidx.'" onclick="'."this.form.changeparms.value='randomorder';this.form.submit()".'" '.$ro_set.' /> '.&mt('Random Order').' </label></span></form>';
+        }
+    } elsif ($supplementalflag && !$allowed) {
+        $url .= ($url =~ /\?/) ? '&amp;':'?';
+        $url .= 'folderpath='.&HTML::Entities::encode($esc_path,'<>&"');
+        if ($title) {
+            $url .= '&amp;title='.&HTML::Entities::encode($renametitle,'<>&"');
+        }
+        if ($isexternal && $orderidx) {
+            $url .= '&amp;idx='.$orderidx;
+        }
     }
     if ($ispage) {
         my $pagename=&escape($pagetitle);
@@ -1841,23 +2444,32 @@ $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).$cpinfo;
+	    '&amp;pagesymb='.&escape($symb);
     }
-    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);
+    if ($allowed) {
+        my $fileloc = 
+            &Apache::lonnet::declutter(&Apache::lonnet::filelocation('',$orig_url));
+        if ($isexternal) {
+            $editlink = '&nbsp;'.
+                &Apache::lonextresedit::extedit_form(0,$residx,$orig_url,$title,$pathitem);
+        } elsif (!$isfolder && !$ispage) {
+            my ($cfile,$home,$switchserver,$forceedit,$forceview) = 
+                &Apache::lonnet::can_edit_resource($fileloc,$coursenum,$coursedom,$orig_url);
+            if (($cfile ne '') && ($symb ne '' || $supplementalflag)) {
+                my $jscall = 
+                    &Apache::lonhtmlcommon::jump_to_editres($cfile,$home,
+                                                            $switchserver,
+                                                            $forceedit,
+                                                            undef,$symb,
+                                                            &escape($env{'form.folderpath'}),
+                                                            $renametitle);
+                if ($jscall) {
+                    $editlink = '&nbsp;<a class="LC_docs_ext_edit" href="javascript:'.
+                                $jscall.'" >'.&mt('Edit').'</a>';
+                }
+            }
+        }
     }
     my $reinit;
     if ($crstype eq 'Community') {
@@ -1883,7 +2495,7 @@ $form_common.'
     } else {
        $line.=$title.' <span class="LC_docs_reinit_warn">'.$reinit.'</span>';
     }
-    $line.=$external."</td>";
+    $line.=$editlink."</td>";
     $rand_pick_text = '&nbsp;' if ($rand_pick_text eq '');
     $rand_order_text = '&nbsp;' if ($rand_order_text eq '');
     if (($allowed) && ($folder!~/^supplemental/)) {
@@ -1914,6 +2526,30 @@ 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()
@@ -2279,7 +2915,8 @@ ENDHEADERS
     '<th colspan="'.$num_ver_col.'">'.&mt('History').'</th>'.
     '</b>');
     foreach my $key (sort(keys(%changes))) {
-	if ($changes{$key}>$starttime) {
+        #excludes not versionable problems from resource version history:
+        if ($changes{$key}>$starttime && $key !~ /^\/res\/lib\/templates/) {
 	    my ($root,$extension)=($key=~/^(.*)\.(\w+)$/);
 	    my $currentversion=&Apache::lonnet::getversion($key);
 	    if ($currentversion<0) {
@@ -2445,9 +3082,9 @@ sub init_breadcrumbs {
 sub create_list_elements {
    my @formarr = @_;
    my $list = '';
-   for my $button (@formarr){
-        for my $picture(keys %$button) {
-            $list .= &Apache::lonhtmlcommon::htmltag('li', $picture.' '.$button->{$picture}, {class => 'LC_menubuttons_inline_text'});
+   foreach my $button (@formarr){
+        foreach my $picture (keys(%{$button})) {
+            $list .= &Apache::lonhtmlcommon::htmltag('li', $picture.' '.$button->{$picture}, {class => 'LC_menubuttons_inline_text', id => ''});
         }
    }
    return $list;
@@ -2517,7 +3154,8 @@ sub handler {
 	               'Adding_External_Resource','Navigate_Content',
 	               'Adding_Folders','Docs_Overview', 'Load_Map',
 	               'Supplemental','Score_Upload_Form','Adding_Pages',
-	               'Importing_LON-CAPA_Resource','Uploading_From_Harddrive',
+	               'Importing_LON-CAPA_Resource','Importing_IMS_Course',
+                       'Uploading_From_Harddrive',
 	               'Check_Resource_Versions','Verify_Content') {
 	$help{$topic}=&Apache::loncommon::help_open_topic('Docs_'.$topic);
     }
@@ -2579,7 +3217,7 @@ sub handler {
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
                                             ['folderpath','pagepath',
                                              'pagesymb','forcesupplement','forcestandard',
-                                             'tools','symb','command']);
+                                             'tools','symb','command','supppath']);
 
 # standard=1: this is a "new-style" course with an uploaded map as top level
 # standard=2: this is a "old-style" course, and there is nothing we can do
@@ -2608,7 +3246,7 @@ sub handler {
     my $addentries = {};
     my $container;
     my $containertag;
-    my $uploadtag;
+    my $pathitem;
 
 # Do we directly jump somewhere?
 
@@ -2649,21 +3287,31 @@ sub handler {
                        }
                    }
                }
-               $path .= '&'.&Apache::lonhtmlcommon::entity_encode($mapurl).'&'.
-                    &Apache::lonhtmlcommon::entity_encode($mapresobj->title()).
+               $path =~ s/^\&//;
+               my $maptitle = $mapresobj->title();
+               if ($mapurl eq 'default') {
+                   $maptitle = 'Main Course Documents';
+               }
+               $path .= (($path ne '')? '&' : '').
+                    &Apache::lonhtmlcommon::entity_encode($mapurl).'&'.
+                    &Apache::lonhtmlcommon::entity_encode($maptitle).
                     ':'.$mapresobj->randompick().
                     ':'.$mapresobj->randomout().
                     ':'.$mapresobj->encrypted().
                     ':'.$mapresobj->randomorder();
            } else {
                my $maptitle = &Apache::lonnet::gettitle($mapurl);
-               $path = '&default&...::::'.
-                   '&'.&Apache::lonhtmlcommon::entity_encode($mapurl).'&'.
-                   &Apache::lonhtmlcommon::entity_encode($maptitle).'::::';
+               if ($mapurl eq 'default') {
+                   $maptitle = 'Main Course Documents';
+               }
+               $path = &Apache::lonhtmlcommon::entity_encode($mapurl).'&'.
+                       &Apache::lonhtmlcommon::entity_encode($maptitle).'::::';
+           }
+           unless ($mapurl eq 'default') {
+               $path = 'default&'.
+                       &Apache::lonhtmlcommon::entity_encode('Main Course Documents').
+                       '::::&'.$path;
            }
-           $path = 'default&'.
-                   &Apache::lonhtmlcommon::entity_encode('Main Course Documents').
-                   $path;
            if ($type eq 'sequence') {
                $env{'form.folderpath'}=$path;
                $env{'form.pagepath'}='';
@@ -2690,10 +3338,10 @@ sub handler {
        $stored_folderpath='docs_sup_folderpath';
     }
 
-# No folderpath, no pagepath, see if we have something stored
-    if ((!$env{'form.folderpath'}) && (!$env{'form.pagepath'})) {
+# No folderpath, no pagepath, and in edit mode, see if we have something stored
+    if ((!$env{'form.folderpath'}) && (!$env{'form.pagepath'}) && $allowed) {
         &Apache::loncommon::restore_course_settings($stored_folderpath,
-                                              {'folderpath' => 'scalar'});
+                                          {'folderpath' => 'scalar'});
     }
    
 # If we are not allowed to make changes, all we can see are supplemental docs
@@ -2725,9 +3373,11 @@ sub handler {
 
 # Store this
     unless ($toolsflag) {
-        &Apache::loncommon::store_course_settings($stored_folderpath,
-                                                  {'pagepath' => 'scalar',
-                                                   'folderpath' => 'scalar'});
+        if ($allowed) {
+            &Apache::loncommon::store_course_settings($stored_folderpath,
+                                                      {'pagepath' => 'scalar',
+                                                       'folderpath' => 'scalar'});
+        }
         if ($env{'form.folderpath'}) {
 	    my (@folderpath)=split('&',$env{'form.folderpath'});
 	    $env{'form.foldername'}=&unescape(pop(@folderpath));
@@ -2741,7 +3391,7 @@ sub handler {
             $container='page';
             $containertag = '<input type="hidden" name="pagepath" value="" />'.
 	                    '<input type="hidden" name="pagesymb" value="" />';
-            $uploadtag = 
+            $pathitem = 
                 '<input type="hidden" name="pagepath" value="'.&HTML::Entities::encode($env{'form.pagepath'},'<>&"').'" />'.
 	        '<input type="hidden" name="pagesymb" value="'.&HTML::Entities::encode($env{'form.pagesymb'},'<>&"').'" />'.
                 '<input type="hidden" name="folderpath" value="" />';
@@ -2755,7 +3405,7 @@ sub handler {
                 }
             }
             $containertag = '<input type="hidden" name="folderpath" value="" />';
-            $uploadtag = '<input type="hidden" name="folderpath" value="'.&HTML::Entities::encode($folderpath,'<>&"').'" />';
+            $pathitem = '<input type="hidden" name="folderpath" value="'.&HTML::Entities::encode($folderpath,'<>&"').'" />';
         }
         if ($r->uri=~/^\/adm\/coursedocs\/showdoc\/(.*)$/) {
            $showdoc='/'.$1;
@@ -2803,11 +3453,19 @@ sub handler {
 	    $script .= &editing_js($udom,$uname,$supplementalflag).
                        &history_tab_js().
                        &inject_data_js().
-                       &Apache::lonhtmlcommon::resize_scrollbox_js('docs',$tabidstr);
+                       &Apache::lonhtmlcommon::resize_scrollbox_js('docs',$tabidstr).
+                       &Apache::lonextresedit::extedit_javascript();
             $addentries = {
                             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"
@@ -2818,22 +3476,26 @@ sub handler {
 
     # Breadcrumbs
     &Apache::lonhtmlcommon::clear_breadcrumbs();
-    unless ($showdoc) {
+
+    if ($showdoc) {
+        $r->print(&Apache::loncommon::start_page("$crstype documents",undef,
+                                                {'force_register' => $showdoc,}));
+    } elsif ($r->uri eq '/adm/supplemental') {
+        my $brcrum = &Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype);
+        $r->print(&Apache::loncommon::start_page("Supplemental $crstype Content",undef,
+                                                {'bread_crumbs' => $brcrum,}));
+    } else {
         &Apache::lonhtmlcommon::add_breadcrumb({
             href=>"/adm/coursedocs",text=>"$crstype Contents"});
 
         $r->print(&Apache::loncommon::start_page("$crstype Contents", $script,
-                                                 {'force_register' => $showdoc,
-                                                  'add_entries'    => $addentries,
-                                                 })
+                                                 {'add_entries'    => $addentries}
+                                                )
                  .&Apache::loncommon::help_open_menu('','',273,'RAT')
                  .&Apache::lonhtmlcommon::breadcrumbs(
                      'Editing '.$crstype.' Contents',
                      'Docs_Adding_Course_Doc')
         );
-    } else {
-        $r->print(&Apache::loncommon::start_page("$crstype documents",undef,
-                                                {'force_register' => $showdoc,}));
     }
 
   my %allfiles = ();
@@ -2900,10 +3562,12 @@ 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',
-                'upld' => 'Import Document',
+                'upfi' => 'Upload File',
+                'upld' => 'Import Content',
                 'srch' => 'Search',
                 'impo' => 'Import',
 		'lnks' => 'Import from Stored Links',
+                'impm' => 'Import from Assembled Map',
                 'selm' => 'Select Map',
                 'load' => 'Load Map',
                 'reco' => 'Recover Deleted Documents',
@@ -2923,9 +3587,14 @@ sub handler {
 				'abou' => 'Personal Information Page for a User',
                 'imsf' => 'IMS Import',
                 'imsl' => 'Import IMS package',
+                'cms'  => 'Origin of IMS package',
+                'se'   => 'Select',
                 'file' =>  'File',
                 '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',
@@ -2946,56 +3615,91 @@ 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 $fileuploada = "<br clear='all' /><input type='submit' value='".$lt{'upld'}."' /> $help{'Uploading_From_Harddrive'}";
 	my $fileuploadform=(<<FUFORM);
-	<form name="uploaddocument" action="/adm/coursedocs" method="post" enctype="multipart/form-data">
+        <a class="LC_menubuttons_link" href="javascript:toggleUpload('doc');">
+        $lt{'upfi'}</a> $help{'Uploading_From_Harddrive'}
+        <form name="uploaddocument" action="/adm/coursedocs" method="post" enctype="multipart/form-data">
+        <fieldset id="uploaddocform" style="display: none;" />
+        <legend>$lt{'upfi'}</legend>
 	<input type="hidden" name="active" value="aa" />
 	$fileupload
 	<br />
 	$lt{'title'}:<br />
 	<input type="text" size="60" name="comment" />
-	$uploadtag
+	$pathitem
 	<input type="hidden" name="cmd" value="upload_default" />
 	<br />
 	<span class="LC_nobreak" style="float:left">
 	$checkbox
 	</span>
+        <br clear="all" />
+        <input type="submit" value="$lt{'upld'}" />
+        </fieldset>
+        </form>
 FUFORM
-    $fileuploadform .= $fileuploada.'</form>';
 
-	my $simpleeditdefaultform=(<<SEDFFORM);
-	<form action="/adm/coursedocs" method="post" name="simpleeditdefault">
+	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>
+
 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>" },
+	my @importpubforma = (
+	{ '<img class="LC_noBorder LC_middle" src="/res/adm/pages/src.png" alt="'.$lt{srch}.'"  onclick="javascript:groupsearch()" />' => $pathitem."<a class='LC_menubuttons_link' href='javascript:groupsearch()'>$lt{'srch'}</a>" },
 	{ '<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 }
 	);
-	$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);
-      <form action="/adm/coursedocs" method="post" name="newext">
-      $uploadtag
-      <input type="hidden" name="importdetail" value="" />
-      <a class="LC_menubuttons_link" href="javascript:makenewext('newext');">$lt{'extr'}</a>$help{'Adding_External_Resource'}
-      </form>
-ERFORM
-
-
+	$importpubform = &create_form_ul(&create_list_elements(@importpubforma));
+        my $extresourcesform =
+            &Apache::lonextresedit::extedit_form(0,0,undef,undef,$pathitem,
+                                                 $help{'Adding_External_Resource'});
     if ($allowed) {
-	&update_paste_buffer($coursenum,$coursedom);
+        my $folder = $env{'form.folder'};
+        if ($folder eq '') {
+            $folder='default';
+        }
+	&update_paste_buffer($coursenum,$coursedom,$folder);
 	$r->print(<<HIDDENFORM);
 	<form name="renameform" method="post" action="/adm/coursedocs">
    <input type="hidden" name="title" />
@@ -3006,18 +3710,23 @@ ERFORM
  </form>
 
 HIDDENFORM
-        $r->print(&makesimpleeditform($uploadtag)."\n".
-                  &makedocslogform($uploadtag."\n".
+        $r->print(&makesimpleeditform($pathitem)."\n".
+                  &makedocslogform($pathitem."\n".
                                    '<input type="hidden" name="folder" value="'.
                                    $env{'form.folder'}.'" />'."\n"));
     }
 
 # Generate the tabs
-    my $mode;
+    my ($mode,$needs_end);
     if (($supplementalflag) && (!$allowed)) {
-        &Apache::lonnavdisplay::startContentScreen($r,'supplemental');
+        my @folders = split('&',$env{'form.folderpath'});
+        unless (@folders > 2) {
+            &Apache::lonnavdisplay::startContentScreen($r,'supplemental');
+            $needs_end = 1;
+        }
     } else {
         $r->print(&startContentScreen(($supplementalflag?'suppdocs':'docs')));
+        $needs_end = 1;
     }
 
 #
@@ -3030,7 +3739,7 @@ HIDDENFORM
            $folder='default';
 	   $savefolderpath = $env{'form.folderpath'};
 	   $env{'form.folderpath'}='default&'.&escape(&mt('Content'));
-           $uploadtag = '<input type="hidden" name="folderpath" value="'.
+           $pathitem = '<input type="hidden" name="folderpath" value="'.
 	       &HTML::Entities::encode($env{'form.folderpath'},'<>&"').'" />';
        }
        my $postexec='';
@@ -3044,27 +3753,18 @@ HIDDENFORM
        } else {
            #$postexec='self.close();';
        }
-       my $folderseq='/uploaded/'.$coursedom.'/'.$coursenum.'/default_'.time.
-                     '.sequence';
-       my $pageseq = '/uploaded/'.$coursedom.'/'.$coursenum.'/default_'.time.
-                     '.page';
+       my $folderseq='/uploaded/'.$coursedom.'/'.$coursenum.'/default_new.sequence';
+       my $pageseq = '/uploaded/'.$coursedom.'/'.$coursenum.'/default_new.page';
 	my $container='sequence';
 	if ($env{'form.pagepath'}) {
 	    $container='page';
 	}
 	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" />
-	$uploadtag
+	$pathitem
 	<input type="hidden" name="importdetail" 
 	value="$lt{'navc'}=/adm/navmaps" />
 	<a class="LC_menubuttons_link" href="javascript:document.newnav.submit()">$lt{'navc'}</a>
@@ -3074,7 +3774,7 @@ NNFORM
 	my $newsmppageform=(<<NSPFORM);
 	<form action="/adm/coursedocs" method="post" name="newsmppg">
 	<input type="hidden" name="active" value="cc" />
-	$uploadtag
+	$pathitem
 	<input type="hidden" name="importdetail" value="" />
 	<a class="LC_menubuttons_link" href="javascript:makesmppage();"> $lt{'sipa'}</a>
 	$help{'Simple Page'}
@@ -3084,7 +3784,7 @@ NSPFORM
 	my $newsmpproblemform=(<<NSPROBFORM);
 	<form action="/adm/coursedocs" method="post" name="newsmpproblem">
 	<input type="hidden" name="active" value="cc" />
-	$uploadtag
+	$pathitem
 	<input type="hidden" name="importdetail" value="" />
 	<a class="LC_menubuttons_link" href="javascript:makesmpproblem();">$lt{'sipr'}</a>
 	$help{'Simple Problem'}
@@ -3095,7 +3795,7 @@ NSPROBFORM
 	my $newdropboxform=(<<NDBFORM);
 	<form action="/adm/coursedocs" method="post" name="newdropbox">
 	<input type="hidden" name="active" value="cc" />
-	$uploadtag
+	$pathitem
 	<input type="hidden" name="importdetail" value="" />
 	<a class="LC_menubuttons_link" href="javascript:makedropbox();">$lt{'drbx'}</a>
 	</form>
@@ -3104,7 +3804,7 @@ NDBFORM
 	my $newexuploadform=(<<NEXUFORM);
 	<form action="/adm/coursedocs" method="post" name="newexamupload">
 	<input type="hidden" name="active" value="cc" />
-	$uploadtag
+	$pathitem
 	<input type="hidden" name="importdetail" value="" />
 	<a class="LC_menubuttons_link" href="javascript:makeexamupload();">$lt{'scuf'}</a>
 	$help{'Score_Upload_Form'}
@@ -3114,7 +3814,7 @@ NEXUFORM
 	my $newbulform=(<<NBFORM);
 	<form action="/adm/coursedocs" method="post" name="newbul">
 	<input type="hidden" name="active" value="cc" />
-	$uploadtag
+	$pathitem
 	<input type="hidden" name="importdetail" value="" />
 	<a class="LC_menubuttons_link" href="javascript:makebulboard();" >$lt{'bull'}</a>
 	$help{'Bulletin Board'}
@@ -3124,7 +3824,7 @@ NBFORM
 	my $newaboutmeform=(<<NAMFORM);
 	<form action="/adm/coursedocs" method="post" name="newaboutme">
 	<input type="hidden" name="active" value="cc" />
-	$uploadtag
+	$pathitem
 	<input type="hidden" name="importdetail" 
 	value="$plainname=/adm/$udom/$uname/aboutme" />
 	<a class="LC_menubuttons_link" href="javascript:document.newaboutme.submit()">$lt{'mypi'}</a>
@@ -3135,7 +3835,7 @@ NAMFORM
 	my $newaboutsomeoneform=(<<NASOFORM);
 	<form action="/adm/coursedocs" method="post" name="newaboutsomeone">
 	<input type="hidden" name="active" value="cc" />
-	$uploadtag
+	$pathitem
 	<input type="hidden" name="importdetail" value="" />
 	<a class="LC_menubuttons_link" href="javascript:makeabout();">$lt{'abou'}</a>
 	</form>
@@ -3145,7 +3845,7 @@ NASOFORM
 	my $newrosterform=(<<NROSTFORM);
 	<form action="/adm/coursedocs" method="post" name="newroster">
 	<input type="hidden" name="active" value="cc" />
-	$uploadtag
+	$pathitem
 	<input type="hidden" name="importdetail" 
 	value="$lt{'rost'}=/adm/viewclasslist" />
 	<a class="LC_menubuttons_link" href="javascript:document.newroster.submit()">$lt{'rost'}</a>
@@ -3177,7 +3877,7 @@ NPFORM
 
 	$newfolderform=(<<NFFORM);
 	<form action="/adm/coursedocs" method="post" name="newfolder">
-	<input type="hidden" name="folderpath" value="$path" />
+	$pathitem
 	<input type="hidden" name="importdetail" value="" />
 	<input type="hidden" name="active" value="aa" />
 	<a href="javascript:makenewfolder(document.newfolder,'$folderseq');">$lt{'newf'}</a>$help{'Adding_Folders'}
@@ -3187,7 +3887,7 @@ NFFORM
 	my $newsylform=(<<NSYLFORM);
 	<form action="/adm/coursedocs" method="post" name="newsyl">
 	<input type="hidden" name="active" value="cc" />
-	$uploadtag
+	$pathitem
 	<input type="hidden" name="importdetail" 
 	value="$lt{'syll'}=/public/$coursedom/$coursenum/syllabus" />
 	<a class="LC_menubuttons_link" href="javascript:document.newsyl.submit()">$lt{'syll'}</a>
@@ -3199,7 +3899,7 @@ NSYLFORM
 	my $newgroupfileform=(<<NGFFORM);
 	<form action="/adm/coursedocs" method="post" name="newgroupfiles">
 	<input type="hidden" name="active" value="cc" />
-	$uploadtag
+	$pathitem
 	<input type="hidden" name="importdetail"
 	value="$lt{'grpo'}=/adm/$coursedom/$coursenum/aboutme" />
 	<a class="LC_menubuttons_link" href="javascript:document.newgroupfiles.submit()">$lt{'grpo'}</a>
@@ -3216,9 +3916,11 @@ NGFFORM
 
 
         my @importdoc = (
-        {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/extres.png" alt="'.$lt{extr}.'" onclick="javascript:makenewext(\'newext\');" />'=>$extresourcesform},
-        {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/ims.png" alt="'.$lt{imsf}.'" onclick="javascript:makeims();" />'=>$imspform},);
-        $fileuploadform =  &create_form_ul(&create_list_elements(@importdoc)) . '<hr id="cc_hrule" style="width:0px;text-align:left;margin-left:0" />' . $fileuploadform;
+        {'<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));
 
         @gradingforma=(
         {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/simpprob.png" alt="'.$lt{sipr}.'" onclick="javascript:makesmpproblem();" />'=>$newsmpproblemform},
@@ -3239,7 +3941,7 @@ NGFFORM
 
 my %orderhash = (
                 'aa' => ['Import Content',$fileuploadform],
-                'bb' => ['Published Content',$simpleeditdefaultform],
+                'bb' => ['Published Content',$importpubform],
                 'cc' => ['Grading Resources',$gradingform],
                 );
 unless ($env{'form.pagepath'}) {
@@ -3251,7 +3953,7 @@ unless ($env{'form.pagepath'}) {
  $hadchanges=0;
        unless (($supplementalflag || $toolsflag)) {
           my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$crstype,
-                              $supplementalflag,\%orderhash,$iconpath);
+                              $supplementalflag,\%orderhash,$iconpath,$pathitem);
           if ($error) {
              $r->print('<p><span class="LC_error">'.$error.'</span></p>');
           }
@@ -3276,16 +3978,18 @@ unless ($env{'form.pagepath'}) {
 	  $env{'form.folderpath'} = $savefolderpath;
        }
        $env{'form.pagepath'} = '';
+       $pathitem = '<input type="hidden" name="folderpath" value="'.
+                    &HTML::Entities::encode($env{'form.folderpath'},'<>&"').'" />';
        if ($allowed) {
 	   my $folderseq=
-	       '/uploaded/'.$coursedom.'/'.$coursenum.'/supplemental_'.time.
-	       '.sequence';
+	       '/uploaded/'.$coursedom.'/'.$coursenum.'/supplemental_new.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 />
@@ -3297,35 +4001,30 @@ unless ($env{'form.pagepath'}) {
 	$lt{'comment'}:<br />
 	<textarea cols="50" rows="4" name="comment"></textarea>
 	<br />
-	<input type="hidden" name="folderpath" value="$path" />
+	$pathitem
 	<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">
 	<input type="hidden" name="active" value="ee" />
-	<input type="hidden" name="folderpath" value="$path" />
+        $pathitem
 	<input type="hidden" name="importdetail" value="" />
 	<a class="LC_menubuttons_link" href="javascript:makenewfolder(document.supnewfolder,'$folderseq');">$lt{'newf'}</a> 
 	$help{'Adding_Folders'}
 	</form>
 SNFFORM
 	
-
-	my $supnewextform=(<<SNEFORM);
-	<form action="/adm/coursedocs" method="post" name="supnewext">
-	<input type="hidden" name="active" value="ff" />
-	<input type="hidden" name="folderpath" value="$path" />
-	<input type="hidden" name="importdetail" value="" />
-	<a class="LC_menubuttons_link" href="javascript:makenewext('supnewext');">$lt{'extr'}</a> $help{'Adding_External_Resource'}
-	</form>
-SNEFORM
+        my $supextform =
+            &Apache::lonextresedit::extedit_form(1,0,undef,undef,$pathitem,
+                                                 $help{'Adding_External_Resource'});
 
 	my $supnewsylform=(<<SNSFORM);
 	<form action="/adm/coursedocs" method="post" name="supnewsyl">
 	<input type="hidden" name="active" value="ff" />
-	<input type="hidden" name="folderpath" value="$path" />
+        $pathitem
 	<input type="hidden" name="importdetail" 
 	value="Syllabus=/public/$coursedom/$coursenum/syllabus" />
 	<a class="LC_menubuttons_link" href="javascript:document.supnewsyl.submit()">$lt{'syll'}</a>
@@ -3336,7 +4035,7 @@ SNSFORM
 	my $supnewaboutmeform=(<<SNAMFORM);
 	<form action="/adm/coursedocs" method="post" name="supnewaboutme">
 	<input type="hidden" name="active" value="ff" />
-	<input type="hidden" name="folderpath" value="$path" />
+        $pathitem
 	<input type="hidden" name="importdetail" 
 	value="$plainname=/adm/$udom/$uname/aboutme" />
 	<a class="LC_menubuttons_link" href="javascript:document.supnewaboutme.submit()">$lt{'mypi'}</a>
@@ -3352,10 +4051,13 @@ my @specialdocs = (
             =>$supnewaboutmeform},
 		);
 my @supimportdoc = (
-		{'<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)) . '<hr id="ee_hrule" style="width:0px;text-align:left;margin-left:0" />' . $supupdocform;
+		{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/extres.png" alt="'.$lt{extr}.'" onclick="toggleUpload(\'suppext\')" />'
+            =>$supextform},
+                {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/pdfupload.png" alt="'.$lt{upl}.'" onclick="javascript:toggleUpload(\'suppdoc\');" />'
+            =>$supupdocform},
+                   );
+
+$supupdocform =  &create_form_ul(&create_list_elements(@supimportdoc));
 my %suporderhash = (
 		'00' => ['Supnewfolder', $supnewfolderform],
                 'ee' => ['Import Content',$supupdocform],
@@ -3363,20 +4065,22 @@ my %suporderhash = (
                 );
         if ($supplementalflag) {
            my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$crstype,
-                               $supplementalflag,\%suporderhash,$iconpath);
+                               $supplementalflag,\%suporderhash,$iconpath,$pathitem);
            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);
+                            $supplementalflag,'',$iconpath,$pathitem);
         if ($error) {
             $r->print('<p><span class="LC_error">'.$error.'</span></p>');
         }
     }
 
-    $r->print(&endContentScreen());
+    if ($needs_end) {
+        $r->print(&endContentScreen());
+    }
 
     if ($allowed) {
 	$r->print('
@@ -3390,7 +4094,7 @@ my %suporderhash = (
   } elsif ($showdoc) {
 # -------------------------------------------------------- This is showdoc mode
       $r->print("<h1>".&mt('Uploaded Document').' - '.
-		&Apache::lonnet::gettitle($r->uri).'</h1><p>'.
+		&Apache::lonnet::gettitle($r->uri).'</h1><p class="LC_warning">'.
 &mt('It is recommended that you use an up-to-date virus scanner before handling this file.')."</p><table>".
                 &entryline(0,&mt("Click to download or use your browser's Save Link function"),$showdoc).'</table>');
   }
@@ -3519,7 +4223,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);
+                ($errtext,$fatal) = &storemap($docuname,$docudom,$map,1);
                 if ($fatal) {
                     if ($container eq 'page') {
                         $delwarning = &mt('An error occurred updating the contents of the current page.');
@@ -3670,7 +4374,6 @@ 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";
@@ -3727,6 +4430,10 @@ 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();
@@ -3746,6 +4453,11 @@ sub editing_js {
         $backtourl = '/adm/supplemental';
     }
 
+    my $fieldsets = "'ext','doc','ims'";
+    if ($supplementalflag) {
+        $fieldsets = "'suppext','suppdoc'";
+    }
+
     return <<ENDNEWSCRIPT;
 function makenewfolder(targetform,folderseq) {
     var foldername=prompt('$lt{"p_mnf"}','$lt{"t_mnf"}');
@@ -3763,22 +4475,6 @@ function makenewpage(targetform,folderse
     }
 }
 
-function makenewext(targetname) {
-    this.document.forms.extimport.useform.value=targetname;
-    this.document.forms.extimport.title.value='';
-    this.document.forms.extimport.url.value='';
-    this.document.forms.extimport.residx.value='';
-    window.open('/adm/rat/extpickframe.html');
-}
-
-function edittext(targetname,residx,title,url) {
-    this.document.forms.extimport.useform.value=targetname;
-    this.document.forms.extimport.residx.value=residx;
-    this.document.forms.extimport.url.value=url;
-    this.document.forms.extimport.title.value=title;
-    window.open('/adm/rat/extpickframe.html');
-}
-
 function makeexamupload() {
    var title=prompt('$lt{"p_mxu"}');
    if (title) {
@@ -3843,19 +4539,46 @@ function makeabout() {
 }
 }
 
-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 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 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 toggleMap() {
+    var disp = 'none';
+    if (document.getElementById('importmapform')) {
+        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 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 changename(folderpath,index,oldtitle,container,pagesymb) {
@@ -4009,6 +4732,8 @@ 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 == '') {
@@ -4235,6 +4960,22 @@ 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()