--- loncom/interface/londocs.pm	2012/05/06 22:09:14	1.483
+++ loncom/interface/londocs.pm	2012/07/13 13:36:24	1.491
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.483 2012/05/06 22:09:14 raeburn Exp $
+# $Id: londocs.pm,v 1.491 2012/07/13 13:36:24 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -40,7 +40,9 @@ use Apache::lonxml;
 use Apache::lonclonecourse;
 use Apache::lonnavmaps;
 use Apache::lonnavdisplay();
+use Apache::lonuserstate();
 use HTML::Entities;
+use HTML::TokeParser;
 use GDBM_File;
 use Apache::lonlocal;
 use Cwd;
@@ -100,12 +102,17 @@ sub authorhosts {
 	    my $allowed=0;
 	    my $myhome=&Apache::lonnet::homeserver($ca,$cd);
 	    my @ids=&Apache::lonnet::current_machine_ids();
-	    foreach my $id (@ids) { if ($id eq $myhome) { $allowed=1; } }
+	    foreach my $id (@ids) {
+                if ($id eq $myhome) {
+                    $allowed=1;
+                    last;
+                }
+            }
 	    if ($allowed) {
 		$home++;
-		$outhash{'home_'.$ca.'@'.$cd}=1;
+		$outhash{'home_'.$ca.':'.$cd}=1;
 	    } else {
-		$outhash{'otherhome_'.$ca.'@'.$cd}=$myhome;
+		$outhash{'otherhome_'.$ca.':'.$cd}=$myhome;
 		$other++;
 	    }
 	}
@@ -114,27 +121,6 @@ sub authorhosts {
 }
 
 
