--- loncom/interface/londocs.pm	2013/01/10 17:12:22	1.484.2.24
+++ loncom/interface/londocs.pm	2012/10/31 05:10:16	1.500
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.484.2.24 2013/01/10 17:12:22 raeburn Exp $
+# $Id: londocs.pm,v 1.500 2012/10/31 05:10:16 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::lonextresedit();
+use Apache::lonuserstate();
 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,9 +270,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 +296,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 +309,62 @@ 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 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);
 }
 
 sub log_docs {
@@ -430,15 +445,17 @@ 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{^/}{};
@@ -446,8 +463,7 @@ sub docs_change_log {
     if ($supplementalflag) {
         $tid = 2;
     }
-    my ($breadcrumbtrail) = 
-        &Apache::lonhtmlcommon::docs_breadcrumbs($allowed,$crstype,1);
+    my ($breadcrumbtrail) = &breadcrumbs($allowed,$crstype);
     $r->print($breadcrumbtrail.
               &generate_edit_table($tid,\%orderhash,undef,$iconpath,$jumpto,
               $readfile));
@@ -690,7 +706,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 +813,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 +957,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 +996,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 +1012,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 +1078,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 +1242,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 +1266,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) = @_;
@@ -1371,71 +1393,23 @@ 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}))) {
+            if ((exists($docmoves->{$key}))) {
                 unless (grep(/^\Q$oldurl\E/,@allcopies)) {
                     push(@allcopies,$oldurl);
                 }
@@ -1449,16 +1423,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 +1440,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 +1451,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 +1478,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) {
@@ -1550,41 +1533,40 @@ sub apply_fixups {
                     }
                 }
             }
-            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{$src})) && ($toretitle{$src} eq $idx)) {
+                    if ((exists($toretitle{$src})) && ($toretitle{$src} eq $i)) {
                         if ($title =~ m{^\d+\Q___&amp;&amp;&amp;___\E$match_username\Q___&amp;&amp;&amp;___\E$match_domain\Q___&amp;&amp;&amp;___\E(.+)$}) {
                             $changed = 1;
                         }
                     }
-                    if ((exists($torewrite{$src})) && ($torewrite{$src} eq $idx)) {
+                    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 ($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}#;
                                 }
                             }
                         }
@@ -1594,7 +1576,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 +1594,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.');
             }
         }
     }
@@ -1763,24 +1743,15 @@ 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);
-    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;
+        $supplementalflag,$orderhash,$iconpath)=@_;
+    my $container= ($env{'form.pagepath'}) ? 'page'
+		                           : 'sequence';
+
+    my ($breadcrumbtrail,$randompick,$ishidden,$isencrypted,$plain,$is_random_order) =
+        &breadcrumbs($allowed,$crstype);
+    $r->print($breadcrumbtrail);
 
