--- loncom/interface/londocs.pm	2012/10/31 12:54:13	1.501
+++ loncom/interface/londocs.pm	2013/01/10 17:10:30	1.531
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.501 2012/10/31 12:54:13 raeburn Exp $
+# $Id: londocs.pm,v 1.531 2013/01/10 17:10:30 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -40,7 +40,7 @@ use Apache::lonxml;
 use Apache::lonclonecourse;
 use Apache::lonnavmaps;
 use Apache::lonnavdisplay();
-use Apache::lonuserstate();
+use Apache::lonextresedit();
 use HTML::Entities;
 use HTML::TokeParser;
 use GDBM_File;
@@ -152,7 +152,7 @@ sub dumpcourse {
             $r->print(&endContentScreen());
             return '';
         }
-	my ($ca,$cd)=split(/\@/,$env{'form.authorspace'});
+	my ($ca,$cd)=split(/\:/,$env{'form.authorspace'});
 	$r->print('<h3>'.&mt('Copying Files').'</h3>');
 	my $title=$env{'form.authorfolder'};
 	$title=&clean($title);
@@ -270,7 +270,9 @@ sub dumpcourse {
 
 sub group_import {
     my ($coursenum, $coursedom, $folder, $container, $caller, @files) = @_;
-
+    my ($donechk,$allmaps,%hierarchy,%titles,%addedmaps,%removefrommap,
+        %removeparam,$importuploaded,$fixuperrors);
+    $allmaps = {};
     while (@files) {
 	my ($name, $url, $residx) = @{ shift(@files) };
         if (($url =~ m{^/uploaded/\Q$coursedom\E/\Q$coursenum\E/(default_\d+\.)(page|sequence)$})
@@ -296,6 +298,24 @@ sub group_import {
             }
         }
 	if ($url) {
+            if (($caller eq 'londocs') &&
+                ($folder =~ /^default/)) {
+                unless ($donechk) {
+                    my $chome = &Apache::lonnet::homeserver($coursenum,$coursedom);
+                    my $cid = $coursedom.'_'.$coursenum;
+                    $allmaps =
+                        &Apache::loncommon::allmaps_incourse($coursedom,$coursenum,
+                                                             $chome,$cid);
+                    $donechk = 1;
+                }
+                if ($url =~ m{^/uploaded/\Q$coursedom\E/\Q$coursenum\E/(default_\d+\.)(page|sequence)$}) {
+                    &contained_map_check($url,$folder,\%removefrommap,\%removeparam,
+                                         \%addedmaps,\%hierarchy,\%titles,$allmaps);
+                    $importuploaded = 1;
+                } elsif ($url =~ m{^/res/.+\.(page|sequence)$}) {
+                    next if ($allmaps->{$url});
+                }
+            }
 	    if (!$residx
 		|| defined($LONCAPA::map::zombies[$residx])) {
 		$residx = &LONCAPA::map::getresidx($url,$residx);
@@ -309,62 +329,27 @@ sub group_import {
 		join(':', ($name, $url, $ext, 'normal', 'res'));
 	}
     }
-    return &storemap($coursenum, $coursedom, $folder.'.'.$container,1);
-}
-
-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 $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,
-		       'title'=>$name,
-		       'text'=>$name,
-		       'no_mt'=>1,
-		       });
-	$plain.=$name.' &gt; ';
-    }
-    $plain=~s/\&gt\;\s*$//;
-    return (&Apache::lonhtmlcommon::breadcrumbs(undef,undef,0,'nohelp',
-					       undef, undef, 1 ),$randompick,$ishidden,
-                                               $isencrypted,$plain,$is_random_order);
+    if ($importuploaded) {
+        my %import_errors;
+        my %updated = (
+                          removefrommap => \%removefrommap,
+                          removeparam   => \%removeparam,
+                      );
+        &apply_fixups($folder,1,$coursedom,$coursenum,\%import_errors,\%updated);
+        if (keys(%import_errors) > 0) {
+            $fixuperrors =
+                '<p span class="LC_warning">'."\n".
+                &mt('The following files are either dependencies of a web page or references within a folder and/or composite page for which errors occurred during import:')."\n".
+                '<ul>'."\n";
+            foreach my $key (sort(keys(%import_errors))) {
+                $fixuperrors .= '<li>'.$key.'</li>'."\n";
+            }
+            $fixuperrors .= '</ul></p>'."\n";
+        }
+    }
+    my ($errtext,$fatal) =
+        &storemap($coursenum, $coursedom, $folder.'.'.$container,1);
+    return ($errtext,$fatal,$fixuperrors);
 }
 
 sub log_docs {
@@ -445,17 +430,15 @@ sub docs_change_log {
     my %orderhash;
     my $container='sequence';
     my $pathitem;
-    if ($env{'form.pagepath'}) {
+    if ($env{'form.folderpath'} =~ /\:1$/) {
         $container='page';
-        $pathitem = '<input type="hidden" name="pagepath" value="'.
-                    &HTML::Entities::encode($env{'form.pagepath'},'<>&"').'" />';
-    } else {
-        my $folderpath=$env{'form.folderpath'};
-        if ($folderpath eq '') {
-            $folderpath = 'default&'.&escape(&mt('Main '.$crstype.' Documents'));
-        }
-        $pathitem = '<input type="hidden" name="folderpath" value="'.&HTML::Entities::encode($folderpath,'<>&"').'" />';
     }
+    my $folderpath=$env{'form.folderpath'};
+    if ($folderpath eq '') {
+        $folderpath = 'default&'.&escape(&mt('Main '.$crstype.' Documents').':::::');
+    }
+    $pathitem = '<input type="hidden" name="folderpath" value="'.
+                &HTML::Entities::encode($folderpath,'<>&"').'" />';
     my $readfile="/uploaded/$coursedom/$coursenum/$folder.$container";
     my $jumpto = $readfile;
     $jumpto =~ s{^/}{};
@@ -463,7 +446,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));
@@ -706,7 +690,7 @@ sub print_paste_buffer {
         $is_external = 1;
     }
 
-    my ($canpaste,$nopaste,$othercrs,$areachange,$is_uploaded_map);
+    my ($canpaste,$nopaste,$othercrs,$areachange);
     if ($folder =~ /^supplemental/) {
         $canpaste = &supp_pasteable($env{'docs.markedcopy_url'});
         unless ($canpaste) {
@@ -813,16 +797,9 @@ sub print_paste_buffer {
             }
         }
         $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'},'<>&"').'" />
-');
-        } else {
-            $r->print('
+        $r->print('
         <input type="hidden" name="folderpath" value="'.&HTML::Entities::encode($env{'form.folderpath'},'<>&"').'" />
 ');
-        }
         $r->print('</form>');
     } else {
         $r->print(&mt('Paste buffer contains:').' '.$buffer.
@@ -957,30 +934,23 @@ sub do_paste_from_buffer {
         %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);
+        my ($allmaps,%hierarchy,%titles);
+        $allmaps = {};
         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;
-                }
-            }
+            $allmaps =
+                &Apache::loncommon::allmaps_incourse($coursedom,$coursenum,
+                                                     $env{"course.$env{'request.course.id'}.home"},
+                                                     $env{'request.course.id'});
         }
         &contained_map_check($url,$folder,\%removefrommap,\%removeparam,
-                             \%addedmaps,\%hierarchy,\%titles,\%allmaps);
+                             \%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);
+                                    $srcdom,$srcnum,\$title,$allmaps,\%newurls);
                 if ($error) {
                     return ($error);
                 }
@@ -996,14 +966,14 @@ sub do_paste_from_buffer {
             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,
+                                          $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,
+                &url_paste_fixups($url,$folder,$prefixchg,$coursedom,$coursenum,$allmaps,\%rewrites,
                                   \%retitles,\%copies,\%dbcopies,\%zombies,\%params,\%mapmoves,
                                   \%mapchanges,\%tomove,\%newsubdir,\%newurls); 
             }
