--- loncom/interface/londocs.pm	2013/01/14 23:14:59	1.484.2.25
+++ loncom/interface/londocs.pm	2012/11/27 23:34:41	1.510
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.484.2.25 2013/01/14 23:14:59 raeburn Exp $
+# $Id: londocs.pm,v 1.510 2012/11/27 23:34:41 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -40,6 +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;
@@ -152,7 +153,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,9 +271,7 @@ 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)$})
@@ -298,24 +297,6 @@ 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);
@@ -329,27 +310,7 @@ sub group_import {
 		join(':', ($name, $url, $ext, 'normal', 'res'));
 	}
     }
-    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);
+    return &storemap($coursenum, $coursedom, $folder.'.'.$container,1);
 }
 
 sub log_docs {
@@ -430,15 +391,18 @@ sub docs_change_log {
     my %orderhash;
     my $container='sequence';
     my $pathitem;
-    if ($env{'form.folderpath'} =~ /\:1$/) {
+    if ($env{'form.pagepath'}) {
         $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{^/}{};
@@ -690,7 +654,7 @@ sub print_paste_buffer {
         $is_external = 1;
     }
 
-    my ($canpaste,$nopaste,$othercrs,$areachange);
+    my ($canpaste,$nopaste,$othercrs,$areachange,$is_uploaded_map);
     if ($folder =~ /^supplemental/) {
         $canpaste = &supp_pasteable($env{'docs.markedcopy_url'});
         unless ($canpaste) {
@@ -797,9 +761,16 @@ sub print_paste_buffer {
             }
         }
         $r->print('<br /><input type="submit" name="pastemarked" value="'.&mt('Paste').'" />'.$othercrs);
-        $r->print('
+        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('
         <input type="hidden" name="folderpath" value="'.&HTML::Entities::encode($env{'form.folderpath'},'<>&"').'" />
 ');
+        }
         $r->print('</form>');
     } else {
         $r->print(&mt('Paste buffer contains:').' '.$buffer.
@@ -934,23 +905,30 @@ 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);
-        $allmaps = {};
+        my (%allmaps,%hierarchy,%titles);
         if ($folder =~ /^default/) {
-            $allmaps =
-                &Apache::loncommon::allmaps_incourse($coursedom,$coursenum,
-                                                     $env{"course.$env{'request.course.id'}.home"},
-                                                     $env{'request.course.id'});
+            my $navmap = Apache::lonnavmaps::navmap->new();
+            if (defined($navmap)) {
+                foreach my $res ($navmap->retrieveResources(undef,sub { $_[0]->is_map() },1,0,1)) {
+                    $allmaps{$res->src()} = 1;
+                }
+            }
         }
         &contained_map_check($url,$folder,\%removefrommap,\%removeparam,
-                             \%addedmaps,\%hierarchy,\%titles,$allmaps);
+                             \%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);
                 }
@@ -966,14 +944,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); 
             }
@@ -982,7 +960,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 ((ref($allmaps) eq 'HASH') && ($allmaps->{$url})) {
+                if ($allmaps{$url}) {
                     return (&mt('Paste failed: only one instance of a particular published sequence or page is allowed within each course.'));
                 }
             }
@@ -1048,28 +1026,11 @@ 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,$coursedom,$coursenum,$errors,
-                      \%updated,\%info,\%moves,$prefixchg,$oldurl,$url,'paste');
+        &apply_fixups($folder,$is_map,$prefixchg,$coursedom,$coursenum,$oldurl,
+                      $url,\%removefrommap,\%removeparam,\%rewrites,\%retitles,
+                      \%copies,\%dbcopies,\%zombies,\%params,\%docmoves,
+                      \%mapmoves,\%newsubdir,$errors,\%before,\%after);
     if ($result eq 'ok') {
         if ($is_map) { 
             my ($errtext,$fatal) = &mapread($coursenum,$coursedom,
@@ -1229,7 +1190,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 {
@@ -1253,6 +1214,15 @@ 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) = @_;
@@ -1282,13 +1252,13 @@ sub url_paste_fixups {
             my $title = $token->[2]->{'title'};
             if ($checktitle) {
                 if ($title =~ m{\d+\Q___&amp;&amp;&amp;___\E$match_username\Q___&amp;&amp;&amp;___\E$match_domain\Q___&amp;&amp;&amp;___\E(.+)$}) {
-                    $retitles->{$oldurl}{$id} = $ressrc;
+                    $retitles->{$oldurl}{$ressrc} = $id;
                 }
             }
             next if ($token->[2]->{'type'} eq 'external');
             if ($token->[2]->{'type'} eq 'zombie') {
                 next if ($skip);  
-                $zombies->{$oldurl}{$id} = $ressrc;
+                $zombies->{$oldurl}{$ressrc} = $id;
                 $changed = 1;
             } elsif ($ressrc =~ m{^/uploaded/($match_domain)/($match_courseid)/(.+)$}) {
                 my $srcdom = $1;
@@ -1321,7 +1291,7 @@ sub url_paste_fixups {
                     ($mapchanges->{$oldurl}) || (($newurl ne '') && ($newurl ne $oldurl))) {
                    
                     if ($rem =~ /^(default|supplemental)(_?\d*).(sequence|page)$/) {
-                        $rewrites->{$oldurl}{$id} = $ressrc;
+                        $rewrites->{$oldurl}{$ressrc} = $id;
                         $mapchanges->{$ressrc} = 1;
                         unless (&url_paste_fixups($ressrc,$folder,$prefixchg,$cdom,$cnum,$allmaps,
                                                   $rewrites,$retitles,$copies,$dbcopies,$zombies,
@@ -1331,7 +1301,7 @@ sub url_paste_fixups {
                         }
                         $changed = 1;
                     } else {
-                        $rewrites->{$oldurl}{$id} = $ressrc;
+                        $rewrites->{$oldurl}{$ressrc} = $id;
                         $copies->{$oldurl}{$ressrc} = $id;
                         $changed = 1;
                     }
@@ -1341,7 +1311,7 @@ sub url_paste_fixups {
                 my $srcdom = $1;
                 my $srcnum = $2;
                 if (($srcdom ne $cdom) || ($srcnum ne $cnum)) {
-                    $rewrites->{$oldurl}{$id} = $ressrc;
+                    $rewrites->{$oldurl}{$ressrc} = $id;
                     $dbcopies->{$oldurl}{$ressrc} = $id;
                     $changed = 1;
                 }
@@ -1350,7 +1320,7 @@ sub url_paste_fixups {
                 my $srcdom = $1;
                 my $srcnum = $2;
                 if (($srcdom ne $cdom) || ($srcnum ne $cnum)) {
-                    $rewrites->{$oldurl}{$id} = $ressrc;
+                    $rewrites->{$oldurl}{$ressrc} = $id;
                     $dbcopies->{$oldurl}{$ressrc} = $id;
                     $changed = 1;
                 }
@@ -1371,72 +1341,24 @@ sub url_paste_fixups {
 }
 
 sub apply_fixups {
-    my ($folder,$is_map,$cdom,$cnum,$errors,$updated,$info,$moves,$prefixchg,
-        $oldurl,$url,$caller) = @_;
-    my (%rewrites,%zombies,%removefrommap,%removeparam,%dbcopies,%retitles,
-        %params,%newsubdir,%before,%after,%copies,%docmoves,%mapmoves);
-    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 ($folder,$is_map,$prefixchg,$cdom,$cnum,$oldurl,$url,$removefrommap,
+        $removeparam,$rewrites,$retitles,$copies,$dbcopies,$zombies,$params,
+        $docmoves,$mapmoves,$newsubdir,$errors,$before,$after) = @_;
+    foreach my $key (keys(%{$copies}),keys(%{$docmoves})) {
         my @allcopies;
-        if (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;
-                    }
+        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}))) {
-                unless (grep(/^\Q$oldurl\E$/,@allcopies)) {
+            if ((exists($docmoves->{$key}))) {
+                unless (grep(/^\Q$oldurl\E/,@allcopies)) {
                     push(@allcopies,$oldurl);
                 }
             }
@@ -1449,16 +1371,16 @@ sub apply_fixups {
                     my $content = &Apache::lonnet::getfile($item);
                     unless ($content eq '-1') {
                         my $storefn;
-                        if (($key eq $oldurl) && (exists($docmoves{$key}))) {
-                            $storefn = $docmoves{$key};
+                        if (($key eq $oldurl) && (ref($docmoves) eq 'HASH') && (exists($docmoves->{$key}))) {
+                            $storefn = $docmoves->{$key};
                         } else {
                             $storefn = $relpath;
                             $storefn =~s{^/uploaded/$match_domain/$match_courseid/}{};
-                            if ($prefixchg && $before{'doc'} && $after{'doc'}) {
-                                $storefn =~ s/^\Q$before{'doc'}\E/$after{'doc'}/;
+                            if ($prefixchg) {
+                                $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);
@@ -1466,7 +1388,7 @@ sub apply_fixups {
                             &Apache::lonclonecourse::writefile($env{'request.course.id'},
                                                                $storefn.$fname,$content);
                         if ($copyurl eq '/adm/notfound.html') {
-                            if (exists($docmoves{$oldurl})) {
+                            if ((ref($docmoves) eq 'HASH') && (exists($docmoves->{$oldurl}))) {
                                 return &mt('Paste failed: an error occurred copying the file.');
                             } elsif (ref($errors) eq 'HASH') {
                                 $errors->{$item} = 1;
@@ -1477,14 +1399,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 && $before{'map'} && $after{'map'}) {
-            $storefn =~ s/^\Q$before{'map'}\E/$after{'map'}/;
+        if ($prefixchg) {
+            $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') {
@@ -1504,39 +1426,48 @@ sub apply_fixups {
     }
     my %updates;
     if ($is_map) {
-        if (ref($updated) eq 'HASH') {
-            foreach my $type (keys(%{$updated})) {
-                if (ref($updated->{$type}) eq 'HASH') {
-                    foreach my $key (keys(%{$updated->{$type}})) {
-                        $updates{$key} = 1;
-                    }
-                }
-            }
+        foreach my $key (keys(%{$rewrites})) {
+            $updates{$key} = 1;
+        }
+        foreach my $key (keys(%{$zombies})) {
+            $updates{$key} = 1;
+        }
+        foreach my $key (keys(%{$removefrommap})) {
+            $updates{$key} = 1;
+        }
+        foreach my $key (keys(%{$removeparam})) {
+            $updates{$key} = 1;
+        }
+        foreach my $key (keys(%{$dbcopies})) {
+            $updates{$key} = 1;
+        }
+        foreach my $key (keys(%{$retitles})) {
+            $updates{$key} = 1;
         }
         foreach my $key (keys(%updates)) {
             my (%torewrite,%toretitle,%toremove,%remparam,%currparam,%zombie,%newdb);
-            if (ref($rewrites{$key}) eq 'HASH') {
-                %torewrite = %{$rewrites{$key}};
+            if (ref($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) {
@@ -1545,47 +1476,46 @@ sub apply_fixups {
             for (my $i=0; $i<@LONCAPA::map::zombies; $i++) {
                 if (defined($LONCAPA::map::zombies[$i])) {
                     my ($title,$src,$ext,$type)=split(/\:/,$LONCAPA::map::zombies[$i]);
-                    if ($zombie{$i} eq $src) {
+                    if ($zombie{$src} eq $i) {
                         undef($LONCAPA::map::zombies[$i]);
                     }
                 }
             }
-            for (my $i=0; $i<@LONCAPA::map::order; $i++) {
-                my $idx = $LONCAPA::map::order[$i];
-                if (defined($LONCAPA::map::resources[$idx])) {
+            for (my $i=0; $i<@LONCAPA::map::resources; $i++) {
+                if (defined($LONCAPA::map::resources[$i])) {
                     my $changed;
-                    my ($title,$src,$ext,$type)=split(/\:/,$LONCAPA::map::resources[$idx]);
-                    if ((exists($toremove{$idx})) && ($toremove{$idx} eq $src)) {
+                    my ($title,$src,$ext,$type)=split(/\:/,$LONCAPA::map::resources[$i]);
+                    if ($toremove{$src} eq $i) {
                         splice(@LONCAPA::map::order,$i,1);
-                        if (ref($currparam{$idx}) eq 'ARRAY') {
-                            foreach my $name (@{$currparam{$idx}}) {
-                                &LONCAPA::map::delparameter($idx,'parameter_'.$name);
+                        if (ref($currparam{$i}) eq 'ARRAY') {
+                            foreach my $name (@{$currparam{$i}}) {
+                                &LONCAPA::map::delparameter($i,'parameter_'.$name);
                             }
                         }
                         next;
                     }
                     my $origsrc = $src;
-                    if ((exists($toretitle{$idx})) && ($toretitle{$idx} eq $src)) {
+                    if ((exists($toretitle{$src})) && ($toretitle{$src} eq $i)) {
                         if ($title =~ m{^\d+\Q___&amp;&amp;&amp;___\E$match_username\Q___&amp;&amp;&amp;___\E$match_domain\Q___&amp;&amp;&amp;___\E(.+)$}) {
                             $changed = 1;
                         }
                     }
-                    if ((exists($torewrite{$idx})) && ($torewrite{$idx} eq $src)) {
+                    if ((exists($torewrite{$src})) && ($torewrite{$src} eq $i)) {
                         $src =~ s{^/(uploaded|adm|public)/$match_domain/$match_courseid/}{/$1/$cdom/$cnum/};
                         if ($origsrc =~ m{^/uploaded/}) {
-                            if ($prefixchg && $before{'map'} && $after{'map'}) {
+                            if ($prefixchg) {
                                 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 ($origsrc =~ /\.(page|sequence)$/) {
-                                if ($newsubdir{$origsrc}) {
-                                    $src =~ s#^(/uploaded/$match_domain/$match_courseid/(?:default|supplemental)_)(\d+)#$1$newsubdir{$origsrc}#;
+                            if ($newsubdir->{$origsrc}) {
+                                if ($src =~ /\.(page|sequence)$/) {
+                                    $src =~ s#^(/uploaded/$match_domain/$match_courseid/(?:default|supplemental)_)(\d+)#$1$newsubdir->{$origsrc}#;
+                                } else {
+                                    $src =~ s#^(/uploaded/$match_domain/$match_courseid/\w+/)(\d+)#$1$newsubdir->{$origsrc}#;
                                 }
-                            } elsif ($newsubdir{$key}) {
-                                $src =~ s#^(/uploaded/$match_domain/$match_courseid/\w+/)(\d+)#$1$newsubdir{$key}#;
                             }
                         }
                         $changed = 1;
@@ -1594,7 +1524,7 @@ sub apply_fixups {
                         $changed = 1;
                     }
                     if ($changed) {
-                        $LONCAPA::map::resources[$idx] = join(':',($title,$src,$ext,$type));
+                        $LONCAPA::map::resources[$i] = join(':',($title,$src,$ext,$type));
                     }
                 }
             }
@@ -1612,23 +1542,21 @@ sub apply_fixups {
             } else {
                 $storefn = $key;
                 $storefn=~s{^/uploaded/$match_domain/$match_courseid/}{};
-                if ($prefixchg && $before{'map'} && $after{'map'}) {
-                    $storefn =~ s/^\Q$before{'map'}\E/$after{'map'}/;
+                if ($prefixchg) {
+                    $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) {
-                if ($caller eq 'paste') {
-                    return &mt('Paste failed: an error occurred saving the folder or page.');
-                }
+                return &mt('Paste failed: an error occurred saving the folder or page.');
             }
         }
     }
@@ -1764,23 +1692,16 @@ sub handle_edit_cmd {
 sub editor {
     my ($r,$coursenum,$coursedom,$folder,$allowed,$upload_output,$crstype,
         $supplementalflag,$orderhash,$iconpath,$pathitem)=@_;
-    my ($randompick,$ishidden,$isencrypted,$plain,$is_random_order,$container);
+    my $container= ($env{'form.pagepath'}) ? 'page'
+		                           : 'sequence';
+    my ($randompick,$ishidden,$isencrypted,$plain,$is_random_order);
     if ($allowed) {
-        (my $breadcrumbtrail,$randompick,$ishidden,$isencrypted,$plain,
-         $is_random_order,$container) =
+        (my $breadcrumbtrail,$randompick,$ishidden,$isencrypted,$plain,$is_random_order) =
             &Apache::lonhtmlcommon::docs_breadcrumbs($allowed,$crstype,1);
         $r->print($breadcrumbtrail);
-    } elsif ($env{'form.folderpath'} =~ /\:1$/) {
-        $container = 'page'; 
-    } else {
-        $container = 'sequence';
     }
 
-    my $jumpto;
-
-    unless ($supplementalflag) {
-        $jumpto = "'uploaded/$coursedom/$coursenum/$folder.$container'";
-    }
+    my $jumpto = "uploaded/$coursedom/$coursenum/$folder.$container";
 
     unless ($allowed) {
         $randompick = -1;
@@ -1872,13 +1793,9 @@ sub editor {
 		    push(@imports, [$name, $url, $residx]);
 		}
 	    }
-            ($errtext,$fatal,my $fixuperrors) =
-                &group_import($coursenum, $coursedom, $folder,$container,
-                              'londocs',@imports);
+	    ($errtext,$fatal)=&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'}) {
@@ -1945,23 +1862,13 @@ sub editor {
         unless ($name) { $idx++; next; }
         $output .= &entryline($idx,$name,$url,$folder,$allowed,$res,
                               $coursenum,$coursedom,$crstype,
-                              $pathitem,$supplementalflag,$container);
+                              $pathitem,$supplementalflag);
         $idx++;
         $shown++;
     }
     &Apache::loncommon::end_data_table_count();
 
     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')
@@ -1979,15 +1886,19 @@ sub editor {
                            .'<br style="line-height:2px;" />'
                            .&Apache::loncommon::end_scrollbox();
             } else {
-                $to_show .= $toolslink
+                $to_show = '<table><tr><td>'.&Apache::loncommon::help_open_menu('Navigation Screen','Navigation_Screen',undef,'RAT')
+                           .'</td><td class="LC_middle">'.&mt('Tools:').'</td>'
+                           .'<td align="left"><ul id="LC_toolbar">'
+                           .'<li><a href="/adm/coursedocs?forcesupplement=1" '
+                           .'id="LC_content_toolbar_edittoplevel" '
+                           .'class="LC_toolbarItem" '
+                           .'title="'.&mt('Supplemental Content Editor').'">'
+                           .'</a></li></ul></td></tr></table><br />'
                            .&Apache::loncommon::start_data_table('LC_tableOfContent')
                            .$output.' '
                            .&Apache::loncommon::end_data_table();
             }
         } else {
-            if (!$allowed) {
-                $to_show .= $toolslink;
-            }
             $to_show .= &Apache::loncommon::start_scrollbox('400px','380px','200px','contentscroll')
                        .'<div class="LC_info" id="contentlist">'
                        .&mt('Currently no documents.')
@@ -2037,7 +1948,7 @@ sub process_file_upload {
         my $errtext='';
         my $fatal=0;
         my $container='sequence';
-        if ($env{'form.folderpath'} =~ /:1$/) {
+        if ($env{'form.pagepath'}) {
             $container='page';
         }
         ($errtext,$fatal)=
@@ -2127,6 +2038,7 @@ 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,
@@ -2181,14 +2093,16 @@ sub is_supplemental_title {
 
 sub entryline {
     my ($index,$title,$url,$folder,$allowed,$residx,$coursenum,$coursedom,
-        $crstype,$pathitem,$supplementalflag,$container)=@_;
-    my ($foldertitle,$renametitle);
+        $crstype,$pathitem,$supplementalflag)=@_;
+    my ($foldertitle,$pagetitle,$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];
@@ -2199,17 +2113,19 @@ sub entryline {
     my $line=&Apache::loncommon::start_data_table_row();
     my ($form_start,$form_end,$form_common);
 # Edit commands
-    my ($type, $esc_path, $path, $symb);
-    if ($container eq 'page') {
-        $type = 'page';
-    } else {
-        $type = 'folder';
-    }
+    my ($container, $type, $esc_path, $path, $symb);
     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'},'<>&"');
+    }
     my $isexternal;
     if ($residx) {
         my $currurl = $url;
@@ -2226,7 +2142,7 @@ sub entryline {
                                                  &Apache::lonnet::declutter($currurl));
         }
     }
-    my ($renamelink,%lt);
+    my %lt;
     if ($allowed) {
 	my $incindex=$index+1;
 	my $selectbox='';
@@ -2323,7 +2239,7 @@ sub entryline {
                 $nocopy=1;
             }
         }
-        my ($copylink,$cutlink,$removelink);
+        my ($copylink,$cutlink,$removelink,$renamelink);
 	my $skip_confirm = 0;
 	if ( $folder =~ /^supplemental/
 	     || ($url =~ m{( /smppg$
@@ -2342,7 +2258,7 @@ sub entryline {
 ENDCOPY
         } else {
 	    $copylink=(<<ENDCOPY);
-<a href="javascript:markcopy('$esc_path','$index','$renametitle','$container','$folder');" class="LC_docs_copy">$lt{'cp'}</a>
+<a href="javascript:markcopy('$esc_path','$index','$renametitle','$container','$symb','$folder');" class="LC_docs_copy">$lt{'cp'}</a>
 ENDCOPY
         }
 	if ($nocut) {
@@ -2351,7 +2267,7 @@ ENDCOPY
 ENDCUT
         } else {
 	    $cutlink=(<<ENDCUT);
-<a href="javascript:cutres('$esc_path','$index','$renametitle','$container','$folder',$skip_confirm);" class="LC_docs_cut">$lt{'ct'}</a>
+<a href="javascript:cutres('$esc_path','$index','$renametitle','$container','$symb','$folder',$skip_confirm);" class="LC_docs_cut">$lt{'ct'}</a>
 ENDCUT
         }
         if ($noremove) {
@@ -2360,14 +2276,12 @@ ENDCUT
 ENDREM
         } else {
             $removelink=(<<ENDREM);
-<a href='javascript:removeres("$esc_path","$index","$renametitle",$skip_confirm);' class="LC_docs_remove">$lt{'rm'}</a>
+<a href='javascript:removeres("$esc_path","$index","$renametitle","$container","$symb",$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>
+        $renamelink=(<<ENDREN);
+<a href='javascript:changename("$esc_path","$index","$renametitle","$container","$symb");' class="LC_docs_rename">$lt{'rn'}</a>
 ENDREN
-        }
 	$form_start = '
    <form action="/adm/coursedocs" method="post">
 ';
@@ -2399,6 +2313,7 @@ END
 </td>
 <td class="LC_docs_entry_commands"><span class="LC_nobreak">
 $removelink
+$renamelink
 $cutlink
 $copylink
 </span>
@@ -2410,18 +2325,22 @@ END
     my ($extension)=($url=~/\.(\w+)$/);
     my $uploaded=($url=~/^\/*uploaded\//);
     my $icon=&Apache::loncommon::icon($url);
-    my $isfolder;
-    my $ispage;
-    my $containerarg;
+    my $isfolder=0;
+    my $ispage=0;
+    my $folderarg;
+    my $pagearg;
+    my $pagefile;
     if ($uploaded) {
         if (($extension eq 'sequence') || ($extension eq 'page')) {
             $url=~/\Q$coursenum\E\/([\/\w]+)\.\Q$extension\E$/;
-            $containerarg = $1;
+            my $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) {
@@ -2434,11 +2353,15 @@ END
 	}
     }
 
-    my ($editlink,$extresform);
+    my $editlink;
     my $orig_url = $url;
     $orig_url=~s{http(&colon;|:)//https(&colon;|:)//}{https$2//};
     $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);
@@ -2463,17 +2386,17 @@ END
 	}
     }
     my ($rand_pick_text,$rand_order_text);
-    if ($isfolder || $ispage || $extension eq 'sequence' || $extension eq 'page') {
+    if ($isfolder || $extension eq 'sequence') {
 	my $foldername=&escape($foldertitle);
 	my $folderpath=$env{'form.folderpath'};
 	if ($folderpath) { $folderpath.='&' };
         if (!$allowed && $supplementalflag) {
-            $folderpath.=$containerarg.'&'.$foldername;
+            $folderpath.=$folderarg.'&'.$foldername;
             $url.='folderpath='.&escape($folderpath);
         } else {
 # Append randompick number, hidden, and encrypted with ":" to foldername,
 # so it gets transferred between levels
-	    $folderpath.=$containerarg.'&'.$foldername.
+	    $folderpath.=$folderarg.'&'.$foldername.
                                               ':'.(&LONCAPA::map::getparameter($orderidx,
                                               'parameter_randompick'))[0]
                                                .':'.((&LONCAPA::map::getparameter($orderidx,
@@ -2481,8 +2404,7 @@ END
                                                .':'.((&LONCAPA::map::getparameter($orderidx,
                                               'parameter_encrypturl'))[0]=~/^yes$/i)
                                                .':'.((&LONCAPA::map::getparameter($orderidx,
-                                              'parameter_randomorder'))[0]=~/^yes$/i)
-                                               .':'.$ispage;
+                                              'parameter_randomorder'))[0]=~/^yes$/i);
 	    $url.='folderpath='.&escape($folderpath);
             my $rpicknum = (&LONCAPA::map::getparameter($orderidx,
                                                         'parameter_randompick'))[0];
@@ -2512,44 +2434,56 @@ $form_common.'
         if ($title) {
             $url .= '&amp;title='.&HTML::Entities::encode($renametitle,'<>&"');
         }
-        if ($isexternal && $orderidx) {
+        if ($orderidx) {
             $url .= '&amp;idx='.$orderidx;
         }
     }
-    my ($tdalign,$tdwidth);
+    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);
+    }
     if ($allowed) {
         my $fileloc = 
             &Apache::lonnet::declutter(&Apache::lonnet::filelocation('',$orig_url));
         if ($isexternal) {
-            ($editlink,$extresform) = 
+            $editlink =
                 &Apache::lonextresedit::extedit_form(0,$residx,$orig_url,$title,$pathitem);
-        } elsif (!$isfolder && !$ispage) {
+        } else {
             my ($cfile,$home,$switchserver,$forceedit,$forceview) = 
                 &Apache::lonnet::can_edit_resource($fileloc,$coursenum,$coursedom,$orig_url);
-            if (($cfile ne '') && ($symb ne '' || $supplementalflag)) {
+            my $geteditlink;
+            if ($supplementalflag) {
+                if ($orig_url eq "/adm/$env{'user.domain'}/$env{'user.name'}/aboutme") {
+                    $geteditlink = 1;
+                }
+            } elsif (($cfile ne '') && ($symb ne '')) {
+                $geteditlink = 1;
+            }
+            if ($geteditlink) {
                 my $jscall = 
                     &Apache::lonhtmlcommon::jump_to_editres($cfile,$home,
                                                             $switchserver,
                                                             $forceedit,
-                                                            undef,$symb,
-                                                            &escape($env{'form.folderpath'}),
-                                                            $renametitle,'','',1);
+                                                            undef,$symb);
                 if ($jscall) {
-                    $editlink = '<a class="LC_docs_ext_edit" href="javascript:'.
-                                $jscall.'" >'.&mt('Edit').'</a>&nbsp;'."\n";
+                    $editlink = '&nbsp;<a class="LC_docs_ext_edit" href="javascript:'.
+                                $jscall.'" >'.&mt('Edit').'</a>';
                 }
             }
         }
-        $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 class="LC_docs_entry_commands"'.$tdalign.'><span class="LC_nobreak">'.$editlink.$renamelink;
+    }  
+    $line.='<td>';
     if (($url=~m{/adm/(coursedocs|supplemental)}) || (!$allowed && $url)) {
        $line.='<a href="'.$url.'"><img src="'.$icon.'" alt="" class="LC_icon" /></a>';
     } elsif ($url) {
@@ -2558,7 +2492,7 @@ $form_common.'
     } else {
        $line.='<img src="'.$icon.'" alt="" class="LC_icon" />';
     }
-    $line.='</span></td><td'.$tdwidth.'>';
+    $line.='</td><td>';
     if (($url=~m{/adm/(coursedocs|supplemental)}) || (!$allowed && $url)) {
        $line.='<a href="'.$url.'">'.$title.'</a>';
     } elsif ($url) {
@@ -2567,7 +2501,7 @@ $form_common.'
     } else {
        $line.=$title.' <span class="LC_docs_reinit_warn">'.$reinit.'</span>';
     }
-    $line.="$extresform</td>";
+    $line.=$editlink."</td>";
     $rand_pick_text = '&nbsp;' if ($rand_pick_text eq '');
     $rand_order_text = '&nbsp;' if ($rand_order_text eq '');
     if (($allowed) && ($folder!~/^supplemental/)) {
@@ -2717,7 +2651,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').'</span>');
+		  $r->print('<span class="LC_error">'.&mt('not found').'</b></span>');
 	      } else {
 		  $r->print('<span class="LC_error">'.&mt('unable to verify variable URL').'</span>');
 	      }
@@ -2763,7 +2697,7 @@ sub list_symbs {
             $r->print(&Apache::loncommon::start_data_table_row().
                       '<td>'.$res->compTitle().'</td>'.
                       '<td>'.$res->symb().'</td>'.
-                      &Apache::loncommon::end_data_table_row());
+                      &Apache::loncommon::start_data_table_row());
             $count ++;
         }
         if (!$count) {
@@ -2773,7 +2707,6 @@ sub list_symbs {
         }
         $r->print(&Apache::loncommon::end_data_table());
     }
-    $r->print(&endContentScreen());
 }
 
 
@@ -2804,7 +2737,6 @@ sub verifycontent {
    }
    &untiehash();
    $r->print('<p class="LC_success">'.&mt('Done').'</p>');
-    $r->print(&endContentScreen());
 }
 
 
@@ -2884,7 +2816,7 @@ sub checkversions {
     if ($env{'form.timerange'} eq 'all') {
 # show all documents
 	$header=&mt('All Documents in '.$crstype);
-	$allsel=' selected="selected"';
+	$allsel=1;
 	foreach my $key (keys(%hash)) {
 	    if ($key=~/^ids\_(\/res\/.+)$/) {
 		my $src=$1;
@@ -2905,19 +2837,19 @@ sub checkversions {
 		.&mt('seconds');
 	    if ($env{'form.timerange'}==-1) {
 		$seltext='since start of course';
-		$startsel=' selected="selected"';
+		$startsel='selected';
 		$env{'form.timerange'}=time;
 	    }
 	    $starttime=time-$env{'form.timerange'};
 	    if ($env{'form.timerange'}==2592000) {
 		$seltext=&mt('during the last month').' ('.&Apache::lonlocal::locallocaltime($starttime).')';
-		$monthsel=' selected="selected"';
+		$monthsel='selected';
 	    } elsif ($env{'form.timerange'}==604800) {
 		$seltext=&mt('during the last week').' ('.&Apache::lonlocal::locallocaltime($starttime).')';
-		$weeksel=' selected="selected"';
+		$weeksel='selected';
 	    } elsif ($env{'form.timerange'}==86400) {
 		$seltext=&mt('since yesterday').' ('.&Apache::lonlocal::locallocaltime($starttime).')';
-		$daysel=' selected="selected"';
+		$daysel='selected';
 	    }
 	    $header=&mt('Content changed').' '.$seltext;
 	} else {
@@ -2955,11 +2887,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>
@@ -2975,93 +2907,111 @@ $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>'.&mt('History').'</th>'.
-        &Apache::loncommon::end_data_table_header_row()
-    );
+    &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>');
     foreach my $key (sort(keys(%changes))) {
         #excludes not versionable problems from resource version history:
-        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);
+        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);
         $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 {
-                $r->print($currentversion);
+                $entries_per_col = $num_entries/$num_ver_col + 1;
             }
-        $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>');
+            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('</span><br />');
-        }
-        $r->print('</span></td>'.&Apache::loncommon::end_data_table_row());
+	}
     }
-    $r->print(
-        &Apache::loncommon::end_data_table().
-        '<input type="submit" name="setversions" value="'.$lt{'save'}.'" />'.
-        '</form>'
-    );
+    $r->print('</td>'.&Apache::loncommon::end_data_table_row().
+            &Apache::loncommon::end_data_table().
+            '<input type="submit" name="setversions" value="'.$lt{'save'}.'" />');
 
     &untiehash();
-    $r->print(&endContentScreen());
 }
 
 sub mark_hash_old {
@@ -3093,6 +3043,11 @@ 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();
@@ -3158,6 +3113,7 @@ sub startContentScreen {
     if (($mode eq 'navmaps') || ($mode eq 'supplemental')) {
         $output .= '<li'.(($mode eq 'navmaps')?' class="active"':'').'><a href="/adm/navmaps"><b>&nbsp;&nbsp;&nbsp;&nbsp;'.&mt('Content Overview').'&nbsp;&nbsp;&nbsp;&nbsp;</b></a></li>'."\n";
         $output .= '<li'.(($mode eq 'coursesearch')?' class="active"':'').'><a href="/adm/searchcourse"><b>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'.&mt('Content Search').'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b></a></li>'."\n";
+        $output .= '<li'.(($mode eq 'courseindex')?' class="active"':'').'><a href="/adm/indexcourse"><b>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'.&mt('Content Index').'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b></a></li>'."\n";
         $output .= '<li '.(($mode eq 'suppdocs')?' class="active"':'').'><a href="/adm/supplemental"><b>'.&mt('Supplemental Content').'</b></a></li>';
     } else {
         $output .= '<li '.(($mode eq 'docs')?' class="active"':'').' id="tabbededitor"><a href="/adm/coursedocs?forcestandard=1"><b>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'.&mt('Content Editor').'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b></a></li>'."\n";
@@ -3265,8 +3221,8 @@ sub handler {
 # Get the parameters that may be needed
 #
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
-                                            ['folderpath',
-                                             'forcesupplement','forcestandard',
+                                            ['folderpath','pagepath',
+                                             'pagesymb','forcesupplement','forcestandard',
                                              'tools','symb','command','supppath']);
 
 # standard=1: this is a "new-style" course with an uploaded map as top level
@@ -3281,7 +3237,7 @@ sub handler {
 
 
     my $supplementalflag=($env{'form.folderpath'}=~/^supplemental/);
-    if (($env{'form.folderpath'}=~/^default/) || ($env{'form.folderpath'} eq "")) {
+    if (($env{'form.folderpath'}=~/^default/) || $env{'form.folderpath'} eq "" || ($env{'form.pagepath'})) {
        $supplementalflag=0;
     }
     if ($env{'form.forcesupplement'}) { $supplementalflag=1; }
@@ -3300,54 +3256,112 @@ sub handler {
 
 # Do we directly jump somewhere?
 
-   if (($env{'form.command'} eq 'direct') || ($env{'form.command'} eq 'directnav')) {
+   if ($env{'form.command'} eq 'direct') {
+       my ($mapurl,$id,$resurl);
        if ($env{'form.symb'} ne '') {
-           $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'}});
+           ($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 =~ s/^\&//;
+               my $maptitle = $mapresobj->title();
+               if ($mapurl eq 'default') {
+                   $maptitle = 'Main Course Documents';
+               }
+               $path .= ($path ne '')? '&' : ''.
+                    &Apache::lonhtmlcommon::entity_encode($mapurl).'&'.
+                    &Apache::lonhtmlcommon::entity_encode($maptitle).
+                    ':'.$mapresobj->randompick().
+                    ':'.$mapresobj->randomout().
+                    ':'.$mapresobj->encrypted().
+                    ':'.$mapresobj->randomorder();
+           } else {
+               my $maptitle = &Apache::lonnet::gettitle($mapurl);
+               if ($mapurl eq 'default') {
+                   $maptitle = 'Main Course Documents';
+               }
+               $path = &Apache::lonhtmlcommon::entity_encode($mapurl).'&'.
+                       &Apache::lonhtmlcommon::entity_encode($maptitle).'::::';
+           }
+           unless ($mapurl eq 'default') {
+               $path = 'default&'.
+                       &Apache::lonhtmlcommon::entity_encode('Main Course Documents').
+                       '::::&'.$path;
+           }
+           if ($type eq 'sequence') {
+               $env{'form.folderpath'}=$path;
+               $env{'form.pagepath'}='';
+           } else {
+               $env{'form.pagepath'}=$path;
+               $env{'form.folderpath'}='';
+           }
        } elsif ($env{'form.supppath'} ne '') {
            $env{'form.folderpath'}=$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').
-                                 ':::::';
-       &Apache::lonnet::appenv({'docs.exit.'.$env{'request.course.id'} => $env{'form.command'}});
+        $env{'form.folderpath'} = 'default&'.
+                                  &Apache::lonhtmlcommon::entity_encode('Main Course Content');
+        $env{'form.pagepath'}='';
    } elsif ($env{'form.command'} eq 'editsupp') {
-       $env{'form.folderpath'} = 'supplemental&'.
+        $env{'form.folderpath'} = 'default&'.
                                   &Apache::lonhtmlcommon::entity_encode('Supplemental Content');
-       &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'});
+        $env{'form.pagepath'}='';
    }
 
-
 # Where do we store these for when we come back?
     my $stored_folderpath='docs_folderpath';
     if ($supplementalflag) {
        $stored_folderpath='docs_sup_folderpath';
     }
 
-# No folderpath, and in edit mode, see if we have something stored
-    if ((!$env{'form.folderpath'}) && $allowed) {
+# No folderpath, no pagepath, and in edit mode, see if we have something stored
+    if ((!$env{'form.folderpath'}) && (!$env{'form.pagepath'}) && $allowed) {
         &Apache::loncommon::restore_course_settings($stored_folderpath,
                                           {'folderpath' => 'scalar'});
-        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()
@@ -3355,12 +3369,11 @@ sub handler {
                                   $env{'form.folderpath'};
     }
 # If after all of this, we still don't have any paths, make them
-    unless ($env{'form.folderpath'}) {
+    unless (($env{'form.pagepath'}) || ($env{'form.folderpath'})) {
        if ($supplementalflag) {
           $env{'form.folderpath'}=&supplemental_base();
        } else {
-          $env{'form.folderpath'}='default'.&escape(&mt('Main '.$crstype.' Documents')).
-                                  ':::::';
+          $env{'form.folderpath'}='default';
        }
     }
 
@@ -3368,29 +3381,38 @@ sub handler {
     unless ($toolsflag) {
         if ($allowed) {
             &Apache::loncommon::store_course_settings($stored_folderpath,
-                                                      {'folderpath' => 'scalar'});
+                                                      {'pagepath' => 'scalar',
+                                                       'folderpath' => 'scalar'});
         }
-        my $folderpath;
         if ($env{'form.folderpath'}) {
-            $folderpath = $env{'form.folderpath'};
-	    my (@folders)=split('&',$env{'form.folderpath'});
-	    $env{'form.foldername'}=&unescape(pop(@folders));
-            if ($env{'form.foldername'} =~ /\:1$/) {
-                $container = 'page';
-            } else {
-                $container = 'sequence';
-            }
-	    $env{'form.folder'}=pop(@folders);
+	    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="" />';
+            $pathitem = 
+                '<input type="hidden" name="pagepath" value="'.&HTML::Entities::encode($env{'form.pagepath'},'<>&"').'" />'.
+	        '<input type="hidden" name="pagesymb" value="'.&HTML::Entities::encode($env{'form.pagesymb'},'<>&"').'" />'.
+                '<input type="hidden" name="folderpath" value="" />';
         } else {
-            if ($env{'form.folder'} eq '' ||
-                $env{'form.folder'} eq 'supplemental') {
-                $folderpath='default&'.
-                            &escape(&mt('Main '.$crstype.' Documents')).
-                            ':::::';
+            my $folderpath=$env{'form.folderpath'};
+            if (!$folderpath) {
+                if ($env{'form.folder'} eq '' ||
+                    $env{'form.folder'} eq 'supplemental') {
+                    $folderpath='default&'.
+                        &escape(&mt('Main '.$crstype.' Documents'));
+                }
             }
+            $containertag = '<input type="hidden" name="folderpath" value="" />';
+            $pathitem = '<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;
         }
@@ -3428,7 +3450,7 @@ sub handler {
                 @tabids = ('002','ee2','ff2');
             } else {
                 @tabids = ('aa1','bb1','cc1','ff1');
-                unless ($env{'form.folderpath'} =~ /\:1$/) {
+                unless ($env{'form.pagepath'}) {
                     unshift(@tabids,'001');
                     push(@tabids,('dd1','ee1'));
                 }
@@ -3542,6 +3564,9 @@ 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',
@@ -3551,8 +3576,10 @@ sub handler {
                 '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',
@@ -3563,7 +3590,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',
@@ -3571,7 +3598,14 @@ 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);
@@ -3595,7 +3629,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 />
@@ -3620,7 +3654,7 @@ 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
@@ -3640,17 +3674,17 @@ IMSFORM
 FUFORM
 
 	my $importpubform=(<<SEDFFORM);
-        <a class="LC_menubuttons_link" href="javascript:toggleMap('map');">
+        <a class="LC_menubuttons_link" href="javascript:toggleMap();">
         $lt{'impm'}</a>$help{'Load_Map'}
 	<form action="/adm/coursedocs" method="post" name="mapimportform">
-        <fieldset id="importmapform" style="display: none;">
+        <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 />
+        &nbsp;<a href="javascript:openbrowser('mapimportform','importmap','sequence,page','');">$lt{'selm'}</a><br />
         <input type="submit" name="loadmap" value="$lt{'load'}" />
         </fieldset>
         </form>
@@ -3660,7 +3694,7 @@ SEDFFORM
 	{ '<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 }
+        { '<img class="LC_noBorder LC_middle" src="/res/adm/pages/sequence.png" alt="'.$lt{impm}.'" onclick="javascript:toggleMap();" />' => $importpubform }
 	);
 	$importpubform = &create_form_ul(&create_list_elements(@importpubforma));
         my $extresourcesform =
@@ -3727,6 +3761,10 @@ HIDDENFORM
        }
        my $folderseq='/uploaded/'.$coursedom.'/'.$coursenum.'/default_new.sequence';
        my $pageseq = '/uploaded/'.$coursedom.'/'.$coursenum.'/default_new.page';
+	my $container='sequence';
+	if ($env{'form.pagepath'}) {
+	    $container='page';
+	}
 	my $readfile='/uploaded/'.$coursedom.'/'.$coursenum.'/'.$folder.'.'.$container;
 
 	my $newnavform=(<<NNFORM);
@@ -3884,16 +3922,10 @@ NGFFORM
 
 
         my @importdoc = (
-        {'<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}
-        );
+        {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/extres.png" alt="'.$lt{extr}.'" onclick="toggleUpload(\'ext\');" />'=>$extresourcesform},
+        {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/ims.png" alt="'.$lt{imsf}.'" onclick="javascript:toggleUpload(\'ims\');" />'=>$imspform},
+        {'<img class="LC_noBorder_LC_middle" src="/res/adm/pages/pdfupload.png" alt="'.$lt{upl}.'" onclick="javascript:toggleUpload(\'doc\');" />'=>$fileuploadform,
+        });
         $fileuploadform =  &create_form_ul(&create_list_elements(@importdoc));
 
         @gradingforma=(
@@ -3918,10 +3950,10 @@ my %orderhash = (
                 'bb' => ['Published Content',$importpubform],
                 'cc' => ['Grading Resources',$gradingform],
                 );
-unless ($container eq 'page') {
+unless ($env{'form.pagepath'}) {
     $orderhash{'00'} = ['Newfolder',$newfolderform];
     $orderhash{'dd'} = ['Collaboration',$communityform];
-    $orderhash{'ee'} = ['Special Pages',$specialdocumentsform];
+    $orderhash{'ee'} = ['Special Documents',$specialdocumentsform];
 }
 
  $hadchanges=0;
@@ -3951,6 +3983,7 @@ unless ($container eq 'page') {
        } elsif ($allowed) {
 	  $env{'form.folderpath'} = $savefolderpath;
        }
+       $env{'form.pagepath'} = '';
        $pathitem = '<input type="hidden" name="folderpath" value="'.
                     &HTML::Entities::encode($env{'form.folderpath'},'<>&"').'" />';
        if ($allowed) {
@@ -3961,7 +3994,7 @@ unless ($container eq 'page') {
         <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
@@ -4024,7 +4057,7 @@ my @specialdocs = (
             =>$supnewaboutmeform},
 		);
 my @supimportdoc = (
-		{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/extres.png" alt="'.$lt{extr}.'" onclick="javascript:toggleUpload(\'suppext\')" />'
+		{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/extres.png" alt="'.$lt{extr}.'" onclick="toggleUpload(\'suppext\')" />'
             =>$supextform},
                 {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/pdfupload.png" alt="'.$lt{upl}.'" onclick="javascript:toggleUpload(\'suppdoc\');" />'
             =>$supupdocform},
@@ -4034,7 +4067,7 @@ $supupdocform =  &create_form_ul(&create
 my %suporderhash = (
 		'00' => ['Supnewfolder', $supnewfolderform],
                 'ee' => ['Import Content',$supupdocform],
-                'ff' => ['Special Pages',&create_form_ul(&create_list_elements(@specialdocs))]
+                'ff' => ['Special Documents',&create_form_ul(&create_list_elements(@specialdocs))]
                 );
         if ($supplementalflag) {
            my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$crstype,
@@ -4119,9 +4152,12 @@ sub decompression_info {
     my $docuname=$env{'course.'.$env{'request.course.id'}.'.num'};
     my $container='sequence';
     my ($pathitem,$hiddenelem);
-    my @hiddens = ('newidx','comment','position','folderpath');
-    if ($env{'form.folderpath'} =~ /\:1$/) {
+    my @hiddens = ('newidx','comment','position');
+    if ($env{'form.pagepath'}) {
         $container='page';
+        $pathitem = 'pagepath';
+    } else {
+        $pathitem = 'folderpath';
     }
     unshift(@hiddens,$pathitem);
     foreach my $item (@hiddens) {
@@ -4311,15 +4347,15 @@ sub generate_edit_table {
     my $form;
     my $activetab;
     my $active;
-    if (($env{'form.active'} ne '') && ($env{'form.active'} ne 'aa')) {
+    if($env{'form.active'} ne ''){
         $activetab = $env{'form.active'};
     }
     my $backicon = $iconpath.'clickhere.gif';
-    my $backtext = &mt('Exit Editor');
+    my $backtext = &mt('To Overview');
     $form = '<div class="LC_Box" style="margin:0;">'.
             '<ul id="navigation'.$tid.'" class="LC_TabContent">'."\n".
             '<li class="goback">'.
-            '<a href="javascript:toContents('.$jumpto.');">'.
+            '<a href="javascript:toContents('."'$jumpto'".');">'.
             '<img src="'.$backicon.'" class="LC_icon" style="border: none; vertical-align: top;"'.
             '  alt="'.$backtext.'" />'.$backtext.'</a></li>'."\n".
             '<li>'.
@@ -4408,38 +4444,22 @@ 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 (&HTML::Entities::decode($env{'environment.internal.'.$env{'request.course.id'}.'.docs_folderpath.folderpath'}) =~ /\:1$/) {
-        $main_container_page = 1;
+    if ($docs_folderpath eq '') {
+        if ($docs_pagepath ne '') {
+            $main_container_page = 1;
+        }
     }
-    my $toplevelmain = 'default&Main%20'.$crstype.'%20Documents%3A%3A%3A%3A%3A';
+    my $toplevelmain = 'default&Main%20'.$crstype.'%20Documents';
     my $toplevelsupp = &supplemental_base();
 
-    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) {
+    my $backtourl = '/adm/navmaps';
+    if ($supplementalflag) {
         $backtourl = '/adm/supplemental';
-    } else {
-        $backtourl = '/adm/navmaps';
     }
 
-    my $fieldsets = "'ext','doc'";
-    unless ($main_container_page) {
-        $fieldsets .=",'ims'";
-    }
+    my $fieldsets = "'ext','doc','ims'";
     if ($supplementalflag) {
         $fieldsets = "'suppext','suppdoc'";
     }
@@ -4541,14 +4561,12 @@ function toggleUpload(caller) {
     return;
 }
 
-function toggleMap(caller) {
+function toggleMap() {
     var disp = 'none';
     if (document.getElementById('importmapform')) {
-        if (caller == 'map') {
-            var curr = document.getElementById('importmapform').style.display;
-            if (curr == 'none') {
-                disp='block';
-            }
+        var curr = document.getElementById('importmapform').style.display;
+        if (curr == 'none') {
+            disp='block';
         }
         document.getElementById('importmapform').style.display=disp;
         resize_scrollbox('contentscroll','1','1');
@@ -4569,40 +4587,64 @@ function makeims(imsform) {
     imsform.submit();
 }
 
-function changename(folderpath,index,oldtitle) {
+function changename(folderpath,index,oldtitle,container,pagesymb) {
 var title=prompt('$lt{"p_chn"}',oldtitle);
 if (title) {
 this.document.forms.renameform.markcopy.value=-1;
 this.document.forms.renameform.title.value=title;
 this.document.forms.renameform.cmd.value='rename_'+index;
-this.document.forms.renameform.folderpath.value=folderpath;
+if (container == 'sequence') {
+    this.document.forms.renameform.folderpath.value=folderpath;
+}
+if (container == 'page') {
+    this.document.forms.renameform.pagepath.value=folderpath;
+    this.document.forms.renameform.pagesymb.value=pagesymb;
+}
 this.document.forms.renameform.submit();
 }
 }
 
-function removeres(folderpath,index,oldtitle,skip_confirm) {
+function removeres(folderpath,index,oldtitle,container,pagesymb,skip_confirm) {
 if (skip_confirm || confirm('$lt{"p_rmr1"}\\n\\n$lt{"p_rmr2a"} "'+oldtitle+'" $lt{"p_rmr2b"}')) {
 this.document.forms.renameform.markcopy.value=-1;
 this.document.forms.renameform.cmd.value='del_'+index;
-this.document.forms.renameform.folderpath.value=folderpath;
+if (container == 'sequence') {
+    this.document.forms.renameform.folderpath.value=folderpath;
+}
+if (container == 'page') {
+    this.document.forms.renameform.pagepath.value=folderpath;
+    this.document.forms.renameform.pagesymb.value=pagesymb;
+}
 this.document.forms.renameform.submit();
 }
 }
 
-function cutres(folderpath,index,oldtitle,container,folder,skip_confirm) {
+function cutres(folderpath,index,oldtitle,container,pagesymb,folder,skip_confirm) {
 if (skip_confirm || confirm('$lt{"p_ctr1a"}\\n$lt{"p_ctr1b"}\\n\\n$lt{"p_ctr2a"} "'+oldtitle+'" $lt{"p_ctr2b"}')) {
 this.document.forms.renameform.cmd.value='cut_'+index;
 this.document.forms.renameform.markcopy.value=index;
 this.document.forms.renameform.copyfolder.value=folder+'.'+container;
-this.document.forms.renameform.folderpath.value=folderpath;
+if (container == 'sequence') {
+    this.document.forms.renameform.folderpath.value=folderpath;
+}
+if (container == 'page') {
+    this.document.forms.renameform.pagepath.value=folderpath;
+    this.document.forms.renameform.pagesymb.value=pagesymb;
+}
 this.document.forms.renameform.submit();
 }
 }
 
-function markcopy(folderpath,index,oldtitle,container,folder) {
+function markcopy(folderpath,index,oldtitle,container,pagesymb,folder) {
 this.document.forms.renameform.markcopy.value=index;
 this.document.forms.renameform.copyfolder.value=folder+'.'+container;
+if (container == 'sequence') {
 this.document.forms.renameform.folderpath.value=folderpath;
+}
+if (container == 'page') {
+this.document.forms.renameform.pagepath.value=folderpath;
+this.document.forms.renameform.pagesymb.value=pagesymb;
+}
 this.document.forms.renameform.submit();
 }
 
@@ -4700,6 +4742,9 @@ function showPage(current, pageId, nav,
         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') {
@@ -4735,8 +4780,9 @@ function showPage(current, pageId, nav,
 
 function toContents(jumpto) {
     var newurl = '$backtourl';
-    if ((newurl == '/adm/navmaps') && (jumpto != '')) {
+    if (jumpto != '') {
         newurl = newurl+'?postdata='+jumpto;
+;
     }
     location.href=newurl;
 }
@@ -4928,6 +4974,8 @@ Return hash with valid author names
 
 =item contained_map_check()
 
+=item reinit_role()
+
 =item url_paste_fixups()
 
 =item apply_fixups()