-    unless ($supplementalflag) {
-        $jumpto = "'uploaded/$coursedom/$coursenum/$folder.$container'";
-    }
+    my $jumpto = "uploaded/$coursedom/$coursenum/$folder.$container";
 
     unless ($allowed) {
         $randompick = -1;
@@ -1857,28 +1828,12 @@ 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,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'}) {
@@ -1944,68 +1899,35 @@ sub editor {
         unless ($name) {  $name=(split(/\//,$url))[-1]; }
         unless ($name) { $idx++; next; }
         $output .= &entryline($idx,$name,$url,$folder,$allowed,$res,
-                              $coursenum,$coursedom,$crstype,
-                              $pathitem,$supplementalflag,$container);
+                              $coursenum,$crstype);
         $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')
-                          .&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;
+    
+    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>';
             }
-            $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 .= &Apache::loncommon::end_data_table_header_row();
         }
+        $to_show .= $output.' '
+                 .&Apache::loncommon::end_data_table()
+                 .'<br style="line-height:2px;" />'
+                 .&Apache::loncommon::end_scrollbox();
     } else {
-        if ($shown) {
-            $to_show = '<div>'
-                      .&Apache::loncommon::start_data_table('LC_tableOfContent')
-                      .$output
-                      .&Apache::loncommon::end_data_table()
-                      .'</div>';
-        } else {
-            $to_show = '<div class="LC_info" id="contentlist">'
-                      .&mt('Currently no documents.')
-                      .'</div>'
-        }
+        $to_show .= &Apache::loncommon::start_scrollbox('400px','380px','200px','contentscroll')
+                 .'<div class="LC_info" id="contentlist">'
+                 .&mt('Currently no documents.')
+                 .'</div>'
+                 .&Apache::loncommon::end_scrollbox();
     }
     my $tid = 1;
     if ($supplementalflag) {
@@ -2017,6 +1939,19 @@ 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;
@@ -2037,7 +1972,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 +2062,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,
@@ -2180,53 +2116,41 @@ sub is_supplemental_title {
 # --------------------------------------------------------------- An entry line
 
 sub entryline {
-    my ($index,$title,$url,$folder,$allowed,$residx,$coursenum,$coursedom,
-        $crstype,$pathitem,$supplementalflag,$container)=@_;
-    my ($foldertitle,$renametitle);
+    my ($index,$title,$url,$folder,$allowed,$residx,$coursenum,$crstype)=@_;
+    my ($foldertitle,$pagetitle,$renametitle);
     if (&is_supplemental_title($title)) {
 	($title,$foldertitle,$renametitle) = &Apache::loncommon::parse_supplemental_title($title);
+	$pagetitle = $foldertitle;
     } else {
 	$title=&HTML::Entities::encode($title,'"<>&\'');
 	$renametitle=$title;
 	$foldertitle=$title;
+	$pagetitle=$title;
     }
 
     my $orderidx=$LONCAPA::map::order[$index];
 
+
     $renametitle=~s/\\/\\\\/g;
     $renametitle=~s/\&quot\;/\\\"/g;
     $renametitle=~s/ /%20/g;
     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'},'<>&"');
     }
-    my $isexternal;
-    if ($residx) {
-        my $currurl = $url;
-        $currurl =~ s{^http(|s)(&colon;|:)//}{/adm/wrapper/ext/};
-        if ($currurl =~ m{^/adm/wrapper/ext/}) {
-            $isexternal = 1;
-        }
-        if (!$supplementalflag) {
-            my $path = 'uploaded/'.
-                       $env{'course.'.$env{'request.course.id'}.'.domain'}.'/'.
-                       $env{'course.'.$env{'request.course.id'}.'.num'}.'/';
-            $symb = &Apache::lonnet::encode_symb($path.$folder.".$container",
-                                                 $residx,
-                                                 &Apache::lonnet::declutter($currurl));
-        }
+    if ($env{'form.pagepath'}) {
+        $type = $container = 'page';
+        $esc_path=&escape($env{'form.pagepath'});
+	$path = &HTML::Entities::encode($env{'form.pagepath'},'<>&"');
+        $symb=&escape($env{'form.pagesymb'});
     }
-    my ($renamelink,%lt);
     if ($allowed) {
 	my $incindex=$index+1;
 	my $selectbox='';
@@ -2249,20 +2173,13 @@ sub entryline {
 	    }
 	    $selectbox.='</select>';
 	}
-	%lt=&Apache::lonlocal::texthash(
+	my %lt=&Apache::lonlocal::texthash(
                 'up' => 'Move Up',
 		'dw' => 'Move Down',
 		'rm' => 'Remove',
                 'ct' => 'Cut',
 		'rn' => 'Rename',
-		'cp' => 'Copy',
-                'ex' => 'External Resource',
-                'ed' => 'Edit',
-                'pr' => 'Preview',
-                'sv' => 'Save',
-                'ul' => 'URL',
-                'ti' => 'Title', 
-                );
+		'cp' => 'Copy');
 	my $nocopy=0;
         my $nocut=0;
         my $noremove=0;
@@ -2323,7 +2240,10 @@ sub entryline {
                 $nocopy=1;
             }
         }
-        my ($copylink,$cutlink,$removelink);
+        my $copylink='&nbsp;';
+        my $cutlink='&nbsp;';
+        my $removelink='&nbsp;';
+
 	my $skip_confirm = 0;
 	if ( $folder =~ /^supplemental/
 	     || ($url =~ m{( /smppg$
@@ -2331,42 +2251,25 @@ sub entryline {
 			    |/aboutme$
 			    |/navmaps$
 			    |/bulletinboard$
-			    |\.html$)}x)
-             || $isexternal) {
+			    |\.html$
+			    |^/adm/wrapper/ext)}x)) {
 	    $skip_confirm = 1;
 	}
 
-	if ($nocopy) {
-            $copylink=(<<ENDCOPY);
-<span style="visibility: hidden;">$lt{'cp'}</span>
-ENDCOPY
-        } else {
+	if (!$nocopy) {
 	    $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) {
-            $cutlink=(<<ENDCUT);
-<span style="visibility: hidden;">$lt{'ct'}</span>
-ENDCUT
-        } else {
+	if (!$nocut) {
 	    $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) {
+        if (!$noremove) {
             $removelink=(<<ENDREM);
-<span style="visibility: hidden;">$lt{'rm'}</a>
+<a href='javascript:removeres("$esc_path","$index","$renametitle","$container","$symb",$skip_confirm);' class="LC_docs_remove">$lt{'rm'}</a>
 ENDREM
-        } else {
-            $removelink=(<<ENDREM);
-<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">
@@ -2382,12 +2285,12 @@ END
 <td>
 <div class="LC_docs_entry_move">
   <a href='/adm/coursedocs?cmd=up_$index&amp;${type}path=$esc_path&amp;${type}symb=$symb'>
-    <img src="${iconpath}move_up.gif" alt="$lt{'up'}" class="LC_icon" />
+    <img src="${iconpath}move_up.gif" alt='$lt{'up'}' class="LC_icon" />
   </a>
 </div>
 <div class="LC_docs_entry_move">
   <a href='/adm/coursedocs?cmd=down_$index&amp;${type}path=$esc_path&amp;${type}symb=$symb'>
-    <img src="${iconpath}move_down.gif" alt="$lt{'dw'}" class="LC_icon" />
+    <img src="${iconpath}move_down.gif" alt='$lt{'dw'}' class="LC_icon" />
   </a>
 </div>
 </td>
@@ -2397,11 +2300,11 @@ END
    $selectbox
    $form_end
 </td>
-<td class="LC_docs_entry_commands"><span class="LC_nobreak">
+<td class="LC_docs_entry_commands">
 $removelink
 $cutlink
+   <a href='javascript:changename("$esc_path","$index","$renametitle","$container","$symb");' class="LC_docs_rename">$lt{'rn'}</a>
 $copylink
-</span>
 </td>
 END
 
@@ -2410,18 +2313,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,122 +2341,114 @@ END
 	}
     }
 
-    my ($editlink,$extresform);
     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 ((!$isfolder) && (!$ispage)) {
-	    (undef,undef,$url)=&Apache::lonnet::decode_symb($symb);
-	    $url=&Apache::lonnet::clutter($url);
-	    if ($url=~/^\/*uploaded\//) {
-	        $url=~/\.(\w+)$/;
-	        my $embstyle=&Apache::loncommon::fileembstyle($1);
-	        if (($embstyle eq 'img') || ($embstyle eq 'emb')) {
-		    $url='/adm/wrapper'.$url;
-	        } elsif ($embstyle eq 'ssi') {
-		    #do nothing with these
-	        } elsif ($url!~/\.(sequence|page)$/) {
-		    $url='/adm/coursedocs/showdoc'.$url;
-	        }
-	    } elsif ($url=~m|^/ext/|) {
-	        $url='/adm/wrapper'.$url;
+    my $external = ($url=~s{^http(|s)(&colon;|:)//}{/adm/wrapper/ext/});
+    if ((!$isfolder) && ($residx) && ($folder!~/supplemental/) && (!$ispage)) {
+	my $symb=&Apache::lonnet::symbclean(
+          &Apache::lonnet::declutter('uploaded/'.
+           $env{'course.'.$env{'request.course.id'}.'.domain'}.'/'.
+           $env{'course.'.$env{'request.course.id'}.'.num'}.'/'.$folder.
+           '.sequence').
+           '___'.$residx.'___'.
+	   &Apache::lonnet::declutter($url));
+	(undef,undef,$url)=&Apache::lonnet::decode_symb($symb);
+	$url=&Apache::lonnet::clutter($url);
+	if ($url=~/^\/*uploaded\//) {
+	    $url=~/\.(\w+)$/;
+	    my $embstyle=&Apache::loncommon::fileembstyle($1);
+	    if (($embstyle eq 'img') || ($embstyle eq 'emb')) {
+		$url='/adm/wrapper'.$url;
+	    } elsif ($embstyle eq 'ssi') {
+		#do nothing with these
+	    } elsif ($url!~/\.(sequence|page)$/) {
+		$url='/adm/coursedocs/showdoc'.$url;
 	    }
-            if (&Apache::lonnet::symbverify($symb,$url)) {
-	        $url.=(($url=~/\?/)?'&':'?').'symb='.&escape($symb);
-            } else {
-                $url='';
-            }
+	} elsif ($url=~m|^/ext/|) {
+	    $url='/adm/wrapper'.$url;
+	    $external = 1;
+	}
+        if (&Apache::lonnet::symbverify($symb,$url)) {
+	    $url.=(($url=~/\?/)?'&':'?').'symb='.&escape($symb);
+        } else {
+            $url='';
+        }
+	if ($container eq 'page') {
+	    my $symb=$env{'form.pagesymb'};
+
+	    $url=&Apache::lonnet::clutter((&Apache::lonnet::decode_symb($symb))[2]);
+	    $url.=(($url=~/\?/)?'&':'?').'symb='.&escape($symb);
 	}
     }
     my ($rand_pick_text,$rand_order_text);
-    if ($isfolder || $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;
-            $url.='folderpath='.&escape($folderpath);
-        } else {
 # Append randompick number, hidden, and encrypted with ":" to foldername,
 # so it gets transferred between levels
-	    $folderpath.=$containerarg.'&'.$foldername.
-                                              ':'.(&LONCAPA::map::getparameter($orderidx,
+	$folderpath.=$folderarg.'&'.$foldername.':'.(&LONCAPA::map::getparameter($orderidx,
                                               'parameter_randompick'))[0]
                                                .':'.((&LONCAPA::map::getparameter($orderidx,
                                               'parameter_hiddenresource'))[0]=~/^yes$/i)
                                                .':'.((&LONCAPA::map::getparameter($orderidx,
                                               'parameter_encrypturl'))[0]=~/^yes$/i)
                                                .':'.((&LONCAPA::map::getparameter($orderidx,
-                                              'parameter_randomorder'))[0]=~/^yes$/i)
-                                               .':'.$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 = 
+                                              '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 = 
 '<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;
-        }
     }
-    my ($tdalign,$tdwidth);
-    if ($allowed) {
-        my $fileloc = 
-            &Apache::lonnet::declutter(&Apache::lonnet::filelocation('',$orig_url));
-        if ($isexternal) {
-            ($editlink,$extresform) = 
-                &Apache::lonextresedit::extedit_form(0,$residx,$orig_url,$title,$pathitem);
-        } elsif (!$isfolder && !$ispage) {
-            my ($cfile,$home,$switchserver,$forceedit,$forceview) = 
-                &Apache::lonnet::can_edit_resource($fileloc,$coursenum,$coursedom,$orig_url);
-            if (($cfile ne '') && ($symb ne '' || $supplementalflag)) {
-                my $jscall = 
-                    &Apache::lonhtmlcommon::jump_to_editres($cfile,$home,
-                                                            $switchserver,
-                                                            $forceedit,
-                                                            undef,$symb,
-                                                            &escape($env{'form.folderpath'}),
-                                                            $renametitle,'','',1);
-                if ($jscall) {
-                    $editlink = '<a class="LC_docs_ext_edit" href="javascript:'.
-                                $jscall.'" >'.&mt('Edit').'</a>&nbsp;'."\n";
-                }
-            }
-        }
-        $tdalign = ' align="right" valign="top"';
-        $tdwidth = ' width="80%"';
+    if ($ispage) {
+        my $pagename=&escape($pagetitle);
+        my $pagepath;
+        my $folderpath=$env{'form.folderpath'};
+        if ($folderpath) { $pagepath = $folderpath.'&' };
+        $pagepath.=$pagearg.'&'.$pagename;
+	my $symb=$env{'form.pagesymb'};
+	if (!$symb) {
+	    my $path='uploaded/'.
+		$env{'course.'.$env{'request.course.id'}.'.domain'}.'/'.
+		$env{'course.'.$env{'request.course.id'}.'.num'}.'/';
+	    $symb=&Apache::lonnet::encode_symb($path.$folder.'.sequence',
+					       $residx,
+					       $path.$pagearg.'.page');
+	}
+	$url.='pagepath='.&escape($pagepath).
+	    '&amp;pagesymb='.&escape($symb);
+    }
+    if (($external) && ($allowed)) {
+	my $form = ($folder =~ /^default/)? 'newext' : 'supnewext';
+	$external = '&nbsp;<a class="LC_docs_ext_edit" href="javascript:edittext(\''.$form.'\',\''.$residx.'\',\''.&escape($title).'\',\''.&escape($orig_url).'\');" >'.&mt('Edit').'</a>';
+    } else {
+	undef($external);
     }
     my $reinit;
     if ($crstype eq 'Community') {
         $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 +2457,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 +2466,7 @@ $form_common.'
     } else {
        $line.=$title.' <span class="LC_docs_reinit_warn">'.$reinit.'</span>';
     }
-    $line.="$extresform</td>";
+    $line.=$external."</td>";
     $rand_pick_text = '&nbsp;' if ($rand_pick_text eq '');
     $rand_order_text = '&nbsp;' if ($rand_order_text eq '');
     if (($allowed) && ($folder!~/^supplemental/)) {
@@ -2598,30 +2497,6 @@ ENDPARMS
     return $line;
 }
 
-sub newmap_suffix {
-    my ($area,$container,$coursedom,$coursenum) = @_;
-    my ($prefix,$idtype,$errtext,$locknotfreed);
-    $prefix = 'docs';
-    if ($area eq 'supplemental') {
-        $prefix = 'supp';
-    }
-    $prefix .= $container;
-    $idtype = 'concat';
-    my ($suffix,$freedlock,$error) =
-        &Apache::lonnet::get_timebased_id($prefix,'num','uploadedmaps',
-                                          $coursedom,$coursenum);
-    if (!$suffix) {
-        $errtext = &mt('Failed to acquire a unique timestamp-based suffix for the new folder/page.');
-        if ($error) {
-            $errtext .= '<br />'.$error;
-        }
-    }
-    if ($freedlock ne 'ok') {
-        $locknotfreed = '<div class="LC_error">'.&mt('There was a problem removing a lockfile. This will prevent creation of additional folders or composite pages in this course.  Please contact the domain coordinator for your LON-CAPA domain.').'</div>';
-    }
-    return ($suffix,$errtext,$locknotfreed);
-}
-
 =pod
 
 =item tiehash()
@@ -2717,7 +2592,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 +2638,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 +2648,6 @@ sub list_symbs {
         }
         $r->print(&Apache::loncommon::end_data_table());
     }
-    $r->print(&endContentScreen());
 }
 
 
@@ -2804,7 +2678,6 @@ sub verifycontent {
    }
    &untiehash();
    $r->print('<p class="LC_success">'.&mt('Done').'</p>');
-    $r->print(&endContentScreen());
 }
 
 
@@ -2884,7 +2757,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 +2778,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 +2828,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 +2848,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 +2984,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();
@@ -3133,9 +3029,9 @@ sub init_breadcrumbs {
 sub create_list_elements {
    my @formarr = @_;
    my $list = '';
-   foreach my $button (@formarr){
-        foreach my $picture (keys(%{$button})) {
-            $list .= &Apache::lonhtmlcommon::htmltag('li', $picture.' '.$button->{$picture}, {class => 'LC_menubuttons_inline_text', id => ''});
+   for my $button (@formarr){
+        for my $picture(keys %$button) {
+            $list .= &Apache::lonhtmlcommon::htmltag('li', $picture.' '.$button->{$picture}, {class => 'LC_menubuttons_inline_text'});
         }
    }
    return $list;
@@ -3158,6 +3054,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";
@@ -3204,8 +3101,7 @@ sub handler {
 	               'Adding_External_Resource','Navigate_Content',
 	               'Adding_Folders','Docs_Overview', 'Load_Map',
 	               'Supplemental','Score_Upload_Form','Adding_Pages',
-	               'Importing_LON-CAPA_Resource','Importing_IMS_Course',
-                       'Uploading_From_Harddrive',
+	               'Importing_LON-CAPA_Resource','Uploading_From_Harddrive',
 	               'Check_Resource_Versions','Verify_Content') {
 	$help{$topic}=&Apache::loncommon::help_open_topic('Docs_'.$topic);
     }
@@ -3265,9 +3161,9 @@ sub handler {
 # Get the parameters that may be needed
 #
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
-                                            ['folderpath',
-                                             'forcesupplement','forcestandard',
-                                             'tools','symb','command','supppath']);
+                                            ['folderpath','pagepath',
+                                             'pagesymb','forcesupplement','forcestandard',
+                                             'tools','symb','command']);
 
 # 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
@@ -3281,7 +3177,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; }
@@ -3296,58 +3192,106 @@ sub handler {
     my $addentries = {};
     my $container;
     my $containertag;
-    my $pathitem;
+    my $uploadtag;
 
 # 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 .= '&'.&Apache::lonhtmlcommon::entity_encode($mapurl).'&'.
+                    &Apache::lonhtmlcommon::entity_encode($mapresobj->title()).
+                    ':'.$mapresobj->randompick().
+                    ':'.$mapresobj->randomout().
+                    ':'.$mapresobj->encrypted().
+                    ':'.$mapresobj->randomorder();
+           } else {
+               my $maptitle = &Apache::lonnet::gettitle($mapurl);
+               $path = '&default&...::::'.
+                   '&'.&Apache::lonhtmlcommon::entity_encode($mapurl).'&'.
+                   &Apache::lonhtmlcommon::entity_encode($maptitle).'::::';
+           }
+           $path = 'default&'.
+                   &Apache::lonhtmlcommon::entity_encode('Main Course Documents').
+                   $path;
+           if ($type eq 'sequence') {
+               $env{'form.folderpath'}=$path;
+               $env{'form.pagepath'}='';
+           } else {
+               $env{'form.pagepath'}=$path;
+               $env{'form.folderpath'}='';
+           }
        } elsif ($env{'form.supppath'} ne '') {
            $env{'form.folderpath'}=$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, see if we have something stored
+    if ((!$env{'form.folderpath'}) && (!$env{'form.pagepath'})) {
         &Apache::loncommon::restore_course_settings($stored_folderpath,
-                                          {'folderpath' => 'scalar'});
-        unless (&unescape($env{'form.folderpath'}) =~ m{^(default|supplemental)&}) {
-            undef($env{'form.folderpath'});
-        }
+                                              {'folderpath' => 'scalar'});
     }
    
 # 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,42 +3299,48 @@ 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';
        }
     }
 
 # Store this
     unless ($toolsflag) {
-        if ($allowed) {
-            &Apache::loncommon::store_course_settings($stored_folderpath,
-                                                      {'folderpath' => 'scalar'});
-        }
-        my $folderpath;
+        &Apache::loncommon::store_course_settings($stored_folderpath,
+                                                  {'pagepath' => 'scalar',
+                                                   'folderpath' => 'scalar'});
         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="" />';
+            $uploadtag = 
+                '<input type="hidden" name="pagepath" value="'.&HTML::Entities::encode($env{'form.pagepath'},'<>&"').'" />'.
+	        '<input type="hidden" name="pagesymb" value="'.&HTML::Entities::encode($env{'form.pagesymb'},'<>&"').'" />'.
+                '<input type="hidden" name="folderpath" value="" />';
         } else {
-            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="" />';
+            $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;
         }
@@ -3428,7 +3378,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'));
                 }
@@ -3437,8 +3387,7 @@ sub handler {
 	    $script .= &editing_js($udom,$uname,$supplementalflag).
                        &history_tab_js().
                        &inject_data_js().
-                       &Apache::lonhtmlcommon::resize_scrollbox_js('docs',$tabidstr).
-                       &Apache::lonextresedit::extedit_javascript();
+                       &Apache::lonhtmlcommon::resize_scrollbox_js('docs',$tabidstr);
             $addentries = {
                             onload   => "javascript:resize_scrollbox('contentscroll','1','1');",
                           };
@@ -3446,10 +3395,6 @@ sub handler {
         if ($env{'docs.markedcopy_url'}) {
             $script .= &paste_popup_js(); 
         }
-        my $confirm_switch = &mt("Editing requires switching to the resource's home server.").'\n'.
-                             &mt('Switch server?');
-        
-
     }
 # -------------------------------------------------------------------- Body tag
     $script = '<script type="text/javascript">'."\n"
@@ -3460,26 +3405,22 @@ sub handler {
 
     # Breadcrumbs
     &Apache::lonhtmlcommon::clear_breadcrumbs();
-
-    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 {
+    unless ($showdoc) {
         &Apache::lonhtmlcommon::add_breadcrumb({
             href=>"/adm/coursedocs",text=>"$crstype Contents"});
 
         $r->print(&Apache::loncommon::start_page("$crstype Contents", $script,
-                                                 {'add_entries'    => $addentries}
-                                                )
+                                                 {'force_register' => $showdoc,
+                                                  '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 = ();
@@ -3542,17 +3483,20 @@ 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',
+                'upld' => 'Import Document',
                 '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',
@@ -3563,15 +3507,17 @@ 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',
-                'se'   => 'Select',
                 'file' =>  'File',
                 'title' => 'Title',
                 'comment' => 'Comment',
                 'parse' => 'Upload embedded images/multimedia files if HTML file',
+		'nd' => 'Upload Document',
+		'pm' => 'Published Map',
+		'sd' => 'Special Document',
+		'mo' => 'More Options',
 					  );
 # -----------------------------------------------------------------------------
 	my $fileupload=(<<FIUP);
@@ -3587,85 +3533,54 @@ FIUP
 	<input type="checkbox" name="parserflag" checked="checked" /> $lt{'parse'}
 	</label>
 CHBO
-        my $imsfolder = $env{'form.folder'};
-        if ($imsfolder eq '') {
-            $imsfolder = 'default';  
-        }
-        my $imspform=(<<IMSFORM);
-        <a class="LC_menubuttons_link" href="javascript:toggleUpload('ims');">
-        $lt{'imsf'}</a> $help{'Importing_IMS_Course'}
-        <form name="uploadims" action="/adm/imsimportdocs" method="post" enctype="multipart/form-data" target="IMSimport">
-        <fieldset id="uploadimsform" style="display: none;">
-        <legend>$lt{'imsf'}</legend>
-        $fileupload
-        <br />
-        <p>
-        $lt{'cms'}:&nbsp; 
-        <select name="source">
-        <option value="-1" selected="selected">$lt{'se'}</option>
-        <option value="bb5">Blackboard 5</option>
-        <option value="bb6">Blackboard 6</option>
-        <option value="angel5">ANGEL 5.5</option>
-        <option value="webctce4">WebCT 4 Campus Edition</option>
-        </select>
-        <input type="hidden" name="folder" value="$imsfolder" />
-        </p>
-        <input type="hidden" name="phase" value="one" />
-        <input type="button" value="$lt{'imsl'}" onclick="makeims(this.form);" />
-        </fieldset>
-        </form>
-IMSFORM
 
+    my $fileuploada = "<br clear='all' /><input type='submit' value='".$lt{'upld'}."' /> $help{'Uploading_From_Harddrive'}";
 	my $fileuploadform=(<<FUFORM);
-        <a class="LC_menubuttons_link" href="javascript:toggleUpload('doc');">
-        $lt{'upfi'}</a> $help{'Uploading_From_Harddrive'}
-        <form name="uploaddocument" action="/adm/coursedocs" method="post" enctype="multipart/form-data">
-        <fieldset id="uploaddocform" style="display: none;">
-        <legend>$lt{'upfi'}</legend>
+	<form name="uploaddocument" action="/adm/coursedocs" method="post" enctype="multipart/form-data">
 	<input type="hidden" name="active" value="aa" />
 	$fileupload
 	<br />
 	$lt{'title'}:<br />
 	<input type="text" size="60" name="comment" />
-	$pathitem
+	$uploadtag
 	<input type="hidden" name="cmd" value="upload_default" />
 	<br />
 	<span class="LC_nobreak" style="float:left">
 	$checkbox
 	</span>
-        <br clear="all" />
-        <input type="submit" value="$lt{'upld'}" />
-        </fieldset>
-        </form>
 FUFORM
+    $fileuploadform .= $fileuploada.'</form>';
 
-	my $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>
+	my $simpleeditdefaultform=(<<SEDFFORM);
+	<form action="/adm/coursedocs" method="post" name="simpleeditdefault">
 	<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 @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>" },
+	my @simpleeditdefaultforma = ( 
+	{ '<img class="LC_noBorder LC_middle" src="/res/adm/pages/src.png" alt="'.$lt{srch}.'"  onclick="javascript:groupsearch()" />' => "$uploadtag<a class='LC_menubuttons_link' href='javascript:groupsearch()'>$lt{'srch'}</a>" },
 	{ '<img class="LC_noBorder LC_middle" src="/res/adm/pages/res.png" alt="'.$lt{impo}.'"  onclick="javascript:groupimport();"/>' => "<a class='LC_menubuttons_link' href='javascript:groupimport();'>$lt{'impo'}</a>$help{'Importing_LON-CAPA_Resource'}" },
 	{ '<img class="LC_noBorder LC_middle" src="/res/adm/pages/wishlist.png" alt="'.$lt{lnks}.'" onclick="javascript:open_StoredLinks_Import();" />' => "<a class='LC_menubuttons_link' href='javascript:open_StoredLinks_Import();'>$lt{'lnks'}</a>" },
-        { '<img class="LC_noBorder LC_middle" src="/res/adm/pages/sequence.png" alt="'.$lt{impm}.'" onclick="javascript:toggleMap(\'map\');" />' => $importpubform }
 	);
-	$importpubform = &create_form_ul(&create_list_elements(@importpubforma));
-        my $extresourcesform =
-            &Apache::lonextresedit::extedit_form(0,0,undef,undef,$pathitem,
-                                                 $help{'Adding_External_Resource'});
+	$simpleeditdefaultform .= &create_form_ul(&create_list_elements(@simpleeditdefaultforma));
+	$simpleeditdefaultform .=(<<SEDFFORM);
+	<hr id="bb_hrule" style="width:0px;text-align:left;margin-left:0" />
+	$lt{'copm'}<br />
+	<input type="text" size="40" name="importmap" /><br />
+	<span class="LC_nobreak" style="float:left"><input type="button"
+	onclick="javascript:openbrowser('simpleeditdefault','importmap','sequence,page','')"
+	value="$lt{'selm'}" /> <input type="submit" name="loadmap" value="$lt{'load'}" />
+	$help{'Load_Map'}</span>
+	</form>
+SEDFFORM
+
+      my $extresourcesform=(<<ERFORM);
+      <form action="/adm/coursedocs" method="post" name="newext">
+      $uploadtag
+      <input type="hidden" name="importdetail" value="" />
+      <a class="LC_menubuttons_link" href="javascript:makenewext('newext');">$lt{'extr'}</a>$help{'Adding_External_Resource'}
+      </form>
+ERFORM
+
+
     if ($allowed) {
         my $folder = $env{'form.folder'};
         if ($folder eq '') {
@@ -3682,23 +3597,18 @@ SEDFFORM
  </form>
 
 HIDDENFORM
-        $r->print(&makesimpleeditform($pathitem)."\n".
-                  &makedocslogform($pathitem."\n".
+        $r->print(&makesimpleeditform($uploadtag)."\n".
+                  &makedocslogform($uploadtag."\n".
                                    '<input type="hidden" name="folder" value="'.
                                    $env{'form.folder'}.'" />'."\n"));
     }
 
 # Generate the tabs
-    my ($mode,$needs_end);
+    my $mode;
     if (($supplementalflag) && (!$allowed)) {
-        my @folders = split('&',$env{'form.folderpath'});
-        unless (@folders > 2) {
-            &Apache::lonnavdisplay::startContentScreen($r,'supplemental');
-            $needs_end = 1;
-        }
+        &Apache::lonnavdisplay::startContentScreen($r,'supplemental');
     } else {
         $r->print(&startContentScreen(($supplementalflag?'suppdocs':'docs')));
-        $needs_end = 1;
     }
 
 #
@@ -3711,7 +3621,7 @@ HIDDENFORM
            $folder='default';
 	   $savefolderpath = $env{'form.folderpath'};
 	   $env{'form.folderpath'}='default&'.&escape(&mt('Content'));
-           $pathitem = '<input type="hidden" name="folderpath" value="'.
+           $uploadtag = '<input type="hidden" name="folderpath" value="'.
 	       &HTML::Entities::encode($env{'form.folderpath'},'<>&"').'" />';
        }
        my $postexec='';
@@ -3725,14 +3635,27 @@ HIDDENFORM
        } else {
            #$postexec='self.close();';
        }
-       my $folderseq='/uploaded/'.$coursedom.'/'.$coursenum.'/default_new.sequence';
-       my $pageseq = '/uploaded/'.$coursedom.'/'.$coursenum.'/default_new.page';
+       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 $readfile='/uploaded/'.$coursedom.'/'.$coursenum.'/'.$folder.'.'.$container;
 
+	my $imspform=(<<IMSPFORM);
+	<form action="/adm/imsimportdocs" method="post" name="ims">
+	<input type="hidden" name="folder" value="$folder" />
+	<a class="LC_menubuttons_link" href="javascript:makeims();">$lt{'imsf'}</a>
+	</form>
+IMSPFORM
+
 	my $newnavform=(<<NNFORM);
 	<form action="/adm/coursedocs" method="post" name="newnav">
 	<input type="hidden" name="active" value="cc" />
-	$pathitem
+	$uploadtag
 	<input type="hidden" name="importdetail" 
 	value="$lt{'navc'}=/adm/navmaps" />
 	<a class="LC_menubuttons_link" href="javascript:document.newnav.submit()">$lt{'navc'}</a>
@@ -3742,7 +3665,7 @@ NNFORM
 	my $newsmppageform=(<<NSPFORM);
 	<form action="/adm/coursedocs" method="post" name="newsmppg">
 	<input type="hidden" name="active" value="cc" />
-	$pathitem
+	$uploadtag
 	<input type="hidden" name="importdetail" value="" />
 	<a class="LC_menubuttons_link" href="javascript:makesmppage();"> $lt{'sipa'}</a>
 	$help{'Simple Page'}
@@ -3752,7 +3675,7 @@ NSPFORM
 	my $newsmpproblemform=(<<NSPROBFORM);
 	<form action="/adm/coursedocs" method="post" name="newsmpproblem">
 	<input type="hidden" name="active" value="cc" />
-	$pathitem
+	$uploadtag
 	<input type="hidden" name="importdetail" value="" />
 	<a class="LC_menubuttons_link" href="javascript:makesmpproblem();">$lt{'sipr'}</a>
 	$help{'Simple Problem'}
@@ -3763,7 +3686,7 @@ NSPROBFORM
 	my $newdropboxform=(<<NDBFORM);
 	<form action="/adm/coursedocs" method="post" name="newdropbox">
 	<input type="hidden" name="active" value="cc" />
-	$pathitem
+	$uploadtag
 	<input type="hidden" name="importdetail" value="" />
 	<a class="LC_menubuttons_link" href="javascript:makedropbox();">$lt{'drbx'}</a>
 	</form>
@@ -3772,7 +3695,7 @@ NDBFORM
 	my $newexuploadform=(<<NEXUFORM);
 	<form action="/adm/coursedocs" method="post" name="newexamupload">
 	<input type="hidden" name="active" value="cc" />
-	$pathitem
+	$uploadtag
 	<input type="hidden" name="importdetail" value="" />
 	<a class="LC_menubuttons_link" href="javascript:makeexamupload();">$lt{'scuf'}</a>
 	$help{'Score_Upload_Form'}
@@ -3782,7 +3705,7 @@ NEXUFORM
 	my $newbulform=(<<NBFORM);
 	<form action="/adm/coursedocs" method="post" name="newbul">
 	<input type="hidden" name="active" value="cc" />
-	$pathitem
+	$uploadtag
 	<input type="hidden" name="importdetail" value="" />
 	<a class="LC_menubuttons_link" href="javascript:makebulboard();" >$lt{'bull'}</a>
 	$help{'Bulletin Board'}
@@ -3792,7 +3715,7 @@ NBFORM
 	my $newaboutmeform=(<<NAMFORM);
 	<form action="/adm/coursedocs" method="post" name="newaboutme">
 	<input type="hidden" name="active" value="cc" />
-	$pathitem
+	$uploadtag
 	<input type="hidden" name="importdetail" 
 	value="$plainname=/adm/$udom/$uname/aboutme" />
 	<a class="LC_menubuttons_link" href="javascript:document.newaboutme.submit()">$lt{'mypi'}</a>
@@ -3803,7 +3726,7 @@ NAMFORM
 	my $newaboutsomeoneform=(<<NASOFORM);
 	<form action="/adm/coursedocs" method="post" name="newaboutsomeone">
 	<input type="hidden" name="active" value="cc" />
-	$pathitem
+	$uploadtag
 	<input type="hidden" name="importdetail" value="" />
 	<a class="LC_menubuttons_link" href="javascript:makeabout();">$lt{'abou'}</a>
 	</form>
@@ -3813,7 +3736,7 @@ NASOFORM
 	my $newrosterform=(<<NROSTFORM);
 	<form action="/adm/coursedocs" method="post" name="newroster">
 	<input type="hidden" name="active" value="cc" />
-	$pathitem
+	$uploadtag
 	<input type="hidden" name="importdetail" 
 	value="$lt{'rost'}=/adm/viewclasslist" />
 	<a class="LC_menubuttons_link" href="javascript:document.newroster.submit()">$lt{'rost'}</a>
@@ -3845,7 +3768,7 @@ NPFORM
 
 	$newfolderform=(<<NFFORM);
 	<form action="/adm/coursedocs" method="post" name="newfolder">
-	$pathitem
+	<input type="hidden" name="folderpath" value="$path" />
 	<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'}
@@ -3855,7 +3778,7 @@ NFFORM
 	my $newsylform=(<<NSYLFORM);
 	<form action="/adm/coursedocs" method="post" name="newsyl">
 	<input type="hidden" name="active" value="cc" />
-	$pathitem
+	$uploadtag
 	<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>
@@ -3867,7 +3790,7 @@ NSYLFORM
 	my $newgroupfileform=(<<NGFFORM);
 	<form action="/adm/coursedocs" method="post" name="newgroupfiles">
 	<input type="hidden" name="active" value="cc" />
-	$pathitem
+	$uploadtag
 	<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>
@@ -3884,17 +3807,9 @@ 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}
-        );
-        $fileuploadform =  &create_form_ul(&create_list_elements(@importdoc));
+        {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/extres.png" alt="'.$lt{extr}.'" onclick="javascript:makenewext(\'newext\');" />'=>$extresourcesform},
+        {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/ims.png" alt="'.$lt{imsf}.'" onclick="javascript:makeims();" />'=>$imspform},);
+        $fileuploadform =  &create_form_ul(&create_list_elements(@importdoc)) . '<hr id="cc_hrule" style="width:0px;text-align:left;margin-left:0" />' . $fileuploadform;
 
         @gradingforma=(
         {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/simpprob.png" alt="'.$lt{sipr}.'" onclick="javascript:makesmpproblem();" />'=>$newsmpproblemform},
@@ -3915,19 +3830,19 @@ NGFFORM
 
 my %orderhash = (
                 'aa' => ['Import Content',$fileuploadform],
-                'bb' => ['Published Content',$importpubform],
+                'bb' => ['Published Content',$simpleeditdefaultform],
                 '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;
        unless (($supplementalflag || $toolsflag)) {
           my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$crstype,
-                              $supplementalflag,\%orderhash,$iconpath,$pathitem);
+                              $supplementalflag,\%orderhash,$iconpath);
           if ($error) {
              $r->print('<p><span class="LC_error">'.$error.'</span></p>');
           }
@@ -3951,18 +3866,17 @@ unless ($container eq 'page') {
        } elsif ($allowed) {
 	  $env{'form.folderpath'} = $savefolderpath;
        }
-       $pathitem = '<input type="hidden" name="folderpath" value="'.
-                    &HTML::Entities::encode($env{'form.folderpath'},'<>&"').'" />';
+       $env{'form.pagepath'} = '';
        if ($allowed) {
 	   my $folderseq=
-	       '/uploaded/'.$coursedom.'/'.$coursenum.'/supplemental_new.sequence';
+	       '/uploaded/'.$coursedom.'/'.$coursenum.'/supplemental_'.time.
+	       '.sequence';
 
+	   my $path = &HTML::Entities::encode($env{'form.folderpath'},'<>&"');
+
+	my $supupdocformbtn = "<input type='submit' value='".$lt{'upld'}."' />$help{'Uploading_From_Harddrive'}";
 	my $supupdocform=(<<SUPDOCFORM);
-        <a class="LC_menubuttons_link" href="javascript:toggleUpload('suppdoc');">
-        $lt{'upfi'}</a> $help{'Uploading_From_Harddrive'}
 	<form action="/adm/coursedocs" method="post" name="supuploaddocument" enctype="multipart/form-data">
-        <fieldset id="uploadsuppdocform" style="display: none;">
-        <legend>$lt{'upfi'}</legend>
 	<input type="hidden" name="active" value="ee" />	
 	$fileupload
 	<br />
@@ -3974,30 +3888,35 @@ unless ($container eq 'page') {
 	$lt{'comment'}:<br />
 	<textarea cols="50" rows="4" name="comment"></textarea>
 	<br />
-	$pathitem
+	<input type="hidden" name="folderpath" value="$path" />
 	<input type="hidden" name="cmd" value="upload_supplemental" />
-        <input type='submit' value="$lt{'upld'}" />
-        </form>
 SUPDOCFORM
+	$supupdocform .=  &create_form_ul(&Apache::lonhtmlcommon::htmltag('li',$supupdocformbtn,{class => 'LC_menubuttons_inline_text'}))."</form>";
 
 	my $supnewfolderform=(<<SNFFORM);
 	<form action="/adm/coursedocs" method="post" name="supnewfolder">
 	<input type="hidden" name="active" value="ee" />
-        $pathitem
+	<input type="hidden" name="folderpath" value="$path" />
 	<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 =
-            &Apache::lonextresedit::extedit_form(1,0,undef,undef,$pathitem,
-                                                 $help{'Adding_External_Resource'});
+
+	my $supnewextform=(<<SNEFORM);
+	<form action="/adm/coursedocs" method="post" name="supnewext">
+	<input type="hidden" name="active" value="ff" />
+	<input type="hidden" name="folderpath" value="$path" />
+	<input type="hidden" name="importdetail" value="" />
+	<a class="LC_menubuttons_link" href="javascript:makenewext('supnewext');">$lt{'extr'}</a> $help{'Adding_External_Resource'}
+	</form>
+SNEFORM
 
 	my $supnewsylform=(<<SNSFORM);
 	<form action="/adm/coursedocs" method="post" name="supnewsyl">
 	<input type="hidden" name="active" value="ff" />
-        $pathitem
+	<input type="hidden" name="folderpath" value="$path" />
 	<input type="hidden" name="importdetail" 
 	value="Syllabus=/public/$coursedom/$coursenum/syllabus" />
 	<a class="LC_menubuttons_link" href="javascript:document.supnewsyl.submit()">$lt{'syll'}</a>
@@ -4008,7 +3927,7 @@ SNSFORM
 	my $supnewaboutmeform=(<<SNAMFORM);
 	<form action="/adm/coursedocs" method="post" name="supnewaboutme">
 	<input type="hidden" name="active" value="ff" />
-        $pathitem
+	<input type="hidden" name="folderpath" value="$path" />
 	<input type="hidden" name="importdetail" 
 	value="$plainname=/adm/$udom/$uname/aboutme" />
 	<a class="LC_menubuttons_link" href="javascript:document.supnewaboutme.submit()">$lt{'mypi'}</a>
@@ -4024,36 +3943,31 @@ my @specialdocs = (
             =>$supnewaboutmeform},
 		);
 my @supimportdoc = (
-		{'<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},
-                   );
-
-$supupdocform =  &create_form_ul(&create_list_elements(@supimportdoc));
+		{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/extres.png" alt="'.$lt{extr}.'" onclick="javascript:makenewext(\'supnewext\');" />'
+            =>$supnewextform},
+        );
+$supupdocform =  &create_form_ul(&create_list_elements(@supimportdoc)) . '<hr id="ee_hrule" style="width:0px;text-align:left;margin-left:0" />' . $supupdocform;
 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,
-                               $supplementalflag,\%suporderhash,$iconpath,$pathitem);
+                               $supplementalflag,\%suporderhash,$iconpath);
            if ($error) {
               $r->print('<p><span class="LC_error">'.$error.'</span></p>');
            }
         }
     } elsif ($supplementalflag) {
         my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$crstype,
-                            $supplementalflag,'',$iconpath,$pathitem);
+                            $supplementalflag,'',$iconpath);
         if ($error) {
             $r->print('<p><span class="LC_error">'.$error.'</span></p>');
         }
     }
 
-    if ($needs_end) {
-        $r->print(&endContentScreen());
-    }
+    $r->print(&endContentScreen());
 
     if ($allowed) {
 	$r->print('
@@ -4119,9 +4033,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 +4228,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>'.
@@ -4400,48 +4317,23 @@ sub editing_js {
                                           p_ctr2a => 'Cut[_98]',
                                           p_ctr2b => '?[_98]',
                                           rpck    => 'Enter number to pick (e.g., 3)',
-                                          imsfile => 'You must choose an IMS package for import',
-                                          imscms  => 'You must select which Course Management System was the source of the IMS package',
-                                          invurl  => 'Invalid URL',
-                                          titbl   => 'Title is blank',
                                         );
 
     my $crstype = &Apache::loncommon::course_type();
     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;
-    }
-    my $toplevelmain = 'default&Main%20'.$crstype.'%20Documents%3A%3A%3A%3A%3A';
-    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,'<>&"');
-            }
+    if ($docs_folderpath eq '') {
+        if ($docs_pagepath ne '') {
+            $main_container_page = 1;
         }
-    } elsif ($env{'docs.exit.'.$env{'request.course.id'}} eq '/adm/menu') {
-        $backtourl = '/adm/menu';
-    } elsif ($supplementalflag) {
-        $backtourl = '/adm/supplemental';
-    } else {
-        $backtourl = '/adm/navmaps';
     }
+    my $toplevelmain = 'default&Main%20'.$crstype.'%20Documents';
+    my $toplevelsupp = &supplemental_base();
 
-    my $fieldsets = "'ext','doc'";
-    unless ($main_container_page) {
-        $fieldsets .=",'ims'";
-    }
+    my $backtourl = '/adm/navmaps';
     if ($supplementalflag) {
-        $fieldsets = "'suppext','suppdoc'";
+        $backtourl = '/adm/supplemental';
     }
 
     return <<ENDNEWSCRIPT;
@@ -4461,6 +4353,22 @@ function makenewpage(targetform,folderse
     }
 }
 
+function makenewext(targetname) {
+    this.document.forms.extimport.useform.value=targetname;
+    this.document.forms.extimport.title.value='';
+    this.document.forms.extimport.url.value='';
+    this.document.forms.extimport.residx.value='';
+    window.open('/adm/rat/extpickframe.html');
+}
+
+function edittext(targetname,residx,title,url) {
+    this.document.forms.extimport.useform.value=targetname;
+    this.document.forms.extimport.residx.value=residx;
+    this.document.forms.extimport.url.value=url;
+    this.document.forms.extimport.title.value=title;
+    window.open('/adm/rat/extpickframe.html');
+}
+
 function makeexamupload() {
    var title=prompt('$lt{"p_mxu"}');
    if (title) {
@@ -4525,84 +4433,79 @@ function makeabout() {
 }
 }
 
-function toggleUpload(caller) {
-    var blocks = Array($fieldsets);
-    for (var i=0; i<blocks.length; i++) {
-        var disp = 'none';
-        if (caller == blocks[i]) {
-            var curr = document.getElementById('upload'+caller+'form').style.display;
-            if (curr == 'none') {
-                disp='block';
-            }
-        }
-        document.getElementById('upload'+blocks[i]+'form').style.display=disp;
-    }
-    resize_scrollbox('contentscroll','1','1');
-    return;
-}
-
-function 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) {
-    if ((imsform.uploaddoc.value == '')  || (!imsform.uploaddoc.value)) {
-        alert("$lt{'imsfile'}");
-        return;
-    }
-    if (imsform.source.selectedIndex == 0) {
-        alert("$lt{'imscms'}");
-        return;
-    }
-    newWindow = window.open('', 'IMSimport',"HEIGHT=700,WIDTH=750,scrollbars=yes");
-    imsform.submit();
+function makeims() {
+var caller = document.forms.ims.folder.value;
+var newlocation = "/adm/imsimportdocs?folder="+caller+"&phase=one";
+newWindow = window.open("","IMSimport","HEIGHT=700,WIDTH=750,scrollbars=yes");
+newWindow.location.href = newlocation;
+}
+
+function finishpick() {
+var title=this.document.forms.extimport.title.value;
+var url=this.document.forms.extimport.url.value;
+var form=this.document.forms.extimport.useform.value;
+var residx=this.document.forms.extimport.residx.value;
+eval('this.document.forms.'+form+'.importdetail.value="'+title+'='+url+'='+residx+'";this.document.forms.'+form+'.submit();');
 }
 
-function changename(folderpath,index,oldtitle) {
+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();
 }
 
@@ -4696,10 +4599,11 @@ function showPage(current, pageId, nav,
 	currentData = document.getElementById(pageId);
 	currentData.style.display = 'block';
         activeTab = pageId;
-        toggleUpload();
-        toggleMap();
         if (nav == 'mainnav') {
             var storedpath = "$docs_folderpath";
+            if (storedpath == '') {
+                storedpath = "$docs_pagepath";
+            }
             var storedpage = "$main_container_page";
             var reg = new RegExp("^supplemental");
             if (pageId == 'mainCourseDocuments') {
@@ -4735,8 +4639,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 +4833,8 @@ Return hash with valid author names
 
 =item contained_map_check()
 
+=item reinit_role()
+
 =item url_paste_fixups()
 
 =item apply_fixups()