@@ -1012,7 +982,7 @@ sub do_paste_from_buffer {
             &Apache::lonnet::delenv('docs.markedcopy');
 # if pasting published map (main content are only) check map is not already in course
             if ($folder =~ /^default/) {
-                if ($allmaps{$url}) {
+                if ((ref($allmaps) eq 'HASH') && ($allmaps->{$url})) {
                     return (&mt('Paste failed: only one instance of a particular published sequence or page is allowed within each course.'));
                 }
             }
@@ -1078,11 +1048,28 @@ sub do_paste_from_buffer {
     }
 # Apply any changes to maps, or copy dependencies for uploaded HTML pages 
     my ($result,$save_err);
+    my %updated = (
+                    rewrites      => \%rewrites,
+                    zombies       => \%zombies,
+                    removefrommap => \%removefrommap,
+                    removeparam   => \%removeparam,
+                    dbcopies      => \%dbcopies,
+                    retitles      => \%retitles,
+                  );
+    my %info = (
+                   newsubdir => \%newsubdir,
+                   params    => \%params,
+                   before    => \%before,
+                   after     => \%after,
+               );
+    my %moves = (
+                   copies   => \%copies,
+                   docmoves => \%docmoves,
+                   mapmoves => \%mapmoves,
+                );
     $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);
+        &apply_fixups($folder,$is_map,$coursedom,$coursenum,$errors,
+                      \%updated,\%info,\%moves,$prefixchg,$oldurl,$url,'paste');
     if ($result eq 'ok') {
         if ($is_map) { 
             my ($errtext,$fatal) = &mapread($coursenum,$coursedom,
@@ -1242,7 +1229,7 @@ sub contained_map_check {
                         $titles->{$url}{$token->[2]->{'id'}} = $token->[2]->{'title'};
                     } else {
                         if ($allmaps->{$ressrc}) {
-                            $removefrommap->{$url}{$token->[2]->{'id'}} = $ressrc; 
+                            $removefrommap->{$url}{$token->[2]->{'id'}} = $ressrc;
                         } elsif (ref($addedmaps->{$ressrc}) eq 'ARRAY') {
                             $removefrommap->{$url}{$token->[2]->{'id'}} = $ressrc;
                         } else {
@@ -1266,15 +1253,6 @@ sub contained_map_check {
     return;
 }
 
-sub reinit_role {
-    my ($cdom,$cnum,$chome) = @_;
-    my ($furl,$ferr) = &Apache::lonuserstate::readmap("$cdom/$cnum");
-    unless ($ferr) {
-        &Apache::loncommon::update_content_constraints($cdom,$cnum,$chome,$cdom.'_'.$cnum);
-    }
-    return;
-}
-
 sub url_paste_fixups {
     my ($oldurl,$folder,$prefixchg,$cdom,$cnum,$allmaps,$rewrites,$retitles,$copies,
         $dbcopies,$zombies,$params,$mapmoves,$mapchanges,$tomove,$newsubdir,$newurls) = @_;
@@ -1393,23 +1371,71 @@ sub url_paste_fixups {
 }
 
 sub apply_fixups {
-    my ($folder,$is_map,$prefixchg,$cdom,$cnum,$oldurl,$url,$removefrommap,
-        $removeparam,$rewrites,$retitles,$copies,$dbcopies,$zombies,$params,
-        $docmoves,$mapmoves,$newsubdir,$errors,$before,$after) = @_;
-    foreach my $key (keys(%{$copies}),keys(%{$docmoves})) {
+    my ($folder,$is_map,$cdom,$cnum,$errors,$updated,$info,$moves,$prefixchg,
+        $oldurl,$url,$caller) = @_;
+    my (%rewrites,%zombies,%removefrommap,%removeparam,%dbcopies,%retitles,
+        %params,%newsubdir,%before,%after,%copies,%docmoves,%mapmoves);
+    if (ref($updated) eq 'HASH') {
+        if (ref($updated->{'rewrites'}) eq 'HASH') {
+            %rewrites = %{$updated->{'rewrites'}};
+        }
+        if (ref($updated->{'zombies'}) eq 'HASH') {
+            %zombies = %{$updated->{'zombies'}};
+        }
+        if (ref($updated->{'removefrommap'}) eq 'HASH') {
+            %removefrommap = %{$updated->{'removefrommap'}};
+        }
+        if (ref($updated->{'removeparam'}) eq 'HASH') {
+            %removeparam = %{$updated->{'removeparam'}};
+        }
+        if (ref($updated->{'dbcopies'}) eq 'HASH') {
+            %dbcopies = %{$updated->{'dbcopies'}};
+        }
+        if (ref($updated->{'retitles'}) eq 'HASH') {
+            %retitles = %{$updated->{'retitles'}};
+        }
+    }
+    if (ref($info) eq 'HASH') {
+        if (ref($info->{'newsubdir'}) eq 'HASH') {
+            %newsubdir = %{$info->{'newsubdir'}};
+        }
+        if (ref($info->{'params'}) eq 'HASH') {
+            %params = %{$info->{'params'}};
+        }
+        if (ref($info->{'before'}) eq 'HASH') {
+            %before = %{$info->{'before'}};
+        }
+        if (ref($info->{'after'}) eq 'HASH') {
+            %after = %{$info->{'after'}};
+        }
+    }
+    if (ref($moves) eq 'HASH') {
+        if (ref($moves->{'copies'}) eq 'HASH') {
+            %copies = %{$moves->{'copies'}};
+        }
+        if (ref($moves->{'docmoves'}) eq 'HASH') {
+            %docmoves = %{$moves->{'docmoves'}};
+        }
+        if (ref($moves->{'mapmoves'}) eq 'HASH') {
+            %mapmoves = %{$moves->{'mapmoves'}};
+        }
+    }
+    foreach my $key (keys(%copies),keys(%docmoves)) {
         my @allcopies;
-        if (ref($copies->{$key}) eq 'HASH') {
-            my %added;
-            foreach my $innerkey (keys(%{$copies->{$key}})) {
-                if (($innerkey ne '') && (!$added{$innerkey})) {
-                    push(@allcopies,$innerkey);
-                    $added{$innerkey} = 1;
+        if (exists($copies{$key})) {
+            if (ref($copies{$key}) eq 'HASH') {
+                my %added;
+                foreach my $innerkey (keys(%{$copies{$key}})) {
+                    if (($innerkey ne '') && (!$added{$innerkey})) {
+                        push(@allcopies,$innerkey);
+                        $added{$innerkey} = 1;
+                    }
                 }
+                undef(%added);
             }
-            undef(%added);
         }
         if ($key eq $oldurl) {
-            if ((exists($docmoves->{$key}))) {
+            if ((exists($docmoves{$key}))) {
                 unless (grep(/^\Q$oldurl\E/,@allcopies)) {
                     push(@allcopies,$oldurl);
                 }
@@ -1423,16 +1449,16 @@ sub apply_fixups {
                     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};
+                        if (($key eq $oldurl) && (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 ($prefixchg && $before{'doc'} && $after{'doc'}) {
+                                $storefn =~ s/^\Q$before{'doc'}\E/$after{'doc'}/;
                             }
-                            if ($newsubdir->{$key}) {
-                                $storefn =~ s#^(docs|supplemental)/\Q$oldsubdir\E/#$1/$newsubdir->{$key}#;
+                            if ($newsubdir{$key}) {
+                                $storefn =~ s#^(docs|supplemental)/\Q$oldsubdir\E/#$1/$newsubdir{$key}#;
                             }
                         }
                         &copy_dependencies($item,$storefn,$relpath,$errors,\$content);
@@ -1440,7 +1466,7 @@ sub apply_fixups {
                             &Apache::lonclonecourse::writefile($env{'request.course.id'},
                                                                $storefn.$fname,$content);
                         if ($copyurl eq '/adm/notfound.html') {
-                            if ((ref($docmoves) eq 'HASH') && (exists($docmoves->{$oldurl}))) {
+                            if (exists($docmoves{$oldurl})) {
                                 return &mt('Paste failed: an error occurred copying the file.');
                             } elsif (ref($errors) eq 'HASH') {
                                 $errors->{$item} = 1;
@@ -1451,14 +1477,14 @@ sub apply_fixups {
             }
         }
     }
-    foreach my $key (keys(%{$mapmoves})) {
+    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 ($prefixchg && $before{'map'} && $after{'map'}) {
+            $storefn =~ s/^\Q$before{'map'}\E/$after{'map'}/;
         }
-        if ($newsubdir->{$key}) {
-            $storefn =~ s/^((?:default|supplemental)_)(\d+)/$1$newsubdir->{$key}/;
+        if ($newsubdir{$key}) {
+            $storefn =~ s/^((?:default|supplemental)_)(\d+)/$1$newsubdir{$key}/;
         }
         my $mapcontent = &Apache::lonnet::getfile($key);
         if ($mapcontent eq '-1') {
@@ -1478,48 +1504,39 @@ sub apply_fixups {
     }
     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;
+        if (ref($updated) eq 'HASH') {
+            foreach my $type (keys(%{$updated})) {
+                if (ref($updated->{$type}) eq 'HASH') {
+                    foreach my $key (keys(%{$updated->{$type}})) {
+                        $updates{$key} = 1;
+                    }
+                }
+            }
         }
         foreach my $key (keys(%updates)) {
             my (%torewrite,%toretitle,%toremove,%remparam,%currparam,%zombie,%newdb);
-            if (ref($rewrites->{$key}) eq 'HASH') {
-                %torewrite = %{$rewrites->{$key}};
+            if (ref($rewrites{$key}) eq 'HASH') {
+                %torewrite = %{$rewrites{$key}};
             }
-            if (ref($retitles->{$key}) eq 'HASH') {
-                %toretitle = %{$retitles->{$key}};
+            if (ref($retitles{$key}) eq 'HASH') {
+                %toretitle = %{$retitles{$key}};
             }
-            if (ref($removefrommap->{$key}) eq 'HASH') {
-                %toremove = %{$removefrommap->{$key}};
+            if (ref($removefrommap{$key}) eq 'HASH') {
+                %toremove = %{$removefrommap{$key}};
             }
-            if (ref($removeparam->{$key}) eq 'HASH') {
-                %remparam = %{$removeparam->{$key}};
+            if (ref($removeparam{$key}) eq 'HASH') {
+                %remparam = %{$removeparam{$key}};
             }
-            if (ref($zombies->{$key}) eq 'HASH') {
-                %zombie = %{$zombies->{$key}};
+            if (ref($zombies{$key}) eq 'HASH') {
+                %zombie = %{$zombies{$key}};
             }
-            if (ref($dbcopies->{$key}) eq 'HASH') {
-                foreach my $item (keys(%{$dbcopies->{$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}};
+            if (ref($params{$key}) eq 'HASH') {
+                %currparam = %{$params{$key}};
             }
             my ($errtext,$fatal) = &LONCAPA::map::mapread($key);
             if ($fatal) {
@@ -1533,40 +1550,41 @@ sub apply_fixups {
                     }
                 }
             }
-            for (my $i=0; $i<@LONCAPA::map::resources; $i++) {
-                if (defined($LONCAPA::map::resources[$i])) {
+            for (my $i=0; $i<@LONCAPA::map::order; $i++) {
+                my $idx = $LONCAPA::map::order[$i];
+                if (defined($LONCAPA::map::resources[$idx])) {
                     my $changed;
-                    my ($title,$src,$ext,$type)=split(/\:/,$LONCAPA::map::resources[$i]);
-                    if ($toremove{$src} eq $i) {
+                    my ($title,$src,$ext,$type)=split(/\:/,$LONCAPA::map::resources[$idx]);
+                    if ((exists($toremove{$idx})) && ($toremove{$idx} eq $src)) {
                         splice(@LONCAPA::map::order,$i,1);
-                        if (ref($currparam{$i}) eq 'ARRAY') {
-                            foreach my $name (@{$currparam{$i}}) {
-                                &LONCAPA::map::delparameter($i,'parameter_'.$name);
+                        if (ref($currparam{$idx}) eq 'ARRAY') {
+                            foreach my $name (@{$currparam{$idx}}) {
+                                &LONCAPA::map::delparameter($idx,'parameter_'.$name);
                             }
                         }
                         next;
                     }
                     my $origsrc = $src;
-                    if ((exists($toretitle{$src})) && ($toretitle{$src} eq $i)) {
+                    if ((exists($toretitle{$src})) && ($toretitle{$src} eq $idx)) {
                         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)) {
+                    if ((exists($torewrite{$src})) && ($torewrite{$src} eq $idx)) {
                         $src =~ s{^/(uploaded|adm|public)/$match_domain/$match_courseid/}{/$1/$cdom/$cnum/};
                         if ($origsrc =~ m{^/uploaded/}) {
-                            if ($prefixchg) {
+                            if ($prefixchg && $before{'map'} && $after{'map'}) {
                                 if ($src =~ /\.(page|sequence)$/) {
-                                    $src =~ s#^(/uploaded/$match_domain/$match_courseid/)\Q$before->{'map'}\E#$1$after->{'map'}#;
+                                    $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'}#;
+                                    $src =~ s#^(/uploaded/$match_domain/$match_courseid/)\Q$before{'doc'}\E#$1$after{'doc'}#;
                                 }
                             }
-                            if ($newsubdir->{$origsrc}) {
+                            if ($newsubdir{$origsrc}) {
                                 if ($src =~ /\.(page|sequence)$/) {
-                                    $src =~ s#^(/uploaded/$match_domain/$match_courseid/(?:default|supplemental)_)(\d+)#$1$newsubdir->{$origsrc}#;
+                                    $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}#;
+                                    $src =~ s#^(/uploaded/$match_domain/$match_courseid/\w+/)(\d+)#$1$newsubdir{$origsrc}#;
                                 }
                             }
                         }
@@ -1576,7 +1594,7 @@ sub apply_fixups {
                         $changed = 1;
                     }
                     if ($changed) {
-                        $LONCAPA::map::resources[$i] = join(':',($title,$src,$ext,$type));
+                        $LONCAPA::map::resources[$idx] = join(':',($title,$src,$ext,$type));
                     }
                 }
             }
@@ -1594,21 +1612,23 @@ sub apply_fixups {
             } else {
                 $storefn = $key;
                 $storefn=~s{^/uploaded/$match_domain/$match_courseid/}{};
-                if ($prefixchg) {
-                    $storefn =~ s/^\Q$before->{'map'}\E/$after->{'map'}/;
+                if ($prefixchg && $before{'map'} && $after{'map'}) {
+                    $storefn =~ s/^\Q$before{'map'}\E/$after{'map'}/;
                 }
-                if ($newsubdir->{$key}) {
-                    $storefn =~ s/^((?:default|supplemental)_)(\d+)/$1$newsubdir->{$key}/;
+                if ($newsubdir{$key}) {
+                    $storefn =~ s/^((?:default|supplemental)_)(\d+)/$1$newsubdir{$key}/;
                 }
             }
             my $report;
             if ($folder !~ /^supplemental/) {
                 $report = 1;
             }
-            my ($outtext,$errtext) =
+            (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.');
+                if ($caller eq 'paste') {
+                    return &mt('Paste failed: an error occurred saving the folder or page.');
+                }
             }
         }
     }
@@ -1743,15 +1763,24 @@ sub handle_edit_cmd {
 
 sub editor {
     my ($r,$coursenum,$coursedom,$folder,$allowed,$upload_output,$crstype,
-        $supplementalflag,$orderhash,$iconpath,$uploadtag)=@_;
-    my $container= ($env{'form.pagepath'}) ? 'page'
-		                           : 'sequence';
-
-    my ($breadcrumbtrail,$randompick,$ishidden,$isencrypted,$plain,$is_random_order) =
-        &breadcrumbs($allowed,$crstype);
-    $r->print($breadcrumbtrail);
+        $supplementalflag,$orderhash,$iconpath,$pathitem)=@_;
+    my ($randompick,$ishidden,$isencrypted,$plain,$is_random_order,$container);
+    if ($allowed) {
+        (my $breadcrumbtrail,$randompick,$ishidden,$isencrypted,$plain,
+         $is_random_order,$container) =
+            &Apache::lonhtmlcommon::docs_breadcrumbs($allowed,$crstype,1);
+        $r->print($breadcrumbtrail);
+    } elsif ($env{'form.folderpath'} =~ /\:1$/) {
+        $container = 'page'; 
+    } else {
+        $container = 'sequence';
+    }
 
-    my $jumpto = "uploaded/$coursedom/$coursenum/$folder.$container";
+    my $jumpto;
+
+    unless ($supplementalflag) {
+        $jumpto = "'uploaded/$coursedom/$coursenum/$folder.$container'";
+    }
 
     unless ($allowed) {
         $randompick = -1;
@@ -1828,12 +1857,28 @@ 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]);
 		}
 	    }
-	    ($errtext,$fatal)=&group_import($coursenum, $coursedom, $folder,
-					    $container,'londocs',@imports);
+            ($errtext,$fatal,my $fixuperrors) =
+                &group_import($coursenum, $coursedom, $folder,$container,
+                              'londocs',@imports);
 	    return $errtext if ($fatal);
+            if ($fixuperrors) {
+                $r->print($fixuperrors);
+            }
 	}
 # Loading a complete map
 	if ($env{'form.loadmap'}) {
@@ -1900,35 +1945,67 @@ sub editor {
         unless ($name) { $idx++; next; }
         $output .= &entryline($idx,$name,$url,$folder,$allowed,$res,
                               $coursenum,$coursedom,$crstype,
-                              $uploadtag,$supplementalflag);
+                              $pathitem,$supplementalflag,$container);
         $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')) {
+        my $toolslink = '<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&amp;command=editsupp" '
+                       .'id="LC_content_toolbar_edittoplevel" '
+                       .'class="LC_toolbarItem" '
+                       .'title="'.&mt('Supplemental Content Editor').'">'
+                       .'</a></li></ul></td></tr></table><br />';
+        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 .= $toolslink
+                           .&Apache::loncommon::start_data_table('LC_tableOfContent')
+                           .$output.' '
+                           .&Apache::loncommon::end_data_table();
+            }
+        } else {
+            if (!$allowed) {
+                $to_show .= $toolslink;
             }
-            $to_show .= &Apache::loncommon::end_data_table_header_row();
+            $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) {
@@ -1940,19 +2017,6 @@ sub editor {
                                        $readfile));
         &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;
@@ -1973,7 +2037,7 @@ sub process_file_upload {
         my $errtext='';
         my $fatal=0;
         my $container='sequence';
-        if ($env{'form.pagepath'}) {
+        if ($env{'form.folderpath'} =~ /:1$/) {
             $container='page';
         }
         ($errtext,$fatal)=
@@ -2063,7 +2127,6 @@ sub process_file_upload {
                 my $archiveurl = &HTML::Entities::encode($url,'<>&"');
                 my %archiveitems = (
                     folderpath => $env{'form.folderpath'},
-                    pagepath   => $env{'form.pagepath'},
                     cmd        => $nextphase,
                     newidx     => $newidx,
                     position   => $position,
@@ -2118,16 +2181,14 @@ sub is_supplemental_title {
 
 sub entryline {
     my ($index,$title,$url,$folder,$allowed,$residx,$coursenum,$coursedom,
-        $crstype,$uploadtag,$supplementalflag)=@_;
-    my ($foldertitle,$pagetitle,$renametitle);
+        $crstype,$pathitem,$supplementalflag,$container)=@_;
+    my ($foldertitle,$renametitle);
     if (&is_supplemental_title($title)) {
 	($title,$foldertitle,$renametitle) = &Apache::loncommon::parse_supplemental_title($title);
-	$pagetitle = $foldertitle;
     } else {
 	$title=&HTML::Entities::encode($title,'"<>&\'');
 	$renametitle=$title;
 	$foldertitle=$title;
-	$pagetitle=$title;
     }
 
     my $orderidx=$LONCAPA::map::order[$index];
@@ -2138,30 +2199,34 @@ sub entryline {
     my $line=&Apache::loncommon::start_data_table_row();
     my ($form_start,$form_end,$form_common);
 # Edit commands
-    my ($container, $type, $esc_path, $path, $symb);
+    my ($type, $esc_path, $path, $symb);
+    if ($container eq 'page') {
+        $type = 'page';
+    } else {
+        $type = 'folder';
+    }
     if ($env{'form.folderpath'}) {
-	$type = 'folder';
-        $container = 'sequence';
 	$esc_path=&escape($env{'form.folderpath'});
 	$path = &HTML::Entities::encode($env{'form.folderpath'},'<>&"');
 	# $htmlfoldername=&HTML::Entities::encode($env{'form.foldername'},'<>&"');
     }
-    if ($env{'form.pagepath'}) {
-        $type = $container = 'page';
-        $esc_path=&escape($env{'form.pagepath'});
-	$path = &HTML::Entities::encode($env{'form.pagepath'},'<>&"');
-    }
-    if (!$supplementalflag && $residx) {
+    my $isexternal;
+    if ($residx) {
         my $currurl = $url;
         $currurl =~ s{^http(|s)(&colon;|:)//}{/adm/wrapper/ext/};
-        my $path = 'uploaded/'.
-                   $env{'course.'.$env{'request.course.id'}.'.domain'}.'/'.
-                   $env{'course.'.$env{'request.course.id'}.'.num'}.'/';
-        $symb = &Apache::lonnet::encode_symb($path.$folder.".$container",
-                                             $residx,
-                                             &Apache::lonnet::declutter($currurl));
+        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;
+    my ($renamelink,%lt);
     if ($allowed) {
 	my $incindex=$index+1;
 	my $selectbox='';
@@ -2258,10 +2323,7 @@ sub entryline {
                 $nocopy=1;
             }
         }
-        my $copylink='&nbsp;';
-        my $cutlink='&nbsp;';
-        my $removelink='&nbsp;';
-
+        my ($copylink,$cutlink,$removelink);
 	my $skip_confirm = 0;
 	if ( $folder =~ /^supplemental/
 	     || ($url =~ m{( /smppg$
@@ -2269,26 +2331,43 @@ 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>
+<a href="javascript:markcopy('$esc_path','$index','$renametitle','$container','$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>
+<a href="javascript:cutres('$esc_path','$index','$renametitle','$container','$folder',$skip_confirm);" class="LC_docs_cut">$lt{'ct'}</a>
 ENDCUT
         }
-        if (!$noremove) {
+        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>
+<a href='javascript:removeres("$esc_path","$index","$renametitle",$skip_confirm);' class="LC_docs_remove">$lt{'rm'}</a>
 ENDREM
         }
+        unless ($isexternal) {
+            $renamelink=(<<ENDREN);
+<a href='javascript:changename("$esc_path","$index","$renametitle");' class="LC_docs_rename">$lt{'rn'}</a>
+ENDREN
+        }
 	$form_start = '
    <form action="/adm/coursedocs" method="post">
 ';
@@ -2318,11 +2397,11 @@ END
    $selectbox
    $form_end
 </td>
-<td class="LC_docs_entry_commands">
+<td class="LC_docs_entry_commands"><span class="LC_nobreak">
 $removelink
 $cutlink
-   <a href='javascript:changename("$esc_path","$index","$renametitle","$container","$symb");' class="LC_docs_rename">$lt{'rn'}</a>
 $copylink
+</span>
 </td>
 END
 
@@ -2331,22 +2410,18 @@ END
     my ($extension)=($url=~/\.(\w+)$/);
     my $uploaded=($url=~/^\/*uploaded\//);
     my $icon=&Apache::loncommon::icon($url);
-    my $isfolder=0;
-    my $ispage=0;
-    my $folderarg;
-    my $pagearg;
-    my $pagefile;
+    my $isfolder;
+    my $ispage;
+    my $containerarg;
     if ($uploaded) {
         if (($extension eq 'sequence') || ($extension eq 'page')) {
             $url=~/\Q$coursenum\E\/([\/\w]+)\.\Q$extension\E$/;
-            my $containerarg = $1;
+            $containerarg = $1;
 	    if ($extension eq 'sequence') {
 	        $icon=$iconpath.'navmap.folder.closed.gif';
-                $folderarg=$containerarg;
                 $isfolder=1;
             } else {
                 $icon=$iconpath.'page.gif';
-                $pagearg=$containerarg;
                 $ispage=1;
             }
             if ($allowed) {
@@ -2359,15 +2434,11 @@ END
 	}
     }
 
-    my $editlink;
+    my ($editlink,$extresform);
     my $orig_url = $url;
     $orig_url=~s{http(&colon;|:)//https(&colon;|:)//}{https$2//};
-    my $external = ($url=~s{^http(|s)(&colon;|:)//}{/adm/wrapper/ext/});
+    $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);
@@ -2383,7 +2454,6 @@ END
 	        }
 	    } elsif ($url=~m|^/ext/|) {
 	        $url='/adm/wrapper'.$url;
-	        $external = 1;
 	    }
             if (&Apache::lonnet::symbverify($symb,$url)) {
 	        $url.=(($url=~/\?/)?'&':'?').'symb='.&escape($symb);
@@ -2393,101 +2463,93 @@ END
 	}
     }
     my ($rand_pick_text,$rand_order_text);
-    if ($isfolder || $extension eq 'sequence') {
+    if ($isfolder || $ispage || $extension eq 'sequence' || $extension eq 'page') {
 	my $foldername=&escape($foldertitle);
 	my $folderpath=$env{'form.folderpath'};
 	if ($folderpath) { $folderpath.='&' };
+        if (!$allowed && $supplementalflag) {
+            $folderpath.=$containerarg.'&'.$foldername;
+            $url.='folderpath='.&escape($folderpath);
+        } else {
 # Append randompick number, hidden, and encrypted with ":" to foldername,
 # so it gets transferred between levels
-	$folderpath.=$folderarg.'&'.$foldername.':'.(&LONCAPA::map::getparameter($orderidx,
+	    $folderpath.=$containerarg.'&'.$foldername.
+                                              ':'.(&LONCAPA::map::getparameter($orderidx,
                                               'parameter_randompick'))[0]
                                                .':'.((&LONCAPA::map::getparameter($orderidx,
                                               'parameter_hiddenresource'))[0]=~/^yes$/i)
                                                .':'.((&LONCAPA::map::getparameter($orderidx,
                                               'parameter_encrypturl'))[0]=~/^yes$/i)
                                                .':'.((&LONCAPA::map::getparameter($orderidx,
-                                              'parameter_randomorder'))[0]=~/^yes$/i);
-	$url.='folderpath='.&escape($folderpath);
-        my $rpicknum = (&LONCAPA::map::getparameter($orderidx,
-                                                   'parameter_randompick'))[0];
-        my $rpckchk;
-        if ($rpicknum) {
-            $rpckchk = ' checked="checked"';
-        }
-        my $formname = 'edit_rpick_'.$orderidx;
-	$rand_pick_text = 
+                                              'parameter_randomorder'))[0]=~/^yes$/i)
+                                               .':'.$ispage;
+	    $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);
-        my $pagepath;
-        my $folderpath=$env{'form.folderpath'};
-        if ($folderpath) { $pagepath = $folderpath.'&' };
-        $pagepath.=$pagearg.'&'.$pagename;
-	$url.='pagepath='.&escape($pagepath).
-	    '&amp;pagesymb='.&escape($symb);
-    }
+    my ($tdalign,$tdwidth);
     if ($allowed) {
         my $fileloc = 
             &Apache::lonnet::declutter(&Apache::lonnet::filelocation('',$orig_url));
-
-        if ($external) {
-	    $editlink = <<"EXTLNK";
-            &nbsp;
-            <a class="LC_docs_ext_edit" href="javascript:editext('$residx');">
-            $lt{'ed'}</a>
-            <form action="/adm/coursedocs" method="post" name="editext_$residx">
-            <fieldset id="uploadext$residx" style="display: none;" />
-            <input type="hidden" name="active" value="aa" />
-            <span class="LC_nobreak">
-            <span class="LC_docs_ext_edit">$lt{'ul'}&nbsp;</span>
-            <input type="text" size="40" name="exturl" id="exturl_$residx" value="$orig_url" />&nbsp;
-            <a class="LC_docs_ext_edit" href="javascript:extUrlPreview('exturl_$residx');">$lt{'pr'}</a></span>
-            </span><br />
-            <span class="LC_nobreak">
-            <span class="LC_docs_ext_edit">$lt{'ti'}&nbsp;</span>
-            <input type="text" size="40" name="exttitle" value="$title" />
-            $uploadtag
-            <input type="hidden" name="importdetail" value="" />
-            <input type="button" value="$lt{'sv'}" onclick="javascript:setExternal(this.form,'$residx')" />
-            </span>
-            </fieldset>
-            </form>
-EXTLNK
-        } else { 
-            my ($cfile,$home,$switchserver,$uploaded) = 
-                &Apache::lonnet::can_edit_resource($fileloc,$coursenum,$coursedom);
-            if (($cfile ne '') && ($symb ne '')) {
+        if ($isexternal) {
+            ($editlink,$extresform) = 
+                &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,
-                                                            $uploaded,$symb);
+                                                            $forceedit,
+                                                            undef,$symb,
+                                                            &escape($env{'form.folderpath'}),
+                                                            $renametitle,'','',1);
                 if ($jscall) {
-                    $editlink = '&nbsp;<a class="LC_docs_ext_edit" href="javascript:'.
-                                $jscall.'" >'.&mt('Edit').'</a>';
+                    $editlink = '<a class="LC_docs_ext_edit" href="javascript:'.
+                                $jscall.'" >'.&mt('Edit').'</a>&nbsp;'."\n";
                 }
             }
         }
+        $tdalign = ' align="right" valign="top"';
+        $tdwidth = ' width="80%"';
     }
     my $reinit;
     if ($crstype eq 'Community') {
         $reinit = &mt('(re-initialize community to access)');
     } else {
         $reinit = &mt('(re-initialize course to access)');
-    }  
-    $line.='<td>';
+    }
+    $line.='<td class="LC_docs_entry_commands"'.$tdalign.'><span class="LC_nobreak">'.$editlink.$renamelink;
     if (($url=~m{/adm/(coursedocs|supplemental)}) || (!$allowed && $url)) {
        $line.='<a href="'.$url.'"><img src="'.$icon.'" alt="" class="LC_icon" /></a>';
     } elsif ($url) {
@@ -2496,7 +2558,7 @@ EXTLNK
     } else {
        $line.='<img src="'.$icon.'" alt="" class="LC_icon" />';
     }
-    $line.='</td><td>';
+    $line.='</span></td><td'.$tdwidth.'>';
     if (($url=~m{/adm/(coursedocs|supplemental)}) || (!$allowed && $url)) {
        $line.='<a href="'.$url.'">'.$title.'</a>';
     } elsif ($url) {
@@ -2505,7 +2567,7 @@ EXTLNK
     } else {
        $line.=$title.' <span class="LC_docs_reinit_warn">'.$reinit.'</span>';
     }
-    $line.=$editlink."</td>";
+    $line.="$extresform</td>";
     $rand_pick_text = '&nbsp;' if ($rand_pick_text eq '');
     $rand_order_text = '&nbsp;' if ($rand_order_text eq '');
     if (($allowed) && ($folder!~/^supplemental/)) {
@@ -2536,6 +2598,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()
@@ -2631,7 +2717,7 @@ sub checkonthis {
              $r->print('<span class="LC_error">'.&mt('connection down').'</span>');
           } elsif ($result eq 'not_found') {
 	      unless ($url=~/\$/) {
-		  $r->print('<span class="LC_error">'.&mt('not found').'</b></span>');
+		  $r->print('<span class="LC_error">'.&mt('not found').'</span>');
 	      } else {
 		  $r->print('<span class="LC_error">'.&mt('unable to verify variable URL').'</span>');
 	      }
@@ -2677,7 +2763,7 @@ sub list_symbs {
             $r->print(&Apache::loncommon::start_data_table_row().
                       '<td>'.$res->compTitle().'</td>'.
                       '<td>'.$res->symb().'</td>'.
-                      &Apache::loncommon::start_data_table_row());
+                      &Apache::loncommon::end_data_table_row());
             $count ++;
         }
         if (!$count) {
@@ -2687,6 +2773,7 @@ sub list_symbs {
         }
         $r->print(&Apache::loncommon::end_data_table());
     }
+    $r->print(&endContentScreen());
 }
 
 
@@ -2717,6 +2804,7 @@ sub verifycontent {
    }
    &untiehash();
    $r->print('<p class="LC_success">'.&mt('Done').'</p>');
+    $r->print(&endContentScreen());
 }
 
 
@@ -2796,7 +2884,7 @@ sub checkversions {
     if ($env{'form.timerange'} eq 'all') {
 # show all documents
 	$header=&mt('All Documents in '.$crstype);
-	$allsel=1;
+	$allsel=' selected="selected"';
 	foreach my $key (keys(%hash)) {
 	    if ($key=~/^ids\_(\/res\/.+)$/) {
 		my $src=$1;
@@ -2817,19 +2905,19 @@ sub checkversions {
 		.&mt('seconds');
 	    if ($env{'form.timerange'}==-1) {
 		$seltext='since start of course';
-		$startsel='selected';
+		$startsel=' selected="selected"';
 		$env{'form.timerange'}=time;
 	    }
 	    $starttime=time-$env{'form.timerange'};
 	    if ($env{'form.timerange'}==2592000) {
 		$seltext=&mt('during the last month').' ('.&Apache::lonlocal::locallocaltime($starttime).')';
-		$monthsel='selected';
+		$monthsel=' selected="selected"';
 	    } elsif ($env{'form.timerange'}==604800) {
 		$seltext=&mt('during the last week').' ('.&Apache::lonlocal::locallocaltime($starttime).')';
-		$weeksel='selected';
+		$weeksel=' selected="selected"';
 	    } elsif ($env{'form.timerange'}==86400) {
 		$seltext=&mt('since yesterday').' ('.&Apache::lonlocal::locallocaltime($starttime).')';
-		$daysel='selected';
+		$daysel=' selected="selected"';
 	    }
 	    $header=&mt('Content changed').' '.$seltext;
 	} else {
@@ -2867,11 +2955,11 @@ sub checkversions {
 <fieldset>
 <legend>$lt{'cd'}</legend>
 <select name="timerange">
-<option value='all' $allsel>$lt{'al'}</option>
-<option value="-1" $startsel>$lt{'st'}</option>
-<option value="2592000" $monthsel>$lt{'lm'}</option>
-<option value="604800" $weeksel>$lt{'lw'}</option>
-<option value="86400" $daysel>$lt{'sy'}</option>
+<option value='all'$allsel>$lt{'al'}</option>
+<option value="-1"$startsel>$lt{'st'}</option>
+<option value="2592000"$monthsel>$lt{'lm'}</option>
+<option value="604800"$weeksel>$lt{'lw'}</option>
+<option value="86400"$daysel>$lt{'sy'}</option>
 </select>
 <input type="submit" name="display" value="$lt{'sd'}" />
 </fieldset>
@@ -2887,111 +2975,93 @@ $lt{'sc'}: <input type="submit" name="se
 <hr />
 <h4>$lt{'vers'}</h4>
 <input type="submit" name="setversions" value="$lt{'save'}" />
-<table border="0">
 ENDHEADERS
     #number of columns for version history
-    my $num_ver_col = 1;
     $r->print(
-    &Apache::loncommon::start_data_table().
-    &Apache::loncommon::start_data_table_header_row().
-    '<th>'.&mt('Resources').'</th>'.
-    "<th>$lt{'mr'}</th>".
-    "<th>$lt{'ve'}</th>".
-    "<th>$lt{'vu'}</th>".
-    '<th colspan="'.$num_ver_col.'">'.&mt('History').'</th>'.
-    '</b>');
+        &Apache::loncommon::start_data_table().
+        &Apache::loncommon::start_data_table_header_row().
+        '<th>'.&mt('Resources').'</th>'.
+        "<th>$lt{'mr'}</th>".
+        "<th>$lt{'ve'}</th>".
+        "<th>$lt{'vu'}</th>".
+        '<th>'.&mt('History').'</th>'.
+        &Apache::loncommon::end_data_table_header_row()
+    );
     foreach my $key (sort(keys(%changes))) {
         #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) {
-                $currentversion='<span class="LC_error">'.&mt('Could not be determined.').'</span>';
-	    }
-	    my $linkurl=&Apache::lonnet::clutter($key);
+        next unless ($changes{$key}>$starttime && $key !~ /^\/res\/lib\/templates/);
+        my ($root,$extension)=($key=~/^(.*)\.(\w+)$/);
+        my $currentversion=&Apache::lonnet::getversion($key);
+        if ($currentversion<0) {
+            $currentversion='<span class="LC_error">'.&mt('Could not be determined.').'</span>';
+        }
+        my $linkurl=&Apache::lonnet::clutter($key);
         $r->print(
-            &Apache::loncommon::end_data_table_header_row().
             &Apache::loncommon::start_data_table_row().
-            '<td><b>'.&Apache::lonnet::gettitle($linkurl).'</b><br>'.
+            '<td><b>'.&Apache::lonnet::gettitle($linkurl).'</b><br />'.
             '<a href="'.$linkurl.'" target="cat">'.$linkurl.'</a></td>'.
-            '<td align="right">'.$currentversion.'<span class="LC_fontsize_medium"><br>('.
+            '<td align="right">'.$currentversion.'<span class="LC_fontsize_medium"><br />('.
             &Apache::lonlocal::locallocaltime(&Apache::lonnet::metadata($root.'.'.$extension,'lastrevisiondate')).')</span></td>'.
-            '<td align="right">');
-# Used in course
-	    my $usedversion=$hash{'version_'.$linkurl};
-	    if (($usedversion) && ($usedversion ne 'mostrecent')) {
-                if($usedversion != $currentversion){
+            '<td align="right">'
+        );
+        # Used in course
+        my $usedversion=$hash{'version_'.$linkurl};
+        if (($usedversion) && ($usedversion ne 'mostrecent')) {
+                if ($usedversion != $currentversion) {
                     $r->print('<span class="LC_warning">'.$usedversion.'</span>');
-                }else{
+                } else {
                     $r->print($usedversion);
                 }
-	    } else {
-		$r->print($currentversion);
-	    }
-	    $r->print('</td><td title="'.$lt{'vu'}.'">');
-# Set version
-	    $r->print(&Apache::loncommon::select_form($setversions{$linkurl},
-						      'set_version_'.$linkurl,
-						      {'select_form_order' =>
-						       ['',1..$currentversion,'mostrecent'],
-						       '' => '',
-						       'mostrecent' => &mt('most recent'),
-						       map {$_,$_} (1..$currentversion)}));
-	    my $lastold=1;
-	    for (my $prevvers=1;$prevvers<$currentversion;$prevvers++) {
-		my $url=$root.'.'.$prevvers.'.'.$extension;
-		if (&Apache::lonnet::metadata($url,'lastrevisiondate')<
-		    $starttime) {
-		    $lastold=$prevvers;
-		}
-	    }
-            #
-            # Code to figure out how many version entries should go in
-            # each of the four columns
-            my $entries_per_col = 0;
-            my $num_entries = ($currentversion-$lastold);
-            if ($num_entries % $num_ver_col == 0) {
-                $entries_per_col = $num_entries/$num_ver_col;
             } else {
-                $entries_per_col = $num_entries/$num_ver_col + 1;
+                $r->print($currentversion);
             }
-            my $entries_count = 0;
-            $r->print('<td valign="top"><span class="LC_fontsize_medium">');
-            my $cols_output = 1;
-            for (my $prevvers=$lastold;$prevvers<$currentversion;$prevvers++) {
-		my $url=$root.'.'.$prevvers.'.'.$extension;
-		$r->print('<span class="LC_nobreak"><a href="'.&Apache::lonnet::clutter($url).
-			  '">'.&mt('Version').' '.$prevvers.'</a> ('.
-			  &Apache::lonlocal::locallocaltime(
-                                &Apache::lonnet::metadata($url,
-                                                          'lastrevisiondate')
-                                                            ).
-			  ')');
-		if (&Apache::loncommon::fileembstyle($extension) eq 'ssi') {
-                    $r->print(' <a href="/adm/diff?filename='.
-			      &Apache::lonnet::clutter($root.'.'.$extension).
-			      '&versionone='.$prevvers.
-			      '" target="diffs">'.&mt('Diffs').'</a>');
-		}
-		$r->print('</span><br />');
-                if (++$entries_count % $entries_per_col == 0) {
-                    $r->print('</span></td>');
-                    if ($cols_output != $num_ver_col) {
-                        $r->print('<td valign="top"><span class="LC_fontsize_medium">');
-                        $cols_output++;
-                    }
-                }
-	    }
-            while($cols_output++ < $num_ver_col) {
-                $r->print('</span></td><td>');
+        $r->print('</td><td title="'.$lt{'vu'}.'">');
+        # Set version
+        $r->print(&Apache::loncommon::select_form(
+            $setversions{$linkurl},
+            'set_version_'.$linkurl,
+            {'select_form_order' => ['',1..$currentversion,'mostrecent'],
+             '' => '',
+             'mostrecent' => &mt('most recent'),
+             map {$_,$_} (1..$currentversion)}));
+        my $lastold=1;
+        for (my $prevvers=1;$prevvers<$currentversion;$prevvers++) {
+            my $url=$root.'.'.$prevvers.'.'.$extension;
+            if (&Apache::lonnet::metadata($url,'lastrevisiondate')<$starttime) {
+                $lastold=$prevvers;
+            }
+        }
+        $r->print('</td>');
+        # List all available versions
+        $r->print('<td valign="top"><span class="LC_fontsize_medium">');
+        for (my $prevvers=$lastold;$prevvers<$currentversion;$prevvers++) {
+            my $url=$root.'.'.$prevvers.'.'.$extension;
+            $r->print(
+                '<span class="LC_nobreak">'
+               .'<a href="'.&Apache::lonnet::clutter($url).'">'
+               .&mt('Version [_1]',$prevvers).'</a>'
+               .' ('.&Apache::lonlocal::locallocaltime(
+                         &Apache::lonnet::metadata($url,'lastrevisiondate'))
+               .')');
+            if (&Apache::loncommon::fileembstyle($extension) eq 'ssi') {
+                $r->print(
+                    ' <a href="/adm/diff?filename='.
+                    &Apache::lonnet::clutter($root.'.'.$extension).
+                    &HTML::Entities::encode('&versionone='.$prevvers,'"<>&').
+                    '" target="diffs">'.&mt('Diffs').'</a>');
             }
-	}
+            $r->print('</span><br />');
+        }
+        $r->print('</span></td>'.&Apache::loncommon::end_data_table_row());
     }
-    $r->print('</td>'.&Apache::loncommon::end_data_table_row().
-            &Apache::loncommon::end_data_table().
-            '<input type="submit" name="setversions" value="'.$lt{'save'}.'" />');
+    $r->print(
+        &Apache::loncommon::end_data_table().
+        '<input type="submit" name="setversions" value="'.$lt{'save'}.'" />'.
+        '</form>'
+    );
 
     &untiehash();
+    $r->print(&endContentScreen());
 }
 
 sub mark_hash_old {
@@ -3023,11 +3093,6 @@ sub changewarning {
     my $pathvar='folderpath';
     my $path=&escape($env{'form.folderpath'});
     if (!defined($url)) {
-	if (defined($env{'form.pagepath'})) {
-	    $pathvar='pagepath';
-	    $path=&escape($env{'form.pagepath'});
-	    $path.='&amp;pagesymb='.&escape($env{'form.pagesymb'});
-	}
 	$url='/adm/coursedocs?'.$pathvar.'='.$path;
     }
     my $course_type = &Apache::loncommon::course_type();
@@ -3201,9 +3266,9 @@ sub handler {
 # Get the parameters that may be needed
 #
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
-                                            ['folderpath','pagepath',
-                                             'pagesymb','forcesupplement','forcestandard',
-                                             'tools','symb','command']);
+                                            ['folderpath',
+                                             'forcesupplement','forcestandard',
+                                             '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
@@ -3217,7 +3282,7 @@ sub handler {
 
 
     my $supplementalflag=($env{'form.folderpath'}=~/^supplemental/);
-    if (($env{'form.folderpath'}=~/^default/) || $env{'form.folderpath'} eq "" || ($env{'form.pagepath'})) {
+    if (($env{'form.folderpath'}=~/^default/) || ($env{'form.folderpath'} eq "")) {
        $supplementalflag=0;
     }
     if ($env{'form.forcesupplement'}) { $supplementalflag=1; }
@@ -3232,106 +3297,58 @@ sub handler {
     my $addentries = {};
     my $container;
     my $containertag;
-    my $uploadtag;
+    my $pathitem;
 
 # Do we directly jump somewhere?
 
-   if ($env{'form.command'} eq 'direct') {
-       my ($mapurl,$id,$resurl);
+   if (($env{'form.command'} eq 'direct') || ($env{'form.command'} eq 'directnav')) {
        if ($env{'form.symb'} ne '') {
-           ($mapurl,$id,$resurl) = &Apache::lonnet::decode_symb($env{'form.symb'});
-           if ($resurl=~/\.(sequence|page)$/) {
-               $mapurl=$resurl;
-           } elsif ($resurl eq 'adm/navmaps') {
-               $mapurl=$env{'course.'.$env{'request.course.id'}.'.url'};
-           }
-           my $mapresobj;
-           my $navmap = Apache::lonnavmaps::navmap->new();
-           if (ref($navmap)) {
-               $mapresobj = $navmap->getResourceByUrl($mapurl);
-           }
-           $mapurl=~s{^.*/([^/]+)\.(\w+)$}{$1};
-           my $type=$2;
-           my $path;
-           if (ref($mapresobj)) {
-               my $pcslist = $mapresobj->map_hierarchy();
-               if ($pcslist ne '') {
-                   foreach my $pc (split(/,/,$pcslist)) {
-                       next if ($pc <= 1);
-                       my $res = $navmap->getByMapPc($pc);
-                       if (ref($res)) {
-                           my $thisurl = $res->src();
-                           $thisurl=~s{^.*/([^/]+)\.\w+$}{$1}; 
-                           my $thistitle = $res->title();
-                           $path .= '&'.
-                                    &Apache::lonhtmlcommon::entity_encode($thisurl).'&'.
-                                    &Apache::lonhtmlcommon::entity_encode($thistitle).
-                                    ':'.$res->randompick().
-                                    ':'.$res->randomout().
-                                    ':'.$res->encrypted().
-                                    ':'.$res->randomorder();
-                       }
-                   }
-               }
-               $path .= '&'.&Apache::lonhtmlcommon::entity_encode($mapurl).'&'.
-                    &Apache::lonhtmlcommon::entity_encode($mapresobj->title()).
-                    ':'.$mapresobj->randompick().
-                    ':'.$mapresobj->randomout().
-                    ':'.$mapresobj->encrypted().
-                    ':'.$mapresobj->randomorder();
-           } else {
-               my $maptitle = &Apache::lonnet::gettitle($mapurl);
-               $path = '&default&...::::'.
-                   '&'.&Apache::lonhtmlcommon::entity_encode($mapurl).'&'.
-                   &Apache::lonhtmlcommon::entity_encode($maptitle).'::::';
-           }
-           $path = 'default&'.
-                   &Apache::lonhtmlcommon::entity_encode('Main Course Documents').
-                   $path;
-           if ($type eq 'sequence') {
-               $env{'form.folderpath'}=$path;
-               $env{'form.pagepath'}='';
-           } else {
-               $env{'form.pagepath'}=$path;
-               $env{'form.folderpath'}='';
-           }
+           $env{'form.folderpath'}=
+               &Apache::loncommon::symb_to_docspath($env{'form.symb'});
+           &Apache::lonnet::appenv({'docs.exit.'.$env{'request.course.id'} =>
+               $env{'form.command'}.'_'.$env{'form.symb'}});
        } elsif ($env{'form.supppath'} ne '') {
            $env{'form.folderpath'}=$env{'form.supppath'};
+           &Apache::lonnet::appenv({'docs.exit.'.$env{'request.course.id'} =>
+               $env{'form.command'}.'_'.$env{'form.supppath'}});
        }
    } elsif ($env{'form.command'} eq 'editdocs') {
-        $env{'form.folderpath'} = 'default&'.
-                                  &Apache::lonhtmlcommon::entity_encode('Main Course Content');
-        $env{'form.pagepath'}='';
+       $env{'form.folderpath'} = 'default&'.
+                                 &Apache::lonhtmlcommon::entity_encode('Main Course Content').
+                                 ':::::';
+       &Apache::lonnet::appenv({'docs.exit.'.$env{'request.course.id'} => $env{'form.command'}});
    } elsif ($env{'form.command'} eq 'editsupp') {
-        $env{'form.folderpath'} = 'default&'.
+       $env{'form.folderpath'} = 'supplemental&'.
                                   &Apache::lonhtmlcommon::entity_encode('Supplemental Content');
-        $env{'form.pagepath'}='';
+       &Apache::lonnet::appenv({'docs.exit.'.$env{'request.course.id'} => '/adm/supplemental'});
+   } elsif ($env{'form.command'} eq 'contents') {
+       &Apache::lonnet::appenv({'docs.exit.'.$env{'request.course.id'} => '/adm/navmaps'});
+   } elsif ($env{'form.command'} eq 'home') {
+       &Apache::lonnet::appenv({'docs.exit.'.$env{'request.course.id'} => '/adm/menu'});
    }
 
+
 # Where do we store these for when we come back?
     my $stored_folderpath='docs_folderpath';
     if ($supplementalflag) {
        $stored_folderpath='docs_sup_folderpath';
     }
 
-# No folderpath, no pagepath, see if we have something stored
-    if ((!$env{'form.folderpath'}) && (!$env{'form.pagepath'})) {
+# No folderpath, and in edit mode, see if we have something stored
+    if ((!$env{'form.folderpath'}) && $allowed) {
         &Apache::loncommon::restore_course_settings($stored_folderpath,
-                                              {'folderpath' => 'scalar'});
+                                          {'folderpath' => 'scalar'});
+        unless (&unescape($env{'form.folderpath'}) =~ m{^(default|supplemental)&}) {
+            undef($env{'form.folderpath'});
+        }
     }
    
 # If we are not allowed to make changes, all we can see are supplemental docs
     if (!$allowed) {
-        $env{'form.pagepath'}='';
         unless ($env{'form.folderpath'} =~ /^supplemental/) {
             $env{'form.folderpath'} = &supplemental_base();
         }
     }
-# If we still not have a folderpath, see if we can resurrect at pagepath
-    if (!$env{'form.folderpath'} && $allowed) {
-        &Apache::loncommon::restore_course_settings($stored_folderpath,
-                                              {'pagepath' => 'scalar'});
-    }
 # Make the zeroth entry in supplemental docs page paths, so we can get to top level
     if ($env{'form.folderpath'} =~ /^supplemental_\d+/) {
         $env{'form.folderpath'} = &supplemental_base()
@@ -3339,48 +3356,42 @@ sub handler {
                                   $env{'form.folderpath'};
     }
 # If after all of this, we still don't have any paths, make them
-    unless (($env{'form.pagepath'}) || ($env{'form.folderpath'})) {
+    unless ($env{'form.folderpath'}) {
        if ($supplementalflag) {
           $env{'form.folderpath'}=&supplemental_base();
        } else {
-          $env{'form.folderpath'}='default';
+          $env{'form.folderpath'}='default'.&escape(&mt('Main '.$crstype.' Documents')).
+                                  ':::::';
        }
     }
 
 # Store this
     unless ($toolsflag) {
-        &Apache::loncommon::store_course_settings($stored_folderpath,
-                                                  {'pagepath' => 'scalar',
-                                                   'folderpath' => 'scalar'});
+        if ($allowed) {
+            &Apache::loncommon::store_course_settings($stored_folderpath,
+                                                      {'folderpath' => 'scalar'});
+        }
+        my $folderpath;
         if ($env{'form.folderpath'}) {
-	    my (@folderpath)=split('&',$env{'form.folderpath'});
-	    $env{'form.foldername'}=&unescape(pop(@folderpath));
-	    $env{'form.folder'}=pop(@folderpath);
-            $container='sequence';
-        }
-        if ($env{'form.pagepath'}) {
-            my (@pagepath)=split('&',$env{'form.pagepath'});
-            $env{'form.pagename'}=&unescape(pop(@pagepath));
-            $env{'form.folder'}=pop(@pagepath);
-            $container='page';
-            $containertag = '<input type="hidden" name="pagepath" value="" />'.
-	                    '<input type="hidden" name="pagesymb" value="" />';
-            $uploadtag = 
-                '<input type="hidden" name="pagepath" value="'.&HTML::Entities::encode($env{'form.pagepath'},'<>&"').'" />'.
-	        '<input type="hidden" name="pagesymb" value="'.&HTML::Entities::encode($env{'form.pagesymb'},'<>&"').'" />'.
-                '<input type="hidden" name="folderpath" value="" />';
+            $folderpath = $env{'form.folderpath'};
+	    my (@folders)=split('&',$env{'form.folderpath'});
+	    $env{'form.foldername'}=&unescape(pop(@folders));
+            if ($env{'form.foldername'} =~ /\:1$/) {
+                $container = 'page';
+            } else {
+                $container = 'sequence';
+            }
+	    $env{'form.folder'}=pop(@folders);
         } else {
-            my $folderpath=$env{'form.folderpath'};
-            if (!$folderpath) {
-                if ($env{'form.folder'} eq '' ||
-                    $env{'form.folder'} eq 'supplemental') {
-                    $folderpath='default&'.
-                        &escape(&mt('Main '.$crstype.' Documents'));
-                }
+            if ($env{'form.folder'} eq '' ||
+                $env{'form.folder'} eq 'supplemental') {
+                $folderpath='default&'.
+                            &escape(&mt('Main '.$crstype.' Documents')).
+                            ':::::';
             }
-            $containertag = '<input type="hidden" name="folderpath" value="" />';
-            $uploadtag = '<input type="hidden" name="folderpath" value="'.&HTML::Entities::encode($folderpath,'<>&"').'" />';
         }
+        $containertag = '<input type="hidden" name="folderpath" value="" />';
+        $pathitem = '<input type="hidden" name="folderpath" value="'.&HTML::Entities::encode($folderpath,'<>&"').'" />';
         if ($r->uri=~/^\/adm\/coursedocs\/showdoc\/(.*)$/) {
            $showdoc='/'.$1;
         }
@@ -3418,7 +3429,7 @@ sub handler {
                 @tabids = ('002','ee2','ff2');
             } else {
                 @tabids = ('aa1','bb1','cc1','ff1');
-                unless ($env{'form.pagepath'}) {
+                unless ($env{'form.folderpath'} =~ /\:1$/) {
                     unshift(@tabids,'001');
                     push(@tabids,('dd1','ee1'));
                 }
@@ -3427,7 +3438,8 @@ 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');",
                           };
@@ -3449,22 +3461,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 = ();
@@ -3527,21 +3543,17 @@ sub handler {
   } elsif ((!$showdoc) && (!$uploadphase)) {
 # -----------------------------------------------------------------------------
        my %lt=&Apache::lonlocal::texthash(
-                'uplm' => 'Upload a new main '.lc($crstype).' document',
-                'upls' => 'Upload a new supplemental '.lc($crstype).' document',
-                'impp' => 'Import a document',
 		'copm' => 'All documents out of a published map into this folder',
                 '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',
                 'newf' => 'New Folder',
                 'newp' => 'New Composite Page',
-                'extr' => 'External Resource',
                 'syll' => 'Syllabus',
                 'navc' => 'Table of Contents',
                 'sipa' => 'Simple Course Page',
@@ -3552,7 +3564,7 @@ sub handler {
                 'mypi' => 'My Personal Information Page',
                 'grpo' => 'Group Portfolio',
                 'rost' => 'Course Roster',
-				'abou' => 'Personal Information Page for a User',
+                'abou' => 'Personal Information Page for a User',
                 'imsf' => 'IMS Import',
                 'imsl' => 'Import IMS package',
                 'cms'  => 'Origin of IMS package',
@@ -3560,14 +3572,7 @@ sub handler {
                 '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',
-		'sd' => 'Special Document',
-		'mo' => 'More Options',
 					  );
 # -----------------------------------------------------------------------------
 	my $fileupload=(<<FIUP);
@@ -3591,7 +3596,7 @@ CHBO
         <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;" />
+        <fieldset id="uploadimsform" style="display: none;">
         <legend>$lt{'imsf'}</legend>
         $fileupload
         <br />
@@ -3616,14 +3621,14 @@ IMSFORM
         <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;" />
+        <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">
@@ -3635,47 +3640,33 @@ IMSFORM
         </form>
 FUFORM
 
-	my $simpleeditdefaultform=(<<SEDFFORM);
-	<form action="/adm/coursedocs" method="post" name="simpleeditdefault">
+	my $importpubform=(<<SEDFFORM);
+        <a class="LC_menubuttons_link" href="javascript:toggleMap('map');">
+        $lt{'impm'}</a>$help{'Load_Map'}
+	<form action="/adm/coursedocs" method="post" name="mapimportform">
+        <fieldset id="importmapform" style="display: none;">
+        <legend>$lt{'impm'}</legend>
 	<input type="hidden" name="active" value="bb" />
+        $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></span><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(\'map\');" />' => $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);
-      <a class="LC_menubuttons_link" href="javascript:toggleUpload('ext');">$lt{'extr'}</a>$help{'Adding_External_Resource'}
-      <form action="/adm/coursedocs" method="post" name="newext">
-      <fieldset id="uploadextform" style="display: none;" />
-      <legend>$lt{'extr'}</legend>
-      <input type="hidden" name="active" value="aa" />
-      $lt{'url'}:<br />
-      <input type="text" size="60" name="exturl" id="exturl" value="http://" />
-      <input type="button" name="view" value="$lt{'prev'}" onclick="javascript:extUrlPreview('exturl');" /><br />
-      $lt{'title'}:<br />
-      <input type="text" size="60" name="exttitle" value="$lt{'extr'}" />
-      $uploadtag
-      <br />
-      <input type="hidden" name="importdetail" value="" />
-      <input type="button" value="$lt{'lnk'}" onclick="javascript:setExternal(this.form,0)" />
-      </fieldset>
-      </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) {
         my $folder = $env{'form.folder'};
         if ($folder eq '') {
@@ -3692,18 +3683,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;
     }
 
 #
@@ -3716,7 +3712,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='';
@@ -3730,20 +3726,14 @@ HIDDENFORM
        } else {
            #$postexec='self.close();';
        }
-       my $folderseq='/uploaded/'.$coursedom.'/'.$coursenum.'/default_'.time.
-                     '.sequence';
-       my $pageseq = '/uploaded/'.$coursedom.'/'.$coursenum.'/default_'.time.
-                     '.page';
-	my $container='sequence';
-	if ($env{'form.pagepath'}) {
-	    $container='page';
-	}
+       my $folderseq='/uploaded/'.$coursedom.'/'.$coursenum.'/default_new.sequence';
+       my $pageseq = '/uploaded/'.$coursedom.'/'.$coursenum.'/default_new.page';
 	my $readfile='/uploaded/'.$coursedom.'/'.$coursenum.'/'.$folder.'.'.$container;
 
 	my $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>
@@ -3753,7 +3743,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'}
@@ -3763,7 +3753,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'}
@@ -3774,7 +3764,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>
@@ -3783,7 +3773,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'}
@@ -3793,7 +3783,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'}
@@ -3803,7 +3793,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>
@@ -3814,7 +3804,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>
@@ -3824,7 +3814,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>
@@ -3856,7 +3846,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'}
@@ -3866,7 +3856,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>
@@ -3878,7 +3868,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>
@@ -3895,10 +3885,16 @@ NGFFORM
 
 
         my @importdoc = (
-        {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/extres.png" alt="'.$lt{extr}.'" onclick="toggleUpload(\'ext\');" />'=>$extresourcesform},
-        {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/ims.png" alt="'.$lt{imsf}.'" onclick="javascript:toggleUpload(\'ims\');" />'=>$imspform},
-        {'<img class="LC_noBorder_LC_middle" src="/res/adm/pages/pdfupload.png" alt="'.$lt{upl}.'" onclick="javascript:toggleUpload(\'doc\');" />'=>$fileuploadform,
-        });
+        {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/extres.png" alt="'.$lt{extr}.'" onclick="toggleUpload(\'ext\');" />'=>$extresourcesform}
+        );
+        unless ($container eq 'page') {
+            push(@importdoc,
+                {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/ims.png" alt="'.$lt{imsf}.'" onclick="javascript:toggleUpload(\'ims\');" />'=>$imspform}
+            );
+        }
+        push(@importdoc,
+            {'<img class="LC_noBorder_LC_middle" src="/res/adm/pages/pdfupload.png" alt="'.$lt{upl}.'" onclick="javascript:toggleUpload(\'doc\');" />'=>$fileuploadform}
+        );
         $fileuploadform =  &create_form_ul(&create_list_elements(@importdoc));
 
         @gradingforma=(
@@ -3920,19 +3916,19 @@ NGFFORM
 
 my %orderhash = (
                 'aa' => ['Import Content',$fileuploadform],
-                'bb' => ['Published Content',$simpleeditdefaultform],
+                'bb' => ['Published Content',$importpubform],
                 'cc' => ['Grading Resources',$gradingform],
                 );
-unless ($env{'form.pagepath'}) {
+unless ($container eq 'page') {
     $orderhash{'00'} = ['Newfolder',$newfolderform];
     $orderhash{'dd'} = ['Collaboration',$communityform];
-    $orderhash{'ee'} = ['Special Documents',$specialdocumentsform];
+    $orderhash{'ee'} = ['Special Pages',$specialdocumentsform];
 }
 
  $hadchanges=0;
        unless (($supplementalflag || $toolsflag)) {
           my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$crstype,
-                              $supplementalflag,\%orderhash,$iconpath,$uploadtag);
+                              $supplementalflag,\%orderhash,$iconpath,$pathitem);
           if ($error) {
              $r->print('<p><span class="LC_error">'.$error.'</span></p>');
           }
@@ -3956,19 +3952,17 @@ unless ($env{'form.pagepath'}) {
        } elsif ($allowed) {
 	  $env{'form.folderpath'} = $savefolderpath;
        }
-       $env{'form.pagepath'} = '';
+       $pathitem = '<input type="hidden" name="folderpath" value="'.
+                    &HTML::Entities::encode($env{'form.folderpath'},'<>&"').'" />';
        if ($allowed) {
 	   my $folderseq=
-	       '/uploaded/'.$coursedom.'/'.$coursenum.'/supplemental_'.time.
-	       '.sequence';
-
-	   my $path = &HTML::Entities::encode($env{'form.folderpath'},'<>&"');
+	       '/uploaded/'.$coursedom.'/'.$coursenum.'/supplemental_new.sequence';
 
 	my $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;" />
+        <fieldset id="uploadsuppdocform" style="display: none;">
         <legend>$lt{'upfi'}</legend>
 	<input type="hidden" name="active" value="ee" />	
 	$fileupload
@@ -3981,7 +3975,7 @@ 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>
@@ -3990,36 +3984,21 @@ SUPDOCFORM
 	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 $supextform=(<<ERFORM);
-        <a class="LC_menubuttons_link" href="javascript:toggleUpload('suppext');">$lt{'extr'}</a>$help{'Adding_External_Resource'}
-        <form action="/adm/coursedocs" method="post" name="newsuppext">
-        <fieldset id="uploadsuppextform" style="display: none;" />
-        <legend>$lt{'extr'}</legend>
-        <input type="hidden" name="active" value="ee" />
-        $lt{'url'}:<br />
-        <input type="text" size="60" name="exturl" id="exturl" value="http://" />
-        <input type="button" name="view" value="$lt{'prev'}" onclick="javascript:extUrlPreview('exturl');" /><br />
-        $lt{'title'}:<br />
-        <input type="text" size="60" name="exttitle" value="$lt{'extr'}" />
-        $uploadtag
-        <br />
-        <input type="hidden" name="importdetail" value="" />
-        <input type="button" value="$lt{'lnk'}" onclick="javascript:setExternal(this.form,0)" />
-        </fieldset>
-        </form>
-ERFORM
+        my $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>
@@ -4030,7 +4009,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>
@@ -4046,7 +4025,7 @@ my @specialdocs = (
             =>$supnewaboutmeform},
 		);
 my @supimportdoc = (
-		{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/extres.png" alt="'.$lt{extr}.'" onclick="toggleUpload(\'suppext\')" />'
+		{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/extres.png" alt="'.$lt{extr}.'" onclick="javascript:toggleUpload(\'suppext\')" />'
             =>$supextform},
                 {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/pdfupload.png" alt="'.$lt{upl}.'" onclick="javascript:toggleUpload(\'suppdoc\');" />'
             =>$supupdocform},
@@ -4056,24 +4035,26 @@ $supupdocform =  &create_form_ul(&create
 my %suporderhash = (
 		'00' => ['Supnewfolder', $supnewfolderform],
                 'ee' => ['Import Content',$supupdocform],
-                'ff' => ['Special Documents',&create_form_ul(&create_list_elements(@specialdocs))]
+                'ff' => ['Special Pages',&create_form_ul(&create_list_elements(@specialdocs))]
                 );
         if ($supplementalflag) {
            my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$crstype,
-                               $supplementalflag,\%suporderhash,$iconpath,$uploadtag);
+                               $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,$uploadtag);
+                            $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('
@@ -4139,12 +4120,9 @@ sub decompression_info {
     my $docuname=$env{'course.'.$env{'request.course.id'}.'.num'};
     my $container='sequence';
     my ($pathitem,$hiddenelem);
-    my @hiddens = ('newidx','comment','position');
-    if ($env{'form.pagepath'}) {
+    my @hiddens = ('newidx','comment','position','folderpath');
+    if ($env{'form.folderpath'} =~ /\:1$/) {
         $container='page';
-        $pathitem = 'pagepath';
-    } else {
-        $pathitem = 'folderpath';
     }
     unshift(@hiddens,$pathitem);
     foreach my $item (@hiddens) {
@@ -4334,15 +4312,15 @@ sub generate_edit_table {
     my $form;
     my $activetab;
     my $active;
-    if($env{'form.active'} ne ''){
+    if (($env{'form.active'} ne '') && ($env{'form.active'} ne 'aa')) {
         $activetab = $env{'form.active'};
     }
     my $backicon = $iconpath.'clickhere.gif';
-    my $backtext = &mt('To Overview');
+    my $backtext = &mt('Exit Editor');
     $form = '<div class="LC_Box" style="margin:0;">'.
             '<ul id="navigation'.$tid.'" class="LC_TabContent">'."\n".
             '<li class="goback">'.
-            '<a href="javascript:toContents('."'$jumpto'".');">'.
+            '<a href="javascript:toContents('.$jumpto.');">'.
             '<img src="'.$backicon.'" class="LC_icon" style="border: none; vertical-align: top;"'.
             '  alt="'.$backtext.'" />'.$backtext.'</a></li>'."\n".
             '<li>'.
@@ -4431,30 +4409,42 @@ sub editing_js {
 
     my $crstype = &Apache::loncommon::course_type();
     my $docs_folderpath = &HTML::Entities::encode($env{'environment.internal.'.$env{'request.course.id'}.'.docs_folderpath.folderpath'},'<>&"');
-    my $docs_pagepath = &HTML::Entities::encode($env{'environment.internal.'.$env{'request.course.id'}.'.docs_folderpath.pagepath'},'<>&"');
     my $main_container_page;
-    if ($docs_folderpath eq '') {
-        if ($docs_pagepath ne '') {
-            $main_container_page = 1;
-        }
+    if (&HTML::Entities::decode($env{'environment.internal.'.$env{'request.course.id'}.'.docs_folderpath.folderpath'}) =~ /\:1$/) {
+        $main_container_page = 1;
     }
-    my $toplevelmain = 'default&Main%20'.$crstype.'%20Documents';
+    my $toplevelmain = 'default&Main%20'.$crstype.'%20Documents%3A%3A%3A%3A%3A';
     my $toplevelsupp = &supplemental_base();
 
-    my $backtourl = '/adm/navmaps';
-    if ($supplementalflag) {
+    my $backtourl;
+    if ($env{'docs.exit.'.$env{'request.course.id'}} =~ /^direct_(.+)$/) {
+        my $caller = $1;
+        if ($caller =~ /^supplemental/) {
+            $backtourl = '/adm/supplemental?folderpath='.&escape($caller);
+        } else {
+            my ($map,$id,$res)=&Apache::lonnet::decode_symb($caller);
+            $res = &Apache::lonnet::clutter($res);
+            if (&Apache::lonnet::is_on_map($res)) {
+                $backtourl = &HTML::Entities::encode(&Apache::lonnet::clutter($res),'<>&"').'?symb='.
+                             &HTML::Entities::encode($caller,'<>&"');
+            }
+        }
+    } elsif ($env{'docs.exit.'.$env{'request.course.id'}} eq '/adm/menu') {
+        $backtourl = '/adm/menu';
+    } elsif ($supplementalflag) {
         $backtourl = '/adm/supplemental';
+    } else {
+        $backtourl = '/adm/navmaps';
     }
 
-    my $fieldsets = "'ext','doc','ims'";
+    my $fieldsets = "'ext','doc'";
+    unless ($main_container_page) {
+        $fieldsets .=",'ims'";
+    }
     if ($supplementalflag) {
         $fieldsets = "'suppext','suppdoc'";
     }
 
-    my $urlregexp = <<'ENDREGEXP';
-/^([a-z]([a-z]|\d|\+|-|\.)*):(\/\/(((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:)*@)?((\[(|(v[\da-f]{1,}\.(([a-z]|\d|-|\.|_|~)|[!\$&'\(\)\*\+,;=]|:)+))\])|((\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5]))|(([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=])*)(:\d*)?)(\/(([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)*)*|(\/((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)+(\/(([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)*)*)?)|((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)+(\/(([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)*)*)|((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)){0})(\?((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|[\uE000-\uF8FF]|\/|\?)*)?(\#((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|\/|\?)*)?$/i
-ENDREGEXP
-
     return <<ENDNEWSCRIPT;
 function makenewfolder(targetform,folderseq) {
     var foldername=prompt('$lt{"p_mnf"}','$lt{"t_mnf"}');
@@ -4472,20 +4462,6 @@ function makenewpage(targetform,folderse
     }
 }
 
-function editext(residx) {
-    if (document.getElementById('uploadext'+residx)) {
-        var curr = document.getElementById('uploadext'+residx).style.display;
-        if (curr == 'none') {
-            disp = 'block';
-        } else {
-            disp = 'none';
-        }
-        document.getElementById('uploadext'+residx).style.display=disp;
-    }
-    resize_scrollbox('contentscroll','1','1');
-    return;
-}
-
 function makeexamupload() {
    var title=prompt('$lt{"p_mxu"}');
    if (title) {
@@ -4562,20 +4538,23 @@ function toggleUpload(caller) {
         }
         document.getElementById('upload'+blocks[i]+'form').style.display=disp;
     }
-    resize_scrollbox('contentscroll','1','0');
+    resize_scrollbox('contentscroll','1','1');
     return;
 }
 
-function extUrlPreview(caller) {
-    if (document.getElementById(caller)) {
-        var url = document.getElementById(caller).value;
-        var regexp = $urlregexp;
-        if (regexp.test(url)) {
-            openMyModal(url,500,400,'yes');
-        } else {
-            alert("$lt{'invurl'}");
+function toggleMap(caller) {
+    var disp = 'none';
+    if (document.getElementById('importmapform')) {
+        if (caller == 'map') {
+            var curr = document.getElementById('importmapform').style.display;
+            if (curr == 'none') {
+                disp='block';
+            }
         }
+        document.getElementById('importmapform').style.display=disp;
+        resize_scrollbox('contentscroll','1','1');
     }
+    return;
 }
 
 function makeims(imsform) {
@@ -4591,89 +4570,40 @@ function makeims(imsform) {
     imsform.submit();
 }
 
-function setExternal(extform,residx) {
-    var title=extform.exttitle.value;
-    if (!String.trim) {
-        String.prototype.trim = function() {return this.replace(\/^\\s+|\\s+$\/g, "");};    }
-    var url=extform.exturl.value;
-    var regexp = $urlregexp;
-    if (title == null || title.trim()=="") {
-        alert("$lt{'titbl'}");
-        extform.exttitle.focus();
-        return;
-    }
-    if (regexp.test(url)) {
-        url = escape(url);
-        if (residx > 0) {
-            eval("extform.importdetail.value=title+'='+url+'='+residx;extform.submit();");
-        } else {
-            eval("extform.importdetail.value=title+'='+url;extform.submit();");
-        }
-    } else {
-        alert("$lt{'invurl'}");
-        extform.exturl.focus();
-        return;
-    }
-}
-
-function changename(folderpath,index,oldtitle,container,pagesymb) {
+function changename(folderpath,index,oldtitle) {
 var title=prompt('$lt{"p_chn"}',oldtitle);
 if (title) {
 this.document.forms.renameform.markcopy.value=-1;
 this.document.forms.renameform.title.value=title;
 this.document.forms.renameform.cmd.value='rename_'+index;
-if (container == 'sequence') {
-    this.document.forms.renameform.folderpath.value=folderpath;
-}
-if (container == 'page') {
-    this.document.forms.renameform.pagepath.value=folderpath;
-    this.document.forms.renameform.pagesymb.value=pagesymb;
-}
+this.document.forms.renameform.folderpath.value=folderpath;
 this.document.forms.renameform.submit();
 }
 }
 
-function removeres(folderpath,index,oldtitle,container,pagesymb,skip_confirm) {
+function removeres(folderpath,index,oldtitle,skip_confirm) {
 if (skip_confirm || confirm('$lt{"p_rmr1"}\\n\\n$lt{"p_rmr2a"} "'+oldtitle+'" $lt{"p_rmr2b"}')) {
 this.document.forms.renameform.markcopy.value=-1;
 this.document.forms.renameform.cmd.value='del_'+index;
-if (container == 'sequence') {
-    this.document.forms.renameform.folderpath.value=folderpath;
-}
-if (container == 'page') {
-    this.document.forms.renameform.pagepath.value=folderpath;
-    this.document.forms.renameform.pagesymb.value=pagesymb;
-}
+this.document.forms.renameform.folderpath.value=folderpath;
 this.document.forms.renameform.submit();
 }
 }
 
-function cutres(folderpath,index,oldtitle,container,pagesymb,folder,skip_confirm) {
+function cutres(folderpath,index,oldtitle,container,folder,skip_confirm) {
 if (skip_confirm || confirm('$lt{"p_ctr1a"}\\n$lt{"p_ctr1b"}\\n\\n$lt{"p_ctr2a"} "'+oldtitle+'" $lt{"p_ctr2b"}')) {
 this.document.forms.renameform.cmd.value='cut_'+index;
 this.document.forms.renameform.markcopy.value=index;
 this.document.forms.renameform.copyfolder.value=folder+'.'+container;
-if (container == 'sequence') {
-    this.document.forms.renameform.folderpath.value=folderpath;
-}
-if (container == 'page') {
-    this.document.forms.renameform.pagepath.value=folderpath;
-    this.document.forms.renameform.pagesymb.value=pagesymb;
-}
+this.document.forms.renameform.folderpath.value=folderpath;
 this.document.forms.renameform.submit();
 }
 }
 
-function markcopy(folderpath,index,oldtitle,container,pagesymb,folder) {
+function markcopy(folderpath,index,oldtitle,container,folder) {
 this.document.forms.renameform.markcopy.value=index;
 this.document.forms.renameform.copyfolder.value=folder+'.'+container;
-if (container == 'sequence') {
 this.document.forms.renameform.folderpath.value=folderpath;
-}
-if (container == 'page') {
-this.document.forms.renameform.pagepath.value=folderpath;
-this.document.forms.renameform.pagesymb.value=pagesymb;
-}
 this.document.forms.renameform.submit();
 }
 
@@ -4768,11 +4698,9 @@ function showPage(current, pageId, nav,
 	currentData.style.display = 'block';
         activeTab = pageId;
         toggleUpload();
+        toggleMap();
         if (nav == 'mainnav') {
             var storedpath = "$docs_folderpath";
-            if (storedpath == '') {
-                storedpath = "$docs_pagepath";
-            }
             var storedpage = "$main_container_page";
             var reg = new RegExp("^supplemental");
             if (pageId == 'mainCourseDocuments') {
@@ -4808,9 +4736,8 @@ function showPage(current, pageId, nav,
 
 function toContents(jumpto) {
     var newurl = '$backtourl';
-    if (jumpto != '') {
+    if ((newurl == '/adm/navmaps') && (jumpto != '')) {
         newurl = newurl+'?postdata='+jumpto;
-;
     }
     location.href=newurl;
 }
@@ -5002,8 +4929,6 @@ Return hash with valid author names
 
 =item contained_map_check()
 
-=item reinit_role()
-
 =item url_paste_fixups()
 
 =item apply_fixups()