-sub dumpbutton {
-    my ($home,$other,%outhash)=&authorhosts();
-    my $crstype = &Apache::loncommon::course_type();
-    if ($home+$other==0) { return ''; }
-    if ($home) {
-        my $link =
-            "<a class='LC_menubuttons_link' href='javascript:injectData(document.courseverify, \"dummy\", \"dumpcourse\", \""
-           .&mt('Dump '.$crstype.' Documents to Construction Space')
-           ."\")'>"
-           .&mt('Dump '.$crstype.' Documents to Construction Space')
-           .'</a>';
-        return
-            $link.' '
-           .&Apache::loncommon::help_open_topic('Docs_Dump_Course_Docs')
-           .'<br />';
-    } else {
-        return
-            &mt('Dump '.$crstype.' Documents to Construction Space: available on other servers');
-    }
-}
-
 sub clean {
     my ($title)=@_;
     $title=~s/[^\w\/\!\$\%\^\*\-\_\=\+\;\:\,\\\|\`\~]+/\_/gs;
@@ -146,16 +132,22 @@ sub clean {
 sub dumpcourse {
     my ($r) = @_;
     my $crstype = &Apache::loncommon::course_type();
-    $r->print(&Apache::loncommon::start_page('Dump '.$crstype.' Documents to Construction Space').
-	      '<form name="dumpdoc" action="" method="post">');
-    $r->print(&Apache::lonhtmlcommon::breadcrumbs('Dump '.$crstype.' Documents to Construction Space'));
+    $r->print(&Apache::loncommon::start_page('Dump '.$crstype.' Content to Authoring Space')."\n".
+              &Apache::lonhtmlcommon::breadcrumbs('Dump '.$crstype.' Content to Authoring Space')."\n");
+    $r->print(&startContentScreen('tools'));
     my ($home,$other,%outhash)=&authorhosts();
-    unless ($home) { return ''; }
+    unless ($home) {
+        $r->print(&endContentScreen());
+        return '';
+    }
     my $origcrsid=$env{'request.course.id'};
     my %origcrsdata=&Apache::lonnet::coursedescription($origcrsid);
     if (($env{'form.authorspace'}) && ($env{'form.authorfolder'}=~/\w/)) {
 # Do the dumping
-	unless ($outhash{'home_'.$env{'form.authorspace'}}) { return ''; }
+	unless ($outhash{'home_'.$env{'form.authorspace'}}) {
+            $r->print(&endContentScreen());
+            return '';
+        }
 	my ($ca,$cd)=split(/\@/,$env{'form.authorspace'});
 	$r->print('<h3>'.&mt('Copying Files').'</h3>');
 	my $title=$env{'form.authorfolder'};
@@ -206,10 +198,15 @@ sub dumpcourse {
 	    }
 	}
     } else {
+        $r->print(&mt('Searching ...').'<br />');
+        $r->rflush();
 # Input form
+        $r->print('<form name="dumpdoc" action="" method="post">'."\n");
 	unless ($home==1) {
-	    $r->print(
-		      '<h3>'.&mt('Select the Construction Space').'</h3><select name="authorspace">');
+	    $r->print('<div class="LC_left_float">'.
+		      '<fieldset><legend>'.
+                      &mt('Select the Authoring Space').
+                      '</legend><select name="authorspace">');
 	}
 	foreach my $key (sort(keys(%outhash))) {
 	    if ($key=~/^home_(.+)$/) {
@@ -218,20 +215,23 @@ sub dumpcourse {
 		  '<input type="hidden" name="authorspace" value="'.$1.'" />');
 		} else {
 		    $r->print('<option value="'.$1.'">'.$1.' - '.
-			      &Apache::loncommon::plainname(split(/\@/,$1)).'</option>');
+			      &Apache::loncommon::plainname(split(/\:/,$1)).'</option>');
 		}
 	    }
 	}
 	unless ($home==1) {
-	    $r->print('</select>');
+	    $r->print('</select></fieldset></div>'."\n");
 	}
 	my $title=$origcrsdata{'description'};
 	$title=~s/[\/\s]+/\_/gs;
 	$title=&clean($title);
-	$r->print('<h3>'.&mt('Folder in Construction Space').'</h3>'
-                 .'<input type="text" size="50" name="authorfolder" value="'.$title.'" /><br />');
+	$r->print('<div class="LC_left_float">'.
+                  '<fieldset><legend>'.&mt('Folder in Authoring Space').'</legend>'.
+                  '<input type="text" size="50" name="authorfolder" value="'.
+                  $title.'" />'.
+                  '</fieldset></div><br clear="all" />'."\n");
 	&tiehash();
-	$r->print('<h3>'.&mt('Filenames in Construction Space').'</h3>'
+	$r->print('<h4>'.&mt('Filenames in Authoring Space').'</h4>'
                  .&Apache::loncommon::start_data_table()
                  .&Apache::loncommon::start_data_table_header_row()
                  .'<th>'.&mt('Internal Filename').'</th>'
@@ -259,14 +259,9 @@ sub dumpcourse {
 	$r->print(&Apache::loncommon::end_data_table());
 	&untiehash();
 	$r->print(
-  '<p><input type="submit" name="dumpcourse" value="'.&mt("Dump $crstype Documents").'" /></p></form>');
+  '<p><input type="submit" name="dumpcourse" value="'.&mt("Dump $crstype Content").'" /></p></form>');
     }
-}
-
-sub exportbutton {
-    my $crstype = &Apache::loncommon::course_type();
-    return "<a class='LC_menubuttons_link' href='javascript:injectData(document.courseverify, \"dummy\", \"exportcourse\", \"".&mt('IMS Export')."\")'>".&mt('IMS Export')."</a>".
-    &Apache::loncommon::help_open_topic('Docs_Export_Course_Docs').'<br />';
+    $r->print(&endContentScreen());
 }
 
 sub group_import {
@@ -430,30 +425,51 @@ sub log_docs {
     }
 }
 
-
-
-
-
 sub docs_change_log {
-    my ($r)=@_;
-    my $folder=$env{'form.folder'};
+    my ($r,$coursenum,$coursedom,$folder,$allowed,$crstype,$iconpath)=@_;
+    my $supplementalflag=($env{'form.folderpath'}=~/^supplemental/);
     my $js = '<script type="text/javascript">'."\n".
              '// <![CDATA['."\n".
              &Apache::loncommon::display_filter_js('docslog')."\n".
+             &editing_js($env{'user.domain'},$env{'user.name'},$supplementalflag)."\n".
              &history_tab_js()."\n".
+             &Apache::lonratedt::editscript('simple')."\n".
              '// ]]>'."\n".
              '</script>'."\n";
-    $r->print(&Apache::loncommon::start_page('Course Document Change Log',$js));
-    $r->print(&Apache::lonhtmlcommon::breadcrumbs('Course Document Change Log'));
+    $r->print(&Apache::loncommon::start_page('Content Change Log',$js));
+    $r->print(&Apache::lonhtmlcommon::breadcrumbs('Content Change Log'));
+    $r->print(&startContentScreen(($supplementalflag?'suppdocs':'docs')));
+    my %orderhash;
+    my $container='sequence';
+    my $pathitem;
+    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 $readfile="/uploaded/$coursedom/$coursenum/$folder.$container";
+    my $jumpto = $readfile;
+    $jumpto =~ s{^/}{};
+    my $tid = 1;
+    if ($supplementalflag) {
+        $tid = 2;
+    }
+    my ($breadcrumbtrail) = &breadcrumbs($allowed,$crstype);
+    $r->print($breadcrumbtrail.
+              &generate_edit_table($tid,\%orderhash,undef,$iconpath,$jumpto,
+              $readfile));
     my %docslog=&Apache::lonnet::dump('nohist_docslog',
                                       $env{'course.'.$env{'request.course.id'}.'.domain'},
                                       $env{'course.'.$env{'request.course.id'}.'.num'});
 
     if ((keys(%docslog))[0]=~/^error\:/) { undef(%docslog); }
 
-    $r->print('<form action="/adm/coursedocs" method="post" name="docslog">'.
-              '<input type="hidden" name="docslog" value="1" />');
-
     my %saveable_parameters = ('show' => 'scalar',);
     &Apache::loncommon::store_course_settings('docs_log',
                                               \%saveable_parameters);
@@ -467,9 +483,14 @@ sub docs_change_log {
 	    'randomorder'    => 'Randomly ordered',
 	    'set'            => 'set to',
 	    'del'            => 'deleted');
-    $r->print(&Apache::loncommon::display_filter('docslog').
-              '<input type="hidden" name="folder" value="'.$folder.'" />'.
-              '<input type="submit" value="'.&mt('Display').'" /></form>');
+    my $filter = &Apache::loncommon::display_filter('docslog')."\n".
+                 $pathitem."\n".
+                 '<input type="hidden" name="folder" value="'.$env{'form.folder'}.'" />'.
+                 ('&nbsp;'x2).'<input type="submit" value="'.&mt('Display').'" />';
+    $r->print('<div class="LC_left_float">'.
+              '<fieldset><legend>'.&mt('Display of Content Changes').'</legend>'."\n".
+              &makedocslogform($filter,1).
+              '</fieldset></div><br clear="all" />');
     $r->print(&Apache::loncommon::start_data_table().&Apache::loncommon::start_data_table_header_row().
               '<th>'.&mt('Time').'</th><th>'.&mt('User').'</th><th>'.&mt('Folder').'</th><th>'.&mt('Before').'</th><th>'.
               &mt('After').'</th>'.
@@ -513,18 +534,30 @@ sub docs_change_log {
                                   ':'.$docslog{$id}{'exe_udom'}.'</tt>'.
                   $send_msg_link.'</td><td>'.
                   $docslog{$id}{'logentry'}{'folder'}.'</td><td>');
+        my $is_supp = 0; 
+        if ($docslog{$id}{'logentry'}{'currentfolder'} =~ /^supplemental/) {
+            $is_supp = 1;
+        }
 # Before
 	for (my $idx=0;$idx<=$docslog{$id}{'logentry'}{'maxidx'};$idx++) {
 	    my $oldname=(split(/\:/,$docslog{$id}{'logentry'}{'before_resources_'.$idx}))[0];
 	    my $newname=(split(/\:/,$docslog{$id}{'logentry'}{'after_resources_'.$idx}))[0];
 	    if ($oldname ne $newname) {
-		$r->print(&LONCAPA::map::qtescape($oldname));
+                my $shown = &LONCAPA::map::qtescape($oldname);
+                if ($is_supp) {
+                    $shown = &Apache::loncommon::parse_supplemental_title($shown);
+                }
+                $r->print($shown);
 	    }
 	}
 	$r->print('<ul>');
 	for (my $idx=0;$idx<=$docslog{$id}{'logentry'}{'maxidx'};$idx++) {
             if ($docslog{$id}{'logentry'}{'before_order_res_'.$idx}) {
-		$r->print('<li>'.&LONCAPA::map::qtescape((split(/\:/,$docslog{$id}{'logentry'}{'before_order_res_'.$idx}))[0]).'</li>');
+                my $shown = &LONCAPA::map::qtescape((split(/\:/,$docslog{$id}{'logentry'}{'before_order_res_'.$idx}))[0]);
+                if ($is_supp) {
+                    $shown = &Apache::loncommon::parse_supplemental_title($shown);
+                }
+		$r->print('<li>'.$shown.'</li>');
 	    }
 	}
 	$r->print('</ul>');
@@ -535,13 +568,21 @@ sub docs_change_log {
 	    my $oldname=(split(/\:/,$docslog{$id}{'logentry'}{'before_resources_'.$idx}))[0];
 	    my $newname=(split(/\:/,$docslog{$id}{'logentry'}{'after_resources_'.$idx}))[0];
 	    if ($oldname ne '' && $oldname ne $newname) {
-		$r->print(&LONCAPA::map::qtescape($newname));
+                my $shown = &LONCAPA::map::qtescape($newname);
+                if ($is_supp) {
+                    $shown = &Apache::loncommon::parse_supplemental_title(&LONCAPA::map::qtescape($newname));
+                }
+                $r->print($shown);
 	    }
 	}
 	$r->print('<ul>');
 	for (my $idx=0;$idx<=$docslog{$id}{'logentry'}{'maxidx'};$idx++) {
             if ($docslog{$id}{'logentry'}{'after_order_res_'.$idx}) {
-		$r->print('<li>'.&LONCAPA::map::qtescape((split(/\:/,$docslog{$id}{'logentry'}{'after_order_res_'.$idx}))[0]).'</li>');
+                my $shown = &LONCAPA::map::qtescape((split(/\:/,$docslog{$id}{'logentry'}{'after_order_res_'.$idx}))[0]);
+                if ($is_supp) {
+                    $shown = &Apache::loncommon::parse_supplemental_title($shown);
+                }
+                $r->print('<li>'.$shown.'</li>');
 	    }
 	}
 	$r->print('</ul>');
@@ -564,7 +605,10 @@ sub docs_change_log {
         if (!($env{'form.show'} eq &mt('all')
               || $shown<=$env{'form.show'})) { last; }
     }
-    $r->print(&Apache::loncommon::end_data_table());
+    $r->print(&Apache::loncommon::end_data_table()."\n".
+              &makesimpleeditform($pathitem)."\n".
+              '</div></div>');
+    $r->print(&endContentScreen());
 }
 
 sub update_paste_buffer {
@@ -583,7 +627,7 @@ sub update_paste_buffer {
     my ($title,$url)=split(':',$LONCAPA::map::resources[$LONCAPA::map::order[$env{'form.markcopy'}]]);
     if (&is_supplemental_title($title)) {
         &Apache::lonnet::appenv({'docs.markedcopy_supplemental' => $title});
-	($title) = &parse_supplemental_title($title);
+	($title) = &Apache::loncommon::parse_supplemental_title($title);
     } elsif ($env{'docs.markedcopy_supplemental'}) {
         &Apache::lonnet::delenv('docs.markedcopy_supplemental');
     }
@@ -595,23 +639,42 @@ sub update_paste_buffer {
 }
 
 sub print_paste_buffer {
-    my ($r,$container) = @_;
+    my ($r,$container,$folder) = @_;
     return if (!defined($env{'docs.markedcopy_url'}));
 
+    my $is_external;
+    my $extension = (split(/\./,$env{'docs.markedcopy_url'}))[-1];
+    if ($env{'docs.markedcopy_url'} =~ m{^(?:/adm/wrapper/ext|(?:http|https)(?:&colon;|:))//} ) {
+        $is_external = 1;
+    }
+
+    my $canpaste;
+    if ($folder =~ /^supplemental/) {
+        $canpaste = &supp_pasteable($env{'docs.markedcopy_url'}); 
+    } else {
+        $canpaste = 1;
+    }
+
+    my $pasteinfo;
+    if ($canpaste) {
+        $pasteinfo = '<form name="pasteform" action="/adm/coursedocs" method="post">'
+                    .'<input type="submit" name="pastemarked" value="'.&mt('Paste').'" /> ';
+    } else {
+        $pasteinfo = &mt('Paste buffer contains:').' ';
+    }
+
     $r->print('<fieldset>'
              .'<legend>'.&mt('Clipboard').'</legend>'
-             .'<form name="pasteform" action="/adm/coursedocs" method="post">'
-             .'<input type="submit" name="pastemarked" value="'.&mt('Paste').'" /> '
-    );
+             .$pasteinfo
+             );
 
     my $type;
-    if ($env{'docs.markedcopy_url'} =~ m{^(?:/adm/wrapper/ext|(?:http|https)(?:&colon;|:))//} ) {
+    if ($is_external) {
 	$type = &mt('External Resource');
 	$r->print($type.': '.
 		  &LONCAPA::map::qtescape($env{'docs.markedcopy_title'}).' ('.
 		  &LONCAPA::map::qtescape($env{'docs.markedcopy_url'}).')');
     }  else {
-	my $extension = (split(/\./,$env{'docs.markedcopy_url'}))[-1];
 	my $icon = &Apache::loncommon::icon($extension);
 	if ($extension eq 'sequence' &&
 	    $env{'docs.markedcopy_url'} =~ m{/default_\d+\.sequence$ }x) {
@@ -619,78 +682,184 @@ sub print_paste_buffer {
 	    $icon .= '/navmap.folder.closed.gif';
 	}
 	$icon = '<img src="'.$icon.'" alt="" class="LC_icon" />';
-	$r->print($icon.$type.': '.  &parse_supplemental_title(&LONCAPA::map::qtescape($env{'docs.markedcopy_title'})));
+	$r->print($icon.$type.': '.  &Apache::loncommon::parse_supplemental_title(&LONCAPA::map::qtescape($env{'docs.markedcopy_title'})));
     }
-    if ($container eq 'page') {
-	$r->print('
+    if ($canpaste) {
+        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('
+        } else {
+	    $r->print('
         <input type="hidden" name="folderpath" value="'.&HTML::Entities::encode($env{'form.folderpath'},'<>&"').'" />
 ');
+        }
+        $r->print('</form>');
+    } else {
+        $r->print('<br /><p class="LC_info">'.&mt('Paste into Supplemental Content unavailable for this type of content.').'</p>');
     }
-    $r->print('</form></fieldset>');
+    $r->print('</fieldset>');
+}
+
+sub supp_pasteable {
+    my ($url) = @_;
+    if (($url =~ m{^(?:/adm/wrapper/ext|(?:http|https)(?:&colon;|:))//}) ||
+        (($url =~ /\.sequence$/) && ($url =~ m{^/uploaded/})) ||
+        ($url =~ m{^/uploaded/$match_domain/$match_courseid/(docs|supplemental)/(default|\d+)/\d+/}) ||
+        ($url =~ m{^/adm/$match_domain/$match_username/aboutme}) ||
+        ($url =~ m{^/public/$match_domain/$match_courseid/syllabus})) {
+        return 1;
+    }
+    return;
 }
 
 sub do_paste_from_buffer {
-    my ($coursenum,$coursedom,$folder) = @_;
+    my ($coursenum,$coursedom,$folder,$errors) = @_;
 
     if (!$env{'form.pastemarked'}) {
         return;
     }
 
-# paste resource to end of list
+# Preparing to paste resource at end of list
     my $url=&LONCAPA::map::qtescape($env{'docs.markedcopy_url'});
     my $title=&LONCAPA::map::qtescape($env{'docs.markedcopy_title'});
+
+    my ($is_map,$srcdom,$srcnum,$prefixchg,%before,%after,%mapchanges);
+    if ($url=~/\.(page|sequence)$/) {
+        $is_map = 1; 
+    }
+    if ($url =~ m{^/uploaded/($match_domain)/($match_courseid)/([^/]+)}) {
+        $srcdom = $1;
+        $srcnum = $2;
+        my $oldprefix = $3;
+        if (($srcdom ne $coursedom) || ($srcnum ne $coursenum)) {
+            unless ($env{"user.priv.cm./$srcdom/$srcnum"} =~ /\Q:mdc&F\E/) {
+                return &mt('Paste failed: Item is from a different course which you do not have rights to edit.');
+            }
+        }
+        if (($folder =~ /^supplemental/) && (($oldprefix =~ /^default/) || ($oldprefix eq 'docs'))) {
+            $prefixchg = 1;
+            %before = ( map => 'default',
+                        doc => 'docs');
+            %after =  ( map => 'supplemental',
+                        doc => 'supplemental' );
+        } elsif (($folder =~ /^default/) && ($oldprefix =~ /^supplemental/)) {
+            $prefixchg = 1;
+            %before = ( map => 'supplemental',
+                        doc => 'supplemental');
+            %after  = ( map => 'default',
+                        doc => 'docs');
+        }
+    }
+
+# Supplemental content may only include certain types of content
+    if ($folder =~ /^supplemental/) {
+        unless (&supp_pasteable($env{'docs.markedcopy_url'})) {
+            return &mt('Paste failed: content type is not supported within Supplemental Content'); 
+        }
+    }
+
 # Maps need to be copied first
-    if (($url=~/\.(page|sequence)$/) && ($url=~/^\/uploaded\//)) {
-	$title=&mt('Copy of').' '.$title;
-	my $newid=$$.int(rand(100)).time;
+    my ($oldurl,%removefrommap,%addedmaps,%rewrites,%retitles,%copies,%dbcopies,%zombies,
+        %params,%docmoves,%mapmoves);
+    $oldurl = $url;
+    if ($is_map) {
+# If pasting a map, check if map contains other maps
+        my %allmaps;
+        &contained_map_check($url,$folder,\%removefrommap,\%addedmaps);
+        if ($folder =~ /^default/) {
+            if (keys(%addedmaps) > 0) {
+                &reinit_role($coursedom,$coursenum,$env{"course.$env{'request.course.id'}.home"});
+            }
+            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;
+                }
+            }
+        }
+        if ($url=~ m{^/uploaded/}) {
+	    $title=&mt('Copy of').' '.$title;
+        }
+        my $now = time;
+	my $suffix=$$.int(rand(100)).$now;
 	my ($oldid,$ext) = ($url=~/^(.+)\.(\w+)$/);
-        if ($oldid =~ m{^(/uploaded/\Q$coursedom\E/\Q$coursenum\E/)(\D+)(\d+)$}) {
+        if ($oldid =~ m{^(/uploaded/$match_domain/$match_courseid/)(\D+)(\d+)$}) {
             my $path = $1;
             my $prefix = $2;
             my $ancestor = $3;
             if (length($ancestor) > 10) {
                 $ancestor = substr($ancestor,-10,10);
             }
-            $oldid = $path.$prefix.$ancestor;
-        }
-        my $counter = 0;
-        my $newurl=$oldid.$newid.'.'.$ext;
-        my $is_unique = &uniqueness_check($newurl);
-        while (!$is_unique && $counter < 100) {
-            $counter ++;
-            $newid ++;
-            $newurl = $oldid.$newid;
-            $is_unique = &uniqueness_check($newurl);
-        }
-        if (!$is_unique) {
-            if ($url=~/\.page$/) {
-                return &mt('Paste failed: an error occurred creating a unique URL for the composite page');
+            my ($newurl,$newid);
+            if ($prefixchg) {
+                if ($folder =~ /^supplemental/) {
+                    $prefix =~ s/^default/supplemental/;                   
+                } else {
+                    $prefix =~ s/^supplemental/default/;
+                }
+            }
+            if (($srcdom eq $coursedom) && ($srcnum eq $coursenum)) {
+                $newurl = $path.$prefix.$ancestor.$suffix.'.'.$ext;
             } else {
-                return &mt('Paste failed: an error occurred creating a unique URL for the folder');
+                $newurl = "/uploaded/$coursedom/$coursenum/$prefix".$now.'.'.$ext;
             }
-        }
-	my $storefn=$newurl;
-	$storefn=~s{^/\w+/$match_domain/$match_username/}{};
-	my $paste_map_result =
-            &Apache::lonclonecourse::writefile($env{'request.course.id'},$storefn,
-					       &Apache::lonnet::getfile($url));
-        if ($paste_map_result eq '/adm/notfound.html') {
-            if ($url=~/\.page$/) {
-                return &mt('Paste failed: an error occurred saving the composite page');
+            my $counter = 0;
+            my $is_unique = &uniqueness_check($newurl);
+            if ($folder =~ /^default/) {
+                if ($allmaps{$newurl}) {
+                    $is_unique = 0;
+                }
+            }
+            while (!$is_unique && $allmaps{$newurl} && $counter < 100) {
+                $counter ++;
+                $suffix ++;
+                if (($srcdom eq $coursedom) && ($srcnum eq $coursenum)) {
+                    $newurl = $path.$prefix.$ancestor.$suffix.'.'.$ext;
+                } else {
+                    $newurl = "/uploaded/$coursedom/$coursenum/$prefix".$ancestor.$suffix.'.'.$ext;
+                }
+                $is_unique = &uniqueness_check($newurl);
+            }
+            if ($is_unique) {
+                if ($newurl ne $oldurl) {
+                    $mapchanges{$oldurl} = 1;
+                }
+                if (($srcdom ne $coursedom) || ($srcnum ne $coursenum) || ($prefixchg)) {
+                    &url_paste_fixups($url,$prefixchg,$coursedom,$coursenum,\%allmaps,
+                                      \%rewrites,\%retitles,\%copies,\%dbcopies,\%zombies,
+                                      \%params,\%mapmoves,\%mapchanges);
+                }
             } else {
-                return &mt('Paste failed: an error occurred saving the folder');
+                if ($url=~/\.page$/) {
+                    return &mt('Paste failed: an error occurred creating a unique URL for the composite page');
+                } else {
+                    return &mt('Paste failed: an error occurred creating a unique URL for the folder');
+                }
             }
-        }
-	$url = $newurl;
-    }
+	    my $storefn=$newurl;
+	    $storefn=~s{^/\w+/$match_domain/$match_username/}{};
+	    my $paste_map_result =
+                &Apache::lonclonecourse::writefile($env{'request.course.id'},$storefn,
+					           &Apache::lonnet::getfile($url));
+            if ($paste_map_result eq '/adm/notfound.html') {
+                if ($url=~/\.page$/) {
+                    return &mt('Paste failed: an error occurred saving the composite page.');
+                } else {
+                    return &mt('Paste failed: an error occurred saving the folder.');
+                }
+            }
+	    $url = $newurl;
+        } elsif ($url=~m {^/res/}) {
 # published maps can only exists once, so remove it from paste buffer when done
-    if (($url=~/\.(page|sequence)$/) && ($url=~m {^/res/})) {
-	&Apache::lonnet::delenv('docs.markedcopy');
+            &Apache::lonnet::delenv('docs.markedcopy');
+            if ($folder =~ /^default/) {  
+                if ($allmaps{$url}) {
+                    return &mt('Paste failed: only one instance of a particular published sequence or page is allowed within each course.');
+                }
+            }
+        }
     }
     if ($url=~ m{/smppg$}) {
 	my $db_name = &Apache::lonsimplepage::get_db_name($url);
@@ -699,10 +868,14 @@ sub do_paste_from_buffer {
 	    my %contents=&Apache::lonnet::dump($db_name,$coursedom,$coursenum);
 	    my $now = time();
 	    $db_name =~ s{_\d*$ }{_$now}x;
-	    my $result=&Apache::lonnet::put($db_name,\%contents,
+	    my $dbresult=&Apache::lonnet::put($db_name,\%contents,
 					    $coursedom,$coursenum);
-	    $url =~ s{/(\d*)/smppg$ }{/$now/smppg}x;
-	    $title=&mt('Copy of').' '.$title;
+            if ($dbresult eq 'ok') {
+                $url =~ s{/(\d*)/smppg$ }{/$now/smppg}x;
+                $title=&mt('Copy of').' '.$title;
+            } else {
+                return &mt('Paste failed: An error occurred when copying the simple page.');
+            }
 	}
     }
     $title = &LONCAPA::map::qtunescape($title);
@@ -711,24 +884,79 @@ sub do_paste_from_buffer {
     $url       = &LONCAPA::map::qtunescape($url);
 # Now insert the URL at the bottom
     my $newidx = &LONCAPA::map::getresidx($url);
-    if ($env{'docs.markedcopy_supplemental'}) {
-        if ($folder =~ /^supplemental/) {
-            $title = $env{'docs.markedcopy_supplemental'};
-        } else {
-            (undef,undef,$title) =
-                &parse_supplemental_title($env{'docs.markedcopy_supplemental'});
+
+# For uploaded files (excluding pages/sequences) path in copied file is changed
+# if paste is from Main to Supplemental (or vice versa), or if pasting between
+# courses.
+
+    unless ($is_map) {
+        if ($url =~ m{^/uploaded/$match_domain/$match_courseid/(?:docs|supplemental)/(.+)$}) {
+            my $relpath = $1;
+            if ($relpath ne '') {
+                my ($prefix,$subdir,$rem) = ($relpath =~ m{^(default|\d+)/(\d+)/(.+)$});
+                my ($newloc,$newsubdir) = ($folder =~ /^(default|supplemental)_?(\d*)/);
+                my $newprefix = $newloc;
+                if ($newloc eq 'default') {
+                    $newprefix = 'docs';
+                }
+                if ($newsubdir eq '') {
+                    $newsubdir = 'default';
+                }
+                if (($prefixchg) || ($srcdom ne $coursedom) || ($srcnum ne $coursenum)) {
+                    my $newpath = "$newprefix/$newsubdir/$newidx/$rem";
+                    $url =
+                        &Apache::lonclonecourse::writefile($env{'request.course.id'},$newpath,
+                                                           &Apache::lonnet::getfile($oldurl));
+                    if ($url eq '/adm/notfound.html') {
+                        return &mt('Paste failed: an error occurred saving the file.');
+                    } else {
+                        my ($newsubpath) = ($newpath =~ m{^(.*/)[^/]*$});
+                        $newsubpath =~ s{/+$}{/};
+                        $docmoves{$oldurl} = $newsubpath;
+                    }
+                }
+            }
         }
-    } else {
-        if ($folder=~/^supplemental/) {
-           $title=time.'___&&&___'.$env{'user.name'}.'___&&&___'.
-                  $env{'user.domain'}.'___&&&___'.$title;
+    }
+    my $result =
+        &apply_fixups($is_map,$prefixchg,$coursedom,$coursenum,$oldurl,$url,
+                      \%removefrommap,\%rewrites,\%retitles,\%copies,\%dbcopies,
+                      \%zombies,\%params,\%docmoves,\%mapmoves,$errors,\%before,\%after);
+    if ($result eq 'ok') {
+        if ($env{'docs.markedcopy_supplemental'}) {
+            if ($folder =~ /^supplemental/) {
+                $title = $env{'docs.markedcopy_supplemental'};
+            } else {
+                (undef,undef,$title) =
+                    &Apache::loncommon::parse_supplemental_title($env{'docs.markedcopy_supplemental'});
+            }
+        } else {
+            if ($folder=~/^supplemental/) {
+                $title=time.'___&&&___'.$env{'user.name'}.'___&&&___'.
+                       $env{'user.domain'}.'___&&&___'.$title;
+            }
         }
+        $LONCAPA::map::resources[$newidx]= 	$title.':'.$url.':'.$ext.':normal:res';
+        push(@LONCAPA::map::order, $newidx);
     }
+    return $result;
+}
 
-    $LONCAPA::map::resources[$newidx]= 	$title.':'.$url.':'.$ext.':normal:res';
-    push(@LONCAPA::map::order, $newidx);
-    return 'ok';
-# Store the result
+sub dbcopy {
+    my ($url,$coursedom,$coursenum) = @_;
+    if ($url=~ m{/smppg$}) {
+        my $db_name = &Apache::lonsimplepage::get_db_name($url);
+        if ($db_name =~ /^smppage_/) {
+            #simple pages, need to copy the db contents to a new one.
+            my %contents=&Apache::lonnet::dump($db_name,$coursedom,$coursenum);
+            my $now = time();
+            $db_name =~ s{_\d*$ }{_$now}x;
+            my $result=&Apache::lonnet::put($db_name,\%contents,
+                                            $coursedom,$coursenum);
+            $url =~ s{/(\d*)/smppg$ }{/$now/smppg}x;
+        }
+    }
+    return $url;
 }
 
 sub uniqueness_check {
@@ -745,6 +973,408 @@ sub uniqueness_check {
     return $unique;
 }
 
+sub contained_map_check {
+    my ($url,$folder,$removefrommap,$addedmaps) = @_;
+    my $content = &Apache::lonnet::getfile($url);
+    unless ($content eq '-1') {
+        my $parser = HTML::TokeParser->new(\$content);
+        $parser->attr_encoded(1);
+        while (my $token = $parser->get_token) {
+            next if ($token->[0] ne 'S');
+            if ($token->[1] eq 'resource') {
+                next if ($token->[2]->{'type'} eq 'zombie');
+                my $ressrc = $token->[2]->{'src'};
+                if ($folder =~ /^supplemental/) {
+                    unless (&supp_pasteable($ressrc)) {
+                        $removefrommap->{$url}{$token->[2]->{'id'}};
+                        next;
+                    }
+                }
+                if ($ressrc =~ /\.(sequence|page)$/) {
+                    if (ref($addedmaps->{$ressrc}) eq 'ARRAY') {
+                        push(@{$addedmaps->{$ressrc}},$url);
+                    } else {
+                        $addedmaps->{$ressrc} = [$url];
+                    }
+                    &contained_map_check($ressrc,$folder,$removefrommap,$addedmaps);
+                }
+            } elsif ($token->[1] !~ /^resource|map|link$/) {
+                if ($folder =~ /^supplemental/) {
+                    $removefrommap->{$url}{$token->[1]};
+                }
+            }
+        }
+    }
+    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,$prefixchg,$cdom,$cnum,$allmaps,$rewrites,$retitles,$copies,
+        $dbcopies,$zombies,$params,$mapmoves,$mapchanges) = @_;
+    my $checktitle;
+    if (($prefixchg) &&
+        ($oldurl =~ m{^/uploaded/($match_domain)/($match_courseid)/supplemental})) {
+        $checktitle = 1;
+    }
+    my $file = &Apache::lonnet::getfile($oldurl);
+    return if ($file eq '-1');
+    my $parser = HTML::TokeParser->new(\$file);
+    $parser->attr_encoded(1);
+    my $changed = 0;
+    while (my $token = $parser->get_token) {
+        next if ($token->[0] ne 'S');
+        if ($token->[1] eq 'resource') {
+            my $ressrc = $token->[2]->{'src'};
+            next if ($ressrc eq '');
+            my $id = $token->[2]->{'id'};
+            if ($checktitle) {
+                my $title = $token->[2]->{'title'};
+                if ($title =~ m{\d+\Q___&amp;&amp;&amp;___\E$match_username\Q___&amp;&amp;&amp;___\E$match_domain\Q___&amp;&amp;&amp;___\E(.+)$}) {
+                    $retitles->{$oldurl}{$ressrc} = $id;
+
+                }
+            }
+            next if ($token->[2]->{'type'} eq 'external');
+            if ($token->[2]->{'type'} eq 'zombie') {
+                $zombies->{$oldurl}{$ressrc} = $id;
+                $changed = 1;
+            } elsif ($ressrc =~ m{^/uploaded/($match_domain)/($match_courseid)/(.+)$}) {
+                my $srccdom = $1;
+                my $srccnum = $2;
+                my $rem = $3;
+                if (($srccdom ne $cdom) || ($srccnum ne $cnum) || ($prefixchg) ||
+                    ($mapchanges->{$oldurl})) {
+                    if ($rem =~ /^(default|supplemental)(_?\d*).(sequence|page)$/) {
+                        $rewrites->{$oldurl}{$ressrc} = $id;
+                        $mapchanges->{$ressrc} = 1;
+                        unless (&url_paste_fixups($ressrc,$prefixchg,$cdom,$cnum,$allmaps,
+                                                  $rewrites,$retitles,$copies,$dbcopies,$zombies,
+                                                  $params,$mapmoves,$mapchanges)) {
+                            $mapmoves->{$ressrc} = 1;
+                        }
+                        $changed = 1;
+                    } else {
+                        $rewrites->{$oldurl}{$ressrc} = $id;
+                        $copies->{$oldurl}{$ressrc} = $id;
+                        $changed = 1;
+                    }
+                }
+            } elsif ($ressrc =~ m{^/adm/($match_domain)/($match_courseid)/(.+)$}) {
+                my $srccdom = $1;
+                my $srccnum = $2;
+                if (($srccdom ne $cdom) || ($srccnum ne $cnum)) {
+                    $rewrites->{$oldurl}{$ressrc} = $id;
+                    $dbcopies->{$oldurl}{$ressrc} = $id;
+                    $changed = 1;
+                }
+            } elsif ($ressrc =~ m{^/public/($match_domain)/($match_courseid)/(.+)$}) {
+                my $srccdom = $1;
+                my $srccnum = $2;
+                if (($srccdom ne $cdom) || ($srccnum ne $cnum)) {
+                    $rewrites->{$oldurl}{$ressrc} = $id;
+                    $dbcopies->{$oldurl}{$ressrc} = $id;
+                    $changed = 1;
+                }
+            }
+        } elsif ($token->[1] eq 'param') {
+            my $to = $token->[2]->{'to'}; 
+            if ($to ne '') {
+                if (ref($params->{$oldurl}{$to}) eq 'ARRAY') {
+                    push (@{$params->{$oldurl}{$to}},$token->[2]->{'name'});
+                } else {
+                    @{$params->{$oldurl}{$to}} = ($token->[2]->{'name'});
+                }
+            }
+        }
+    }
+    return $changed;
+}
+
+sub apply_fixups {
+    my ($is_map,$prefixchg,$cdom,$cnum,$oldurl,$url,$removefrommap,$rewrites,
+        $retitles,$copies,$dbcopies,$zombies,$params,$docmoves,$mapmoves,$errors,
+        $before,$after) = @_;
+    my ($oldsubdir,$newsubdir,$subdirchg);
+    if ($is_map) {
+        ($oldsubdir) =
+            ($oldurl =~ m{^/uploaded/$match_domain/$match_courseid/(?:default|supplemental)_?(\d*)});
+        if ($oldsubdir eq '') {
+            $oldsubdir = 'default';
+        }
+        ($newsubdir) =
+            ($url =~ m{^/uploaded/$match_domain/$match_courseid/(?:default|supplemental)_?(\d*)});
+        if ($newsubdir eq '') {
+            $newsubdir = 'default';
+        }
+        if ($oldsubdir ne $newsubdir) {
+            $subdirchg = 1;
+        }
+    }
+    foreach my $key (keys(%{$copies}),keys(%{$docmoves})) {
+        my @allcopies;
+        if (ref($copies->{$key}) eq 'HASH') {
+            my %added;
+            foreach my $innerkey (keys(%{$copies->{$key}})) {
+                if (($innerkey ne '') && (!$added{$innerkey})) {
+                    push(@allcopies,$innerkey);
+                    $added{$innerkey} = 1;
+                }
+            }
+            undef(%added);
+        }
+        if ($key eq $oldurl) {
+            if ((exists($docmoves->{$key}))) {
+                unless (grep(/^\Q$oldurl\E/,@allcopies)) {
+                    push(@allcopies,$oldurl);
+                }
+            }
+        }
+        if (@allcopies > 0) {
+            foreach my $item (@allcopies) {
+                my ($relpath,$fname) = 
+                    ($item =~ m{^(/uploaded/$match_domain/$match_courseid/(?:docs|supplemental)/(?:default|\d+)/.*/)([^/]+)$});
+                if ($fname ne '') {
+                    my $content = &Apache::lonnet::getfile($item);
+                    unless ($content eq '-1') {
+                        my $storefn;
+                        if (($key eq $oldurl) && (ref($docmoves) eq 'HASH') && (exists($docmoves->{$key}))) {
+                            $storefn = $docmoves->{$key};
+                        } else {
+                            $storefn = $relpath;
+                            $storefn =~s{^/uploaded/$match_domain/$match_courseid/}{};
+                            if ($prefixchg) {
+                                $storefn =~ s/^\Q$before->{'doc'}\E/$after->{'doc'}/;
+                            }
+                            if (($key eq $oldurl) && ($subdirchg)) {
+                                $storefn =~ s{^(docs|supplemental)/\Q$oldsubdir\E/}{$1/$newsubdir/};
+                            }
+                        }
+                        &copy_dependencies($item,$storefn,$relpath,$errors,\$content);
+                        my $copyurl = 
+                            &Apache::lonclonecourse::writefile($env{'request.course.id'},
+                                                               $storefn.$fname,$content);
+                        if ($copyurl eq '/adm/notfound.html') {
+                            if ((ref($docmoves) eq 'HASH') && (exists($docmoves->{$oldurl}))) {
+                                return &mt('Paste failed: an error occurred copying the file.');
+                            } elsif (ref($errors) eq 'HASH') {
+                                $errors->{$item} = 1;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+    foreach my $key (keys(%{$mapmoves})) {
+        my $storefn=$key;
+        $storefn=~s{^/uploaded/$match_domain/$match_courseid/}{};
+        if ($prefixchg) {
+            $storefn =~ s/^\Q$before->{'map'}\E/$after->{'map'}/;
+        }
+        my $mapcontent = &Apache::lonnet::getfile($key);
+        if ($mapcontent eq '-1') {
+            if (ref($errors) eq 'HASH') {
+                $errors->{$key} = 1;
+            }
+        } else {
+            my $newmap =
+                &Apache::lonclonecourse::writefile($env{'request.course.id'},$storefn,
+                                                   $mapcontent);
+            if ($newmap eq '/adm/notfound.html') {
+                if (ref($errors) eq 'HASH') {
+                    $errors->{$key} = 1;
+                }
+            }
+        }
+    }
+    my %updates;
+    if ($is_map) {
+        foreach my $key (keys(%{$rewrites})) {
+           $updates{$key} = 1;
+        }
+        foreach my $key (keys(%{$zombies})) {
+           $updates{$key} = 1;
+        }
+        foreach my $key (keys(%{$removefrommap})) {
+           $updates{$key} = 1;
+        } 
+        foreach my $key (keys(%{$dbcopies})) {
+           $updates{$key} = 1;
+        }
+        foreach my $key (keys(%{$retitles})) {
+           $updates{$key} = 1;
+        }
+        foreach my $key (keys(%updates)) {
+            my (%torewrite,%toretitle,%toremove,%zombie,%newdb);
+            if (ref($rewrites->{$key}) eq 'HASH') {
+                %torewrite = %{$rewrites->{$key}};
+            }
+            if (ref($retitles->{$key}) eq 'HASH') {
+                %toretitle = %{$retitles->{$key}};
+            }
+            if (ref($removefrommap->{$key}) eq 'HASH') {
+                %toremove = %{$removefrommap->{$key}};
+            }
+            if (ref($zombies->{$key}) eq 'HASH') {
+                %zombie = %{$zombies->{$key}};
+            }
+            if (ref($dbcopies->{$key}) eq 'HASH') {
+                foreach my $item (keys(%{$dbcopies->{$key}})) {
+                    $newdb{$item} = &dbcopy($item);
+                }
+            }
+            my $map = &Apache::lonnet::getfile($key);
+            my $newcontent;
+            if ($map eq '-1') {
+                return &mt('Paste failed: an error occurred reading a folder or page: [_1].',$key);
+            } else {
+                my $parser = HTML::TokeParser->new(\$map);
+                $parser->attr_encoded(1);
+                while (my $token = $parser->get_token) {
+                    if ($token->[0] eq 'S') {
+                        if ($token->[2]->{'type'} eq 'zombie') {
+                            next if (($token->[2]->{'src'} ne '') &&
+                                     ($zombie{$token->[2]->{'src'}} eq $token->[2]->{'id'}));
+                        }
+                        if ($token->[1] eq 'resource') {
+                            my $src = $token->[2]->{'src'};
+                            my $id = $token->[2]->{'id'};
+                            my $title = $token->[2]->{'title'};
+                            my $changed;
+                            if ((exists($toretitle{$src})) && ($toretitle{$src} eq $id)) {
+                                if ($title =~ m{^\d+\Q___&amp;&amp;&amp;___\E$match_username\Q___&amp;&amp;&amp;___\E$match_domain\Q___&amp;&amp;&amp;___\E(.+)$}) {
+                                    $token->[2]->{'title'} = $1;
+                                    $changed = 1;
+                                }
+                            }
+                            if ((exists($torewrite{$src})) && ($torewrite{$src} eq $id)) {
+                                $src =~ s{^/(uploaded|adm|public)/$match_domain/$match_courseid/}{/$1/$cdom/$cnum/};
+                                if ($src =~ m{^/uploaded/}) {
+                                    if ($prefixchg) {
+                                        if ($src =~ /\.(page|sequence)$/) {
+                                            $src =~ s#^(/uploaded/$match_domain/$match_courseid/)\Q$before->{'map'}\E#$1$after->{'map'}#;
+                                        } else {
+                                            $src =~ s#^(/uploaded/$match_domain/$match_courseid/)\Q$before->{'doc'}\E#$1$after->{'doc'}#;
+                                        }
+                                    }
+                                    if (($key eq $oldurl) && ($src !~ /\.(page|sequence)$/) && ($subdirchg)) {
+                                        $src =~ s{^(/uploaded/$match_domain/$match_courseid/\w+/)\Q$oldsubdir\E}{$1$newsubdir};
+                                    }
+                                }
+                                $token->[2]->{'src'} = $src;
+                                $changed = 1;
+                            } elsif ($newdb{$src} ne '') {
+                                $token->[2]->{'src'} = $newdb{$src};
+                                $changed = 1;
+                            }
+                            if ($changed) {
+                                $newcontent .= "<$token->[1]";
+                                foreach my $attr (@{$token->[3]}) {
+                                    if ($attr =~ /^\w+$/) {
+                                        $newcontent .=  ' '.$attr.'="'.$token->[2]->{$attr}.'"';
+                                    }
+                                }
+                                $newcontent .= ' />'."\n";
+                            } else {
+                                $newcontent .= $token->[4]."\n";
+                            }
+                        } elsif (($token->[2]->{'id'} ne '') &&
+                                 (exists($toremove{$token->[2]->{'id'}}))) {
+                            next;
+                        } else {
+                            $newcontent .= $token->[4]."\n";
+                        }
+                    } elsif ($token->[0] eq 'E') {
+                        $newcontent .= $token->[2]."\n";
+                    }
+                }
+            }
+            my $storefn;
+            if ($key eq $oldurl) {
+                $storefn = $url;
+                $storefn=~s{^/uploaded/$match_domain/$match_courseid/}{};
+            } else {
+                $storefn = $key;
+                $storefn=~s{^/uploaded/$match_domain/$match_courseid/}{};
+                if ($prefixchg) {
+                    $storefn =~ s/^\Q$before->{'map'}\E/$after->{'map'}/;
+                }
+            }
+            my $newmapurl =
+                &Apache::lonclonecourse::writefile($env{'request.course.id'},$storefn,
+                                                   $newcontent);
+            if ($newmapurl eq '/adm/notfound.html') {
+                return &mt('Paste failed: an error occurred saving the folder or page.');
+            }
+        }
+    }
+    return 'ok';
+}
+
+sub copy_dependencies {
+    my ($item,$storefn,$relpath,$errors,$contentref) = @_;
+    my $content;
+    if (ref($contentref)) {
+        $content = $$contentref;
+    } else {
+        $content = &Apache::lonnet::getfile($item);
+    }
+    unless ($content eq '-1') {
+        my $mm = new File::MMagic;
+        my $mimetype = $mm->checktype_contents($content);
+        if ($mimetype eq 'text/html') {
+            my (%allfiles,%codebase,$state);
+            my $res = &Apache::lonnet::extract_embedded_items(undef,\%allfiles,\%codebase,\$content);
+            if ($res eq 'ok') {
+                my ($numexisting,$numpathchanges,$existing);
+                (undef,$numexisting,$numpathchanges,$existing) =
+                    &Apache::loncommon::ask_for_embedded_content(
+                        '/adm/coursedocs',$state,\%allfiles,\%codebase,
+                        {'error_on_invalid_names'   => 1,
+                         'ignore_remote_references' => 1,
+                         'docs_url'                 => $item,
+                         'context'                  => 'paste'});
+                if ($numexisting > 0) {
+                    if (ref($existing) eq 'HASH') {
+                        foreach my $dep (keys(%{$existing})) {
+                            my $depfile = $dep;
+                            unless ($depfile =~ m{^\Q$relpath\E}) {
+                                $depfile = $relpath.$dep;
+                            }
+                            my $depcontent = &Apache::lonnet::getfile($depfile);
+                            unless ($depcontent eq '-1') {
+                                my $storedep = $dep;
+                                $storedep =~ s{^\Q$relpath\E}{};
+                                my $dep_url =
+                                    &Apache::lonclonecourse::writefile(
+                                        $env{'request.course.id'},
+                                        $storefn.$storedep,$depcontent);
+                                if ($dep_url eq '/adm/notfound.html') {
+                                    if (ref($errors) eq 'HASH') {
+                                        $errors->{$depfile} = 1;
+                                    }
+                                } else {
+                                    &copy_dependencies($depfile,$storefn,$relpath,$errors,\$depcontent);
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+    return;
+}
+
 my %parameter_type = ( 'randompick'     => 'int_pos',
 		       'hiddenresource' => 'string_yesno',
 		       'encrypturl'     => 'string_yesno',
@@ -822,6 +1452,16 @@ sub editor {
     my $container= ($env{'form.pagepath'}) ? 'page'
 		                           : 'sequence';
 
+    my ($breadcrumbtrail,$randompick,$ishidden,$isencrypted,$plain,$is_random_order) =
+        &breadcrumbs($allowed,$crstype);
+    $r->print($breadcrumbtrail);
+
+    my $jumpto = "uploaded/$coursedom/$coursenum/$folder.$container";
+
+    unless ($allowed) {
+        $randompick = -1;
+    }
+
     my ($errtext,$fatal) = &mapread($coursenum,$coursedom,
 				    $folder.'.'.$container);
     return $errtext if ($fatal);
@@ -833,16 +1473,6 @@ sub editor {
         $LONCAPA::map::resources[$idx]='';
     }
 
-    my ($breadcrumbtrail,$randompick,$ishidden,$isencrypted,$plain,$is_random_order) =
-        &breadcrumbs($allowed,$crstype);
-    $r->print($breadcrumbtrail);
-
-    my $jumpto = "uploaded/$coursedom/$coursenum/$folder.$container";
-
-    unless ($allowed) {
-        $randompick = -1;
-    }
-
 # ------------------------------------------------------------ Process commands
 
 # ---------------- if they are for this folder and user allowed to make changes
@@ -865,14 +1495,25 @@ sub editor {
 	}
 
 	if ($env{'form.pastemarked'}) {
+            my %paste_errors;
             my $paste_res =
-                &do_paste_from_buffer($coursenum,$coursedom,$folder);
+                &do_paste_from_buffer($coursenum,$coursedom,$folder,\%paste_errors);
             if ($paste_res eq 'ok') {
+# Store the result
                 ($errtext,$fatal) = &storemap($coursenum,$coursedom,$folder.'.'.$container);
                 return $errtext if ($fatal);
             } elsif ($paste_res ne '') {
                 $r->print('<p><span class="LC_error">'.$paste_res.'</span></p>');
             }
+            if (keys(%paste_errors) > 0) {
+                $r->print('<p span class="LC_warning">'."\n".
+                          &mt('The following files are either dependencies of a web page or references within a folder and/or composite page which could not be copied during the paste operation:')."\n".
+                          '<ul>'."\n");
+                foreach my $key (sort(keys(%paste_errors))) {
+                    $r->print('<li>'.$key.'</li>'."\n");
+                }
+                $r->print('</ul></p>'."\n");
+            }
 	}
 
 	$r->print($upload_output);
@@ -994,8 +1635,10 @@ sub editor {
         $tid = 2;
     }
     if ($allowed) {
-        $r->print(&generate_edit_table($tid,$orderhash,$to_show,$iconpath,$jumpto));
-        &print_paste_buffer($r,$container);
+        my $readfile="/uploaded/$coursedom/$coursenum/$folder.$container";
+        $r->print(&generate_edit_table($tid,$orderhash,$to_show,$iconpath,$jumpto,
+                                       $readfile));
+        &print_paste_buffer($r,$container,$folder);
     } else {
         if (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) {
             #Function Box for Supplemental Content for users with mdc priv.
@@ -1171,36 +1814,13 @@ sub is_supplemental_title {
     return scalar($title =~ m/^(\d+)___&&&___($match_username)___&&&___($match_domain)___&&&___(.*)$/);
 }
 
-sub parse_supplemental_title {
-    my ($title) = @_;
-
-    my ($foldertitle,$renametitle);
-    if ($title =~ /&amp;&amp;&amp;/) {
-	$title = &HTML::Entites::decode($title);
-    }
- if ($title =~ m/^(\d+)___&&&___($match_username)___&&&___($match_domain)___&&&___(.*)$/) {
-	$renametitle=$4;
-	my ($time,$uname,$udom) = ($1,$2,$3);
-	$foldertitle=&Apache::lontexconvert::msgtexconverted($4);
-	my $name =  &Apache::loncommon::plainname($uname,$udom);
-	$name = &HTML::Entities::encode($name,'"<>&\'');
-        $renametitle = &HTML::Entities::encode($renametitle,'"<>&\'');
-	$title='<i>'.&Apache::lonlocal::locallocaltime($time).'</i> '.
-	    $name.': <br />'.$foldertitle;
-    }
-    if (wantarray) {
-	return ($title,$foldertitle,$renametitle);
-    }
-    return $title;
-}
-
 # --------------------------------------------------------------- An entry line
 
 sub entryline {
     my ($index,$title,$url,$folder,$allowed,$residx,$coursenum,$crstype)=@_;
     my ($foldertitle,$pagetitle,$renametitle);
     if (&is_supplemental_title($title)) {
-	($title,$foldertitle,$renametitle) = &parse_supplemental_title($title);
+	($title,$foldertitle,$renametitle) = &Apache::loncommon::parse_supplemental_title($title);
 	$pagetitle = $foldertitle;
     } else {
 	$title=&HTML::Entities::encode($title,'"<>&\'');
@@ -1299,12 +1919,12 @@ sub entryline {
 
 	if (!$nocopy) {
 	    $copylink=(<<ENDCOPY);
-<a href='javascript:markcopy("$esc_path","$index","$renametitle","$container","$symb","$folder");' class="LC_docs_copy">$lt{'cp'}</a>
+<a href="javascript:markcopy('$esc_path','$index','$renametitle','$container','$symb','$folder');" class="LC_docs_copy">$lt{'cp'}</a>
 ENDCOPY
         }
 	if (!$nocut) {
 	    $cutlink=(<<ENDCUT);
-<a href='javascript:cutres("$esc_path","$index","$renametitle","$container","$symb","$folder",$skip_confirm);' class="LC_docs_cut">$lt{'ct'}</a>
+<a href="javascript:cutres('$esc_path','$index','$renametitle','$container','$symb','$folder',$skip_confirm);" class="LC_docs_cut">$lt{'ct'}</a>
 ENDCUT
         }
 	$form_start = '
@@ -1488,7 +2108,7 @@ $form_common.'
     if (($url=~m{/adm/(coursedocs|supplemental)}) || (!$allowed && $url)) {
        $line.='<a href="'.$url.'"><img src="'.$icon.'" alt="" class="LC_icon" /></a>';
     } elsif ($url) {
-       $line.=&Apache::loncommon::modal_link($url.(($url=~/\?/)?'&':'?').'inhibitmenu=yes',
+       $line.=&Apache::loncommon::modal_link($url.(($url=~/\?/)?'&amp;':'?').'inhibitmenu=yes',
                                              '<img src="'.$icon.'" alt="" class="LC_icon" />',600,500);
     } else {
        $line.='<img src="'.$icon.'" alt="" class="LC_icon" />';
@@ -1497,7 +2117,7 @@ $form_common.'
     if (($url=~m{/adm/(coursedocs|supplemental)}) || (!$allowed && $url)) {
        $line.='<a href="'.$url.'">'.$title.'</a>';
     } elsif ($url) {
-       $line.=&Apache::loncommon::modal_link($url.(($url=~/\?/)?'&':'?').'inhibitmenu=yes',
+       $line.=&Apache::loncommon::modal_link($url.(($url=~/\?/)?'&amp;':'?').'inhibitmenu=yes',
                                              $title,600,500);
     } else {
        $line.=$title.' <span class="LC_docs_reinit_warn">'.$reinit.'</span>';
@@ -1645,7 +2265,7 @@ sub checkonthis {
 
 =item list_symbs()
 
-List Symbs
+List Content Identifiers
 
 =cut
 
@@ -1653,9 +2273,9 @@ sub list_symbs {
     my ($r) = @_;
 
     my $crstype = &Apache::loncommon::course_type();
-    $r->print(&Apache::loncommon::start_page('Symb List'));
-    $r->print(&Apache::lonhtmlcommon::breadcrumbs('Symb List'));
-    &startContentScreen($r,'tools');
+    $r->print(&Apache::loncommon::start_page('List of Content Identifiers'));
+    $r->print(&Apache::lonhtmlcommon::breadcrumbs('Content Identifiers'));
+    $r->print(&startContentScreen('tools'));
     my $navmap = Apache::lonnavmaps::navmap->new();
     if (!defined($navmap)) {
         $r->print('<h2>'.&mt('Retrieval of List Failed').'</h2>'.
@@ -1664,11 +2284,25 @@ sub list_symbs {
                   '</div>');
         &Apache::lonnet::logthis('Symb list failed - could not create navmap object in '.lc($crstype).':'.$env{'request.course.id'});
     } else {
-        $r->print("<pre>\n");
+        $r->print('<h4 class="LC_info">'.&mt("$crstype Content Identifiers").'</h4>'.
+                  &Apache::loncommon::start_data_table().
+                  &Apache::loncommon::start_data_table_header_row().
+                  '<th>'.&mt('Title').'</th><th>'.&mt('Identifier').'</th>'.
+                  &Apache::loncommon::end_data_table_header_row()."\n");
+        my $count;
         foreach my $res ($navmap->retrieveResources()) {
-            $r->print($res->compTitle()."\t".$res->symb()."\n");
+            $r->print(&Apache::loncommon::start_data_table_row().
+                      '<td>'.$res->compTitle().'</td>'.
+                      '<td>'.$res->symb().'</td>'.
+                      &Apache::loncommon::start_data_table_row());
+            $count ++;
+        }
+        if (!$count) {
+            $r->print(&Apache::loncommon::start_data_table_row().
+                      '<td colspan="2">'.&mt("$crstype is empty").'</td>'.
+                      &Apache::loncommon::end_data_table_row()); 
         }
-        $r->print("\n</pre>\n");
+        $r->print(&Apache::loncommon::end_data_table());
     }
 }
 
@@ -1676,13 +2310,15 @@ sub list_symbs {
 sub verifycontent {
     my ($r) = @_;
     my $crstype = &Apache::loncommon::course_type();
-   $r->print(&Apache::loncommon::start_page('Verify '.$crstype.' Documents'));
-   $r->print(&Apache::lonhtmlcommon::breadcrumbs('Verify '.$crstype.' Documents'));
-   &startContentScreen($r,'tools');
+    $r->print(&Apache::loncommon::start_page('Verify '.$crstype.' Documents'));
+    $r->print(&Apache::lonhtmlcommon::breadcrumbs('Verify '.$crstype.' Documents'));
+    $r->print(&startContentScreen('tools'));
+    $r->print('<h4 class="LC_info">'.&mt($crstype.' content verification').'</h4>'); 
    $hashtied=0;
    undef %alreadyseen;
    %alreadyseen=();
    &tiehash();
+   
    foreach my $key (keys(%hash)) {
        if ($hash{$key}=~/\.(page|sequence)$/) {
 	   if (($key=~/^src_/) && ($alreadyseen{&unescape($hash{$key})})) {
@@ -1712,7 +2348,7 @@ sub checkversions {
     my $crstype = &Apache::loncommon::course_type();
     $r->print(&Apache::loncommon::start_page("Check $crstype Document Versions"));
     $r->print(&Apache::lonhtmlcommon::breadcrumbs("Check $crstype Document Versions"));
-    &startContentScreen($r,'tools');
+    $r->print(&startContentScreen('tools'));
 
     my $header='';
     my $startsel='';
@@ -1826,6 +2462,7 @@ sub checkversions {
 	       'lw' => 'Version changes since last Week',
 	       'sy' => 'Version changes since Yesterday',
                'al' => 'All Resources (possibly large output)',
+               'cd' => 'Change display', 
 	       'sd' => 'Display',
 	       'fi' => 'File',
 	       'md' => 'Modification Date',
@@ -1836,18 +2473,16 @@ sub checkversions {
 'sm' => 'Keep all Resources up-to-date with most recent Versions (default)',
 'sc' => 'Set all Resource Versions to current Version (Fix Versions)',
 	       'di' => 'Differences',
-	       'save' => 'Save',
+	       'save' => 'Save changes',
+               'vers' => 'Version choice(s) for specific resources', 
 	       'act' => 'Actions');
     $r->print(<<ENDHEADERS);
+<h4 class="LC_info">$header</h4>
 <form action="/adm/coursedocs" method="post">
 <input type="hidden" name="versions" value="1" />
-<div class="LC_columnSection">
+<div class="LC_left_float">
 <fieldset>
-<legend>$lt{'act'}</legend>
-$lt{'sm'}: <input type="submit" name="setmostrecent" value="Go" /><br />
-$lt{'sc'}: <input type="submit" name="setcurrent" value="Go" />
-</fieldset>
-</div>
+<legend>$lt{'cd'}</legend>
 <select name="timerange">
 <option value='all' $allsel>$lt{'al'}</option>
 <option value="-1" $startsel>$lt{'st'}</option>
@@ -1856,7 +2491,18 @@ $lt{'sc'}: <input type="submit" name="se
 <option value="86400" $daysel>$lt{'sy'}</option>
 </select>
 <input type="submit" name="display" value="$lt{'sd'}" />
-<h2>$header</h2>
+</fieldset>
+</div>
+<div class="LC_left_float">
+<fieldset>
+<legend>$lt{'act'}</legend>
+$lt{'sm'}: <input type="submit" name="setmostrecent" value="Go" /><br />
+$lt{'sc'}: <input type="submit" name="setcurrent" value="Go" />
+</fieldset>
+</div>
+<br clear="all" />
+<hr />
+<h4>$lt{'vers'}</h4>
 <input type="submit" name="setversions" value="$lt{'save'}" />
 <table border="0">
 ENDHEADERS
@@ -2023,7 +2669,7 @@ $help{'Caching'}.'</p></form>'."\n\n");
 sub init_breadcrumbs {
     my ($form,$text)=@_;
     &Apache::lonhtmlcommon::clear_breadcrumbs();
-    &Apache::lonhtmlcommon::add_breadcrumb({href=>"/adm/coursedocs",
+    &Apache::lonhtmlcommon::add_breadcrumb({href=>"/adm/coursedocs?tools=1",
 					    text=>&Apache::loncommon::course_type().' Editor',
 					    faq=>273,
 					    bug=>'Instructor Interface',
@@ -2058,23 +2704,24 @@ sub create_form_ul {
 #
 
 sub startContentScreen {
-    my ($r,$mode)=@_;
-    $r->print('<ul class="LC_TabContentBigger" id="mainnav">');
+    my ($mode) = @_;
+    my $output = '<ul class="LC_TabContentBigger" id="mainnav">';
     if (($mode eq 'navmaps') || ($mode eq 'supplemental')) {
-        $r->print('<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");
-        $r->print('<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");
-        $r->print('<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");
-        $r->print('<li '.(($mode eq 'suppdocs')?' class="active"':'').'><a href="/adm/supplemental"><b>'.&mt('Supplemental Content').'</b></a></li>');
-    } else {
-        $r->print('<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>');
-        $r->print('<li '.(($mode eq 'suppdocs')?' class="active"':'').
-                  '><a href="/adm/coursedocs?forcesupplement=1"><b>'.&mt('Supplemental Content Editor').'</b></a></li>');
-    }
-    $r->print("\n".'</ul>'."\n");
-    $r->print('<div class="LC_DocsBox" style="clear:both;margin:0;" id="contenteditor">'.
-              '<div id="maincoursedoc" style="margin:0 0;padding:0 0;">'.
-              '<div class="LC_ContentBox" id="mainCourseDocuments" style="display: block;">');
+        $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";
+        $output .= '<li '.(($mode eq 'suppdocs')?' class="active"':'').'><a href="/adm/coursedocs?forcesupplement=1"><b>'.&mt('Supplemental Content Editor').'</b></a></li>'."\n";
+        $output .= '<li '.(($mode eq 'tools')?' class="active"':'').'><a href="/adm/coursedocs?tools=1"><b>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'.&mt('Content Utilities').'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b></a></li>'."\n";
+                   '><a href="/adm/coursedocs?tools=1"><b>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'.&mt('Content Utilities').'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b></a></li>';
+    }
+    $output .= "\n".'</ul>'."\n";
+    $output .= '<div class="LC_DocsBox" style="clear:both;margin:0;" id="contenteditor">'.
+               '<div id="maincoursedoc" style="margin:0 0;padding:0 0;">'.
+               '<div class="LC_ContentBox" id="mainCourseDocuments" style="display: block;">';
+    return $output;
 }
 
 #
@@ -2082,8 +2729,7 @@ sub startContentScreen {
 #
 
 sub endContentScreen {
-   my ($r)=@_;
-   $r->print('</div></div></div>');
+    return '</div></div></div>';
 }
 
 sub supplemental_base {
@@ -2095,7 +2741,14 @@ sub handler {
     &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;
     return OK if $r->header_only;
+
+# get course data
     my $crstype = &Apache::loncommon::course_type();
+    my $coursenum=$env{'course.'.$env{'request.course.id'}.'.num'};
+    my $coursedom=$env{'course.'.$env{'request.course.id'}.'.domain'};
+
+# graphics settings
+    $iconpath = &Apache::loncommon::lonhttpdurl($r->dir_config('lonIconsURL').'/');
 
 #
 # --------------------------------------------- Initialize help topics for this
@@ -2129,20 +2782,29 @@ sub handler {
         $allowed = &Apache::lonnet::allowed('mdc',$env{'request.course.id'});
     }
 
-  if ($allowed && $env{'form.verify'}) {
+    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['chooseserver',
+                                            'inhibitmenu']);
+  if ($allowed && $env{'form.chooseserver'}) {
+      &choose_dump_server($r);
+      return OK;
+  } elsif ($allowed && $env{'form.verify'}) {
       &init_breadcrumbs('verify','Verify Content');
       &verifycontent($r);
   } elsif ($allowed && $env{'form.listsymbs'}) {
-      &init_breadcrumbs('listsymbs','List Symbs');
+      &init_breadcrumbs('listsymbs','List Content IDs');
       &list_symbs($r);
   } elsif ($allowed && $env{'form.docslog'}) {
       &init_breadcrumbs('docslog','Show Log');
-      &docs_change_log($r);
+      my $folder = $env{'form.folder'};
+      if ($folder eq '') {
+          $folder='default';
+      }
+      &docs_change_log($r,$coursenum,$coursedom,$folder,$allowed,$crstype,$iconpath);
   } elsif ($allowed && $env{'form.versions'}) {
       &init_breadcrumbs('versions','Check/Set Resource Versions');
       &checkversions($r);
   } elsif ($allowed && $env{'form.dumpcourse'}) {
-      &init_breadcrumbs('dumpcourse','Dump '.&Apache::loncommon::course_type().' Documents to Construction Space');
+      &init_breadcrumbs('dumpcourse','Dump '.&Apache::loncommon::course_type().' Content to Authoring Space');
       &dumpcourse($r);
   } elsif ($allowed && $env{'form.exportcourse'}) {
       &init_breadcrumbs('exportcourse','IMS Export');
@@ -2150,22 +2812,23 @@ sub handler {
   } else {
 #
 # Done catching special calls
-# The whole rest is for course and supplemental documents
+# The whole rest is for course and supplemental documents and utilities menu
 # Get the parameters that may be needed
 #
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
                                             ['folderpath','pagepath',
                                              'pagesymb','forcesupplement','forcestandard',
-                                             'symb','command']);
+                                             '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
 
     my $standard=($env{'request.course.uri'}=~/^\/uploaded\//);
 
-# Decide whether this should display supplemental or main content
+# Decide whether this should display supplemental or main content or utilities
 # supplementalflag=1: show supplemental documents
 # supplementalflag=0: show standard documents
+# toolsflag=1: show utilities
 
 
     my $supplementalflag=($env{'form.folderpath'}=~/^supplemental/);
@@ -2176,6 +2839,8 @@ sub handler {
     if ($env{'form.forcestandard'})   { $supplementalflag=0; }
     unless ($allowed) { $supplementalflag=1; }
     unless ($standard) { $supplementalflag=1; }
+    my $toolsflag=0;
+    if ($env{'form.tools'}) { $toolsflag=1; }
 
     my $script='';
     my $showdoc=0;
@@ -2298,81 +2963,90 @@ sub handler {
     }
 
 # Store this
-    &Apache::loncommon::store_course_settings($stored_folderpath,
-                                                {'pagepath' => 'scalar',
-                                                 'folderpath' => 'scalar'});
-
-    if ($env{'form.folderpath'}) {
-	my (@folderpath)=split('&',$env{'form.folderpath'});
-	$env{'form.foldername'}=&unescape(pop(@folderpath));
-	$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 {
-        my $folderpath=$env{'form.folderpath'};
-        if (!$folderpath) {
-            if ($env{'form.folder'} eq '' ||
-                $env{'form.folder'} eq 'supplemental') {
-                $folderpath='default&'.
-                    &escape(&mt('Main '.$crstype.' Documents'));
+    unless ($toolsflag) {
+        &Apache::loncommon::store_course_settings($stored_folderpath,
+                                                  {'pagepath' => 'scalar',
+                                                   'folderpath' => 'scalar'});
+        if ($env{'form.folderpath'}) {
+	    my (@folderpath)=split('&',$env{'form.folderpath'});
+	    $env{'form.foldername'}=&unescape(pop(@folderpath));
+	    $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 {
+            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,'<>&"').'" />';
+        }
+        if ($r->uri=~/^\/adm\/coursedocs\/showdoc\/(.*)$/) {
+           $showdoc='/'.$1;
+        }
+        if ($showdoc) { # got called in sequence from course
+	    $allowed=0; 
+        } else {
+            if ($allowed) {
+                &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['cmd']);
+                $script=&Apache::lonratedt::editscript('simple');
             }
         }
-        $containertag = '<input type="hidden" name="folderpath" value="" />';
-        $uploadtag = '<input type="hidden" name="folderpath" value="'.&HTML::Entities::encode($folderpath,'<>&"').'" />';
-    }
-    if ($r->uri=~/^\/adm\/coursedocs\/showdoc\/(.*)$/) {
-       $showdoc='/'.$1;
-    }
-    if ($showdoc) { # got called in sequence from course
-	$allowed=0; 
-    } else {
-       if ($allowed) {
-         &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['cmd']);
-         $script=&Apache::lonratedt::editscript('simple');
-       }
     }
 
-# get course data
-    my $coursenum=$env{'course.'.$env{'request.course.id'}.'.num'};
-    my $coursedom=$env{'course.'.$env{'request.course.id'}.'.domain'};
-
 # get personal data
     my $uname=$env{'user.name'};
     my $udom=$env{'user.domain'};
     my $plainname=&escape(&Apache::loncommon::plainname($uname,$udom));
 
-# graphics settings
-
-    $iconpath = &Apache::loncommon::lonhttpdurl($r->dir_config('lonIconsURL') . "/");
-
     if ($allowed) {
-        my @tabids;
-        if ($supplementalflag) {
-            @tabids = ('002','ee2','ff2');
+        if ($toolsflag) {
+            $script .= &inject_data_js();
+            my ($home,$other,%outhash)=&authorhosts();
+            if (!$home && $other) {
+                my @hosts;
+                foreach my $aurole (keys(%outhash)) {
+                    unless(grep(/^\Q$outhash{$aurole}\E/,@hosts)) {
+                        push(@hosts,$outhash{$aurole});
+                    }
+                }
+                $script .= &dump_switchserver_js(@hosts); 
+            }
         } else {
-            @tabids = ('aa1','bb1','cc1','ff1');
-            unless ($env{'form.pagepath'}) {
-                unshift(@tabids,'001');
-                push(@tabids,('dd1','ee1'));
+            my @tabids;
+            if ($supplementalflag) {
+                @tabids = ('002','ee2','ff2');
+            } else {
+                @tabids = ('aa1','bb1','cc1','ff1');
+                unless ($env{'form.pagepath'}) {
+                    unshift(@tabids,'001');
+                    push(@tabids,('dd1','ee1'));
+                }
             }
+            my $tabidstr = join("','",@tabids);
+	    $script .= &editing_js($udom,$uname,$supplementalflag).
+                       &history_tab_js().
+                       &inject_data_js().
+                       &Apache::lonhtmlcommon::resize_scrollbox_js('docs',$tabidstr);
+            $addentries = {
+                            onload   => "javascript:resize_scrollbox('contentscroll','1','1');",
+                          };
         }
-        my $tabidstr = join("','",@tabids);
-	$script .= &editing_js($udom,$uname,$supplementalflag).
-                   &resize_contentdiv_js($tabidstr);
-        $addentries = {
-                        onload   => "javascript:resize_contentdiv('contentscroll','1','1');",
-                      };
     }
 # -------------------------------------------------------------------- Body tag
     $script = '<script type="text/javascript">'."\n"
@@ -2393,7 +3067,7 @@ sub handler {
                                                  })
                  .&Apache::loncommon::help_open_menu('','',273,'RAT')
                  .&Apache::lonhtmlcommon::breadcrumbs(
-                     'Editing the Table of Contents for your '.$crstype,
+                     'Editing '.$crstype.' Contents',
                      'Docs_Adding_Course_Doc')
         );
     } else {
@@ -2454,7 +3128,11 @@ sub handler {
       }
   }
 
-  unless ($showdoc || $uploadphase) {  
+  if ($allowed && $toolsflag) {
+      $r->print(&startContentScreen('tools'));
+      $r->print(&generate_admin_menu($crstype));
+      $r->print(&endContentScreen());
+  } elsif ((!$showdoc) && (!$uploadphase)) {
 # -----------------------------------------------------------------------------
        my %lt=&Apache::lonlocal::texthash(
                 'uplm' => 'Upload a new main '.lc($crstype).' document',
@@ -2464,7 +3142,7 @@ sub handler {
                 'upld' => 'Import Document',
                 'srch' => 'Search',
                 'impo' => 'Import',
-		'wish' => 'Import from Wishlist',
+		'lnks' => 'Import from Stored Links',
                 'selm' => 'Select Map',
                 'load' => 'Load Map',
                 'reco' => 'Recover Deleted Documents',
@@ -2532,7 +3210,7 @@ SEDFFORM
 	my @simpleeditdefaultforma = ( 
 	{ '<img class="LC_noBorder LC_middle" src="/res/adm/pages/src.png" alt="'.$lt{srch}.'"  onclick="javascript:groupsearch()" />' => "$uploadtag<a class='LC_menubuttons_link' href='javascript:groupsearch()'>$lt{'srch'}</a>" },
 	{ '<img class="LC_noBorder LC_middle" src="/res/adm/pages/res.png" alt="'.$lt{impo}.'"  onclick="javascript:groupimport();"/>' => "<a class='LC_menubuttons_link' href='javascript:groupimport();'>$lt{'impo'}</a>$help{'Importing_LON-CAPA_Resource'}" },
-	{ '<img class="LC_noBorder LC_middle" src="/res/adm/pages/wishlist.png" alt="'.$lt{wish}.'" onclick="javascript:open_Wishlist_Import();" />' => "<a class='LC_menubuttons_link' href='javascript:open_Wishlist_Import();'>$lt{'wish'}</a>" },
+	{ '<img class="LC_noBorder LC_middle" src="/res/adm/pages/wishlist.png" alt="'.$lt{lnks}.'" onclick="javascript:open_StoredLinks_Import();" />' => "<a class='LC_menubuttons_link' href='javascript:open_StoredLinks_Import();'>$lt{'lnks'}</a>" },
 	);
 	$simpleeditdefaultform .= &create_form_ul(&create_list_elements(@simpleeditdefaultforma));
 	$simpleeditdefaultform .=(<<SEDFFORM);
@@ -2557,13 +3235,6 @@ ERFORM
 
     if ($allowed) {
 	&update_paste_buffer($coursenum,$coursedom);
-       my %lt=&Apache::lonlocal::texthash(
-					 'vc' => 'Verify Content',
-					 'cv' => 'Check/Set Resource Versions',
-					 'ls' => 'List Symbs',
-                                         'sl' => 'Show Log'
-					  );
-
 	$r->print(<<HIDDENFORM);
 	<form name="renameform" method="post" action="/adm/coursedocs">
    <input type="hidden" name="title" />
@@ -2572,11 +3243,12 @@ ERFORM
    <input type="hidden" name="copyfolder" />
    $containertag
  </form>
- <form name="simpleedit" method="post" action="/adm/coursedocs">
-   <input type="hidden" name="importdetail" value="" />
-   $uploadtag
- </form>
+
 HIDDENFORM
+        $r->print(&makesimpleeditform($uploadtag)."\n".
+                  &makedocslogform($uploadtag."\n".
+                                   '<input type="hidden" name="folder" value="'.
+                                   $env{'form.folder'}.'" />'."\n"));
     }
 
 # Generate the tabs
@@ -2584,7 +3256,7 @@ HIDDENFORM
     if (($supplementalflag) && (!$allowed)) {
         &Apache::lonnavdisplay::startContentScreen($r,'supplemental');
     } else {
-        &startContentScreen($r,($supplementalflag?'suppdocs':'docs'));
+        $r->print(&startContentScreen(($supplementalflag?'suppdocs':'docs')));
     }
 
 #
@@ -2621,14 +3293,6 @@ HIDDENFORM
 	}
 	my $readfile='/uploaded/'.$coursedom.'/'.$coursenum.'/'.$folder.'.'.$container;
 
-
-
-	my $recoverform=(<<RFORM);
-	<form action="/adm/groupsort" method="post" name="recover">
-	<a class="LC_menubuttons_link" href="javascript:groupopen('$readfile',1)">$lt{'reco'}</a>
-	</form>
-RFORM
-
 	my $imspform=(<<IMSPFORM);
 	<form action="/adm/imsimportdocs" method="post" name="ims">
 	<input type="hidden" name="folder" value="$folder" />
@@ -2812,28 +3476,19 @@ NGFFORM
         );
         $communityform = &create_form_ul(&create_list_elements(@communityforma));
 
-
-
-my @tools = (
-#	{'<img class="LC_noBorder LC_middle" align="left" src="/res/adm/pages/extres.png" alt="'.$lt{extr}.'" />'=>$extresourcesform},
-#	{'<img class="LC_noBorder LC_middle" align="left" src="/res/adm/pages/ims.png" alt="'.$lt{imsf}.'" />'=>$imspform},
-	{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/recover.png" alt="'.$lt{reco}.'" onclick="javascript:groupopen(\''.$readfile.'\',1)" />'=>$recoverform},
-	);
-
 my %orderhash = (
-                'aa' => ['Import Documents',$fileuploadform],
-                'bb' => ['Published Resources',$simpleeditdefaultform],
+                'aa' => ['Import Content',$fileuploadform],
+                'bb' => ['Published Content',$simpleeditdefaultform],
                 'cc' => ['Grading Resources',$gradingform],
-		'ff' => ['Tools', &create_form_ul(&create_list_elements(@tools)).&generate_admin_options(\%help,\%env)],
                 );
 unless ($env{'form.pagepath'}) {
     $orderhash{'00'} = ['Newfolder',$newfolderform];
-    $orderhash{'dd'} = ['Community Resources',$communityform];
+    $orderhash{'dd'} = ['Collaboration',$communityform];
     $orderhash{'ee'} = ['Special Documents',$specialdocumentsform];
 }
 
  $hadchanges=0;
-       unless ($supplementalflag) {
+       unless (($supplementalflag || $toolsflag)) {
           my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$crstype,
                               $supplementalflag,\%orderhash,$iconpath);
           if ($error) {
@@ -2942,7 +3597,7 @@ my @supimportdoc = (
 $supupdocform =  &create_form_ul(&create_list_elements(@supimportdoc)) . '<hr id="ee_hrule" style="width:0px;text-align:left;margin-left:0" />' . $supupdocform;
 my %suporderhash = (
 		'00' => ['Supnewfolder', $supnewfolderform],
-                'ee' => ['Import Documents',$supupdocform],
+                'ee' => ['Import Content',$supupdocform],
                 'ff' => ['Special Documents',&create_form_ul(&create_list_elements(@specialdocs))]
                 );
         if ($supplementalflag) {
@@ -2960,7 +3615,7 @@ my %suporderhash = (
         }
     }
 
-    &endContentScreen($r);
+    $r->print(&endContentScreen());
 
     if ($allowed) {
 	$r->print('
@@ -2971,14 +3626,12 @@ my %suporderhash = (
   <input type="hidden" name="residx" />
 </form>');
     }
-  } else {
-      unless ($uploadphase) {
+  } elsif ($showdoc) {
 # -------------------------------------------------------- This is showdoc mode
-          $r->print("<h1>".&mt('Uploaded Document').' - '.
+      $r->print("<h1>".&mt('Uploaded Document').' - '.
 		&Apache::lonnet::gettitle($r->uri).'</h1><p>'.
 &mt('It is recommended that you use an up-to-date virus scanner before handling this file.')."</p><table>".
-          &entryline(0,&mt("Click to download or use your browser's Save Link function"),$showdoc).'</table>');
-      }
+                &entryline(0,&mt("Click to download or use your browser's Save Link function"),$showdoc).'</table>');
   }
  }
  $r->print(&Apache::loncommon::end_page());
@@ -3050,7 +3703,7 @@ sub decompression_phase_one {
     my ($dir,$file,$warning,$error,$output);
     my ($destination,$dir_root,$londocroot,$docudom,$docuname,$container,$hiddenelem)=
         &decompression_info();
-    if ($env{'form.archiveurl'} !~ m{^/uploaded/\Q$docudom/$docuname/docs/\E(?:default|supplemental|\d+).*/([^/]+)$}) {
+    if ($env{'form.archiveurl'} !~ m{^/uploaded/\Q$docudom/$docuname/\E(?:docs|supplemental)/(?:default|\d+).*/([^/]+)$}) {
         $error = &mt('Archive file "[_1]" not in the expected location.',$env{'form.archiveurl'});
     } else {
         my $file = $1;
@@ -3132,43 +3785,92 @@ sub remove_archive {
     return $output;
 }
 
-sub generate_admin_options {
-  my ($help_ref,$env_ref) = @_;
-  my %lt=&Apache::lonlocal::texthash(
-                                         'vc' => 'Verify Content',
-                                         'cv' => 'Check/Set Resource Versions',
-                                         'ls' => 'List Symbs',
-                                         'sl' => 'Show Log',
-                                         'imse' => 'IMS Export',
-                                         'dcd' => 'Dump Course Documents to Construction Space: available on other servers'
-                                          );
-  my %help = %{$help_ref};
-  my %env = %{$env_ref};
-  my $dumpbut=&dumpbutton();
-  my $exportbut=&exportbutton();
-  my @list = (
-	{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/verify.png" alt="'.$lt{vc}.'"  onclick=\'javascript:injectData(document.courseverify, "dummy", "verify", "'.$lt{'vc'}.'")\' />' 
-        => "<a class='LC_menubuttons_link' href='javascript:injectData(document.courseverify, \"dummy\", \"verify\", \"$lt{'vc'}\")'>$lt{'vc'}</a>$help{'Verify_Content'}"},
-	{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/resversion.png" alt="'.$lt{cv}.'"  onclick=\'javascript:injectData(document.courseverify, "dummy", "versions", "'.$lt{'cv'}.'")\' />'
-        =>"<a class='LC_menubuttons_link' href='javascript:injectData(document.courseverify, \"dummy\", \"versions\", \"$lt{'cv'}\")'>$lt{'cv'}</a>$help{'Check_Resource_Versions'}"},
-	);
-  if($dumpbut ne ''){
-  push @list, {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/dump.png" alt="'.$lt{dcd}.'" />'=>$dumpbut};
-  }
-  push @list, ({'<img class="LC_noBorder LC_middle" src="/res/adm/pages/imsexport.png" alt="'.$lt{imse}.'" onclick="javascript:injectData(document.courseverify, \'dummy\', \'exportcourse\', \''.&mt('IMS Export').'\');" />'
-          =>$exportbut},
-	{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/symbs.png" alt="'.$lt{ls}.'"  onclick=\'javascript:injectData(document.courseverify, "dummy", "listsymbs", "'.$lt{'ls'}.'")\'  />'
-        =>"<a class='LC_menubuttons_link' href='javascript:injectData(document.courseverify, \"dummy\", \"listsymbs\", \"$lt{'ls'}\")'>$lt{'ls'}</a><input type='hidden' name='folder' value='$env{'form.folder'}' />"},
-	{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/document-properties.png" alt="'.$lt{sl}.'"  onclick=\'javascript:injectData(document.courseverify, "dummy", "docslog", "'.$lt{'sl'}.'")\'  />'
-        =>"<a class='LC_menubuttons_link' href='javascript:injectData(document.courseverify, \"dummy\", \"docslog\", \"$lt{'sl'}\")'>$lt{'sl'}</a>"},
-	);
-  return '<form action="/adm/coursedocs" method="post" name="courseverify"><input type="hidden" id="dummy" />'.&create_form_ul(&create_list_elements(@list)).'</form>';
-
+sub generate_admin_menu {
+    my ($crstype) = @_;
+    my $lc_crstype = lc($crstype);
+    my ($home,$other,%outhash)=&authorhosts();
+    my %lt=&Apache::lonlocal::texthash (
+                                         'vc'   => 'Verify Content',
+                                         'cv'   => 'Check/Set Resource Versions',
+                                         'ls'   => 'List Resource Identifiers',
+                                         'imse' => 'Export contents to IMS Archive',
+                                         'dcd'  => "Dump $crstype Content to Authoring Space",
+                                       );
+    my ($candump,$dumpurl);
+    if ($home + $other > 0) {
+        $candump = 'F';
+        if ($home) {
+            $dumpurl = "javascript:injectData(document.courseverify,'dummy','dumpcourse','$lt{'dcd'}')";
+        } else {
+            my @hosts;
+            foreach my $aurole (keys(%outhash)) {
+                unless(grep(/^\Q$outhash{$aurole}\E/,@hosts)) {
+                    push(@hosts,$outhash{$aurole});
+                }  
+            }
+            if (@hosts == 1) {
+                my $switchto = '/adm/switchserver?otherserver='.$hosts[0].
+                               '&amp;role='.
+                               &HTML::Entities::encode($env{'request.role'},'"<>&').'&amp;origurl='.
+                               &HTML::Entities::encode('/adm/coursedocs?dumpcourse=1','"<>&');
+                $dumpurl = "javascript:dump_needs_switchserver('$switchto')";
+            } else {
+                $dumpurl = "javascript:choose_switchserver_window()";
+            }
+        }
+    }
+    my @menu=
+        ({  categorytitle=>'Administration',
+            items =>[
+                {   linktext   => $lt{'vc'},
+                    url        => "javascript:injectData(document.courseverify,'dummy','verify','$lt{'vc'}')",
+                    permission => 'F',
+                    help       => 'Verify_Content',
+                    icon       => 'verify.png',
+                    linktitle  => 'Verify contents can be retrieved/rendered',
+                },
+                {   linktext => $lt{'cv'},
+                    url => "javascript:injectData(document.courseverify,'dummy','versions','$lt{'cv'}')",
+                    permission => 'F',
+                    help       => 'Check_Resource_Versions',
+                    icon       => 'resversion.png',
+                    linktitle  => "View version information for resources in your $lc_crstype, and fix/unfix use of specific versions",
+                },
+                {   linktext   => $lt{'ls'},
+                    url        => "javascript:injectData(document.courseverify,'dummy','listsymbs','$lt{'ls'}')",
+                    permission => 'F',
+                    #help => '',
+                    icon       => 'symbs.png',
+                    linktitle  => "List the unique identifier used for each resource instance in your $lc_crstype"
+                },
+                ]
+        },
+        {   categorytitle=>'Export',
+            items =>[
+                {   linktext   => $lt{'imse'},
+                    url => "javascript:injectData(document.courseverify,'dummy','exportcourse','$lt{'imse'}')",
+                    permission => 'F',
+                    help       => 'Docs_Export_Course_Docs',
+                    icon       => 'imsexport.png',
+                    linktitle  => $lt{'imse'},
+                },
+                {   linktext   => $lt{'dcd'},
+                    url        => $dumpurl,
+                    permission => $candump,
+                    #help => '',
+                    icon       => 'dump.png',
+                    linktitle  => $lt{'dcd'},
+                },
+                ]
+        });
+    return '<form action="/adm/coursedocs" method="post" name="courseverify">'."\n".
+           '<input type="hidden" id="dummy" />'."\n".
+           &Apache::lonhtmlcommon::generate_menu(@menu)."\n".
+           '</form>';
 }
 
-
 sub generate_edit_table {
-    my ($tid,$orderhash_ref,$to_show,$iconpath,$jumpto) = @_;
+    my ($tid,$orderhash_ref,$to_show,$iconpath,$jumpto,$readfile) = @_;
     return unless(ref($orderhash_ref) eq 'HASH');
     my %orderhash = %{$orderhash_ref};
     my $form;
@@ -3180,11 +3882,25 @@ sub generate_edit_table {
     my $backicon = $iconpath.'clickhere.gif';
     my $backtext = &mt('To Overview');
     $form = '<div class="LC_Box" style="margin:0;">'.
-             '<ul id="navigation'.$tid.'" class="LC_TabContent">'.
-             '<li class="goback">'.
-             '<a href="javascript:toContents('."'$jumpto'".');">'.
-             '<img src="'.$backicon.'" class="LC_icon" style="border: none; vertical-align: top;"'.
-             '  alt="'.$backtext.'" />'.$backtext.'</a></li>';
+            '<ul id="navigation'.$tid.'" class="LC_TabContent">'."\n".
+            '<li class="goback">'.
+            '<a href="javascript:toContents('."'$jumpto'".');">'.
+            '<img src="'.$backicon.'" class="LC_icon" style="border: none; vertical-align: top;"'.
+            '  alt="'.$backtext.'" />'.$backtext.'</a></li>'."\n".
+            '<li>'.
+            '<a href="javascript:groupopen('."'$readfile'".',1);">'.
+            &mt('Undo Delete').'</a></li>'."\n";
+    if ($env{'form.docslog'}) {
+        $form .= '<li class="active">';
+    } else {
+        $form .= '<li>';
+    }
+    $form .= '<a href="javascript:toggleHistoryDisp(1);">'.
+             &mt('History').'</a></li>'."\n";
+    if ($env{'form.docslog'}) {
+        $form .= '<li><a href="javascript:toggleHistoryDisp(0);">'.
+                 &mt('Edit').'</a></li>'."\n";
+    }
     foreach my $name (reverse(sort(keys(%orderhash)))) {
         if($name ne '00'){
             if($activetab eq '' || $activetab ne $name){
@@ -3194,17 +3910,17 @@ sub generate_edit_table {
             }
             $form .= '<li style="float:right" '.$active
                 .' onmouseover="javascript:showPage(this, \''.$name.$tid.'\', \'navigation'.$tid.'\',\'content'.$tid.'\');"'
-                .' onclick="javascript:showPage(this, \''.$name.$tid.'\', \'navigation'.$tid.'\',\'content'.$tid.'\');"><a href="javascript:;"><b>'.&mt(${$orderhash{$name}}[0]).'</b></a></li>';
+                .' onclick="javascript:showPage(this, \''.$name.$tid.'\', \'navigation'.$tid.'\',\'content'.$tid.'\');"><a href="javascript:;"><b>'.&mt(${$orderhash{$name}}[0]).'</b></a></li>'."\n";
         } else {
-	    $form .= '<li '.$active.' style="float:right">'.${$orderhash{$name}}[1].'</li>';
+	    $form .= '<li '.$active.' style="float:right">'.${$orderhash{$name}}[1].'</li>'."\n";
 
 	}
     }
-    $form .= '</ul>';
-    $form .= '<div id="content'.$tid.'" style="padding: 0 0; margin: 0 0; overflow: hidden; clear:right">';
+    $form .= '</ul>'."\n";
+    $form .= '<div id="content'.$tid.'" style="padding: 0 0; margin: 0 0; overflow: hidden; clear:right">'."\n";
 
     if ($to_show ne '') {
-        $form .= '<div style="padding:0;margin:0;float:left">'.$to_show.'</div>';
+        $form .= '<div style="padding:0;margin:0;float:left">'.$to_show.'</div>'."\n";
     }
     foreach my $field (keys(%orderhash)){
 	if($field ne '00'){
@@ -3215,11 +3931,12 @@ sub generate_edit_table {
             }
             $form .= '<div id="'.$field.$tid.'"'
                     .' class="LC_ContentBox" '.$active.'>'.${$orderhash{$field}}[1]
-                    .'</div>';
+                    .'</div>'."\n";
         }
     }
-    $form .= '</div></div>';
-
+    unless ($env{'form.docslog'}) {
+        $form .= '</div></div>'."\n";
+    }
     return $form;
 }
 
@@ -3565,17 +4282,10 @@ function showPage(current, pageId, nav,
                 }
             }
         }
-        resize_contentdiv('contentscroll','1','0');
+        resize_scrollbox('contentscroll','1','0');
 	return false;
 }
 
-function injectData(current, hiddenField, name, value) {
-	currentElement = document.getElementById(hiddenField);
-	currentElement.name = name;
-	currentElement.value = value;
-	current.submit();
-}
-
 function toContents(jumpto) {
     var newurl = '$backtourl';
     if (jumpto != '') {
@@ -3599,194 +4309,114 @@ function toggleHistoryDisp(choice) {
 ENDHIST
 }
 
-sub resize_contentdiv_js {
-    my ($tabidstr) = @_;
-    my $viewport_js = &Apache::loncommon::viewport_geometry_js();
-    return <<ENDRESIZESCRIPT;
-
-window.onresize=resizeContentEditor;
-
-var activeTab;
-
-$viewport_js
-
-function resize_contentdiv(scrollboxname,chkw,chkh) {
-    var scrollboxid = 'div_'+scrollboxname;
-    var scrolltableid = 'table_'+scrollboxname;
-    var scrollbox;
-    var scrolltable;
+sub inject_data_js {
+    return <<ENDINJECT;
 
-    if (document.getElementById("contenteditor") == null) {
-        return;
-    }
-
-    if (document.getElementById(scrollboxid) == null) {
-        return;
-    } else {
-        scrollbox = document.getElementById(scrollboxid);
-    }
-
-    if (document.getElementById(scrolltableid) == null) {
-        return;
-    } else {
-        scrolltable = document.getElementById(scrolltableid);
-    }
+function injectData(current, hiddenField, name, value) {
+        currentElement = document.getElementById(hiddenField);
+        currentElement.name = name;
+        currentElement.value = value;
+        current.submit();
+}
 
-    init_geometry();
-    var vph = Geometry.getViewportHeight();
-    var vpw = Geometry.getViewportWidth();
-
-    var alltabs = ['$tabidstr'];
-    var listwchange;
-    if (chkw == 1) {
-        var contenteditorw = document.getElementById("contenteditor").offsetWidth;
-        var contentlistw;
-        var contentlistid = document.getElementById("contentlist");
-        if (contentlistid != null) {
-            contentlistw = document.getElementById("contentlist").offsetWidth;
-        }
-        var contentlistwstart = contentlistw;
-
-        var scrollboxw = scrollbox.offsetWidth;
-        var scrollboxscrollw = scrollbox.scrollWidth;
-
-        var offsetw = parseInt(vpw * 0.015);
-        var paddingw = parseInt(vpw * 0.09);
-
-        var minscrollboxw = 250;
-
-        var maxtabw = 0;
-        var actabw = 0;
-        for (var i=0; i<alltabs.length; i++) {
-            if (activeTab == alltabs[i]) {
-                actabw = document.getElementById(alltabs[i]).offsetWidth;
-                if (actabw > maxtabw) {
-                    maxtabw = actabw;
-                }
-            } else {
-                if (document.getElementById(alltabs[i]) != null) {
-                    var thistab = document.getElementById(alltabs[i]);
-                    thistab.style.visibility = 'hidden';
-                    thistab.style.display = 'block';
-                    var tabw = document.getElementById(alltabs[i]).offsetWidth;
-                    thistab.style.display = 'none';
-                    thistab.style.visibility = '';
-                    if (tabw > maxtabw) {
-                        maxtabw = tabw;
-                    }
-                }
-            }
-        }
+ENDINJECT
+}
 
-        if (maxtabw > 0) {
-            var newscrollboxw;
-            if (maxtabw+paddingw+scrollboxscrollw<contenteditorw) {
-                newscrollboxw = contenteditorw-paddingw-maxtabw;
-                if (newscrollboxw < minscrollboxw) {
-                    newscrollboxw = minscrollboxw;
-                }
-                scrollbox.style.width = newscrollboxw+"px";
-                if (newscrollboxw != scrollboxw) {
-                    var newcontentlistw = newscrollboxw-offsetw;
-                    contentlistid.style.width = newcontentlistw+"px";
-                }
-            } else {
-                newscrollboxw = contenteditorw-paddingw-maxtabw;
-                if (newscrollboxw < minscrollboxw) {
-                    newscrollboxw = minscrollboxw;
-                }
-                scrollbox.style.width = newscrollboxw+"px";
-                if (newscrollboxw != scrollboxw) {
-                    var newcontentlistw = newscrollboxw-offsetw;
-                    contentlistid.style.width = newcontentlistw+"px";
-                }
+sub dump_switchserver_js {
+    my @hosts = @_;
+    my %lt = &Apache::lonlocal::texthash(
+        dump => 'Dumping to Authoring Space requires switching server.',
+        swit => 'Switch server?',
+        duco => 'Dump content to Authoring Space',
+        yone => 'You need to switch to a server housing an Authoring Space for which you are author or co-author.',
+        chos => 'Choose server',
+    );
+    my $role = $env{'request.role'};
+    my $js = <<"ENDSWJS";
+<script type="text/javascript">
+function write_switchserver() {
+    var server;
+    if (document.setserver.posshosts.length > 0) {
+        for (var i=0; i<document.setserver.posshosts.length; i++) {
+            if (document.setserver.posshosts[i].checked) {
+                server = document.setserver.posshosts[i].value;
             }
+       }
+       opener.document.location.href="/adm/switchserver?otherserver="+server+"&role=$role&origurl=/adm/coursedocs";
+    }
+    window.close();
+}
+</script>
 
-            if (newscrollboxw != scrollboxw) {
-                var newscrolltablew = newscrollboxw+offsetw;
-                scrolltable.style.width = newscrolltablew+"px";
-            }
-        }
+ENDSWJS
 
-        if (contentlistid.offsetWidth != contentlistwstart) {
-            listwchange = 1;
-        }
+    my $startpage = &Apache::loncommon::start_page('Choose server',$js,
+                                                   {'only_body' => 1,
+                                                    'js_ready'  => 1,});
+    my $endpage = &Apache::loncommon::end_page({'js_ready'  => 1});
 
-        if (activeTab == 'cc1') {
-            if (document.getElementById('cc_hrule') != null) {
-                document.getElementById('cc_hrule').style.width=actabw+"px";
-            }
-        } else {
-            if (activeTab == 'bb1') {
-                if (document.getElementById('bb_hrule') != null) {
-                    document.getElementById('bb_hrule').style.width=actabw+"px";
-                }
-            } else {
-                if (activeTab == 'ee2') {
-                    if (document.getElementById('ee_hrule') != null) {
-                        document.getElementById('ee_hrule').style.width=actabw+"px";
-                    }
-                }
-            }
+    my $hostpicker;
+    my $count = 0;
+    foreach my $host (sort(@hosts)) {
+        my $checked;
+        if ($count == 0) {
+            $checked = ' checked="checked"';
         }
+        $hostpicker .= '<label><input type="radio" name="posshosts" value="'.
+                       $host.'"'.$checked.' />'.$host.'</label>&nbsp;&nbsp;';
+        $count++;
     }
-    if ((chkh == 1) || (listwchange)) {
-        var primaryheight = document.getElementById("LC_nav_bar").offsetHeight;
-        var secondaryheight = document.getElementById("LC_secondary_menu").offsetHeight;
-        var crumbsheight = document.getElementById("LC_breadcrumbs").offsetHeight;
-        var dccidheight = document.getElementById("dccid").offsetHeight;
-
-        var uploadresultheight = 0;
-        if (document.getElementById("uploadfileresult") != null) {
-            uploadresultheight = document.getElementById("uploadfileresult").offsetHeight;
-        }
-        var tabbedheight = document.getElementById("tabbededitor").offsetHeight;
-        var contenteditorheight = document.getElementById("contenteditor").offsetHeight;
-        var scrollboxheight = scrollbox.offsetHeight;
-        var scrollboxscrollheight = scrollbox.scrollHeight;
-        var freevspace = vph-(primaryheight+secondaryheight+crumbsheight+dccidheight+uploadresultheight+tabbedheight+contenteditorheight);
-
-        var minvscrollbox = 200;
-        var offsetv = 20;
-        var newscrollboxheight;
-        if (freevspace < 0) {
-            newscrollboxheight = scrollboxheight+freevspace-offsetv;
-            if (newscrollboxheight < minvscrollbox) {
-                newscrollboxheight = minvscrollbox;
-            }
-            scrollbox.style.height = newscrollboxheight + "px";
-        } else {
-            if (scrollboxscrollheight > scrollboxheight) {
-                if (freevspace > offsetv) {
-                    newscrollboxheight = scrollboxheight+freevspace-offsetv;
-                    if (newscrollboxheight < minvscrollbox) {
-                        newscrollboxheight = minvscrollbox;
-                    }
-                    scrollbox.style.height = newscrollboxheight+"px";
-                }
-            }
-        }
-        scrollboxheight = scrollbox.offsetHeight;
-        var contentlistheight = document.getElementById("contentlist").offsetHeight;
+    
+    return <<"ENDSWITCHJS";
 
-        if (scrollboxscrollheight <= scrollboxheight) {
-            if ((contentlistheight+offsetv)<scrollboxheight) {
-                newscrollheight = contentlistheight+offsetv;
-                scrollbox.style.height = newscrollheight+"px";
-            }
+function dump_needs_switchserver(url) {
+    if (url!='' && url!= null) {
+        if (confirm("$lt{'dump'}\\n$lt{'swit'}")) {
+            go(url);
         }
     }
     return;
 }
 
-function resizeContentEditor() {
-    var timer;
-    clearTimeout(timer)
-    timer=setTimeout('resize_contentdiv("contentscroll","1","1")',500);
+function choose_switchserver_window() {
+    newWindow = window.open('','ChooseServer','height=400,width=500,scrollbars=yes')
+    newWindow.document.open();
+    newWindow.document.writeln('$startpage');
+    newWindow.document.write('<h3>$lt{'duco'}<\\/h3>\\n'+
+       '<p>$lt{'yone'}<\\/p>\\n'+
+       '<div class="LC_left_float"><fieldset><legend>$lt{'chos'}<\\/legend>\\n'+
+       '<form name="setserver" method="post" action="" \\/>\\n'+
+       '$hostpicker\\n'+
+       '<br \\/><br \\/>\\n'+
+       '<input type="button" name="makeswitch" value="$lt{'swit'}" '+
+       'onclick="write_switchserver();" \\/>\\n'+
+       '<\\/form><\\/fieldset><\\/div><br clear="all" \\/>\\n');
+    newWindow.document.writeln('$endpage');
+    newWindow.document.close();
+    newWindow.focus();
+}
+
+ENDSWITCHJS
+}
+
+sub makedocslogform {
+    my ($formelems,$docslog) = @_;
+    return <<"LOGSFORM";
+ <form action="/adm/coursedocs" method="post" name="docslogform">
+   <input type="hidden" name="docslog" value="$docslog" />
+   $formelems
+ </form>
+LOGSFORM
 }
 
-ENDRESIZESCRIPT
-    return;
+sub makesimpleeditform {
+    my ($formelems) = @_;
+    return <<"SIMPFORM";
+ <form name="simpleedit" method="post" action="/adm/coursedocs">
+   <input type="hidden" name="importdetail" value="" />
+   $formelems
+ </form>
+SIMPFORM
 }
 
 1;
@@ -3821,21 +4451,12 @@ sets @resources - array with the resourc
 
 Return hash with valid author names
 
-=item dumpbutton()
-
-Generate "dump" button
-
 =item clean()
 
 =item dumpcourse()
 
     Actually dump course
 
-
-=item exportbutton()
-
-    Generate "export" button
-
 =item group_import()
 
     Imports the given (name, url) resources into the course
@@ -3865,8 +4486,6 @@ Generate "dump" button
 
 =item is_supplemental_title()
 
-=item parse_supplemental_title()
-
 =item entryline()
 
 =item tiehash()
@@ -3895,6 +4514,48 @@ Check Versions
 
 Breadcrumbs for special functions
 
+=item create_list_elements()
+
+=item create_form_ul()
+
+=item startContentScreen() 
+
+=item endContentScreen()
+
+=item supplemental_base()
+
+=item embedded_form_elems()
+
+=item embedded_destination()
+
+=item return_to_editor()
+
+=item decompression_info()
+
+=item decompression_phase_one()
+
+=item decompression_phase_two()
+
+=item remove_archive()
+
+=item generate_admin_menu()
+
+=item generate_edit_table()
+
+=item editing_js()
+
+=item history_tab_js()
+
+=item inject_data_js()
+
+=item dump_switchserver_js()
+
+=item resize_scrollbox_js()
+
+=item makedocslogform()
+
+=item makesimpleeditform()
+
 =back
 
 =cut