--- loncom/interface/londocs.pm	2013/01/09 17:22:51	1.530
+++ loncom/interface/londocs.pm	2015/08/20 00:28:52	1.596
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.530 2013/01/09 17:22:51 raeburn Exp $
+# $Id: londocs.pm,v 1.596 2015/08/20 00:28:52 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -41,9 +41,12 @@ use Apache::lonclonecourse;
 use Apache::lonnavmaps;
 use Apache::lonnavdisplay();
 use Apache::lonextresedit();
+use Apache::lontemplate();
+use Apache::lonsimplepage();
 use HTML::Entities;
 use HTML::TokeParser;
 use GDBM_File;
+use File::MMagic;
 use Apache::lonlocal;
 use Cwd;
 use LONCAPA qw(:DEFAULT :match);
@@ -56,6 +59,7 @@ my $hashtied;
 my %alreadyseen=();
 
 my $hadchanges;
+my $suppchanges;
 
 
 my %help=();
@@ -79,7 +83,11 @@ sub storemap {
 			      $map,1,$report);
     if ($errtext) { return ($errtext,2); }
 
-    $hadchanges=1;
+    if ($map =~ /^default/) {
+        $hadchanges=1;
+    } else {
+        $suppchanges=1;
+    }
     return ($errtext,0);
 }
 
@@ -136,8 +144,28 @@ sub clean {
 sub dumpcourse {
     my ($r) = @_;
     my $crstype = &Apache::loncommon::course_type();
-    $r->print(&Apache::loncommon::start_page('Dump '.$crstype.' Content to Authoring Space')."\n".
-              &Apache::lonhtmlcommon::breadcrumbs('Dump '.$crstype.' Content to Authoring Space')."\n");
+    my ($starthash,$js);
+    unless (($env{'form.authorspace'}) && ($env{'form.authorfolder'}=~/\w/)) {
+        $js = <<"ENDJS";
+<script type="text/javascript">
+// <![CDATA[
+
+function hide_searching() {
+    if (document.getElementById('searching')) {
+        document.getElementById('searching').style.display = 'none';
+    }
+    return;
+}
+
+// ]]>
+</script>
+ENDJS
+        $starthash = {
+                         add_entries => {'onload' => "hide_searching();"},
+                     };
+    }
+    $r->print(&Apache::loncommon::start_page('Copy '.$crstype.' Content to Authoring Space',$js,$starthash)."\n".
+              &Apache::lonhtmlcommon::breadcrumbs('Copy '.$crstype.' Content to Authoring Space')."\n");
     $r->print(&startContentScreen('tools'));
     my ($home,$other,%outhash)=&authorhosts();
     unless ($home) {
@@ -152,122 +180,411 @@ sub dumpcourse {
             $r->print(&endContentScreen());
             return '';
         }
-	my ($ca,$cd)=split(/\@/,$env{'form.authorspace'});
+	my ($ca,$cd)=split(/\:/,$env{'form.authorspace'});
 	$r->print('<h3>'.&mt('Copying Files').'</h3>');
 	my $title=$env{'form.authorfolder'};
 	$title=&clean($title);
-	my %replacehash=();
-	foreach my $key (keys(%env)) {
-	    if ($key=~/^form\.namefor\_(.+)/) {
-		$replacehash{$1}=$env{$key};
-	    }
+        my ($navmap,$errormsg) =
+            &Apache::loncourserespicker::get_navmap_object($crstype,'dumpdocs');
+        my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+        my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+        my (%maps,%resources,%titles);
+        if (!ref($navmap)) {
+            $r->print($errormsg.
+                      &endContentScreen());
+            return '';
+        } else {
+            &Apache::loncourserespicker::enumerate_course_contents($navmap,\%maps,\%resources,\%titles,
+                                                                   'dumpdocs',$cdom,$cnum);
 	}
+        my @todump = &Apache::loncommon::get_env_multiple('form.archive');
+        my (%tocopy,%replacehash,%lookup,%deps,%display,%result,%depresult,%simpleproblems,%simplepages,
+            %newcontent,%has_simpleprobs);
+        foreach my $item (sort {$a <=> $b} (@todump)) {
+            my $name = $env{'form.namefor_'.$item};
+            if ($resources{$item}) {
+                my ($map,$id,$res) = &Apache::lonnet::decode_symb($resources{$item});
+                if ($res =~ m{^uploaded/$cdom/$cnum/\E((?:docs|supplemental)/.+)$}) {
+                    $tocopy{$1} = $name;
+                    $display{$item} = $1;
+                    $lookup{$1} = $item; 
+                } elsif ($res eq 'lib/templates/simpleproblem.problem') {
+                    $simpleproblems{$item} = {
+                                                symb => $resources{$item},
+                                                name => $name,
+                                             };
+                    $display{$item} = 'simpleproblem_'.$name;
+                    if ($map =~ m{^\Quploaded/$cdom/$cnum/\E(.+)$}) {
+                        $has_simpleprobs{$1}{$id} = $item;
+                    }
+                } elsif ($res =~ m{^adm/$match_domain/$match_username/(\d+)/smppg}) {
+                    my $marker = $1;
+                    my $db_name = &Apache::lonsimplepage::get_db_name($res,$marker,$cdom,$cnum);
+                    $simplepages{$item} = {
+                                            res    => $res,
+                                            title  => $titles{$item},
+                                            db     => $db_name,
+                                            marker => $marker,
+                                            symb   => $resources{$item},
+                                            name   => $name,
+                                          };
+                    $display{$item} = '/'.$res;
+                }
+            } elsif ($maps{$item}) {
+                if ($maps{$item} =~ m{^\Quploaded/$cdom/$cnum/\E((?:default|supplemental)_\d+\.(?:sequence|page))$}) {
+                    $tocopy{$1} = $name;
+                    $display{$item} = $1;
+                    $lookup{$1} = $item;
+                }
+            } else {
+                next;
+            }
+        }
 	my $crs='/uploaded/'.$env{'request.course.id'}.'/';
 	$crs=~s/\_/\//g;
-	foreach my $item (keys(%replacehash)) {
-	    my $newfilename=$title.'/'.$replacehash{$item};
-	    $newfilename=~s/\.(\w+)$//;
-	    my $ext=$1;
-	    $newfilename=&clean($newfilename);
-	    $newfilename.='.'.$ext;
-	    my @dirs=split(/\//,$newfilename);
-	    my $path=$r->dir_config('lonDocRoot')."/priv/$cd/$ca";
-	    my $makepath=$path;
-	    my $fail=0;
-	    for (my $i=0;$i<$#dirs;$i++) {
-		$makepath.='/'.$dirs[$i];
-		unless (-e $makepath) {
-		    unless(mkdir($makepath,0777)) { $fail=1; }
-		}
-	    }
-	    $r->print('<br /><tt>'.$item.'</tt> => <tt>'.$newfilename.'</tt>: ');
-	    if (my $fh=Apache::File->new('>'.$path.'/'.$newfilename)) {
-		if ($item=~/\.(sequence|page|html|htm|xml|xhtml)$/) {
-		    print $fh &Apache::lonclonecourse::rewritefile(
-         &Apache::lonclonecourse::readfile($env{'request.course.id'},$item),
-				     (%replacehash,$crs => '')
-								    );
-		} else {
-		    print $fh
-         &Apache::lonclonecourse::readfile($env{'request.course.id'},$item);
-		       }
-		$fh->close();
-	    } else {
-		$fail=1;
-	    }
-	    if ($fail) {
-		$r->print('<span class="LC_error">'.&mt('fail').'</span>');
-	    } else {
-		$r->print('<span class="LC_success">'.&mt('ok').'</span>');
-	    }
-	}
+        my $mm = new File::MMagic;
+        my $prefix = "/uploaded/$cdom/$cnum/";
+        %replacehash = %tocopy;
+        foreach my $item (sort(keys(%simpleproblems))) {
+            my $content = &Apache::imsexport::simpleproblem($simpleproblems{$item}{'symb'});
+            $newcontent{$display{$item}} = $content;
+        }
+        my $gateway = Apache::lonhtmlgateway->new('web');
+        foreach my $item (sort(keys(%simplepages))) {
+            if (ref($simplepages{$item}) eq 'HASH') {
+                my $pagetitle = $simplepages{$item}{'title'};
+                my %fields = &Apache::lonnet::dump($simplepages{$item}{'db'},$cdom,$cnum);
+                my %contents;
+                foreach my $field (keys(%fields)) {
+                    if ($field =~ /^(?:aaa|bbb|ccc)_(\w+)$/) {
+                        my $name = $1;
+                        my $msg = $fields{$field};
+                        if ($name eq 'webreferences') {
+                            if ($msg =~ m{^https?://}) {
+                                $contents{$name} = '<a href="'.$msg.'"><tt>'.$msg.'</tt></a>';
+                            }
+                        } else {
+                            $msg = &Encode::decode('utf8',$msg);
+                            $msg = $gateway->process_outgoing_html($msg,1);
+                            $contents{$name} = $msg;
+                        }
+                    } elsif ($field eq 'uploaded.photourl') {
+                        my $marker = $simplepages{$item}{marker};
+                        if ($fields{$field} =~ m{^\Q$prefix\E(simplepage/$marker/.+)$}) {
+                            my $filepath = $1;
+                            my ($relpath,$fname) = ($filepath =~ m{^(.+/)([^/]+)$});
+                            if ($fname ne '') {
+                                $fname=~s/\.(\w+)$//;
+                                my $ext=$1;
+                                $fname = &clean($fname);
+                                $fname.='.'.$ext;
+                                $contents{image} = '<img src="'.$relpath.$fname.'" alt="Image" />';
+                                $replacehash{$filepath} = $relpath.$fname;
+                                $deps{$item}{$filepath} = 1;
+                            }
+                        }
+                    }
+                }
+                $replacehash{'/'.$simplepages{$item}{'res'}} = $simplepages{$item}{'name'};
+                $lookup{'/'.$simplepages{$item}{'res'}} = $item;
+                my $content = '
+<html>
+<head>
+<title>'.$pagetitle.'</title>
+</head>
+<body bgcolor="#ffffff">';
+                if ($contents{title}) {
+                    $content .= "\n".'<h2>'.$contents{title}.'</h2>';
+                }
+                if ($contents{image}) {
+                    $content .= "\n".$contents{image};
+                }
+                if ($contents{content}) {
+                    $content .= '
+<div class="LC_Box">
+<h4 class="LC_hcell">'.&mt('Content').'</h4>'.
+$contents{content}.'
+</div>';
+                }
+                if ($contents{webreferences}) {
+                    $content .= ' 
+<div class="LC_Box">
+<h4 class="LC_hcell">'.&mt('Web References').'</h4>'.
+$contents{webreferences}.'
+</div>';
+                }
+                $content .= '
+</body>
+</html>
+';
+                $newcontent{'/'.$simplepages{$item}{res}} = $content; 
+            }
+        }
+	foreach my $item (keys(%tocopy)) {
+            unless ($item=~/\.(sequence|page)$/) {
+                my $currurlpath = $prefix.$item;
+                my $currdirpath = &Apache::lonnet::filelocation('',$currurlpath);
+                &recurse_html($mm,$prefix,$currdirpath,$currurlpath,$item,$lookup{$item},\%replacehash,\%deps);
+            }
+        }
+        foreach my $num (sort {$a <=> $b} (@todump)) {
+            my $src = $display{$num};
+            next if ($src eq '');
+            my @needcopy = ();
+            if ($replacehash{$src}) {
+                push(@needcopy,$src);
+                if (ref($deps{$num}) eq 'HASH') {
+                    foreach my $dep (sort(keys(%{$deps{$num}}))) {
+                        if ($replacehash{$dep}) {
+                            push(@needcopy,$dep);
+                        }
+                    }
+                }
+            } elsif ($src =~ /^simpleproblem_/) {
+                push(@needcopy,$src);
+            }
+            next if (@needcopy == 0);
+            my ($result,$depresult);
+            for (my $i=0; $i<@needcopy; $i++) {
+                my $item = $needcopy[$i];
+                my $newfilename;
+                if ($simpleproblems{$num}) {
+                    $newfilename=$title.'/'.$simpleproblems{$num}{'name'};
+                } else {
+	            $newfilename=$title.'/'.$replacehash{$item};
+                }
+	        $newfilename=~s/\.(\w+)$//;
+	        my $ext=$1;
+	        $newfilename=&clean($newfilename);
+	        $newfilename.='.'.$ext;
+                my ($newrelpath) = ($newfilename =~ m{^\Q$title/\E(.+)$}); 
+                if ($newrelpath ne $replacehash{$item}) {
+                    $replacehash{$item} = $newrelpath;
+                }
+	        my @dirs=split(/\//,$newfilename);
+	        my $path=$r->dir_config('lonDocRoot')."/priv/$cd/$ca";
+	        my $makepath=$path;
+	        my $fail;
+                my $origin;
+	        for (my $i=0;$i<$#dirs;$i++) {
+		    $makepath.='/'.$dirs[$i];
+		    unless (-e $makepath) {
+		        unless(mkdir($makepath,0755)) { 
+                            $fail = &mt('Directory creation failed.');
+                        }
+		    }
+	        }
+                if ($i == 0) {
+	            $result = '<br /><tt>'.$item.'</tt> => <tt>'.$newfilename.'</tt>: ';
+                } else {
+                    $depresult .= '<li><tt>'.$item.'</tt> => <tt>'.$newfilename.'</tt> '.
+                                  '<span class="LC_fontsize_small" style="font-weight: bold;">'.
+                                  &mt('(dependency)').'</span>: ';
+                }
+                if (-e $path.'/'.$newfilename) {
+                    $fail = &mt('Destination already exists -- not overwriting.'); 
+	        } else {
+                    if (my $fh=Apache::File->new('>'.$path.'/'.$newfilename)) {
+                        if (($item =~ m{^/adm/$match_domain/$match_username/\d+/smppg}) ||
+                            ($item =~ /^simpleproblem_/)) {
+                            print $fh $newcontent{$item};
+                        } else {
+                            my $fileloc = &Apache::lonnet::filelocation('',$prefix.$item);
+                            if (-e $fileloc) {
+                                if ($item=~/\.(sequence|page|html|htm|xml|xhtml)$/) {
+                                    if ((($1 eq 'sequence') || ($1 eq 'page')) &&
+                                        (ref($has_simpleprobs{$item}) eq 'HASH')) {
+                                        my %changes = %{$has_simpleprobs{$item}};
+                                        my $content = &Apache::lonclonecourse::rewritefile(
+                     &Apache::lonclonecourse::readfile($env{'request.course.id'},$item),
+                                                      (%replacehash,$crs => '')
+                                                                                          );
+                                        my $updatedcontent = '';
+                                        my $parser = HTML::TokeParser->new(\$content);
+                                        $parser->attr_encoded(1);
+                                        while (my $token = $parser->get_token) {
+                                            if ($token->[0] eq 'S') {
+                                                if (($token->[1] eq 'resource') &&
+                                                    ($token->[2]->{'src'} eq '/res/lib/templates/simpleproblem.problem') && 
+                                                    ($changes{$token->[2]->{'id'}})) {
+                                                    my $id = $token->[2]->{'id'};
+                                                    $updatedcontent .= '<'.$token->[1];
+                                                    foreach my $attrib (@{$token->[3]}) {
+                                                        next unless ($attrib =~ /^(src|type|title|id)$/);
+                                                        if ($attrib eq 'src') {
+                                                            my ($file) = ($display{$changes{$id}} =~ /^\Qsimpleproblem_\E(.+)$/); 
+                                                            if ($file) {
+                                                                $updatedcontent .= ' '.$attrib.'="'.$file.'"';
+                                                            } else {
+                                                                $updatedcontent .= ' '.$attrib.'="'.$token->[2]->{$attrib}.'"'; 
+                                                            }
+                                                        } else {
+                                                            $updatedcontent .= ' '.$attrib.'="'.$token->[2]->{$attrib}.'"';
+                                                        }
+                                                    }
+                                                    $updatedcontent .= ' />'."\n";
+                                                } else {
+                                                    $updatedcontent .= $token->[4]."\n";
+                                                }
+                                             } else {
+                                                 $updatedcontent .= $token->[2];
+                                             }
+                                         }
+                                         print $fh $updatedcontent;
+                                    } else {  
+		                        print $fh &Apache::lonclonecourse::rewritefile(
+                     &Apache::lonclonecourse::readfile($env{'request.course.id'},$item),
+		                                      (%replacehash,$crs => '')
+							                              );
+                                    }
+                                } else {
+		                    print $fh
+                                        &Apache::lonclonecourse::readfile($env{'request.course.id'},$item);
+		                }
+                            } else {
+                                $fail = &mt('Source does not exist.');  
+                            }
+                        }
+                        $fh->close();
+	            } else {
+		        $fail = &mt('Could not write to destination.');
+                    }
+	        }
+                my $text;
+	        if ($fail) {
+                    $text = '<span class="LC_error">'.&mt('fail').('&nbsp;'x3).$fail.'</span>';
+	        } else {
+                    $text = '<span class="LC_success">'.&mt('ok').'</span>';
+                }
+                if ($i == 0) {
+                    $result .= $text;
+                } else {
+                    $depresult .= $text.'</li>';
+	        }
+            }
+            $r->print($result);
+            if ($depresult) {
+                $r->print('<ul>'.$depresult.'</ul>');
+            }
+        }
     } else {
-        $r->print(&mt('Searching ...').'<br />');
-        $r->rflush();
-# Input form
-        $r->print('<form name="dumpdoc" action="" method="post">'."\n");
-	unless ($home==1) {
-	    $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_(.+)$/) {
+        my ($navmap,$errormsg) =
+            &Apache::loncourserespicker::get_navmap_object($crstype,'dumpdocs');
+        if (!ref($navmap)) {
+            $r->print($errormsg);
+        } else {
+            $r->print('<div id="searching">'.&mt('Searching ...').'</div>');
+            $r->rflush();
+            my ($preamble,$formname);
+            $formname = 'dumpdoc';
+	    unless ($home==1) {
+	        $preamble = '<div class="LC_left_float">'.
+		            '<fieldset><legend>'.
+                            &mt('Select the Authoring Space').
+                            '</legend><select name="authorspace">';
+	    }
+            my @orderspaces = ();
+	    foreach my $key (sort(keys(%outhash))) {
+                if ($key=~/^home_(.+)$/) {
+                    if ($1 eq $env{'user.name'}.':'.$env{'user.domain'}) {
+                        unshift(@orderspaces,$1);
+                    } else {
+                        push(@orderspaces,$1);
+                    }
+                } 
+            }
+            if ($home>1) {
+                $preamble .= '<option value="" selected="selected">'.&mt('Select').'</option>';
+            }
+            foreach my $user (@orderspaces) {
 		if ($home==1) {
-		    $r->print(
-		  '<input type="hidden" name="authorspace" value="'.$1.'" />');
+		    $preamble .= '<input type="hidden" name="authorspace" value="'.$user.'" />';
 		} else {
-		    $r->print('<option value="'.$1.'">'.$1.' - '.
-			      &Apache::loncommon::plainname(split(/\:/,$1)).'</option>');
-		}
+		    $preamble .= '<option value="'.$user.'">'.$user.' - '.
+			         &Apache::loncommon::plainname(split(/\:/,$user)).'</option>';
+	        }
 	    }
-	}
-	unless ($home==1) {
-	    $r->print('</select></fieldset></div>'."\n");
-	}
-	my $title=$origcrsdata{'description'};
-	$title=~s/[\/\s]+/\_/gs;
-	$title=&clean($title);
-	$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('<h4>'.&mt('Filenames in Authoring Space').'</h4>'
-                 .&Apache::loncommon::start_data_table()
-                 .&Apache::loncommon::start_data_table_header_row()
-                 .'<th>'.&mt('Internal Filename').'</th>'
-                 .'<th>'.&mt('Title').'</th>'
-                 .'<th>'.&mt('Save as ...').'</th>'
-                 .&Apache::loncommon::end_data_table_header_row());
-	foreach my $file (&Apache::lonclonecourse::crsdirlist($origcrsid,'userfiles')) {
-	    $r->print(&Apache::loncommon::start_data_table_row()
-                     .'<td>'.$file.'</td>');
-	    my ($ext)=($file=~/\.(\w+)$/);
-	    my $title=$hash{'title_'.$hash{
-		'ids_/uploaded/'.$origcrsdata{'domain'}.'/'.$origcrsdata{'num'}.'/'.$file}};
-	    $r->print('<td>'.($title?$title:'&nbsp;').'</td>');
-	    if (!$title) {
-		$title=$file;
-	    } else {
-		$title=~s|/|_|g;
+	    unless ($home==1) {
+	        $preamble .= '</select></fieldset></div>'."\n";
 	    }
-	    $title=~s/\.(\w+)$//;
+	    my $title=$origcrsdata{'description'};
+	    $title=~s/[\/\s]+/\_/gs;
 	    $title=&clean($title);
-	    $title.='.'.$ext;
-	    $r->print("\n<td><input type='text' size='60' name='namefor_".$file."' value='".$title."' /></td>"
-                     .&Apache::loncommon::end_data_table_row());
-	}
-	$r->print(&Apache::loncommon::end_data_table());
-	&untiehash();
-	$r->print(
-  '<p><input type="submit" name="dumpcourse" value="'.&mt("Dump $crstype Content").'" /></p></form>');
+	    $preamble .= '<div class="LC_left_float">'.
+                         '<fieldset><legend>'.&mt('Folder in Authoring Space').'</legend>'.
+                         '<input type="text" size="50" name="authorfolder" value="'.
+                         $title.'" />'.
+                         '</fieldset></div><div style="padding:0;clear:both;margin:0;border:0"></div>'."\n";
+            my %uploadedfiles;
+	    &tiehash();
+	    foreach my $file (&Apache::lonclonecourse::crsdirlist($origcrsid,'userfiles')) {
+	        my ($ext)=($file=~/\.(\w+)$/);
+# FIXME Check supplemental here
+	        my $title=$hash{'title_'.$hash{
+		                'ids_/uploaded/'.$origcrsdata{'domain'}.'/'.$origcrsdata{'num'}.'/'.$file}};
+	        if (!$title) {
+		    $title=$file;
+	        } else {
+		    $title=~s|/|_|g;
+	        }
+	        $title=~s/\.(\w+)$//;
+	        $title=&clean($title);
+	        $title.='.'.$ext;
+#	    $r->print("\n<td><input type='text' size='60' name='namefor_".$file."' value='".$title."' /></td>"
+                $uploadedfiles{$file} = $title;
+	    }
+	    &untiehash();
+            $r->print(&Apache::loncourserespicker::create_picker($navmap,'dumpdocs',$formname,$crstype,undef,
+                                                                 undef,undef,$preamble,$home,\%uploadedfiles));
+        }
     }
     $r->print(&endContentScreen());
 }
 
+sub recurse_html {
+    my ($mm,$prefix,$currdirpath,$currurlpath,$container,$item,$replacehash,$deps) = @_;
+    return unless ((ref($replacehash) eq 'HASH') && (ref($deps) eq 'HASH'));
+    my (%allfiles,%codebase);
+    if (&Apache::lonnet::extract_embedded_items($currdirpath,\%allfiles,\%codebase) eq 'ok') {
+        if (keys(%allfiles)) {
+            foreach my $dependency (keys(%allfiles)) {
+                next if (($dependency =~ m{^/(res|adm)/}) || ($dependency =~ m{^https?://}));
+                my ($depurl,$relfile,$newcontainer);
+                if ($dependency =~ m{^/}) {
+                    if ($dependency =~ m{^\Q$currurlpath/\E(.+)$}) {
+                        $relfile = $1;
+                        if ($dependency =~ m{^\Q$prefix\E(.+)$}) {
+                            $newcontainer = $1;
+                            next if ($replacehash->{$newcontainer});
+                        }
+                        $depurl = $dependency;
+                    } else {
+                        next;
+                    }
+                } else {
+                    $relfile = $dependency;
+                    $depurl = $currurlpath;
+                    $depurl =~ s{[^/]+$}{};  
+                    $depurl .= $dependency;
+                    ($newcontainer) = ($depurl =~ m{^\Q$prefix\E(.+)$}); 
+                }
+                next if ($relfile eq '');
+                my $newname = $replacehash->{$container};
+                $newname =~ s{[^/]+$}{};
+                $replacehash->{$newcontainer} = $newname.$relfile;
+                $deps->{$item}{$newcontainer} = 1;
+                my ($newurlpath) = ($depurl =~ m{^(.*)/[^/]+$});  
+                my $depfile = &Apache::lonnet::filelocation('',$depurl);
+                my $type = $mm->checktype_filename($depfile);
+                if ($type eq 'text/html') {
+                    &recurse_html($mm,$prefix,$depfile,$newurlpath,$newcontainer,$item,$replacehash,$deps);
+                }
+            }
+        }
+    }
+    return;
+}
+
 sub group_import {
     my ($coursenum, $coursedom, $folder, $container, $caller, @files) = @_;
     my ($donechk,$allmaps,%hierarchy,%titles,%addedmaps,%removefrommap,
@@ -289,7 +606,7 @@ sub group_import {
             $env{'form.output'}=$newmapstr;
             my $result=&Apache::lonnet::finishuserfileupload($coursenum,$coursedom,
                                                 'output',$1.$2);
-            if ($result != m|^/uploaded/|) {
+            if ($result !~ m{^/uploaded/}) {
                 $errtext.='Map not saved: A network error occurred when trying to save the new map. ';
                 $fatal = 2;
             }
@@ -300,7 +617,7 @@ sub group_import {
 	if ($url) {
             if (($caller eq 'londocs') &&
                 ($folder =~ /^default/)) {
-                unless ($donechk) {
+                if (($url =~ /\.(page|sequence)$/) && (!$donechk)) {
                     my $chome = &Apache::lonnet::homeserver($coursenum,$coursedom);
                     my $cid = $coursedom.'_'.$coursenum;
                     $allmaps =
@@ -323,8 +640,48 @@ sub group_import {
 	    }
 	    my $ext = 'false';
 	    if ($url=~m{^http://} || $url=~m{^https://}) { $ext = 'true'; }
-	    $url  = &LONCAPA::map::qtunescape($url);
 	    $name = &LONCAPA::map::qtunescape($name);
+            if ($name eq '') {
+                $name = &LONCAPA::map::qtunescape(&mt('Web Page'));
+            }
+            if ($url =~ m{^/uploaded/$coursedom/$coursenum/((?:docs|supplemental)/(?:default|\d+))/new\.html$}) {
+                my $filepath = $1;
+                my $fname = $name;
+                if ($fname =~ /^\W+$/) {
+                    $fname = 'web';
+                } else {
+                    $fname =~ s/\W/_/g;
+                }
+                if (length($fname > 15)) {
+                    $fname = substr($fname,0,14);
+                }
+                my $initialtext = &mt('Replace with your own content.');
+                my $newhtml = <<END;
+<html>
+<head>
+<title>$name</title>
+</head>
+<body bgcolor="#ffffff">
+$initialtext
+</body>
+</html>
+END
+                $env{'form.output'}=$newhtml;
+                my $result = 
+                    &Apache::lonnet::finishuserfileupload($coursenum,$coursedom,
+                                                          'output',
+                                                          "$filepath/$residx/$fname.html");
+                if ($result =~ m{^/uploaded/}) {
+                    $url = $result;
+                    if ($filepath =~ /^supplemental/) {
+                        $name = time.'___&&&___'.$env{'user.name'}.'___&&&___'.
+                                $env{'user.domain'}.'___&&&___'.$name;
+                    }
+                } else {
+                    return (&mt('Failed to save new web page.'),1);
+                }
+            }
+            $url  = &LONCAPA::map::qtunescape($url);
 	    $LONCAPA::map::resources[$residx] =
 		join(':', ($name, $url, $ext, 'normal', 'res'));
 	}
@@ -335,7 +692,8 @@ sub group_import {
                           removefrommap => \%removefrommap,
                           removeparam   => \%removeparam,
                       );
-        &apply_fixups($folder,1,$coursedom,$coursenum,\%import_errors,\%updated);
+        my ($result,$msgsarray,$lockerror) = 
+            &apply_fixups($folder,1,$coursedom,$coursenum,\%import_errors,\%updated);
         if (keys(%import_errors) > 0) {
             $fixuperrors =
                 '<p span class="LC_warning">'."\n".
@@ -346,9 +704,28 @@ sub group_import {
             }
             $fixuperrors .= '</ul></p>'."\n";
         }
+        if (ref($msgsarray) eq 'ARRAY') {
+            if (@{$msgsarray} > 0) {
+                $fixuperrors .= '<p class="LC_info">'.
+                                join('<br />',@{$msgsarray}).
+                                '</p>';
+            }
+        }
+        if ($lockerror) {
+            $fixuperrors .= '<p class="LC_error">'.
+                            $lockerror.
+                            '</p>';
+        }
     }
     my ($errtext,$fatal) =
         &storemap($coursenum, $coursedom, $folder.'.'.$container,1);
+    unless ($fatal) {
+        if ($folder =~ /^supplemental/) {
+            &Apache::lonnet::get_numsuppfiles($coursenum,$coursedom,1);
+            my ($errtext,$fatal) = &mapread($coursenum,$coursedom,
+                                            $folder.'.'.$container);
+        }
+    }
     return ($errtext,$fatal,$fixuperrors);
 }
 
@@ -435,7 +812,7 @@ sub docs_change_log {
     }
     my $folderpath=$env{'form.folderpath'};
     if ($folderpath eq '') {
-        $folderpath = 'default&'.&escape(&mt('Main '.$crstype.' Documents').':::::');
+        $folderpath = 'default&'.&escape(&mt('Main Content').':::::');
     }
     $pathitem = '<input type="hidden" name="folderpath" value="'.
                 &HTML::Entities::encode($folderpath,'<>&"').'" />';
@@ -600,59 +977,124 @@ sub docs_change_log {
 
 sub update_paste_buffer {
     my ($coursenum,$coursedom,$folder) = @_;
+    my (@possibles,%removals,%cuts,$output);
+    if ($env{'form.multiremove'}) {
+        $env{'form.multiremove'} =~ s/,$//;
+        map { $removals{$_} = 1; } split(/,/,$env{'form.multiremove'});
+    }
+    if (($env{'form.multicopy'}) || ($env{'form.multicut'})) {
+        if ($env{'form.multicut'}) {
+            $env{'form.multicut'} =~ s/,$//;
+            foreach my $item (split(/,/,$env{'form.multicut'})) {
+                unless ($removals{$item}) {
+                    $cuts{$item} = 1;
+                    push(@possibles,$item.':cut');
+                }
+            }
+        }
+        if ($env{'form.multicopy'}) {
+            $env{'form.multicopy'} =~ s/,$//;
+            foreach my $item (split(/,/,$env{'form.multicopy'})) {
+                unless ($removals{$item} || $cuts{$item}) {
+                    push(@possibles,$item.':copy'); 
+                }
+            }
+        }
+    } elsif ($env{'form.markcopy'}) {
+        @possibles = split(/,/,$env{'form.markcopy'});
+    }
 
-    return if (!defined($env{'form.markcopy'}));
+    return if (@possibles == 0);
     return if (!defined($env{'form.copyfolder'}));
-    return if ($env{'form.markcopy'} < 0);
 
     my ($errtext,$fatal) = &mapread($coursenum,$coursedom,
 				    $env{'form.copyfolder'});
-
     return if ($fatal);
 
-# Mark for copying
-    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) = &Apache::loncommon::parse_supplemental_title($title);
-    } elsif ($env{'docs.markedcopy_supplemental'}) {
-        &Apache::lonnet::delenv('docs.markedcopy_supplemental');
-    }
-    $url=~s{http(&colon;|:)//https(&colon;|:)//}{https$2//};
-
-    (my $cmd,undef)=split('_',$env{'form.cmd'});
-
-    my %addtoenv = (
-                    'docs.markedcopy_title' => $title,
-                    'docs.markedcopy_url'   => $url,
-                    'docs.markedcopy_cmd'   => $cmd,
-                   );
-    &Apache::lonnet::delenv('docs.markedcopy_nested');
-    &Apache::lonnet::delenv('docs.markedcopy_nestednames');
-    if ($url =~ m{^/uploaded/$match_domain/$match_courseid/(default|supplemental)_?(\d*)\.(page|sequence)$}) {
-        my $prefix = $1;
-        my $subdir =$2;
-        if ($subdir eq '') {
-            $subdir = $prefix;
-        }
-        my (%addedmaps,%removefrommap,%removeparam,%hierarchy,%titles,%allmaps);
-        &contained_map_check($url,$folder,\%removefrommap,\%removeparam,\%addedmaps,
-                             \%hierarchy,\%titles,\%allmaps);
-        if (ref($hierarchy{$url}) eq 'HASH') {
-            my ($nested,$nestednames);
-            &recurse_uploaded_maps($url,$subdir,\%hierarchy,\%titles,\$nested,\$nestednames);
-            $nested =~ s/\&$//;
-            $nestednames =~ s/\Q___&&&___\E$//;
-            if ($nested ne '') {
-                $addtoenv{'docs.markedcopy_nested'} = $nested;
+    my %curr_groups = &Apache::longroup::coursegroups();
+
+# Retrieve current paste buffer suffixes.
+    my @currpaste = split(/,/,$env{'docs.markedcopies'});
+    my (%pasteurls,@newpaste);
+
+# Construct identifiers for current contents of user's paste buffer
+    if (@currpaste) {
+        foreach my $suffix (@currpaste) {
+             my $cid = $env{'docs.markedcopy_crs_'.$suffix};
+             my $url = $env{'docs.markedcopy_url_'.$suffix};
+             if (($cid =~ /^$match_domain(?:_)$match_courseid$/) &&
+                 ($url ne '')) {
+                 $pasteurls{$cid.'_'.$url} = 1;
+             }
+        }
+    }
+
+# Mark items for copying (skip any items already in user's paste buffer)
+    my %addtoenv;
+                  
+    foreach my $item (@possibles) {
+        my ($orderidx,$cmd) = split(/:/,$item);
+        next if ($orderidx =~ /\D/);
+        next unless (($cmd eq 'cut') || ($cmd eq 'copy') || ($cmd eq 'remove'));
+        my ($title,$url)=split(':',$LONCAPA::map::resources[$orderidx]);
+        my %denied = &action_restrictions($coursenum,$coursedom,
+                                          &LONCAPA::map::qtescape($url),
+                                          $env{'form.folderpath'},\%curr_groups);
+        next if ($denied{'copy'});
+        $url=~s{http(&colon;|:)//https(&colon;|:)//}{https$2//};
+        next if (exists($pasteurls{$coursedom.'_'.$coursenum.'_'.$url}));
+        my ($suffix,$errortxt,$locknotfreed) =
+            &new_timebased_suffix($env{'user.domain'},$env{'user.name'},'paste');
+        if ($suffix ne '') {
+            push(@newpaste,$suffix);
+        } else {
+            if ($locknotfreed) {
+                return $locknotfreed;
             }
-            if ($nestednames ne '') {
-                $addtoenv{'docs.markedcopy_nestednames'} = $nestednames;
+        }
+        if (&is_supplemental_title($title)) {
+            &Apache::lonnet::appenv({'docs.markedcopy_supplemental_'.$suffix => $title});
+	    ($title) = &Apache::loncommon::parse_supplemental_title($title);
+        }
+
+        $addtoenv{'docs.markedcopy_title_'.$suffix} = $title,
+        $addtoenv{'docs.markedcopy_url_'.$suffix}   = $url,
+        $addtoenv{'docs.markedcopy_cmd_'.$suffix}   = $cmd,
+        $addtoenv{'docs.markedcopy_crs_'.$suffix}   = $env{'request.course.id'};
+ 
+        if ($url =~ m{^/uploaded/$match_domain/$match_courseid/(default|supplemental)_?(\d*)\.(page|sequence)$}) {
+            my $prefix = $1;
+            my $subdir =$2;
+            if ($subdir eq '') {
+                $subdir = $prefix;
+            }
+            my (%addedmaps,%removefrommap,%removeparam,%hierarchy,%titles,%allmaps);
+            &contained_map_check($url,$folder,\%removefrommap,\%removeparam,\%addedmaps,
+                                 \%hierarchy,\%titles,\%allmaps);
+            if (ref($hierarchy{$url}) eq 'HASH') {
+                my ($nested,$nestednames);
+                &recurse_uploaded_maps($url,$subdir,\%hierarchy,\%titles,\$nested,\$nestednames);
+                $nested =~ s/\&$//;
+                $nestednames =~ s/\Q___&&&___\E$//;
+                if ($nested ne '') {
+                    $addtoenv{'docs.markedcopy_nested_'.$suffix} = $nested;
+                }
+                if ($nestednames ne '') {
+                    $addtoenv{'docs.markedcopy_nestednames_'.$suffix} = $nestednames;
+                }
             }
         }
+        if ($locknotfreed) {
+            $output = $locknotfreed;
+            last;
+        }
+    }
+    if (@newpaste) {
+        $addtoenv{'docs.markedcopies'} = join(',',(@currpaste,@newpaste));
     }
     &Apache::lonnet::appenv(\%addtoenv);
     delete($env{'form.markcopy'});
+    return $output;
 }
 
 sub recurse_uploaded_maps {
@@ -682,138 +1124,226 @@ sub recurse_uploaded_maps {
 
 sub print_paste_buffer {
     my ($r,$container,$folder,$coursedom,$coursenum) = @_;
-    return if (!defined($env{'docs.markedcopy_url'}));
-
-    my ($is_external,$othercourse,$fromsupp,$is_uploaded_map,$parent);
-    my $extension = (split(/\./,$env{'docs.markedcopy_url'}))[-1];
-    if ($env{'docs.markedcopy_url'} =~ m{^(?:/adm/wrapper/ext|(?:http|https)(?:&colon;|:))//} ) {
-        $is_external = 1;
-    }
+    return if (!defined($env{'docs.markedcopies'}));
 
-    my ($canpaste,$nopaste,$othercrs,$areachange);
-    if ($folder =~ /^supplemental/) {
-        $canpaste = &supp_pasteable($env{'docs.markedcopy_url'});
-        unless ($canpaste) {
-            $nopaste = &mt('Paste into Supplemental Content unavailable for this type of content.');
-        } 
-    } else {
-        $canpaste = 1;
+    unless (($env{'form.pastemarked'}) || ($env{'form.clearmarked'})) {
+        return if ($env{'docs.markedcopies'} eq '');
     }
 
-    if ($canpaste) {
-        if ($env{'docs.markedcopy_url'} =~ m{^/uploaded/($match_domain)/($match_courseid)/(.+)$}) {
-            my $srcdom = $1;
-            my $srcnum = $2;
-            my $rem = $3;
-            if (($srcdom ne $coursedom) || ($srcnum ne $coursenum)) {
-                $othercourse = 1;
-                if ($env{"user.priv.cm./$srcdom/$srcnum"} =~ /\Q:mdc&F\E/) {
-                    if ($canpaste) {
-                        $othercrs = '<br />'.&mt('(from another course).');  
+    my @currpaste = split(/,/,$env{'docs.markedcopies'});
+    my ($pasteitems,@pasteable);
+    my $clipboardcount = 0;
+
+# Construct identifiers for current contents of user's paste buffer
+    foreach my $suffix (@currpaste) {
+        next if ($suffix =~ /\D/);
+        my $cid = $env{'docs.markedcopy_crs_'.$suffix};
+        my $url = $env{'docs.markedcopy_url_'.$suffix};
+        if (($cid =~ /^$match_domain\_$match_courseid$/) &&
+            ($url ne '')) {
+            $clipboardcount ++;
+            my ($is_external,$othercourse,$fromsupp,$is_uploaded_map,$parent,
+                $canpaste,$nopaste,$othercrs,$areachange);
+            my $extension = (split(/\./,$env{'docs.markedcopy_url_'.$suffix}))[-1];
+            if ($url =~ m{^(?:/adm/wrapper/ext|(?:http|https)(?:&colon;|:))//} ) {
+                $is_external = 1;
+            }
+            if ($folder =~ /^supplemental/) {
+                $canpaste = &supp_pasteable($env{'docs.markedcopy_url_'.$suffix});
+                unless ($canpaste) {
+                    $nopaste = &mt('Paste into Supplemental Content unavailable.');
+                }
+            } else {
+                $canpaste = 1;
+            }
+            if ($canpaste) {
+                if ($url =~ m{^/uploaded/($match_domain)/($match_courseid)/(.+)$}) {
+                    my $srcdom = $1;
+                    my $srcnum = $2;
+                    my $rem = $3;
+                    if (($srcdom ne $coursedom) || ($srcnum ne $coursenum)) {
+                        $othercourse = 1;
+                        if ($env{"user.priv.cm./$srcdom/$srcnum"} =~ /\Q:mdc&F\E/) {
+                            $othercrs = '<br />'.&mt('(from another course)');
+                        } else {
+                            $canpaste = 0;
+                            $nopaste = &mt('Paste from another course unavailable.'); 
+                        }
                     }
-                } else {
-                    $canpaste = 0;
-                    $nopaste = &mt('Paste from another course unavailable.') 
+                    if ($rem =~ m{^(default|supplemental)_?(\d*)\.(?:page|sequence)$}) {
+                        my $prefix = $1;
+                        $parent = $2;
+                        if ($folder !~ /^\Q$prefix\E/) {
+                            $areachange = 1;
+                        }
+                        $is_uploaded_map = 1;
+                    }
+                } elsif ($url =~ m{^/adm/($match_domain)/($match_username)/\d+/(bulletinboard|smppg)$}) {
+                    if ($cid ne $env{'request.course.id'}) {
+                        my ($srcdom,$srcnum) = split(/_/,$cid);
+                        if ($env{"user.priv.cm./$srcdom/$srcnum"} =~ /\Q:mdc&F\E/) {
+                            $othercrs = '<br />'.&mt('(from another course)');
+                        } else {
+                            $canpaste = 0;
+                            $nopaste = &mt('Paste from another course unavailable.');
+                        }       
+                    }
+                }
+                if ($canpaste) {
+                    push(@pasteable,$suffix);
+                }  
+            }
+            my $buffer;
+            if ($is_external) {
+                $buffer = &mt('External Resource').': '.
+                    &LONCAPA::map::qtescape($env{'docs.markedcopy_title_'.$suffix}).' ('.
+                    &LONCAPA::map::qtescape($url).')';
+            } else {
+                my $icon = &Apache::loncommon::icon($extension);
+                if ($extension eq 'sequence' &&
+                    $url =~ m{/default_\d+\.sequence$}x) {
+                    $icon = &Apache::loncommon::lonhttpdurl($r->dir_config('lonIconsURL'));
+                    $icon .= '/navmap.folder.closed.gif';
+                }
+                my $title = $env{'docs.markedcopy_title_'.$suffix};
+                if ($title eq '') {
+                    ($title) = ($url =~ m{/([^/]+)$});
+                }
+                $buffer = '<img src="'.$icon.'" alt="" class="LC_icon" />'.
+                          ': '.
+                          &Apache::loncommon::parse_supplemental_title(
+                             &LONCAPA::map::qtescape($title));
+            }
+            $pasteitems .= '<div class="LC_left_float">';
+            my ($options,$onclick);
+            if (($canpaste) && (!$areachange) && (!$othercourse) &&
+                ($env{'docs.markedcopy_cmd_'.$suffix} eq 'cut')) {
+                if (($is_uploaded_map) ||
+                    ($url =~ /(bulletinboard|smppg)$/) ||
+                    ($url =~ m{^/uploaded/$coursedom/$coursenum/(?:docs|supplemental)/(.+)$})) {
+                    $options = &paste_options($suffix,$is_uploaded_map,$parent);
+                    $onclick= 'onclick="showOptions(this,'."'$suffix'".');" ';
+                }
+            }
+            $pasteitems .= '<label><input type="checkbox" name="pasting" id="pasting_'.$suffix.'" value="'.$suffix.'" '.$onclick.'/>'.$buffer.'</label>';
+            if ($nopaste) {
+                 $pasteitems .= $nopaste;   
+            } else {
+                if ($othercrs) {
+                    $pasteitems .= $othercrs;
+                }
+                if ($options) {
+                    $pasteitems .= $options;
                 }
             }
-            if ($rem =~ m{^(default|supplemental)_?(\d*)\.(?:page|sequence)$}) {
-                my $prefix = $1;
-                $parent = $2;
-                if ($folder !~ /^\Q$prefix\E/) {
-                    $areachange = 1;
-                }
-                $is_uploaded_map = 1;
-            }
-        }
-    }
-
-    $r->print('<fieldset>'
-             .'<legend>'.&mt('Clipboard').'</legend>');
-    my ($type,$buffer);
-    if ($is_external) {
-        $type = &mt('External Resource');
-        $buffer = $type.': '.
-                  &LONCAPA::map::qtescape($env{'docs.markedcopy_title'}).' ('.
-                  &LONCAPA::map::qtescape($env{'docs.markedcopy_url'}).')';
-    }  else {
-        my $icon = &Apache::loncommon::icon($extension);
-        if ($extension eq 'sequence' &&
-            $env{'docs.markedcopy_url'} =~ m{/default_\d+\.sequence$ }x) {
-            $icon = &Apache::loncommon::lonhttpdurl($r->dir_config('lonIconsURL'));
-            $icon .= '/navmap.folder.closed.gif';
-        }
-        $icon = '<img src="'.$icon.'" alt="" class="LC_icon" />';
-        $buffer = $icon.$type.': '.  &Apache::loncommon::parse_supplemental_title(&LONCAPA::map::qtescape($env{'docs.markedcopy_title'}));
-    }
-    if ($canpaste) {
-        $r->print('<form name="pasteform" action="/adm/coursedocs" method="post">'.$buffer);
-        if (($is_uploaded_map) && (!$areachange)) {
-            if ((!$othercourse) && ($env{'docs.markedcopy_cmd'} eq 'cut')) {
-                $r->print(('&nbsp;'x 4).'<span id="pasteoptionstext">'.
-                          '<a href="javascript:showPasteOptions();" class="LC_menubuttons_link">'.
-                          &mt('Show Paste Options').'</a></span><br />'.
-                          '<div id="pasteoptions" class="LC_dccid">'.('&nbsp;'x 4).
-                          '<label>'.
-                          '<input type="radio" name="docs.markedcopy_options" value="new" checked="checked" />'.
-                          &mt('Copy to new folder').'</label>'.('&nbsp;' x2).
-                          '<label>'.   
-                          '<input type="radio" name="docs.markedcopy_options" value="move" />'.
-                          &mt('Move old folder').'</label><br />');
-                if ($env{'docs.markedcopy_nested'}) {
-                    $r->print('<br />'.&mt('Folder to paste contains sub-folders').
-                              '<br /><table border="0">');
-                    my @pastemaps = split(/\&/,$env{'docs.markedcopy_nested'});
-                    my @titles = split(/\Q___&&&___\E/,$env{'docs.markedcopy_nestednames'});
-                    my $lastdir = $parent;
-                    my %depths = (
-                                   $lastdir => 0,
-                                 );
-                    my (%display,%deps); 
-                    for (my $i=0; $i<@pastemaps; $i++) {
-                        ($lastdir,my $subfolderstr) = split(/\:/,$pastemaps[$i]);
-                        my ($namedir,$esctitlestr) = split(/\:/,$titles[$i]);
-                        my @subfolders = split(/,/,$subfolderstr);
-                        $deps{$lastdir} = \@subfolders;
-                        my @subfoldertitles = map { &unescape($_); } split(/,/,$esctitlestr);
-                        my $depth = $depths{$lastdir} + 1;
-                        my $offset = int($depth * 4);
-                        my $indent = ('&nbsp;' x $offset);
-                        for (my $j=0; $j<@subfolders; $j++) {
-                            $depths{$subfolders[$j]} = $depth;
-                            $display{$subfolders[$j]} = 
-                                  '<tr><td>'.$indent.$subfoldertitles[$j].'&nbsp;</td>'.
-                                  '<td><label>'.
-                                  '<input type="radio" name="docs.markedcopy_'.$subfolders[$j].'" value="new" checked="checked" />'.&mt('Copy to new').'</label>'.('&nbsp;' x2).
-                                  '<label>'.
-                                  '<input type="radio" name="docs.markedcopy_'.$subfolders[$j].'" value="move" />'.
-                                  &mt('Move old').'</label>'.
-                                  '</td></tr>';
-                        }
-                    }
-                    &recurse_print($r,$parent,\%deps,\%display);
-                    $r->print('</table>');
-                }
-                $r->print('</div>');
-            }
-        }
-        $r->print('<br /><input type="submit" name="pastemarked" value="'.&mt('Paste').'" />'.$othercrs);
-        $r->print('
-        <input type="hidden" name="folderpath" value="'.&HTML::Entities::encode($env{'form.folderpath'},'<>&"').'" />
-');
-        $r->print('</form>');
+            $pasteitems .= '</div>';
+        }
+    }
+    if ($pasteitems eq '') {
+        &Apache::lonnet::delenv('docs.markedcopies');
+    }
+    my ($pasteform,$form_start,$buttons,$form_end);
+    if ($pasteitems) {
+        $pasteitems .= '<div style="padding:0;clear:both;margin:0;border:0"></div>';
+        $form_start = '<form name="pasteform" action="/adm/coursedocs" method="post" onsubmit="return validateClipboard();">';
+        if (@pasteable) {
+            my $value = &mt('Paste to current folder');
+            if ($container eq 'page') {
+                $value = &mt('Paste to current page');
+            } 
+            $buttons = '<input type="submit" name="pastemarked" value="'.$value.'" />'.('&nbsp;'x2);
+        }
+        $buttons .= '<input type="submit" name="clearmarked" value="'.&mt('Remove from clipboard').'" />'.('&nbsp;'x2);
+        if ($clipboardcount > 1) {
+            $buttons .=
+                '<span style="text-decoration:line-through">'.('&nbsp;'x20).'</span>'.('&nbsp;'x2).
+                '<input type="button" name="checkallclip" value="'.&mt('Check all').'" style="height:20px;" onclick="checkClipboard();" />'.
+                ('&nbsp;'x2).
+                '<input type="button" name="uncheckallclip" value="'.&mt('Uncheck all').'" style="height:20px;" onclick="uncheckClipboard();" />'.
+                ('&nbsp;'x2);
+        }
+        $form_end = '<input type="hidden" name="folderpath" value="'.&HTML::Entities::encode($env{'form.folderpath'},'<>&"').'" />'.
+                    '</form>';
+    } else {
+        $pasteitems = &mt('Clipboard is empty');
+    }
+    $r->print($form_start
+             .'<fieldset>'
+             .'<legend>'.&mt('Clipboard').('&nbsp;' x2).$buttons.'</legend>'
+             .$pasteitems
+             .'</fieldset>'
+             .$form_end);
+}
+
+sub paste_options {
+    my ($suffix,$is_uploaded_map,$parent) = @_;
+    my ($copytext,$movetext);
+    if ($is_uploaded_map) {
+        $copytext = &mt('Copy to new folder');
+        $movetext = &mt('Move old');
+    } elsif ($env{'docs.markedcopy_url_'.$suffix} =~ /bulletinboard$/) {
+        $copytext = &mt('Copy to new board');
+        $movetext = &mt('Move (not posts)');
+    } elsif ($env{'docs.markedcopy_url_'.$suffix} =~ /smppg$/) {
+        $copytext = &mt('Copy to new page');
+        $movetext = &mt('Move');
     } else {
-        $r->print(&mt('Paste buffer contains:').' '.$buffer.
-                  '<br /><p class="LC_info">'.$nopaste.'</p>');
+        $copytext = &mt('Copy to new file');
+        $movetext = &mt('Move');
+    }
+    my $output = '<br />'.
+                 '<span id="pasteoptionstext_'.$suffix.'" class="LC_fontsize_small LC_nobreak"></span>'.
+                 '<div id="pasteoptions_'.$suffix.'" class="LC_dccid" style="display:none;"><span class="LC_nobreak">'.('&nbsp;'x 4).
+                 '<label>'.
+                 '<input type="radio" name="docs.markedcopy_options_'.$suffix.'" value="new" checked="checked" />'.
+                 $copytext.'</label></span>'.('&nbsp;'x2).' '.
+                 '<span class="LC_nobreak"><label>'.
+                 '<input type="radio" name="docs.markedcopy_options_'.$suffix.'" value="move" />'.
+                 $movetext.'</label></span>';
+    if (($is_uploaded_map) && ($env{'docs.markedcopy_nested_'.$suffix})) {
+        $output .= '<br /><fieldset><legend>'.&mt('Folder to paste contains sub-folders').
+                   '</legend><table border="0">';
+        my @pastemaps = split(/\&/,$env{'docs.markedcopy_nested_'.$suffix});
+        my @titles = split(/\Q___&&&___\E/,$env{'docs.markedcopy_nestednames_'.$suffix});
+        my $lastdir = $parent;
+        my %depths = (
+                       $lastdir => 0,
+                     );
+        my (%display,%deps);
+        for (my $i=0; $i<@pastemaps; $i++) {
+            ($lastdir,my $subfolderstr) = split(/\:/,$pastemaps[$i]);
+            my ($namedir,$esctitlestr) = split(/\:/,$titles[$i]);
+            my @subfolders = split(/,/,$subfolderstr);
+            $deps{$lastdir} = \@subfolders;
+            my @subfoldertitles = map { &unescape($_); } split(/,/,$esctitlestr);
+            my $depth = $depths{$lastdir} + 1;
+            my $offset = int($depth * 4);
+            my $indent = ('&nbsp;' x $offset);
+            for (my $j=0; $j<@subfolders; $j++) {
+                $depths{$subfolders[$j]} = $depth;
+                $display{$subfolders[$j]} =
+                    '<tr><td>'.$indent.$subfoldertitles[$j].'&nbsp;</td>'.
+                    '<td><label>'.
+                    '<input type="radio" name="docs.markedcopy_'.$suffix.'_'.$subfolders[$j].'" value="new" checked="checked" />'.&mt('Copy to new').'</label>'.('&nbsp;' x2).
+                    '<label>'.
+                    '<input type="radio" name="docs.markedcopy_'.$suffix.'_'.$subfolders[$j].'" value="move" />'.
+                    &mt('Move old').'</label>'.
+                    '</td></tr>';
+             }
+        }
+        &recurse_print(\$output,$parent,\%deps,\%display);
+        $output .= '</table></fieldset>';
     }
-    $r->print('</fieldset>');
+    $output .= '</div>';
+    return $output;
 }
 
 sub recurse_print {
-    my ($r,$dir,$deps,$display) = @_;
-    $r->print($display->{$dir}."\n");
+    my ($outputref,$dir,$deps,$display) = @_;
+    $$outputref .= $display->{$dir}."\n";
     if (ref($deps->{$dir}) eq 'ARRAY') {
         foreach my $subdir (@{$deps->{$dir}}) {
-            &recurse_print($r,$subdir,$deps,$display);
+            &recurse_print($outputref,$subdir,$deps,$display);
         }
     }
 }
@@ -831,287 +1361,529 @@ sub supp_pasteable {
 }
 
 sub paste_popup_js {
-    my %lt = &Apache::lonlocal::texthash(
-                                          show => 'Show Paste Options',
-                                          hide => 'Hide Paste Options',
+    my %html_js_lt = &Apache::lonlocal::texthash(
+                                          show => 'Show Options',
+                                          hide => 'Hide Options',
+                                        );
+    my %js_lt = &Apache::lonlocal::texthash(
+                                          none => 'No items selected from clipboard.',
                                         );
+    &html_escape(\%html_js_lt);
+    &js_escape(\%html_js_lt);
+    &js_escape(\%js_lt);
     return <<"END";
 
-function showPasteOptions() {
-    document.getElementById('pasteoptions').style.display='block';
-    document.getElementById('pasteoptions').style.textAlign='left';
-    document.getElementById('pasteoptions').style.textFace='normal';
-    document.getElementById('pasteoptionstext').innerHTML ='<a href="javascript:hidePasteOptions();" class="LC_menubuttons_link">$lt{'hide'}</a><br />';
+function showPasteOptions(suffix) {
+    document.getElementById('pasteoptions_'+suffix).style.display='block';
+    document.getElementById('pasteoptionstext_'+suffix).innerHTML = '&nbsp;&nbsp;&nbsp;&nbsp;<a href="javascript:hidePasteOptions(\\''+suffix+'\\');" class="LC_menubuttons_link">$html_js_lt{'hide'}</a>';
     return;
 }
 
-function hidePasteOptions() {
-    document.getElementById('pasteoptions').style.display='none';
-    document.getElementById('pasteoptionstext').innerHTML ='<a href="javascript:showPasteOptions()" class="LC_menubuttons_link">$lt{'show'}</a>';
+function hidePasteOptions(suffix) {
+    document.getElementById('pasteoptions_'+suffix).style.display='none';
+    document.getElementById('pasteoptionstext_'+suffix).innerHTML ='&nbsp;&nbsp;&nbsp;&nbsp;<a href="javascript:showPasteOptions(\\''+suffix+'\\')" class="LC_menubuttons_link">$html_js_lt{'show'}</a>';
     return;
 }
 
-END
+function showOptions(caller,suffix) {
+    if (document.getElementById('pasteoptionstext_'+suffix)) {
+        if (caller.checked) {
+            document.getElementById('pasteoptionstext_'+suffix).innerHTML ='&nbsp;&nbsp;&nbsp;&nbsp;<a href="javascript:showPasteOptions(\\''+suffix+'\\')" class="LC_menubuttons_link">$html_js_lt{'show'}</a>';
+        } else {
+            document.getElementById('pasteoptionstext_'+suffix).innerHTML ='';
+        }
+        if (document.getElementById('pasteoptions_'+suffix)) {
+            document.getElementById('pasteoptions_'+suffix).style.display='none';
+        }
+    }
+    return;
+}
+
+function validateClipboard() {
+    var numchk = 0;
+    if (document.pasteform.pasting.length > 1) {
+        for (var i=0; i<document.pasteform.pasting.length; i++) {
+            if (document.pasteform.pasting[i].checked) {
+                numchk ++;
+            }
+        }
+    } else {
+        if (document.pasteform.pasting.type == 'checkbox') {
+            if (document.pasteform.pasting.checked) {
+                numchk ++; 
+            } 
+        }
+    }
+    if (numchk > 0) { 
+        return true;
+    } else {
+        alert("$js_lt{'none'}");
+        return false;
+    }
+}
 
+function checkClipboard() {
+    if (document.pasteform.pasting.length > 1) {
+        for (var i=0; i<document.pasteform.pasting.length; i++) {
+            document.pasteform.pasting[i].checked = true;
+        } 
+    }
+    return;
+}
+
+function uncheckClipboard() {
+    if (document.pasteform.pasting.length >1) {
+        for (var i=0; i<document.pasteform.pasting.length; i++) {
+            document.pasteform.pasting[i].checked = false;
+        }
+    }
+    return;
 }
 
+END
+
+}
 
 sub do_paste_from_buffer {
     my ($coursenum,$coursedom,$folder,$container,$errors) = @_;
 
+# Array of items in paste buffer
+    my (@currpaste,%pastebuffer,%allerrors);
+    @currpaste = split(/,/,$env{'docs.markedcopies'});
+
 # Early out if paste buffer is empty
-    if (!$env{'form.pastemarked'}) {
+    if (@currpaste == 0) {
         return ();
+    } 
+    map { $pastebuffer{$_} = 1; } @currpaste;
+
+# Array of items selected items to paste
+    my @reqpaste = &Apache::loncommon::get_env_multiple('form.pasting');
+
+# Early out if nothing selected to paste
+    if (@reqpaste == 0) {
+        return();
+    }
+    my @topaste;
+    foreach my $suffix (@reqpaste) {
+        next if ($suffix =~ /\D/);
+        next unless (exists($pastebuffer{$suffix}));
+        push(@topaste,$suffix);
     }
 
-# Supplemental content may only include certain types of content
-# Early out if pasted content is not supported in Supplemental area
-    if ($folder =~ /^supplemental/) {
-        unless (&supp_pasteable($env{'docs.markedcopy_url'})) {
-            return (&mt('Paste failed: content type is not supported within Supplemental Content'));
-        }
+# Early out if nothing available to paste
+    if (@topaste == 0) {
+        return();
     }
 
-# Prepare to paste resource at end of list
-    my $url=&LONCAPA::map::qtescape($env{'docs.markedcopy_url'});
-    my $title=&LONCAPA::map::qtescape($env{'docs.markedcopy_title'});
+    my (%msgs,%before,%after,@dopaste,%is_map,%notinsupp,%notincrs,%duplicate,
+        %prefixchg,%srcdom,%srcnum,%marktomove,$save_err,$lockerrors,$allresult);
 
-    my ($is_map,$srcdom,$srcnum,$prefixchg,%before,%after,%mapchanges,%tomove);
-    if ($url=~/\.(page|sequence)$/) {
-        $is_map = 1; 
-    }
-    if ($url =~ m{^/uploaded/($match_domain)/($match_courseid)/([^/]+)}) {
-        $srcdom = $1;
-        $srcnum = $2;
-        my $oldprefix = $3;
+    foreach my $suffix (@topaste) {
+        my $url=&LONCAPA::map::qtescape($env{'docs.markedcopy_url_'.$suffix});
+        my $cid=&LONCAPA::map::qtescape($env{'docs.markedcopy_crs_'.$suffix});
+# Supplemental content may only include certain types of content
+# Early out if pasted content is not supported in Supplemental area
+        if ($folder =~ /^supplemental/) {
+            unless (&supp_pasteable($url)) {
+                $notinsupp{$suffix} = 1;
+                next;
+            }
+        }
+        if ($url =~ m{^/uploaded/($match_domain)/($match_courseid)/}) {
+            my $srcd = $1;
+            my $srcn = $2;
 # When paste buffer was populated using an active role in a different course
-# check for mdc privilege in the course from which the resource was pasted 
-        if (($srcdom ne $coursedom) || ($srcnum ne $coursenum)) {
-            unless ($env{"user.priv.cm./$srcdom/$srcnum"} =~ /\Q:mdc&F\E/) {
-                return (&mt('Paste failed: Item is from a different course which you do not have rights to edit.'));
+# check for mdc privilege in the course from which the resource was pasted
+            if (($srcd ne $coursedom) || ($srcn ne $coursenum)) {
+                unless ($env{"user.priv.cm./$srcd/$srcn"} =~ /\Q:mdc&F\E/) {
+                    $notincrs{$suffix} = 1;
+                    next;
+                }
+            }
+            $srcdom{$suffix} = $srcd;
+            $srcnum{$suffix} = $srcn;
+        } elsif ($url =~ m{^/adm/$match_domain/$match_username/\d+/(bulletinboard|smppg)$}) {
+            my ($srcd,$srcn) = split(/_/,$cid);
+# When paste buffer was populated using an active role in a different course
+# check for mdc privilege in the course from which the resource was pasted
+            if (($srcd ne $coursedom) || ($srcn ne $coursenum)) {
+                unless ($env{"user.priv.cm./$srcd/$srcn"} =~ /\Q:mdc&F\E/) {
+                    $notincrs{$suffix} = 1;
+                    next;
+                }
             }
+            $srcdom{$suffix} = $srcd;
+            $srcnum{$suffix} = $srcn;
+        }
+        push(@dopaste,$suffix);
+        if ($url=~/\.(page|sequence)$/) {
+            $is_map{$suffix} = 1; 
         }
+
+        if ($url =~ m{^/uploaded/$match_domain/$match_courseid/([^/]+)}) {
+            my $oldprefix = $1;
 # When pasting content from Main Content to Supplemental Content and vice versa 
 # URLs will contain different paths (which depend on whether pasted item is
 # a folder/page or a document.   
-        if (($folder =~ /^supplemental/) && (($oldprefix =~ /^default/) || ($oldprefix eq 'docs'))) {
-            $prefixchg = 1;
-            %before = ( map => 'default',
-                        doc => 'docs');
-            %after =  ( map => 'supplemental',
-                        doc => 'supplemental' );
-        } elsif (($folder =~ /^default/) && ($oldprefix =~ /^supplemental/)) {
-            $prefixchg = 1;
-            %before = ( map => 'supplemental',
-                        doc => 'supplemental');
-            %after  = ( map => 'default',
-                        doc => 'docs');
-        }
+            if (($folder =~ /^supplemental/) && (($oldprefix =~ /^default/) || ($oldprefix eq 'docs'))) {
+                $prefixchg{$suffix} = 'docstosupp';
+            } elsif (($folder =~ /^default/) && ($oldprefix =~ /^supplemental/)) {
+                $prefixchg{$suffix} = 'supptodocs';
+            }
 
 # If pasting an uploaded map, get list of contained uploaded maps.
-        my @nested;
-        if ($env{'docs.markedcopy_nested'}) {
-            my ($type) = ($oldprefix =~ /^(default|supplemental)/);
-            my @items = split(/\&/,$env{'docs.markedcopy_nested'});
-            my @deps = map { /\d+:([\d,]+$)/ } @items;
-            foreach my $dep (@deps) {
-                if ($dep =~ /,/) {
-                    push(@nested,split(/,/,$dep));
-                } else {
-                    push(@nested,$dep);
+            if ($env{'docs.markedcopy_nested_'.$suffix}) {
+                my @nested;
+                my ($type) = ($oldprefix =~ /^(default|supplemental)/);
+                my @items = split(/\&/,$env{'docs.markedcopy_nested_'.$suffix});
+                my @deps = map { /\d+:([\d,]+$)/ } @items;
+                foreach my $dep (@deps) {
+                    if ($dep =~ /,/) {
+                        push(@nested,split(/,/,$dep));
+                    } else {
+                        push(@nested,$dep);
+                    }
                 }
-            }
-            foreach my $item (@nested) {
-                if ($env{'form.docs.markedcopy_'.$item} eq 'move') {
-                    $tomove{$type.'_'.$item} = 1;
+                foreach my $item (@nested) {
+                    if ($env{'form.docs.markedcopy_'.$suffix.'_'.$item} eq 'move') {
+                        push(@{$marktomove{$suffix}},$type.'_'.$item);
+                    }
                 }
             }
         }
     }
 
+# Early out if nothing available to paste
+    if (@dopaste == 0) {
+        return ();
+    }
+
+# Populate message hash and hashes used for main content <=> supplemental content
+# changes    
+
+    %msgs = &Apache::lonlocal::texthash (
+                notinsupp => 'Paste failed: content type is not supported within Supplemental Content',
+                notincrs  => 'Paste failed: Item is from a different course which you do not have rights to edit.',
+                duplicate => 'Paste failed: only one instance of a particular published sequence or page is allowed within each course.',
+            );
+
+    %before = (
+                 docstosupp => {
+                                   map => 'default',
+                                   doc => 'docs',
+                               },
+                 supptodocs => {
+                                   map => 'supplemental',
+                                   doc => 'supplemental',
+                               },
+              );
+
+    %after = (
+                 docstosupp => {
+                                   map => 'supplemental',
+                                   doc => 'supplemental'
+                               },
+                 supptodocs => {
+                                   map => 'default',
+                                   doc => 'docs',
+                               },
+             );
+
+# Retrieve information about all course maps in main content area 
+
+    my $allmaps = {};
+    if ($folder =~ /^default/) {
+        $allmaps =
+            &Apache::loncommon::allmaps_incourse($coursedom,$coursenum,
+                                                 $env{"course.$env{'request.course.id'}.home"},
+                                                 $env{'request.course.id'});
+    }
+
+    my (@toclear,%mapurls,%lockerrs,%msgerrs,%results);
+
+# Loop over the items to paste
+    foreach my $suffix (@dopaste) {
 # Maps need to be copied first
-    my ($oldurl,%removefrommap,%removeparam,%addedmaps,%rewrites,%retitles,%copies,
-        %dbcopies,%zombies,%params,%docmoves,%mapmoves,%newsubdir,%newurls);
-    $oldurl = $url;
-    if ($is_map) {
+        my (%removefrommap,%removeparam,%addedmaps,%rewrites,%retitles,%copies,
+            %dbcopies,%zombies,%params,%docmoves,%mapmoves,%mapchanges,%newsubdir,
+            %newurls,%tomove);
+        if (ref($marktomove{$suffix}) eq 'ARRAY') {
+            map { $tomove{$_} = 1; } @{$marktomove{$suffix}};
+        }
+        my $url=&LONCAPA::map::qtescape($env{'docs.markedcopy_url_'.$suffix});
+        my $title=&LONCAPA::map::qtescape($env{'docs.markedcopy_title_'.$suffix});
+        my $cid=&LONCAPA::map::qtescape($env{'docs.markedcopy_crs_'.$suffix}); 
+        my $oldurl = $url;
+        if ($is_map{$suffix}) {
 # If pasting a map, check if map contains other maps
-        my ($allmaps,%hierarchy,%titles);
-        $allmaps = {};
-        if ($folder =~ /^default/) {
-            $allmaps =
-                &Apache::loncommon::allmaps_incourse($coursedom,$coursenum,
-                                                     $env{"course.$env{'request.course.id'}.home"},
-                                                     $env{'request.course.id'});
-        }
-        &contained_map_check($url,$folder,\%removefrommap,\%removeparam,
-                             \%addedmaps,\%hierarchy,\%titles,$allmaps);
-        if ($url=~ m{^/uploaded/}) {
-            my $newurl;
-            unless ($env{'form.docs.markedcopy_options'} eq 'move') {
-                ($newurl,my $error) = 
-                    &get_newmap_url($url,$folder,$prefixchg,$coursedom,$coursenum,
-                                    $srcdom,$srcnum,\$title,$allmaps,\%newurls);
-                if ($error) {
-                    return ($error);
-                }
-                if ($newurl ne '') {
-                    if ($newurl ne $url) {
-                        if ($newurl =~ /(?:default|supplemental)_(\d+).(?:sequence|page)$/) {
-                            $newsubdir{$url} = $1;
-                        }
-                        $mapchanges{$url} = 1;
+            my (%hierarchy,%titles);
+            &contained_map_check($url,$folder,\%removefrommap,\%removeparam,
+                                 \%addedmaps,\%hierarchy,\%titles,$allmaps);
+            if ($url=~ m{^/uploaded/}) {
+                my $newurl;
+                unless ($env{'form.docs.markedcopy_options_'.$suffix} eq 'move') {
+                    ($newurl,my $error) = 
+                        &get_newmap_url($url,$folder,$prefixchg{$suffix},$coursedom,
+                                        $coursenum,$srcdom{$suffix},$srcnum{$suffix},
+                                        \$title,$allmaps,\%newurls);
+                    if ($error) {
+                        $allerrors{$suffix} = $error;
+                        next;
+                    }
+                    if ($newurl ne '') {
+                        if ($newurl ne $url) {
+                            if ($newurl =~ /(?:default|supplemental)_(\d+).(?:sequence|page)$/) {
+                                $newsubdir{$url} = $1;
+                            }
+                            $mapchanges{$url} = 1;
+                        }
+                    }
+                }
+                if (($srcdom{$suffix} ne $coursedom) ||
+                    ($srcnum{$suffix} ne $coursenum) ||
+                    ($prefixchg{$suffix}) || (($newurl ne '') && ($newurl ne $url))) {
+                    unless (&url_paste_fixups($url,$folder,$prefixchg{$suffix},
+                                              $coursedom,$coursenum,$srcdom{$suffix},
+                                              $srcnum{$suffix},$allmaps,\%rewrites,
+                                              \%retitles,\%copies,\%dbcopies,
+                                              \%zombies,\%params,\%mapmoves,
+                                              \%mapchanges,\%tomove,\%newsubdir,
+                                              \%newurls)) {
+                        $mapmoves{$url} = 1;
+                    }
+                    $url = $newurl;
+                } elsif ($env{'docs.markedcopy_nested_'.$suffix}) {
+                    &url_paste_fixups($url,$folder,$prefixchg{$suffix},$coursedom,
+                                      $coursenum,$srcdom{$suffix},$srcnum{$suffix},
+                                      $allmaps,\%rewrites,\%retitles,\%copies,\%dbcopies,
+                                      \%zombies,\%params,\%mapmoves,\%mapchanges,
+                                      \%tomove,\%newsubdir,\%newurls); 
+                }
+            } elsif ($url=~m {^/res/}) {
+# published map can only exists once, so remove from paste buffer when done
+                push(@toclear,$suffix);
+# if pasting published map (main content area only) check map not already in course
+                if ($folder =~ /^default/) {
+                    if ((ref($allmaps) eq 'HASH') && ($allmaps->{$url})) {
+                        $duplicate{$suffix} = 1; 
+                        next;
                     }
                 }
             }
-            if (($srcdom ne $coursedom) || ($srcnum ne $coursenum) || ($prefixchg) ||
-                (($newurl ne '') && ($newurl ne $url))) {
-                unless (&url_paste_fixups($url,$folder,$prefixchg,$coursedom,$coursenum,
-                                          $allmaps,\%rewrites,\%retitles,\%copies,\%dbcopies,
-                                          \%zombies,\%params,\%mapmoves,\%mapchanges,\%tomove,
-                                          \%newsubdir,\%newurls)) {
-                    $mapmoves{$url} = 1;
-                }
-                $url = $newurl;
-            } elsif ($env{'docs.markedcopy_nested'}) {
-                &url_paste_fixups($url,$folder,$prefixchg,$coursedom,$coursenum,$allmaps,\%rewrites,
-                                  \%retitles,\%copies,\%dbcopies,\%zombies,\%params,\%mapmoves,
-                                  \%mapchanges,\%tomove,\%newsubdir,\%newurls); 
-            }
-        } elsif ($url=~m {^/res/}) {
-# published maps can only exists once, so remove it from paste buffer when done
-            &Apache::lonnet::delenv('docs.markedcopy');
-# if pasting published map (main content are only) check map is not already in course
-            if ($folder =~ /^default/) {
-                if ((ref($allmaps) eq 'HASH') && ($allmaps->{$url})) {
-                    return (&mt('Paste failed: only one instance of a particular published sequence or page is allowed within each course.'));
+        }
+        if ($url=~ m{/(bulletinboard|smppg)$}) {
+            my $prefix = $1;
+            my $fromothercrs; 
+            #need to copy the db contents to a new one, unless this is a move.
+            my %info = (
+                         src  => $url,
+                         cdom => $coursedom,
+                         cnum => $coursenum,
+                       );
+            if (($srcdom{$suffix} =~ /^$match_domain$/) && ($srcnum{$suffix} =~ /^$match_courseid$/)) {
+                unless (($srcdom{$suffix} eq $coursedom) && ($srcnum{$suffix} eq $coursenum)) {
+                    $fromothercrs = 1;
+                    $info{'cdom'} = $srcdom{$suffix};
+                    $info{'cnum'} = $srcnum{$suffix};
+                }
+            }
+            unless (($env{'form.docs.markedcopy_options_'.$suffix} eq 'move') && (!$fromothercrs)) {
+                my (%lockerr,$msg); 
+                my ($newurl,$result,$errtext) =
+                    &dbcopy(\%info,$coursedom,$coursenum,\%lockerr);
+                if ($result eq 'ok') {
+                    $url = $newurl;
+                    $title=&mt('Copy of').' '.$title;
+                } else {
+                    if ($prefix eq 'smppg') {
+                        $msg = &mt('Paste failed: An error occurred when copying the simple page.').' '.$errtext;
+                    } elsif ($prefix eq 'bulletinboard') {
+                        $msg = &mt('Paste failed: An error occurred when copying the discussion board.').' '.$errtext;
+                    }
+                    $results{$suffix} = $result;
+                    $msgerrs{$suffix} = $msg;
+                    $lockerrs{$suffix} = $lockerr{$prefix}; 
+                    next;
+	        }
+                if ($lockerr{$prefix}) {
+                    $lockerrs{$suffix} = $lockerr{$prefix};  
                 }
             }
         }
-    }
-    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 $dbresult=&Apache::lonnet::put($db_name,\%contents,
-					    $coursedom,$coursenum);
-            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);
+        my $ext='false';
+        if ($url=~m{^http(|s)://}) { $ext='true'; }
+        if ($env{'docs.markedcopy_supplemental_'.$suffix}) {
+            if ($folder !~ /^supplemental/) {
+                (undef,undef,$title) =
+                    &Apache::loncommon::parse_supplemental_title($env{'docs.markedcopy_supplemental_'.$suffix});
             }
-	}
-    }
-    $title = &LONCAPA::map::qtunescape($title);
-    my $ext='false';
-    if ($url=~m{^http(|s)://}) { $ext='true'; }
-    $url       = &LONCAPA::map::qtunescape($url);
+        } else {
+            if ($folder=~/^supplemental/) {
+                $title=time.'___&&&___'.$env{'user.name'}.'___&&&___'.
+                       $env{'user.domain'}.'___&&&___'.$title;
+            }
+        }
 
 # For uploaded files (excluding pages/sequences) path in copied file is changed
 # if paste is from Main to Supplemental (or vice versa), or if pasting between
 # courses.
 
-    my $newidx;
-    unless ($is_map) {
+        unless ($is_map{$suffix}) {
+            my $newidx;
 # Now insert the URL at the bottom
-        $newidx = &LONCAPA::map::getresidx($url);
-        if ($url =~ m{^/uploaded/$match_domain/$match_courseid/(?:docs|supplemental)/(.+)$}) {
-            my $relpath = $1;
-            if ($relpath ne '') {
-                my ($prefix,$subdir,$rem) = ($relpath =~ m{^(default|\d+)/(\d+)/(.+)$});
-                my ($newloc,$newdocsdir) = ($folder =~ /^(default|supplemental)_?(\d*)/);
-                my $newprefix = $newloc;
-                if ($newloc eq 'default') {
-                    $newprefix = 'docs';
-                }
-                if ($newdocsdir eq '') {
-                    $newdocsdir = 'default';
-                }
-                if (($prefixchg) || ($srcdom ne $coursedom) || ($srcnum ne $coursenum)) {
-                    my $newpath = "$newprefix/$newdocsdir/$newidx/$rem";
-                    $url =
-                        &Apache::lonclonecourse::writefile($env{'request.course.id'},$newpath,
-                                                           &Apache::lonnet::getfile($oldurl));
-                    if ($url eq '/adm/notfound.html') {
-                        return (&mt('Paste failed: an error occurred saving the file.'));
-                    } else {
-                        my ($newsubpath) = ($newpath =~ m{^(.*/)[^/]*$});
-                        $newsubpath =~ s{/+$}{/};
-                        $docmoves{$oldurl} = $newsubpath;
+            $newidx = &LONCAPA::map::getresidx(&LONCAPA::map::qtunescape($url));
+            if ($url =~ m{^/uploaded/$match_domain/$match_courseid/(?:docs|supplemental)/(.+)$}) {
+                my $relpath = $1;
+                if ($relpath ne '') {
+                    my ($prefix,$subdir,$rem) = ($relpath =~ m{^(default|\d+)/(\d+)/(.+)$});
+                    my ($newloc,$newdocsdir) = ($folder =~ /^(default|supplemental)_?(\d*)/);
+                    my $newprefix = $newloc;
+                    if ($newloc eq 'default') {
+                        $newprefix = 'docs';
+                    }
+                    if ($newdocsdir eq '') {
+                        $newdocsdir = 'default';
+                    }
+                    if (($prefixchg{$suffix}) || 
+                        ($srcdom{$suffix} ne $coursedom) || 
+                        ($srcnum{$suffix} ne $coursenum) ||
+                        ($env{'form.docs.markedcopy_options_'.$suffix} ne 'move')) {
+                        my $newpath = "$newprefix/$newdocsdir/$newidx/$rem";
+                        $url =
+                            &Apache::lonclonecourse::writefile($env{'request.course.id'},$newpath,
+                                                               &Apache::lonnet::getfile($oldurl));
+                        if ($url eq '/adm/notfound.html') {
+                            $msgs{$suffix} = &mt('Paste failed: an error occurred saving the file.');
+                            next;
+                        } else {
+                            my ($newsubpath) = ($newpath =~ m{^(.*/)[^/]*$});
+                            $newsubpath =~ s{/+$}{/};
+                            $docmoves{$oldurl} = $newsubpath;
+                        }
                     }
                 }
             }
+            $LONCAPA::map::resources[$newidx]=$title.':'.&LONCAPA::map::qtunescape($url).
+                                              ':'.$ext.':normal:res';
+            push(@LONCAPA::map::order,$newidx);
+# Store the result
+            my ($errtext,$fatal) =
+                &storemap($coursenum,$coursedom,$folder.'.'.$container,1);
+            if ($fatal) {
+                $save_err .= $errtext;
+                $allresult = 'fail';
+            }
         }
-    }
+
 # Apply any changes to maps, or copy dependencies for uploaded HTML pages 
-    my ($result,$save_err);
-    my %updated = (
-                    rewrites      => \%rewrites,
-                    zombies       => \%zombies,
-                    removefrommap => \%removefrommap,
-                    removeparam   => \%removeparam,
-                    dbcopies      => \%dbcopies,
-                    retitles      => \%retitles,
-                  );
-    my %info = (
-                   newsubdir => \%newsubdir,
-                   params    => \%params,
-                   before    => \%before,
-                   after     => \%after,
-               );
-    my %moves = (
-                   copies   => \%copies,
-                   docmoves => \%docmoves,
-                   mapmoves => \%mapmoves,
-                );
-    $result =
-        &apply_fixups($folder,$is_map,$coursedom,$coursenum,$errors,
-                      \%updated,\%info,\%moves,$prefixchg,$oldurl,$url,'paste');
-    if ($result eq 'ok') {
-        if ($is_map) { 
-            my ($errtext,$fatal) = &mapread($coursenum,$coursedom,
-                                            $folder.'.'.$container);
-            return $errtext if ($fatal);
+        unless ($allresult eq 'fail') {
+            my %updated = (
+                            rewrites      => \%rewrites,
+                            zombies       => \%zombies,
+                            removefrommap => \%removefrommap,
+                            removeparam   => \%removeparam,
+                            dbcopies      => \%dbcopies,
+                            retitles      => \%retitles,
+                          );
+            my %info = (
+                           newsubdir => \%newsubdir,
+                           params    => \%params,
+                       );
+            if ($prefixchg{$suffix}) {
+                $info{'before'} = $before{$prefixchg{$suffix}};
+                $info{'after'} = $after{$prefixchg{$suffix}};
+            }
+            my %moves = (
+                           copies   => \%copies,
+                           docmoves => \%docmoves,
+                           mapmoves => \%mapmoves,
+                        );
+            (my $result,$msgs{$suffix},my $lockerror) =
+                &apply_fixups($folder,$is_map{$suffix},$coursedom,$coursenum,$errors,
+                              \%updated,\%info,\%moves,$prefixchg{$suffix},$oldurl,
+                              $url,'paste');
+            $lockerrors .= $lockerror;
+            if ($result eq 'ok') {
+                if ($is_map{$suffix}) {
+                    my ($errtext,$fatal) = &mapread($coursenum,$coursedom,
+                                                    $folder.'.'.$container);
+                    if ($fatal) {
+                        $allresult = 'failread';
+                    } else {
+                        if ($#LONCAPA::map::order<1) {
+                            my $idx=&LONCAPA::map::getresidx();
+                            if ($idx<=0) { $idx=1; }
+                            $LONCAPA::map::order[0]=$idx;
+                            $LONCAPA::map::resources[$idx]='';
+                        }
+                        my $newidx = &LONCAPA::map::getresidx(&LONCAPA::map::qtunescape($url));
+                        $LONCAPA::map::resources[$newidx]=$title.':'.&LONCAPA::map::qtunescape($url).
+                                                          ':'.$ext.':normal:res';
+                        push(@LONCAPA::map::order,$newidx);
 
-            if ($#LONCAPA::map::order<1) {
-                my $idx=&LONCAPA::map::getresidx();
-                if ($idx<=0) { $idx=1; }
-                $LONCAPA::map::order[0]=$idx;
-                $LONCAPA::map::resources[$idx]='';
-            }
-            $newidx = &LONCAPA::map::getresidx($url);
-        }
-        if ($env{'docs.markedcopy_supplemental'}) {
-            if ($folder !~ /^supplemental/) {
-                (undef,undef,$title) =
-                    &Apache::loncommon::parse_supplemental_title($env{'docs.markedcopy_supplemental'});
-            }
-        } else {
-            if ($folder=~/^supplemental/) {
-                $title=time.'___&&&___'.$env{'user.name'}.'___&&&___'.
-                       $env{'user.domain'}.'___&&&___'.$title;
+# Store the result
+                        my ($errtext,$fatal) = 
+                            &storemap($coursenum,$coursedom,$folder.'.'.$container,1);
+                        if ($fatal) {
+                            $save_err .= $errtext;
+                            $allresult = 'failstore';
+                        }
+                    } 
+                }
+                if ($env{'form.docs.markedcopy_options_'.$suffix} eq 'move') {
+                     push(@toclear,$suffix);
+                }
             }
         }
-        $LONCAPA::map::resources[$newidx]= 	$title.':'.$url.':'.$ext.':normal:res';
-        push(@LONCAPA::map::order, $newidx);
+    }
+    &clear_from_buffer(\@toclear,\@currpaste);
+    my $msgsarray;
+    foreach my $suffix (keys(%msgs)) {
+         if (ref($msgs{$suffix}) eq 'ARRAY') {
+             $msgsarray .= join(',',@{$msgs{$suffix}});
+         }
+    }
+    return ($allresult,$save_err,$msgsarray,$lockerrors);
+}
 
-# Store the result
-        my ($errtext,$fatal) = 
-            &storemap($coursenum,$coursedom,$folder.'.'.$container,1);
-        if ($fatal) {
-            $save_err = $errtext;
-        }
+sub do_buffer_empty {
+    my @currpaste = split(/,/,$env{'docs.markedcopies'});
+    if (@currpaste == 0) {
+        return &mt('Clipboard is already empty');
     }
-   
-    if ($env{'form.docs.markedcopy_options'} eq 'move') {
-        &Apache::lonnet::delenv('docs.markedcopy');
-        &Apache::lonnet::delenv('docs.markedcopy_nested');
-        &Apache::lonnet::delenv('docs.markedcopy_nestednames');
+    my @toclear = &Apache::loncommon::get_env_multiple('form.pasting');
+    if (@toclear == 0) {
+        return &mt('Nothing selected to clear from clipboard');
+    }
+    my $numdel = &clear_from_buffer(\@toclear,\@currpaste);
+    if ($numdel) {
+        return &mt('[quant,_1,item] cleared from clipboard',$numdel);
+    } else {
+        return &mt('Clipboard unchanged');
     }
-    return ($result,$save_err);
+    return;
+}
+
+sub clear_from_buffer {
+    my ($toclear,$currpaste) = @_;
+    return unless ((ref($toclear) eq 'ARRAY') && (ref($currpaste) eq 'ARRAY'));
+    my %pastebuffer;
+    map { $pastebuffer{$_} = 1; } @{$currpaste};
+    my $numdel = 0;
+    foreach my $suffix (@{$toclear}) {
+        next if ($suffix =~ /\D/);
+        next unless (exists($pastebuffer{$suffix}));
+        my $regexp = 'docs.markedcopy_[a-z]+_'.$suffix;
+        if (&Apache::lonnet::delenv($regexp,1) eq 'ok') {
+            delete($pastebuffer{$suffix});
+            $numdel ++;
+        }
+    }
+    my $newbuffer = join(',',sort(keys(%pastebuffer)));
+    &Apache::lonnet::appenv({'docs.markedcopies' => $newbuffer});
+    return $numdel;
 }
 
 sub get_newmap_url {
@@ -1175,20 +1947,98 @@ sub get_newmap_url {
 }
 
 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;
+    my ($dbref,$coursedom,$coursenum,$lockerrorsref) = @_;
+    my ($url,$result,$errtext);
+    if (ref($dbref) eq 'HASH') {
+        $url = $dbref->{'src'};
+        if ($url =~ m{/(smppg|bulletinboard)$}) {
+            my $prefix = $1;
+            if (($dbref->{'cdom'} =~ /^$match_domain$/) && 
+                ($dbref->{'cnum'} =~ /^$match_courseid$/)) {
+                my $db_name;
+                my $marker = (split(m{/},$url))[4];
+                $marker=~s/\D//g;
+                if ($dbref->{'src'} =~ m{/smppg$}) {
+                    $db_name =
+                        &Apache::lonsimplepage::get_db_name($url,$marker,
+                                                            $dbref->{'cdom'},
+                                                            $dbref->{'cnum'});
+                } else {
+                    $db_name = 'bulletinpage_'.$marker;
+                }
+                my ($suffix,$freedlock,$error) =
+                    &Apache::lonnet::get_timebased_id($prefix,'num','templated',
+                                                      $coursedom,$coursenum,
+                                                      'concat');
+                if (!$suffix) {
+                    if ($prefix eq 'smppg') {
+                        $errtext = &mt('Failed to acquire a unique timestamp-based suffix when copying a simple page [_1].',$url);
+                    } else {
+                        $errtext = &mt('Failed to acquire a unique timestamp-based suffix when copying a discussion board [_1].',$url);
+                    }
+                    if ($error) {
+                        $errtext .= '<br />'.$error;
+                    }
+                } else {
+                    #need to copy the db contents to a new one.
+                    my %contents=&Apache::lonnet::dump($db_name,
+                                                       $dbref->{'cdom'},
+                                                       $dbref->{'cnum'});
+                    if (exists($contents{'uploaded.photourl'})) {
+                        my $photo = $contents{'uploaded.photourl'};
+                        my ($subdir,$fname) =
+                            ($photo =~ m{^/uploaded/$match_domain/$match_courseid/+(bulletin|simplepage)/(?:|\d+/)([^/]+)$});
+                        my $newphoto;
+                        if ($fname ne '') {
+                            my $content = &Apache::lonnet::getfile($photo);
+                            unless ($content eq '-1') {
+                                $env{'form.'.$suffix.'.photourl'} = $content;
+                                $newphoto = 
+                                    &Apache::lonnet::finishuserfileupload($coursenum,$coursedom,$suffix.'.photourl',"$subdir/$suffix/$fname");
+                                delete($env{'form.'.$suffix.'.photourl'});
+                            }
+                        }
+                        if ($newphoto =~ m{^/uploaded/}) {
+                            $contents{'uploaded.photourl'} = $newphoto;
+                        }
+                    }
+                    $db_name =~ s{_\d*$ }{_$suffix}x;
+                    $result=&Apache::lonnet::put($db_name,\%contents,
+                                                 $coursedom,$coursenum);
+                    if ($result eq 'ok') {
+                        $url =~ s{/(\d*)/(smppg|bulletinboard)$}{/$suffix/$2}x;
+                    }
+                }
+                if (($freedlock ne 'ok') && (ref($lockerrorsref) eq 'HASH')) {
+                    $lockerrorsref->{$prefix} =
+                        '<div class="LC_error">'.
+                        &mt('There was a problem removing a lockfile.');
+                    if ($prefix eq 'smppg') {
+                        $lockerrorsref->{$prefix} .=
+                            ' '.&mt('This will prevent creation of additional simple pages in this course.');
+                    } else {
+                        $lockerrorsref->{$prefix} .= ' '.&mt('This will prevent creation of additional discussion boards in this course.');
+                    }
+                    $lockerrorsref->{$prefix} .= ' '.&mt('Please contact the [_1]helpdesk[_2] for assistance.',
+                                                     '<a href="/adm/helpdesk" target="_helpdesk">','</a>').
+                                                 '</div>';
+                }
+            }
+        } elsif ($url =~ m{/syllabus$}) {
+            if (($dbref->{'cdom'} =~ /^$match_domain$/) &&
+                ($dbref->{'cnum'} =~ /^$match_courseid$/)) {
+                if (($dbref->{'cdom'} ne $coursedom) ||
+                    ($dbref->{'cnum'} ne $coursenum)) {
+                    my %contents=&Apache::lonnet::dump('syllabus',
+                                                       $dbref->{'cdom'},
+                                                       $dbref->{'cnum'});
+                    $result=&Apache::lonnet::put('syllabus',\%contents,
+                                                 $coursedom,$coursenum);
+                }
+            }
         }
     }
-    return $url;
+    return ($url,$result,$errtext);
 }
 
 sub uniqueness_check {
@@ -1254,8 +2104,9 @@ sub contained_map_check {
 }
 
 sub url_paste_fixups {
-    my ($oldurl,$folder,$prefixchg,$cdom,$cnum,$allmaps,$rewrites,$retitles,$copies,
-        $dbcopies,$zombies,$params,$mapmoves,$mapchanges,$tomove,$newsubdir,$newurls) = @_;
+    my ($oldurl,$folder,$prefixchg,$cdom,$cnum,$fromcdom,$fromcnum,$allmaps,
+        $rewrites,$retitles,$copies,$dbcopies,$zombies,$params,$mapmoves,
+        $mapchanges,$tomove,$newsubdir,$newurls) = @_;
     my $checktitle;
     if (($prefixchg) &&
         ($oldurl =~ m{^/uploaded/$match_domain/$match_courseid/supplemental})) {
@@ -1282,13 +2133,13 @@ sub url_paste_fixups {
             my $title = $token->[2]->{'title'};
             if ($checktitle) {
                 if ($title =~ m{\d+\Q___&amp;&amp;&amp;___\E$match_username\Q___&amp;&amp;&amp;___\E$match_domain\Q___&amp;&amp;&amp;___\E(.+)$}) {
-                    $retitles->{$oldurl}{$ressrc} = $id;
+                    $retitles->{$oldurl}{$id} = $ressrc;
                 }
             }
             next if ($token->[2]->{'type'} eq 'external');
             if ($token->[2]->{'type'} eq 'zombie') {
                 next if ($skip);  
-                $zombies->{$oldurl}{$ressrc} = $id;
+                $zombies->{$oldurl}{$id} = $ressrc;
                 $changed = 1;
             } elsif ($ressrc =~ m{^/uploaded/($match_domain)/($match_courseid)/(.+)$}) {
                 my $srcdom = $1;
@@ -1300,10 +2151,11 @@ sub url_paste_fixups {
                     my $prefix = $1;
                     $mapname = $prefix.$2;
                     if ($tomove->{$mapname}) {
-                        &url_paste_fixups($ressrc,$folder,$prefixchg,$cdom,$cnum,$allmaps,
-                                          $rewrites,$retitles,$copies,$dbcopies,$zombies,
-                                          $params,$mapmoves,$mapchanges,$tomove,$newsubdir,
-                                          $newurls);
+                        &url_paste_fixups($ressrc,$folder,$prefixchg,$cdom,$cnum,
+                                          $srcdom,$srcnum,$allmaps,$rewrites,
+                                          $retitles,$copies,$dbcopies,$zombies,
+                                          $params,$mapmoves,$mapchanges,$tomove,
+                                          $newsubdir,$newurls);
                         next;
                     } else {
                         ($newurl,my $error) =
@@ -1321,28 +2173,39 @@ sub url_paste_fixups {
                     ($mapchanges->{$oldurl}) || (($newurl ne '') && ($newurl ne $oldurl))) {
                    
                     if ($rem =~ /^(default|supplemental)(_?\d*).(sequence|page)$/) {
-                        $rewrites->{$oldurl}{$ressrc} = $id;
+                        $rewrites->{$oldurl}{$id} = $ressrc;
                         $mapchanges->{$ressrc} = 1;
-                        unless (&url_paste_fixups($ressrc,$folder,$prefixchg,$cdom,$cnum,$allmaps,
-                                                  $rewrites,$retitles,$copies,$dbcopies,$zombies,
-                                                  $params,$mapmoves,$mapchanges,$tomove,$newsubdir,
-                                                  $newurls)) {
+                        unless (&url_paste_fixups($ressrc,$folder,$prefixchg,$cdom,
+                                                  $cnum,$srcdom,$srcnum,$allmaps,
+                                                  $rewrites,$retitles,$copies,$dbcopies,
+                                                  $zombies,$params,$mapmoves,$mapchanges,
+                                                  $tomove,$newsubdir,$newurls)) {
                             $mapmoves->{$ressrc} = 1;
                         }
                         $changed = 1;
                     } else {
-                        $rewrites->{$oldurl}{$ressrc} = $id;
+                        $rewrites->{$oldurl}{$id} = $ressrc;
                         $copies->{$oldurl}{$ressrc} = $id;
                         $changed = 1;
                     }
                 }
-            } elsif ($ressrc =~ m{^/adm/($match_domain)/($match_courseid)/(.+)$}) {
-                next if ($skip);  
+            } elsif ($ressrc =~ m{^/adm/($match_domain)/($match_courseid)/.+$}) {
+                next if ($skip);
                 my $srcdom = $1;
                 my $srcnum = $2;
                 if (($srcdom ne $cdom) || ($srcnum ne $cnum)) {
-                    $rewrites->{$oldurl}{$ressrc} = $id;
-                    $dbcopies->{$oldurl}{$ressrc} = $id;
+                    $rewrites->{$oldurl}{$id} = $ressrc;
+                    $dbcopies->{$oldurl}{$id}{'src'} = $ressrc;
+                    $dbcopies->{$oldurl}{$id}{'cdom'} = $srcdom;
+                    $dbcopies->{$oldurl}{$id}{'cnum'} = $srcnum;
+                    $changed = 1;
+                }
+            } elsif ($ressrc =~ m{^/adm/$match_domain/$match_username/\d+/(smppg|bulletinboard)$}) {
+                if (($fromcdom ne $cdom) || ($fromcnum ne $cnum) ||
+                    ($env{'form.docs.markedcopy_options'} ne 'move')) {
+                    $dbcopies->{$oldurl}{$id}{'src'} = $ressrc;
+                    $dbcopies->{$oldurl}{$id}{'cdom'} = $fromcdom;
+                    $dbcopies->{$oldurl}{$id}{'cnum'} = $fromcnum;
                     $changed = 1;
                 }
             } elsif ($ressrc =~ m{^/public/($match_domain)/($match_courseid)/(.+)$}) {
@@ -1350,8 +2213,9 @@ sub url_paste_fixups {
                 my $srcdom = $1;
                 my $srcnum = $2;
                 if (($srcdom ne $cdom) || ($srcnum ne $cnum)) {
-                    $rewrites->{$oldurl}{$ressrc} = $id;
-                    $dbcopies->{$oldurl}{$ressrc} = $id;
+                    $dbcopies->{$oldurl}{$id}{'src'} = $ressrc;
+                    $dbcopies->{$oldurl}{$id}{'cdom'} = $srcdom;
+                    $dbcopies->{$oldurl}{$id}{'cnum'} = $srcnum;
                     $changed = 1;
                 }
             }
@@ -1374,7 +2238,8 @@ sub apply_fixups {
     my ($folder,$is_map,$cdom,$cnum,$errors,$updated,$info,$moves,$prefixchg,
         $oldurl,$url,$caller) = @_;
     my (%rewrites,%zombies,%removefrommap,%removeparam,%dbcopies,%retitles,
-        %params,%newsubdir,%before,%after,%copies,%docmoves,%mapmoves);
+        %params,%newsubdir,%before,%after,%copies,%docmoves,%mapmoves,@msgs,
+        %lockerrors,$lockmsg);
     if (ref($updated) eq 'HASH') {
         if (ref($updated->{'rewrites'}) eq 'HASH') {
             %rewrites = %{$updated->{'rewrites'}};
@@ -1436,7 +2301,7 @@ sub apply_fixups {
         }
         if ($key eq $oldurl) {
             if ((exists($docmoves{$key}))) {
-                unless (grep(/^\Q$oldurl\E/,@allcopies)) {
+                unless (grep(/^\Q$oldurl\E$/,@allcopies)) {
                     push(@allcopies,$oldurl);
                 }
             }
@@ -1458,7 +2323,7 @@ sub apply_fixups {
                                 $storefn =~ s/^\Q$before{'doc'}\E/$after{'doc'}/;
                             }
                             if ($newsubdir{$key}) {
-                                $storefn =~ s#^(docs|supplemental)/\Q$oldsubdir\E/#$1/$newsubdir{$key}#;
+                                $storefn =~ s#^(docs|supplemental)/\Q$oldsubdir\E/#$1/$newsubdir{$key}/#;
                             }
                         }
                         &copy_dependencies($item,$storefn,$relpath,$errors,\$content);
@@ -1531,8 +2396,17 @@ sub apply_fixups {
                 %zombie = %{$zombies{$key}};
             }
             if (ref($dbcopies{$key}) eq 'HASH') {
-                foreach my $item (keys(%{$dbcopies{$key}})) {
-                    $newdb{$item} = &dbcopy($item);
+                foreach my $idx (keys(%{$dbcopies{$key}})) {
+                    if (ref($dbcopies{$key}{$idx}) eq 'HASH') {
+                        my ($newurl,$result,$errtext) =
+                            &dbcopy($dbcopies{$key}{$idx},$cdom,$cnum,\%lockerrors);
+                        if ($result eq 'ok') {
+                            $newdb{$idx} = $newurl;
+                        } elsif (ref($errors) eq 'HASH') {
+                            $errors->{$key} = 1;
+                        }
+                        push(@msgs,$errtext);
+                    }
                 }
             }
             if (ref($params{$key}) eq 'HASH') {
@@ -1540,12 +2414,12 @@ sub apply_fixups {
             }
             my ($errtext,$fatal) = &LONCAPA::map::mapread($key);
             if ($fatal) {
-                return $errtext;
+                return ($errtext);
             }
             for (my $i=0; $i<@LONCAPA::map::zombies; $i++) {
                 if (defined($LONCAPA::map::zombies[$i])) {
                     my ($title,$src,$ext,$type)=split(/\:/,$LONCAPA::map::zombies[$i]);
-                    if ($zombie{$src} eq $i) {
+                    if ($zombie{$i} eq $src) {
                         undef($LONCAPA::map::zombies[$i]);
                     }
                 }
@@ -1555,7 +2429,8 @@ sub apply_fixups {
                 if (defined($LONCAPA::map::resources[$idx])) {
                     my $changed;
                     my ($title,$src,$ext,$type)=split(/\:/,$LONCAPA::map::resources[$idx]);
-                    if ((exists($toremove{$idx})) && ($toremove{$idx} eq $src)) {
+                    if ((exists($toremove{$idx})) && 
+                        ($toremove{$idx} eq &LONCAPA::map::qtescape($src))) {
                         splice(@LONCAPA::map::order,$i,1);
                         if (ref($currparam{$idx}) eq 'ARRAY') {
                             foreach my $name (@{$currparam{$idx}}) {
@@ -1565,12 +2440,12 @@ sub apply_fixups {
                         next;
                     }
                     my $origsrc = $src;
-                    if ((exists($toretitle{$src})) && ($toretitle{$src} eq $idx)) {
+                    if ((exists($toretitle{$idx})) && ($toretitle{$idx} eq $src)) {
                         if ($title =~ m{^\d+\Q___&amp;&amp;&amp;___\E$match_username\Q___&amp;&amp;&amp;___\E$match_domain\Q___&amp;&amp;&amp;___\E(.+)$}) {
                             $changed = 1;
                         }
                     }
-                    if ((exists($torewrite{$src})) && ($torewrite{$src} eq $idx)) {
+                    if ((exists($torewrite{$idx})) && ($torewrite{$idx} eq $src)) {
                         $src =~ s{^/(uploaded|adm|public)/$match_domain/$match_courseid/}{/$1/$cdom/$cnum/};
                         if ($origsrc =~ m{^/uploaded/}) {
                             if ($prefixchg && $before{'map'} && $after{'map'}) {
@@ -1580,21 +2455,21 @@ sub apply_fixups {
                                     $src =~ s#^(/uploaded/$match_domain/$match_courseid/)\Q$before{'doc'}\E#$1$after{'doc'}#;
                                 }
                             }
-                            if ($newsubdir{$origsrc}) {
-                                if ($src =~ /\.(page|sequence)$/) {
+                            if ($origsrc =~ /\.(page|sequence)$/) {
+                                if ($newsubdir{$origsrc}) {
                                     $src =~ s#^(/uploaded/$match_domain/$match_courseid/(?:default|supplemental)_)(\d+)#$1$newsubdir{$origsrc}#;
-                                } else {
-                                    $src =~ s#^(/uploaded/$match_domain/$match_courseid/\w+/)(\d+)#$1$newsubdir{$origsrc}#;
                                 }
+                            } elsif ($newsubdir{$key}) {
+                                $src =~ s#^(/uploaded/$match_domain/$match_courseid/\w+/)(\d+)#$1$newsubdir{$key}#;
                             }
                         }
                         $changed = 1;
-                    } elsif ($newdb{$src} ne '') {
-                        $src = $newdb{$src};
+                    } elsif ($newdb{$idx} ne '') {
+                        $src = $newdb{$idx};
                         $changed = 1;
                     }
                     if ($changed) {
-                        $LONCAPA::map::resources[$idx] = join(':',($title,$src,$ext,$type));
+                        $LONCAPA::map::resources[$idx] = join(':',($title,&LONCAPA::map::qtunescape($src),$ext,$type));
                     }
                 }
             }
@@ -1605,6 +2480,9 @@ sub apply_fixups {
                     }
                 }
             }
+            if (values(%lockerrors) > 0) {
+                $lockmsg = join('<br />',values(%lockerrors));
+            }
             my $storefn;
             if ($key eq $oldurl) {
                 $storefn = $url;
@@ -1627,12 +2505,12 @@ sub apply_fixups {
                 &LONCAPA::map::storemap("/uploaded/$cdom/$cnum/$storefn",1,$report);
             if ($errtext) {
                 if ($caller eq 'paste') {
-                    return &mt('Paste failed: an error occurred saving the folder or page.');
+                    return (&mt('Paste failed: an error occurred saving the folder or page.'));
                 }
             }
         }
     }
-    return 'ok';
+    return ('ok',\@msgs,$lockmsg);
 }
 
 sub copy_dependencies {
@@ -1697,34 +2575,127 @@ my %parameter_type = ( 'randompick'
 my $valid_parameters_re = join('|',keys(%parameter_type));
 # set parameters
 sub update_parameter {
-
-    return 0 if ($env{'form.changeparms'} !~ /^($valid_parameters_re)$/);
-
-    my $which = $env{'form.changeparms'};
-    my $idx = $env{'form.setparms'};
-    if ($env{'form.'.$which.'_'.$idx}) {
-	my $value = ($which eq 'randompick') ? $env{'form.'.$which.'_'.$idx}
-	                                     : 'yes';
-	&LONCAPA::map::storeparameter($idx, 'parameter_'.$which, $value,
-				      $parameter_type{$which});
-	&remember_parms($idx,$which,'set',$value);
+    if ($env{'form.changeparms'} eq 'all') {
+        my (@allidx,@allmapidx,%allchecked,%currchecked);
+        %allchecked = (
+                         'hiddenresource' => {},
+                         'encrypturl'     => {},
+                         'randompick'     => {},
+                         'randomorder'    => {},
+                      );
+        foreach my $which (keys(%allchecked)) {
+            $env{'form.all'.$which} =~ s/,$//;   
+            if ($which eq 'randompick') {
+                foreach my $item (split(/,/,$env{'form.all'.$which})) {
+                    my ($res,$value) = split(/:/,$item);
+                    if ($value =~ /^\d+$/) {
+                        $allchecked{$which}{$res} = $value;
+                    }
+                }
+            } else {
+                if ($env{'form.all'.$which}) {
+                    map { $allchecked{$which}{$_} = 1; } split(/,/,$env{'form.all'.$which});
+                }
+            }
+        }
+        my $haschanges = 0;
+        foreach my $res (@LONCAPA::map::order) {
+            my ($name,$url)=split(/\:/,$LONCAPA::map::resources[$res]);
+            $name=&LONCAPA::map::qtescape($name);
+            $url=&LONCAPA::map::qtescape($url);
+            next unless ($name && $url);
+            my $is_map;
+            if ($url =~ m{/uploaded/.+\.(page|sequence)$}) {
+                $is_map = 1;
+            }
+            foreach my $which (keys(%allchecked)) {
+                if (($which eq 'randompick' || $which eq 'randomorder')) {
+                    next if (!$is_map);
+                } 
+                my $oldvalue = 0;
+                my $newvalue = 0;
+                if ($allchecked{$which}{$res}) {
+                    $newvalue = $allchecked{$which}{$res};
+                }
+                my $current = (&LONCAPA::map::getparameter($res,'parameter_'.$which))[0];
+                if ($which eq 'randompick') {
+                    if ($current =~ /^(\d+)$/) {
+                        $oldvalue = $1;
+                    }
+                } else {
+                    if ($current =~ /^yes$/i) {
+                        $oldvalue = 1;
+                    }
+                }
+                if ($oldvalue ne $newvalue) {
+                    $haschanges = 1;
+                    if ($newvalue) {
+                        my $storeval = 'yes';
+                        if ($which eq 'randompick') {
+                            $storeval = $newvalue;
+                        }
+                        &LONCAPA::map::storeparameter($res,'parameter_'.$which,
+                                                      $storeval,
+                                                      $parameter_type{$which});
+                        &remember_parms($res,$which,'set',$storeval);
+                    } elsif ($oldvalue) {
+                        &LONCAPA::map::delparameter($res,'parameter_'.$which);
+                        &remember_parms($res,$which,'del');
+                    }
+                }
+            }
+        }
+        return $haschanges;
     } else {
-	&LONCAPA::map::delparameter($idx,'parameter_'.$which);
+        my $haschanges = 0;
+        return $haschanges if ($env{'form.changeparms'} !~ /^($valid_parameters_re)$/);
 
-	&remember_parms($idx,$which,'del');
+        my $which = $env{'form.changeparms'};
+        my $idx = $env{'form.setparms'};
+        my $oldvalue = 0;
+        my $newvalue = 0;
+        my $current = (&LONCAPA::map::getparameter($idx,'parameter_'.$which))[0];
+        if ($which eq 'randompick') {
+            if ($current =~ /^(\d+)$/) {
+                $oldvalue = $1;
+            }
+        } elsif ($current =~ /^yes$/i) {
+            $oldvalue = 1;
+        }
+        if ($env{'form.'.$which.'_'.$idx}) {
+	    $newvalue = ($which eq 'randompick') ? $env{'form.rpicknum_'.$idx}
+	                                         : 1;
+        }
+        if ($oldvalue ne $newvalue) {
+            $haschanges = 1;
+            if ($newvalue) {
+                my $storeval = 'yes';
+                if ($which eq 'randompick') {
+                    $storeval = $newvalue;
+                }
+	        &LONCAPA::map::storeparameter($idx, 'parameter_'.$which, $storeval,
+				              $parameter_type{$which});
+	        &remember_parms($idx,$which,'set',$storeval);
+            } else {
+	        &LONCAPA::map::delparameter($idx,'parameter_'.$which);
+	        &remember_parms($idx,$which,'del');
+            }
+        }
+        return $haschanges;
     }
-    return 1;
 }
 
-
 sub handle_edit_cmd {
     my ($coursenum,$coursedom) =@_;
+    if ($env{'form.cmd'} eq '') {
+        return 0;
+    }
     my ($cmd,$idx)=split('_',$env{'form.cmd'});
 
     my $ratstr = $LONCAPA::map::resources[$LONCAPA::map::order[$idx]];
     my ($title, $url, @rrest) = split(':', $ratstr);
 
-    if ($cmd eq 'del') {
+    if ($cmd eq 'remove') {
 	if (($url=~m|/+uploaded/\Q$coursedom\E/\Q$coursenum\E/|) &&
 	    ($url!~/$LONCAPA::assess_page_seq_re/)) {
 	    &Apache::lonnet::removeuploadedurl($url);
@@ -1746,7 +2717,6 @@ sub handle_edit_cmd {
 	@LONCAPA::map::order[$idx+1,$idx] = @LONCAPA::map::order[$idx,$idx+1];
 
     } elsif ($cmd eq 'rename') {
-
 	my $comment = &LONCAPA::map::qtunescape($env{'form.title'});
 	if ($comment=~/\S/) {
 	    $LONCAPA::map::resources[$LONCAPA::map::order[$idx]]=
@@ -1755,6 +2725,7 @@ sub handle_edit_cmd {
 # Devalidate title cache
 	my $renamed_url=&LONCAPA::map::qtescape($url);
 	&Apache::lonnet::devalidate_title_cache($renamed_url);
+
     } else {
 	return 0;
     }
@@ -1779,7 +2750,7 @@ sub editor {
     my $jumpto;
 
     unless ($supplementalflag) {
-        $jumpto = "'uploaded/$coursedom/$coursenum/$folder.$container'";
+        $jumpto = "uploaded/$coursedom/$coursenum/$folder.$container";
     }
 
     unless ($allowed) {
@@ -1805,7 +2776,7 @@ sub editor {
 	&snapshotbefore();
 
 	if (&update_parameter()) {
-	    ($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container);
+	    ($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container,1);
 	    return $errtext if ($fatal);
 	}
 
@@ -1820,17 +2791,36 @@ sub editor {
 
 	if ($env{'form.pastemarked'}) {
             my %paste_errors;
-            my ($paste_res,$save_error) =
+            my ($paste_res,$save_error,$pastemsgarray,$lockerror) =
                 &do_paste_from_buffer($coursenum,$coursedom,$folder,$container,
                                       \%paste_errors);
-                if ($save_error ne '') {
-                    return $save_error; 
+            if (ref($pastemsgarray) eq 'ARRAY') {
+                if (@{$pastemsgarray} > 0) {
+                    $r->print('<p class="LC_info">'.
+                              join('<br />',@{$pastemsgarray}).
+                              '</p>');
+                }
+            }
+            if ($lockerror) {
+                $r->print('<p class="LC_error">'.
+                          $lockerror.
+                          '</p>');
+            }
+            if ($save_error ne '') {
+                return $save_error; 
+            }
+            if ($paste_res) {
+                my %errortext = &Apache::lonlocal::texthash (
+                                    fail      => 'Storage of folder contents failed',
+                                    failread  => 'Reading folder contents failed',
+                                    failstore => 'Storage of folder contents failed',
+                                );
+                if ($errortext{$paste_res}) {
+                    $r->print('<p class="LC_error">'.$errortext{$paste_res}.'</p>');
                 }
-            if ($paste_res ne 'ok') {
-                $r->print('<p><span class="LC_error">'.$paste_res.'</span></p>');
             }
             if (keys(%paste_errors) > 0) {
-                $r->print('<p span class="LC_warning">'."\n".
+                $r->print('<p 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))) {
@@ -1838,28 +2828,91 @@ sub editor {
                 }
                 $r->print('</ul></p>'."\n");
             }
-	}
+	} elsif ($env{'form.clearmarked'}) {
+            my $output = &do_buffer_empty();
+            if ($output) {
+                $r->print('<p class="LC_info">'.$output.'</p>');
+            }
+        }
 
 	$r->print($upload_output);
 
+# Rename, cut, copy or remove a single resource
 	if (&handle_edit_cmd()) {
             my $contentchg;
-            if ($env{'form.cmd'} =~ /^(del|cut)_/) {
+            if ($env{'form.cmd'} =~ m{^(remove|cut)_}) {
                 $contentchg = 1;
             }
 	    ($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container,$contentchg);
 	    return $errtext if ($fatal);
 	}
+
+# Cut, copy and/or remove multiple resources
+        if ($env{'form.multichange'}) {
+            my %allchecked = (
+                               cut     => {},
+                               remove  => {},
+                             );
+            my $needsupdate;
+            foreach my $which (keys(%allchecked)) {
+                $env{'form.multi'.$which} =~ s/,$//;
+                if ($env{'form.multi'.$which}) {
+                    map { $allchecked{$which}{$_} = 1; } split(/,/,$env{'form.multi'.$which});
+                    if (ref($allchecked{$which}) eq 'HASH') {
+                        $needsupdate += scalar(keys(%{$allchecked{$which}}));
+                    }
+                }
+            }
+            if ($needsupdate) {
+                my $haschanges = 0;
+                my %curr_groups = &Apache::longroup::coursegroups();
+                my $total = scalar(@LONCAPA::map::order) - 1; 
+                for (my $i=$total; $i>=0; $i--) {
+                    my $res = $LONCAPA::map::order[$i];
+                    my ($name,$url)=split(/\:/,$LONCAPA::map::resources[$res]);
+                    $name=&LONCAPA::map::qtescape($name);
+                    $url=&LONCAPA::map::qtescape($url);
+                    next unless $url;
+                    my %denied =
+                        &action_restrictions($coursenum,$coursedom,$url,
+                                             $env{'form.folderpath'},\%curr_groups);
+                    foreach my $which (keys(%allchecked)) {
+                        next if ($denied{$which});
+                        next unless ($allchecked{$which}{$res});
+                        if ($which eq 'remove') {
+                            if (($url=~m|/+uploaded/\Q$coursedom\E/\Q$coursenum\E/|) &&
+                                ($url!~/$LONCAPA::assess_page_seq_re/)) {
+                                &Apache::lonnet::removeuploadedurl($url);
+                            } else {
+                                &LONCAPA::map::makezombie($res);
+                            }
+                            splice(@LONCAPA::map::order,$i,1);
+                            $haschanges ++;
+                        } elsif ($which eq 'cut') {
+                            &LONCAPA::map::makezombie($res);
+                            splice(@LONCAPA::map::order,$i,1);
+                            $haschanges ++;
+                        }
+                    }
+                }
+                if ($haschanges) {
+                    ($errtext,$fatal) = 
+                        &storemap($coursenum,$coursedom,$folder.'.'.$container,1);
+                    return $errtext if ($fatal);
+                }
+            }
+        }
+
 # Group import/search
 	if ($env{'form.importdetail'}) {
 	    my @imports;
 	    foreach my $item (split(/\&/,$env{'form.importdetail'})) {
 		if (defined($item)) {
 		    my ($name,$url,$residx)=
-			map {&unescape($_)} split(/\=/,$item);
-                    if ($url=~ m{^\Q/uploaded/$coursedom/$coursenum/\E(default|supplemental)_new\.(sequence|page)$}) {
-                        my ($suffix,$errortxt,$locknotfreed) = 
-                            &newmap_suffix($1,$2,$coursedom,$coursenum);
+			map { &unescape($_); } split(/\=/,$item);
+                    if ($url =~ m{^\Q/uploaded/$coursedom/$coursenum/\E(default|supplemental)_new\.(sequence|page)$}) {
+                        my ($suffix,$errortxt,$locknotfreed) =
+                            &new_timebased_suffix($coursedom,$coursenum,'map',$1,$2);
                         if ($locknotfreed) {
                             $r->print($locknotfreed);
                         }
@@ -1868,6 +2921,34 @@ sub editor {
                         } else {
                             return $errortxt;
                         }
+                    } elsif ($url =~ m{^/adm/$match_domain/$match_username/new/(smppg|bulletinboard)$}) {
+                        my $type = $1;
+                        my ($suffix,$errortxt,$locknotfreed) =
+                            &new_timebased_suffix($coursedom,$coursenum,$type);
+                        if ($locknotfreed) {
+                            $r->print($locknotfreed);
+                        }
+                        if ($suffix) {
+                            $url =~ s{^(/adm/$match_domain/$match_username)/new}{$1/$suffix};
+                        } else {
+                            return $errortxt;
+                        }
+                    } elsif ($url =~ m{^/uploaded/$coursedom/$coursenum/(docs|supplemental)/(default|\d+)/new.html$}) {
+                        if ($supplementalflag) {
+                            next unless ($1 eq 'supplemental');
+                            if ($folder eq 'supplemental') {
+                                next unless ($2 eq 'default');
+                            } else {
+                                next unless ($folder eq 'supplemental_'.$2);
+                            }
+                        } else {
+                            next unless ($1 eq 'docs');
+                            if ($folder eq 'default') {
+                                next unless ($2 eq 'default');
+                            } else {
+                                next unless ($folder eq 'default_'.$2);
+                            }
+                        }
                     }
 		    push(@imports, [$name, $url, $residx]);
 		}
@@ -1934,8 +3015,17 @@ sub editor {
         $r->print('</div>');
     }
 
-    my ($to_show,$output);
-
+    my ($to_show,$output,@allidx,@allmapidx,%filters,%lists,%curr_groups);
+    %filters =  (
+                  canremove      => [],
+                  cancut         => [],
+                  cancopy        => [],
+                  hiddenresource => [],
+                  encrypturl     => [],
+                  randomorder    => [],
+                  randompick     => [],
+                );
+    %curr_groups = &Apache::longroup::coursegroups();
     &Apache::loncommon::start_data_table_count(); #setup a row counter 
     foreach my $res (@LONCAPA::map::order) {
         my ($name,$url)=split(/\:/,$LONCAPA::map::resources[$res]);
@@ -1943,16 +3033,24 @@ sub editor {
         $url=&LONCAPA::map::qtescape($url);
         unless ($name) {  $name=(split(/\//,$url))[-1]; }
         unless ($name) { $idx++; next; }
+        push(@allidx,$res);
+        if ($url =~ m{/uploaded/.+\.(page|sequence)$}) {
+            push(@allmapidx,$res);
+        }
         $output .= &entryline($idx,$name,$url,$folder,$allowed,$res,
                               $coursenum,$coursedom,$crstype,
-                              $pathitem,$supplementalflag,$container);
+                              $pathitem,$supplementalflag,$container,
+                              \%filters,\%curr_groups);
         $idx++;
         $shown++;
     }
     &Apache::loncommon::end_data_table_count();
 
+    my $need_save;
     if (($allowed) || ($supplementalflag && $folder eq 'supplemental')) {
-        my $toolslink = '<table><tr><td>'
+        my $toolslink;
+        if ($allowed || &Apache::lonnet::allowed('mdc',$env{'request.course.id'})) {
+            $toolslink = '<table><tr><td>'
                        .&Apache::loncommon::help_open_menu('Navigation Screen',
                                                            'Navigation_Screen',undef,'RAT')
                        .'</td><td class="LC_middle">'.&mt('Tools:').'</td>'
@@ -1962,19 +3060,55 @@ sub editor {
                        .'class="LC_toolbarItem" '
                        .'title="'.&mt('Supplemental Content Editor').'">'
                        .'</a></li></ul></td></tr></table><br />';
+        }
         if ($shown) {
             if ($allowed) {
                 $to_show = &Apache::loncommon::start_scrollbox('900px','880px','400px','contentscroll')
                           .&Apache::loncommon::start_data_table(undef,'contentlist')
                           .&Apache::loncommon::start_data_table_header_row()
                           .'<th colspan="2">'.&mt('Move').'</th>'
-                          .'<th>'.&mt('Actions').'</th>'
-                          .'<th colspan="2">'.&mt('Document').'</th>';
+                          .'<th colspan="2">'.&mt('Actions').'</th>'
+                          .'<th>'.&mt('Document').'</th>';
                 if ($folder !~ /^supplemental/) {
                     $to_show .= '<th colspan="4">'.&mt('Settings').'</th>';
                 }
-                $to_show .= &Apache::loncommon::end_data_table_header_row()
-                           .$output.' '
+                $to_show .= &Apache::loncommon::end_data_table_header_row();
+                if ($folder !~ /^supplemental/) {
+                    $lists{'canhide'} = join(',',@allidx);
+                    $lists{'canrandomlyorder'} = join(',',@allmapidx);
+                    my @possfilters = ('canremove','cancut','cancopy','hiddenresource','encrypturl',
+                                       'randomorder','randompick');
+                    foreach my $item (@possfilters) {
+                        if (ref($filters{$item}) eq 'ARRAY') {
+                            if (@{$filters{$item}} > 0) {
+                                $lists{$item} = join(',',@{$filters{$item}});
+                            }
+                        }
+                    }
+                    if (@allidx > 0) {
+                        my $path;
+                        if ($env{'form.folderpath'}) {
+                            $path = 
+                                &HTML::Entities::encode($env{'form.folderpath'},'<>&"');
+                        }
+                        if (@allidx > 1) {
+                            $to_show .= 
+                                &Apache::loncommon::continue_data_table_row().
+                                '<td colspan="2">&nbsp;</td>'.
+                                '<td>'.
+                                &multiple_check_form('actions',\%lists).
+                                '</td>'.
+                                '<td>&nbsp;</td>'.
+                                '<td>&nbsp;</td>'.
+                                '<td colspan="4">'.
+                                &multiple_check_form('settings',\%lists).
+                                '</td>'.
+                                &Apache::loncommon::end_data_table_row();
+                             $need_save = 1;
+                        }
+                    }
+                }
+                $to_show .= $output.' '
                            .&Apache::loncommon::end_data_table()
                            .'<br style="line-height:2px;" />'
                            .&Apache::loncommon::end_scrollbox();
@@ -1990,7 +3124,7 @@ sub editor {
             }
             $to_show .= &Apache::loncommon::start_scrollbox('400px','380px','200px','contentscroll')
                        .'<div class="LC_info" id="contentlist">'
-                       .&mt('Currently no documents.')
+                       .&mt('Currently empty')
                        .'</div>'
                        .&Apache::loncommon::end_scrollbox();
         }
@@ -2003,7 +3137,7 @@ sub editor {
                       .'</div>';
         } else {
             $to_show = '<div class="LC_info" id="contentlist">'
-                      .&mt('Currently no documents.')
+                      .&mt('Currently empty')
                       .'</div>'
         }
     }
@@ -2013,8 +3147,8 @@ sub editor {
     }
     if ($allowed) {
         my $readfile="/uploaded/$coursedom/$coursenum/$folder.$container";
-        $r->print(&generate_edit_table($tid,$orderhash,$to_show,$iconpath,$jumpto,
-                                       $readfile));
+        $r->print(&generate_edit_table($tid,$orderhash,$to_show,$iconpath,
+                                       $jumpto,$readfile,$need_save,"$folder.$container"));
         &print_paste_buffer($r,$container,$folder,$coursedom,$coursenum);
     } else {
         $r->print($to_show);
@@ -2022,9 +3156,99 @@ sub editor {
     return;
 }
 
+sub multiple_check_form {
+    my ($caller,$listsref) = @_;
+    return unless (ref($listsref) eq 'HASH');
+    my $output =
+    '<form action="/adm/coursedocs" method="post" name="togglemult'.$caller.'">'.
+    '<span class="LC_nobreak" style="font-size:x-small;font-weight:bold;">'.
+    '<label><input type="radio" name="showmultpick" value="0" onclick="javascript:togglePick('."'$caller','0'".');" checked="checked" />'.&mt('one').'</label>'.('&nbsp;'x2).'<label><input type="radio" name="showmultpick" value="1" onclick="javascript:togglePick('."'$caller','1'".');" />'.&mt('multiple').'</label></span><span id="more'.$caller.'" class="LC_nobreak LC_docs_ext_edit"></span></form>'.
+    '<div id="multi'.$caller.'" style="display:none;margin:0;padding:0;border:0">'.
+    '<form action="/adm/coursedocs" method="post" name="cumulative'.$caller.'">'."\n".
+    '<fieldset id="allfields'.$caller.'" style="display:none"><legend style="font-size:x-small;">'.&mt('check/uncheck all').'</legend>'."\n";
+    if ($caller eq 'settings') {
+        $output .= 
+            '<table><tr>'.
+            '<td class="LC_docs_entry_parameter">'.
+            '<span class="LC_nobreak"><label>'.
+            '<input type="checkbox" name="hiddenresourceall" id="hiddenresourceall" onclick="propagateState(this.form,'."'hiddenresource'".')" />'.&mt('Hidden').
+            '</label></span></td>'.
+            '<td class="LC_docs_entry_parameter">'.
+            '<span class="LC_nobreak"><label><input type="checkbox" name="randompickall" id="randompickall" onclick="updatePick(this.form,'."'all','check'".');propagateState(this.form,'."'randompick'".');propagateState(this.form,'."'rpicknum'".');" />'.&mt('Randomly Pick').'</label><span id="rpicktextall"></span><input type="hidden" name="rpicknumall" id="rpicknumall" value="" />'.
+            '</span></td>'.
+            '</tr>'."\n".
+            '<tr>'.
+            '<td class="LC_docs_entry_parameter">'.
+            '<span class="LC_nobreak"><label><input type="checkbox" name="encrypturlall" id="encrypturlall" onclick="propagateState(this.form,'."'encrypturl'".')" />'.&mt('URL hidden').'</label></span></td><td class="LC_docs_entry_parameter"><span class="LC_nobreak"><label><input type="checkbox" name="randomorderall" id="randomorderall" onclick="propagateState(this.form,'."'randomorder'".')" />'.&mt('Random Order').
+            '</label></span>'.
+            '</td></tr></table>'."\n";
+    } else {
+        $output .=
+            '<table><tr>'.
+            '<td class="LC_docs_entry_parameter">'.
+            '<span class="LC_nobreak LC_docs_remove">'.
+            '<label><input type="checkbox" name="removeall" id="removeall" onclick="propagateState(this.form,'."'remove'".')" />'.&mt('Remove').
+            '</label></span></td>'.
+            '<td class="LC_docs_entry_parameter">'.
+            '<span class="LC_nobreak LC_docs_cut">'.
+            '<label><input type="checkbox" name="cut" id="cutall" onclick="propagateState(this.form,'."'cut'".');" />'.&mt('Cut').
+            '</label></span></td>'."\n".
+            '<td class="LC_docs_entry_parameter">'.
+            '<span class="LC_nobreak LC_docs_copy">'.
+            '<label><input type="checkbox" name="copyall" id="copyall" onclick="propagateState(this.form,'."'copy'".')" />'.&mt('Copy').
+            '</label></span></td>'.
+            '</tr></table>'."\n";
+    }
+    $output .= 
+        '</fieldset>'.
+        '<input type="hidden" name="allidx" value="'.$listsref->{'canhide'}.'" />';
+    if ($caller eq 'settings') {
+        $output .= 
+        '<input type="hidden" name="allmapidx" value="'.$listsref->{'canrandomlyorder'}.'" />'."\n".
+        '<input type="hidden" name="currhiddenresource" value="'.$listsref->{'hiddenresource'}.'" />'."\n".
+        '<input type="hidden" name="currencrypturl" value="'.$listsref->{'encrypturl'}.'" />'."\n".
+        '<input type="hidden" name="currrandomorder" value="'.$listsref->{'randomorder'}.'" />'."\n".
+        '<input type="hidden" name="currrandompick" value="'.$listsref->{'randompick'}.'" />'."\n";
+    } elsif ($caller eq 'actions') {
+        $output .=
+        '<input type="hidden" name="allremoveidx" id="allremoveidx" value="'.$listsref->{'canremove'}.'" />'.
+        '<input type="hidden" name="allcutidx" id="allcutidx" value="'.$listsref->{'cancut'}.'" />'.
+        '<input type="hidden" name="allcopyidx" id="allcopyidx" value="'.$listsref->{'cancopy'}.'" />';
+    }
+    $output .= 
+        '</form>'.
+        '</div>';
+    return $output;
+}
+
 sub process_file_upload {
-    my ($upload_output,$coursenum,$coursedom,$allfiles,$codebase,$uploadcmd) = @_;
+    my ($upload_output,$coursenum,$coursedom,$allfiles,$codebase,$uploadcmd,$crstype) = @_;
 # upload a file, if present
+    my $filesize = length($env{'form.uploaddoc'});
+    if (!$filesize) {
+        $$upload_output = '<div class="LC_error">'.
+                           &mt('Unable to upload [_1]. (size = [_2] bytes)',
+                          '<span class="LC_filename">'.$env{'form.uploaddoc.filename'}.'</span>',
+                          $filesize).'<br />'.
+                          &mt('Either the file you attempted to upload was empty, or your web browser was unable to read its contents.').'<br />'.
+                          '</div>';
+        return;
+    }
+    my $quotatype = 'unofficial';
+    if ($crstype eq 'Community') {
+        $quotatype = 'community';    
+    } elsif ($env{'course.'.$coursedom.'_'.$coursenum.'.internal.coursecode'}) {
+        $quotatype = 'official';
+    } elsif ($env{'course.'.$coursedom.'_'.$coursenum.'.internal.textbook'}) {
+        $quotatype = 'textbook';
+    }
+    if (&Apache::loncommon::get_user_quota($coursenum,$coursedom,'course',$quotatype)) {
+        $filesize = int($filesize/1000); #expressed in kb
+        $$upload_output = &Apache::loncommon::excess_filesize_warning($coursenum,$coursedom,'course',
+                                                                      $env{'form.uploaddoc.filename'},$filesize,
+                                                                      'upload',$quotatype);
+        return if ($$upload_output);
+    }
     my ($parseaction,$showupload,$nextphase,$mimetype);
     if ($env{'form.parserflag'}) {
         $parseaction = 'parse';
@@ -2041,15 +3265,11 @@ sub process_file_upload {
             $container='page';
         }
         ($errtext,$fatal)=
-              &mapread($coursenum,$coursedom,$folder.'.'.$container);
+            &mapread($coursenum,$coursedom,$folder.'.'.$container);
         if ($#LONCAPA::map::order<1) {
             $LONCAPA::map::order[0]=1;
             $LONCAPA::map::resources[1]='';
         }
-        if ($fatal) {
-            $$upload_output = '<div class="LC_error" id="uploadfileresult">'.&mt('The uploaded file has not been stored as an error occurred reading the contents of the current folder.').'</div>';
-            return;
-        }
         my $destination = 'docs/';
         if ($folder =~ /^supplemental/) {
             $destination = 'supplemental/';
@@ -2059,6 +3279,10 @@ sub process_file_upload {
         } elsif ($folder =~ /^(default|supplemental)_(\d+)$/) {
             $destination .=  $2.'/';
         }
+        if ($fatal) {
+            $$upload_output = '<div class="LC_error" id="uploadfileresult">'.&mt('The uploaded file has not been stored as an error occurred reading the contents of the current folder.').'</div>';
+            return;
+        }
 # this is for a course, not a user, so set context to coursedoc.
         my $newidx=&LONCAPA::map::getresidx();
         $destination .= $newidx;
@@ -2120,7 +3344,8 @@ sub process_file_upload {
                     $$upload_output .= &mt('No embedded items identified').'<br />';
                 }
                 $$upload_output = '<div id="uploadfileresult">'.$$upload_output.'</div>';
-            } elsif (&Apache::loncommon::is_archive_file($mimetype)) {
+            } elsif ((&Apache::loncommon::is_archive_file($mimetype)) &&
+                     ($env{'form.uploaddoc.filename'} =~ /\.(zip|tar|bz2|gz|tar.gz|tar.bz2|tgz)$/i)) {
                 $nextphase = 'decompress_uploaded';
                 my $position = scalar(@LONCAPA::map::order)-1;
                 my $noextract = &return_to_editor();
@@ -2181,8 +3406,8 @@ sub is_supplemental_title {
 
 sub entryline {
     my ($index,$title,$url,$folder,$allowed,$residx,$coursenum,$coursedom,
-        $crstype,$pathitem,$supplementalflag,$container)=@_;
-    my ($foldertitle,$renametitle);
+        $crstype,$pathitem,$supplementalflag,$container,$filtersref,$currgroups)=@_;
+    my ($foldertitle,$renametitle,$oldtitle);
     if (&is_supplemental_title($title)) {
 	($title,$foldertitle,$renametitle) = &Apache::loncommon::parse_supplemental_title($title);
     } else {
@@ -2195,16 +3420,14 @@ sub entryline {
 
     $renametitle=~s/\\/\\\\/g;
     $renametitle=~s/\&quot\;/\\\"/g;
+    $renametitle=~s/"/%22/g;
     $renametitle=~s/ /%20/g;
+    $oldtitle = $renametitle;
+    $renametitle=~s/\&#39;/\\\'/g;
     my $line=&Apache::loncommon::start_data_table_row();
-    my ($form_start,$form_end,$form_common);
+    my ($form_start,$form_end,$form_common,$form_param);
 # Edit commands
-    my ($type, $esc_path, $path, $symb);
-    if ($container eq 'page') {
-        $type = 'page';
-    } else {
-        $type = 'folder';
-    }
+    my ($esc_path, $path, $symb);
     if ($env{'form.folderpath'}) {
 	$esc_path=&escape($env{'form.folderpath'});
 	$path = &HTML::Entities::encode($env{'form.folderpath'},'<>&"');
@@ -2226,8 +3449,25 @@ sub entryline {
                                                  &Apache::lonnet::declutter($currurl));
         }
     }
-    my ($renamelink,%lt);
+    my ($renamelink,%lt,$ishash);
+    if (ref($filtersref) eq 'HASH') {
+        $ishash = 1;
+    }
+
     if ($allowed) {
+        $form_start = '
+   <form action="/adm/coursedocs" method="post">
+';
+        $form_common=(<<END);
+   <input type="hidden" name="folderpath" value="$path" />
+   <input type="hidden" name="symb" value="$symb" />
+END
+        $form_param=(<<END);
+   <input type="hidden" name="setparms" value="$orderidx" />
+   <input type="hidden" name="changeparms" value="0" />
+END
+        $form_end = '</form>';
+
 	my $incindex=$index+1;
 	my $selectbox='';
 	if (($#LONCAPA::map::order>0) &&
@@ -2263,66 +3503,9 @@ sub entryline {
                 'ul' => 'URL',
                 'ti' => 'Title', 
                 );
-	my $nocopy=0;
-        my $nocut=0;
-        my $noremove=0;
-        if ($url=~ m{^/res/.+\.(page|sequence)$}) {
-	    # no copy for published maps
-	    $nocopy=1;
-	}
-        if ($url=~/^\/res\/lib\/templates\//) {
-           $nocopy=1;
-           $nocut=1;
-        }
-        my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
-        my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
-        if ($url eq "/uploaded/$cdom/$cnum/group_allfolders.sequence") {
-            if ($env{'form.folderpath'} =~ /^default&[^\&]+$/) {
-                my %curr_groups = &Apache::longroup::coursegroups();
-                if (keys(%curr_groups) > 0) {
-                    $noremove=1;
-                }
-                $nocut=1;
-                $nocopy=1;
-            }
-        } elsif ($url =~ m{^\Q/uploaded/$cdom/$cnum/group_folder_\E(\w+)\.sequence$}) {
-            my $group = $1;
-            if ($env{'form.folderpath'} =~ /^default&[^\&]+\&group_allfolders\&[^\&]+$/) {
-                my %curr_group = &Apache::longroup::coursegroups($cdom,$cnum,$group);
-                if (keys(%curr_group) > 0) {
-                    $noremove=1;
-                }
-            }
-            $nocut=1;
-            $nocopy=1;
-        } elsif ($url =~ m{^\Q/adm/$cdom/$cnum/\E(\w+)/smppg$}) {
-            my $group = $1;
-            if ($env{'form.folderpath'} =~ /^default&[^\&]+\&group_allfolders\&[^\&]+\&\Qgroup_folder_$group\E\&[^\&]+$/) {
-                my %curr_group = &Apache::longroup::coursegroups($cdom,$cnum,$group);
-                my %groupsettings = &Apache::longroup::get_group_settings($curr_group{$group});
-                if (keys(%groupsettings) > 0) {
-                    $noremove=1;
-                }
-                $nocut=1;
-                $nocopy=1;
-            }
-        } elsif ($env{'form.folderpath'} =~ /^default&[^\&]+\&group_allfolders\&[^\&]+\&group_folder_(\w+)\&/) {
-            my $group = $1;
-            my %curr_group = &Apache::longroup::coursegroups($cdom,$cnum,$group);
-            if ($url =~ /group_boards_\Q$group\E/) {
-                my %curr_group = &Apache::longroup::coursegroups($cdom,$cnum,$group);
-                my %groupsettings = &Apache::longroup::get_group_settings($curr_group{$group});
-                if (keys(%groupsettings) > 0) {
-                    if (ref($groupsettings{'functions'}) eq 'HASH') {
-                        if ($groupsettings{'functions'}{'discussion'} eq 'on') {
-                            $noremove=1;
-                        }
-                    }
-                }
-                $nocut=1;
-                $nocopy=1;
-            }
-        }
+	my %denied = &action_restrictions($coursenum,$coursedom,$url,
+                                          $env{'form.folderpath'},
+                                          $currgroups);
         my ($copylink,$cutlink,$removelink);
 	my $skip_confirm = 0;
 	if ( $folder =~ /^supplemental/
@@ -2336,75 +3519,88 @@ sub entryline {
 	    $skip_confirm = 1;
 	}
 
-	if ($nocopy) {
-            $copylink=(<<ENDCOPY);
+	if ($denied{'copy'}) {
+            $copylink=(<<ENDCOPY)
 <span style="visibility: hidden;">$lt{'cp'}</span>
 ENDCOPY
         } else {
+            my $formname = 'edit_copy_'.$orderidx;
+            my $js = "javascript:checkForSubmit(document.forms.renameform,'copy','actions','$orderidx','$esc_path','$index','$renametitle',$skip_confirm,'$container','$folder');";
 	    $copylink=(<<ENDCOPY);
-<a href="javascript:markcopy('$esc_path','$index','$renametitle','$container','$folder');" class="LC_docs_copy">$lt{'cp'}</a>
+<form name="$formname" method="post" action="/adm/coursedocs">
+$form_common
+<input type="checkbox" name="copy" id="copy_$orderidx" value="$orderidx" onclick="javascript:singleCheck(this,'$orderidx','copy');" class="LC_hidden" /><a href="$js" class="LC_docs_copy">$lt{'cp'}</a>
+$form_end
 ENDCOPY
+            if (($ishash) && (ref($filtersref->{'cancopy'}) eq 'ARRAY')) {
+                push(@{$filtersref->{'cancopy'}},$orderidx);
+            }
         }
-	if ($nocut) {
+	if ($denied{'cut'}) {
             $cutlink=(<<ENDCUT);
 <span style="visibility: hidden;">$lt{'ct'}</span>
 ENDCUT
         } else {
+            my $formname = 'edit_cut_'.$orderidx;
+            my $js = "javascript:checkForSubmit(document.forms.renameform,'cut','actions','$orderidx','$esc_path','$index','$renametitle',$skip_confirm,'$container','$folder');";
 	    $cutlink=(<<ENDCUT);
-<a href="javascript:cutres('$esc_path','$index','$renametitle','$container','$folder',$skip_confirm);" class="LC_docs_cut">$lt{'ct'}</a>
+<form name="$formname" method="post" action="/adm/coursedocs">
+$form_common
+<input type="hidden" name="skip_$orderidx" id="skip_cut_$orderidx" value="$skip_confirm" />
+<input type="checkbox" name="cut" id="cut_$orderidx" value="$orderidx" onclick="javascript:singleCheck(this,'$orderidx','cut');" class="LC_hidden" /><a href="$js" class="LC_docs_cut">$lt{'ct'}</a>
+$form_end
 ENDCUT
+            if (($ishash) && (ref($filtersref->{'cancut'}) eq 'ARRAY')) {
+                push(@{$filtersref->{'cancut'}},$orderidx);
+            }
         }
-        if ($noremove) {
+        if ($denied{'remove'}) {
             $removelink=(<<ENDREM);
 <span style="visibility: hidden;">$lt{'rm'}</a>
 ENDREM
         } else {
+            my $formname = 'edit_remove_'.$orderidx;
+            my $js = "javascript:checkForSubmit(document.forms.renameform,'remove','actions','$orderidx','$esc_path','$index','$renametitle',$skip_confirm);";
             $removelink=(<<ENDREM);
-<a href='javascript:removeres("$esc_path","$index","$renametitle",$skip_confirm);' class="LC_docs_remove">$lt{'rm'}</a>
+<form name="$formname" method="post" action="/adm/coursedocs">
+$form_common
+<input type="hidden" name="skip_$orderidx" id="skip_remove_$orderidx" value="$skip_confirm" />
+<input type="checkbox" name="remove" id="remove_$orderidx" value="$orderidx" onclick="javascript:singleCheck(this,'$orderidx','remove');" class="LC_hidden" /><a href="$js" class="LC_docs_remove">$lt{'rm'}</a>
+$form_end
 ENDREM
+            if (($ishash) && (ref($filtersref->{'canremove'}) eq 'ARRAY')) {
+                push(@{$filtersref->{'canremove'}},$orderidx);
+            }
         }
-        unless ($isexternal) {
-            $renamelink=(<<ENDREN);
-<a href='javascript:changename("$esc_path","$index","$renametitle");' class="LC_docs_rename">$lt{'rn'}</a>
+        $renamelink=(<<ENDREN);
+<a href='javascript:changename("$esc_path","$index","$oldtitle");' class="LC_docs_rename">$lt{'rn'}</a>
 ENDREN
-        }
-	$form_start = '
-   <form action="/adm/coursedocs" method="post">
-';
-        $form_common=(<<END);
-   <input type="hidden" name="${type}path" value="$path" />
-   <input type="hidden" name="${type}symb" value="$symb" />
-   <input type="hidden" name="setparms" value="$orderidx" />
-   <input type="hidden" name="changeparms" value="0" />
-END
-        $form_end = '</form>';
 	$line.=(<<END);
 <td>
 <div class="LC_docs_entry_move">
-  <a href='/adm/coursedocs?cmd=up_$index&amp;${type}path=$esc_path&amp;${type}symb=$symb'>
+  <a href='/adm/coursedocs?cmd=up_$index&amp;folderpath=$esc_path&amp;symb=$symb'>
     <img src="${iconpath}move_up.gif" alt="$lt{'up'}" class="LC_icon" />
   </a>
 </div>
 <div class="LC_docs_entry_move">
-  <a href='/adm/coursedocs?cmd=down_$index&amp;${type}path=$esc_path&amp;${type}symb=$symb'>
+  <a href='/adm/coursedocs?cmd=down_$index&amp;folderpath=$esc_path&amp;symb=$symb'>
     <img src="${iconpath}move_down.gif" alt="$lt{'dw'}" class="LC_icon" />
   </a>
 </div>
 </td>
 <td>
    $form_start
+   $form_param
    $form_common
    $selectbox
    $form_end
 </td>
-<td class="LC_docs_entry_commands"><span class="LC_nobreak">
+<td class="LC_docs_entry_commands LC_nobreak">
 $removelink
 $cutlink
 $copylink
-</span>
 </td>
 END
-
     }
 # Figure out what kind of a resource this is
     my ($extension)=($url=~/\.(\w+)$/);
@@ -2489,22 +3685,35 @@ END
             my $rpckchk;
             if ($rpicknum) {
                 $rpckchk = ' checked="checked"';
+                if (($ishash) && (ref($filtersref->{'randompick'}) eq 'ARRAY')) {
+                    push(@{$filtersref->{'randompick'}},$orderidx.':'.$rpicknum);
+                }
             }
-            my $formname = 'edit_rpick_'.$orderidx;
+            my $formname = 'edit_randompick_'.$orderidx;
 	    $rand_pick_text = 
 '<form action="/adm/coursedocs" method="post" name="'.$formname.'">'."\n".
+$form_param."\n".
 $form_common."\n".
-'<span class="LC_nobreak"><label><input type="checkbox" name="randpickon_'.$orderidx.'" id="rpick_'.$orderidx.'" onclick="'."updatePick(this.form,'$orderidx','check');".'"'.$rpckchk.' /> '.&mt('Randomly Pick').'</label><input type="hidden" name="randompick_'.$orderidx.'" id="rpicknum_'.$orderidx.'" value="'.$rpicknum.'" />';
+'<span class="LC_nobreak"><label><input type="checkbox" name="randompick_'.$orderidx.'" id="randompick_'.$orderidx.'" onclick="'."updatePick(this.form,'$orderidx','check');".'"'.$rpckchk.' /> '.&mt('Randomly Pick').'</label><input type="hidden" name="rpicknum_'.$orderidx.'" id="rpicknum_'.$orderidx.'" value="'.$rpicknum.'" /><span id="randompicknum_'.$orderidx.'">';
             if ($rpicknum ne '') {
                 $rand_pick_text .= ':&nbsp;<a href="javascript:updatePick('."document.$formname,'$orderidx','link'".')">'.$rpicknum.'</a>';
             }
-            $rand_pick_text .= '</span></form>';
-    	    my $ro_set=
-	        ((&LONCAPA::map::getparameter($orderidx,'parameter_randomorder'))[0]=~/^yes$/i?' checked="checked"':'');
+            $rand_pick_text .= '</span></span>'.
+                               $form_end;
+            my $ro_set;
+            if ((&LONCAPA::map::getparameter($orderidx,'parameter_randomorder'))[0]=~/^yes$/i) {
+                $ro_set = 'checked="checked"';
+                if (($ishash) && (ref($filtersref->{'randomorder'}) eq 'ARRAY')) {
+                    push(@{$filtersref->{'randomorder'}},$orderidx);
+                }
+            }
+            $formname = 'edit_rorder_'.$orderidx;
 	    $rand_order_text = 
-$form_start.
-$form_common.'
-<span class="LC_nobreak"><label><input type="checkbox" name="randomorder_'.$orderidx.'" onclick="'."this.form.changeparms.value='randomorder';this.form.submit()".'" '.$ro_set.' /> '.&mt('Random Order').' </label></span></form>';
+'<form action="/adm/coursedocs" method="post" name="'.$formname.'">'."\n".
+$form_param."\n".
+$form_common."\n".
+'<span class="LC_nobreak"><label><input type="checkbox" name="randomorder_'.$orderidx.'" id="randomorder_'.$orderidx.'" onclick="checkForSubmit(this.form,'."'randomorder','settings'".');" '.$ro_set.' /> '.&mt('Random Order').' </label></span>'.
+$form_end; 
         }
     } elsif ($supplementalflag && !$allowed) {
         $url .= ($url =~ /\?/) ? '&amp;':'?';
@@ -2574,20 +3783,33 @@ $form_common.'
  	my %lt=&Apache::lonlocal::texthash(
  			      'hd' => 'Hidden',
  			      'ec' => 'URL hidden');
-	my $enctext=
-	    ((&LONCAPA::map::getparameter($orderidx,'parameter_encrypturl'))[0]=~/^yes$/i?' checked="checked"':'');
-	my $hidtext=
-	    ((&LONCAPA::map::getparameter($orderidx,'parameter_hiddenresource'))[0]=~/^yes$/i?' checked="checked"':'');
+        my ($enctext,$hidtext);
+        if ((&LONCAPA::map::getparameter($orderidx,'parameter_encrypturl'))[0]=~/^yes$/i) {
+            $enctext = ' checked="checked"';
+            if (($ishash) && (ref($filtersref->{'encrypturl'}) eq 'ARRAY')) {
+                push(@{$filtersref->{'encrypturl'}},$orderidx);
+            }
+        }
+        if ((&LONCAPA::map::getparameter($orderidx,'parameter_hiddenresource'))[0]=~/^yes$/i) {
+            $hidtext = ' checked="checked"';
+            if (($ishash) && (ref($filtersref->{'randomorder'}) eq 'ARRAY')) {
+                push(@{$filtersref->{'hiddenresource'}},$orderidx);
+            }
+        }
+        my $formhidden = 'edit_hiddenresource_'.$orderidx;
+        my $formurlhidden = 'edit_encrypturl_'.$orderidx;
 	$line.=(<<ENDPARMS);
   <td class="LC_docs_entry_parameter">
-    $form_start
+    <form action="/adm/coursedocs" method="post" name="$formhidden">
+    $form_param
     $form_common
-    <label><input type="checkbox" name="hiddenresource_$orderidx" onclick="this.form.changeparms.value='hiddenresource';this.form.submit()" $hidtext /> $lt{'hd'}</label>
+    <label><input type="checkbox" name="hiddenresource_$orderidx" id="hiddenresource_$orderidx" onclick="checkForSubmit(this.form,'hiddenresource','settings');" $hidtext /> $lt{'hd'}</label>
     $form_end
     <br />
-    $form_start
+    <form action="/adm/coursedocs" method="post" name="$formurlhidden">
+    $form_param
     $form_common
-    <label><input type="checkbox" name="encrypturl_$orderidx" onclick="this.form.changeparms.value='encrypturl';this.form.submit()" $enctext /> $lt{'ec'}</label>
+    <label><input type="checkbox" name="encrypturl_$orderidx" id="encrypturl_$orderidx" onclick="checkForSubmit(this.form,'encrypturl','settings');" $enctext /> $lt{'ec'}</label>
     $form_end
   </td>
   <td class="LC_docs_entry_parameter">$rand_pick_text<br />
@@ -2598,26 +3820,133 @@ ENDPARMS
     return $line;
 }
 
-sub newmap_suffix {
-    my ($area,$container,$coursedom,$coursenum) = @_;
-    my ($prefix,$idtype,$errtext,$locknotfreed);
-    $prefix = 'docs';
-    if ($area eq 'supplemental') {
-        $prefix = 'supp';
+sub action_restrictions {
+    my ($cnum,$cdom,$url,$folderpath,$currgroups) = @_;
+    my %denied = (
+                   cut    => 0,
+                   copy   => 0,
+                   remove => 0,
+                 );
+    if ($url=~ m{^/res/.+\.(page|sequence)$}) {
+        # no copy for published maps
+        $denied{'copy'} = 1;
+    } elsif ($url=~m{^/res/lib/templates/}) {
+       $denied{'copy'} = 1;
+       $denied{'cut'} = 1;
+    } elsif ($url eq "/uploaded/$cdom/$cnum/group_allfolders.sequence") {
+        if ($folderpath =~ /^default&[^\&]+$/) {
+            if ((ref($currgroups) eq 'HASH') && (keys(%{$currgroups}) > 0)) {
+                $denied{'remove'} = 1;
+            }
+            $denied{'cut'} = 1;
+            $denied{'copy'} = 1;
+        }
+    } elsif ($url =~ m{^\Q/uploaded/$cdom/$cnum/group_folder_\E(\w+)\.sequence$}) {
+        my $group = $1;
+        if ($folderpath =~ /^default&[^\&]+\&group_allfolders\&[^\&]+$/) {
+            if ((ref($currgroups) eq 'HASH') && (exists($currgroups->{$group}))) {
+                $denied{'remove'} = 1;
+            }
+        }
+        $denied{'cut'} = 1;
+        $denied{'copy'} = 1;
+    } elsif ($url =~ m{^\Q/adm/$cdom/$cnum/\E(\w+)/smppg$}) {
+        my $group = $1;
+        if ($folderpath =~ /^default&[^\&]+\&group_allfolders\&[^\&]+\&\Qgroup_folder_$group\E\&[^\&]+$/) {
+            if ((ref($currgroups) eq 'HASH') && (exists($currgroups->{$group}))) {
+                my %groupsettings = &Apache::longroup::get_group_settings($currgroups->{$group});
+                if (keys(%groupsettings) > 0) {
+                    $denied{'remove'} = 1;
+                }
+                $denied{'cut'} = 1;
+                $denied{'copy'} = 1;
+            }
+        }
+    } elsif ($folderpath =~ /^default&[^\&]+\&group_allfolders\&[^\&]+\&group_folder_(\w+)\&/) {
+        my $group = $1;
+        if ($url =~ /group_boards_\Q$group\E/) {
+            if ((ref($currgroups) eq 'HASH') && (exists($currgroups->{$group}))) {
+                my %groupsettings = &Apache::longroup::get_group_settings($currgroups->{$group});
+                if (keys(%groupsettings) > 0) {
+                    if (ref($groupsettings{'functions'}) eq 'HASH') {
+                        if ($groupsettings{'functions'}{'discussion'} eq 'on') {
+                            $denied{'remove'} = 1;
+                        }
+                    }
+                }
+                $denied{'cut'} = 1;
+                $denied{'copy'} = 1;
+            }
+        }
+    }
+    return %denied;
+}
+
+sub new_timebased_suffix {
+    my ($dom,$num,$type,$area,$container) = @_;
+    my ($prefix,$namespace,$idtype,$errtext,$locknotfreed);
+    if ($type eq 'paste') {
+        $prefix = $type;
+        $namespace = 'courseeditor';
+        $idtype = 'addcode';
+    } elsif ($type eq 'map') {
+        $prefix = 'docs';
+        if ($area eq 'supplemental') {
+            $prefix = 'supp';
+        }
+        $prefix .= $container;
+        $namespace = 'uploadedmaps';
+    } else {
+        $prefix = $type;
+        $namespace = 'templated';
     }
-    $prefix .= $container;
-    $idtype = 'concat';
     my ($suffix,$freedlock,$error) =
-        &Apache::lonnet::get_timebased_id($prefix,'num','uploadedmaps',
-                                          $coursedom,$coursenum);
+        &Apache::lonnet::get_timebased_id($prefix,'num',$namespace,$dom,$num,$idtype);
     if (!$suffix) {
-        $errtext = &mt('Failed to acquire a unique timestamp-based suffix for the new folder/page.');
+        if ($type eq 'paste') {
+            $errtext = &mt('Failed to acquire a unique timestamp-based suffix when adding to the paste buffer.');
+        } elsif ($type eq 'map') {
+            $errtext = &mt('Failed to acquire a unique timestamp-based suffix for the new folder/page.');
+        } elsif ($type eq 'smppg') {
+            $errtext = &mt('Failed to acquire a unique timestamp-based suffix for the new simple page.');
+        } else {
+            $errtext = &mt('Failed to acquire a unique timestamp-based suffix for the new discussion board.');
+        }
         if ($error) {
             $errtext .= '<br />'.$error;
         }
     }
     if ($freedlock ne 'ok') {
-        $locknotfreed = '<div class="LC_error">'.&mt('There was a problem removing a lockfile. This will prevent creation of additional folders or composite pages in this course.  Please contact the domain coordinator for your LON-CAPA domain.').'</div>';
+        $locknotfreed = 
+            '<div class="LC_error">'.
+            &mt('There was a problem removing a lockfile.').' ';
+        if ($type eq 'paste') {
+            if ($freedlock eq 'nolock') {
+                $locknotfreed =
+                    '<div class="LC_error">'.
+                    &mt('A lockfile was not released when you added content to the clipboard earlier in this session.').' '.
+ 
+                    &mt('As a result addition of items to the clipboard will be unavailable until your next log-in.');
+            } else { 
+                $locknotfreed .=
+                    &mt('This will prevent addition of items to the clipboard until your next log-in.');
+            }
+        } elsif ($type eq 'map') {
+            $locknotfreed .=
+                &mt('This will prevent creation of additional folders or composite pages in this course.');
+        } elsif ($type eq 'smppg') {
+            $locknotfreed .=
+                &mt('This will prevent creation of additional simple pages in this course.');
+        } else {
+            $locknotfreed .=
+                &mt('This will prevent creation of additional discussion boards in this course.');
+        }
+        unless ($type eq 'paste') {
+            $locknotfreed .=
+                ' '.&mt('Please contact the [_1]helpdesk[_2] for assistance.',
+                        '<a href="/adm/helpdesk" target="_helpdesk">','</a>');
+        }
+        $locknotfreed .= '</div>';
     }
     return ($suffix,$errtext,$locknotfreed);
 }
@@ -2780,8 +4109,8 @@ 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'));
+    $r->print(&Apache::loncommon::start_page('Verify '.$crstype.' Content'));
+    $r->print(&Apache::lonhtmlcommon::breadcrumbs('Verify '.$crstype.' Content'));
     $r->print(&startContentScreen('tools'));
     $r->print('<h4 class="LC_info">'.&mt($crstype.' content verification').'</h4>'); 
    $hashtied=0;
@@ -2817,8 +4146,8 @@ sub devalidateversioncache {
 sub checkversions {
     my ($r) = @_;
     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"));
+    $r->print(&Apache::loncommon::start_page("Check $crstype Resource Versions"));
+    $r->print(&Apache::lonhtmlcommon::breadcrumbs("Check $crstype Resource Versions"));
     $r->print(&startContentScreen('tools'));
 
     my $header='';
@@ -2883,7 +4212,7 @@ sub checkversions {
     &changewarning($r,'');
     if ($env{'form.timerange'} eq 'all') {
 # show all documents
-	$header=&mt('All Documents in '.$crstype);
+	$header=&mt('All content in '.$crstype);
 	$allsel=' selected="selected"';
 	foreach my $key (keys(%hash)) {
 	    if ($key=~/^ids\_(\/res\/.+)$/) {
@@ -2974,10 +4303,30 @@ $lt{'sc'}: <input type="submit" name="se
 <br clear="all" />
 <hr />
 <h4>$lt{'vers'}</h4>
-<input type="submit" name="setversions" value="$lt{'save'}" />
 ENDHEADERS
     #number of columns for version history
+    my %changedbytime;
+    foreach my $key (keys(%changes)) {
+        #excludes not versionable problems from resource version history:
+        next if ($key =~ /^\/res\/lib\/templates/);
+        my $chg;
+        if ($env{'form.timerange'} eq 'all') {
+            my ($root,$extension)=($key=~/^(.*)\.(\w+)$/);
+            $chg = &Apache::lonnet::metadata($root.'.'.$extension,'lastrevisiondate');
+        } else {
+            $chg = $changes{$key};
+            next if ($chg < $starttime);
+        }
+        push(@{$changedbytime{$chg}},$key);
+    }
+    if (keys(%changedbytime) == 0) {
+        &untiehash();
+        $r->print(&mt('No content changes in imported content in specified time frame').
+                  &endContentScreen());
+        return;
+    }
     $r->print(
+       '<input type="submit" name="setversions" value="'.$lt{'save'}.'" />'.
         &Apache::loncommon::start_data_table().
         &Apache::loncommon::start_data_table_header_row().
         '<th>'.&mt('Resources').'</th>'.
@@ -2987,26 +4336,25 @@ ENDHEADERS
         '<th>'.&mt('History').'</th>'.
         &Apache::loncommon::end_data_table_header_row()
     );
-    foreach my $key (sort(keys(%changes))) {
-        #excludes not versionable problems from resource version history:
-        next unless ($changes{$key}>$starttime && $key !~ /^\/res\/lib\/templates/);
-        my ($root,$extension)=($key=~/^(.*)\.(\w+)$/);
-        my $currentversion=&Apache::lonnet::getversion($key);
-        if ($currentversion<0) {
-            $currentversion='<span class="LC_error">'.&mt('Could not be determined.').'</span>';
-        }
-        my $linkurl=&Apache::lonnet::clutter($key);
-        $r->print(
-            &Apache::loncommon::start_data_table_row().
-            '<td><b>'.&Apache::lonnet::gettitle($linkurl).'</b><br />'.
-            '<a href="'.$linkurl.'" target="cat">'.$linkurl.'</a></td>'.
-            '<td align="right">'.$currentversion.'<span class="LC_fontsize_medium"><br />('.
-            &Apache::lonlocal::locallocaltime(&Apache::lonnet::metadata($root.'.'.$extension,'lastrevisiondate')).')</span></td>'.
-            '<td align="right">'
-        );
-        # Used in course
-        my $usedversion=$hash{'version_'.$linkurl};
-        if (($usedversion) && ($usedversion ne 'mostrecent')) {
+    foreach my $chg (sort {$b <=> $a } keys(%changedbytime)) {
+        foreach my $key (sort(@{$changedbytime{$chg}})) {
+            my ($root,$extension)=($key=~/^(.*)\.(\w+)$/);
+            my $currentversion=&Apache::lonnet::getversion($key);
+            if ($currentversion<0) {
+                $currentversion='<span class="LC_error">'.&mt('Could not be determined.').'</span>';
+            }
+            my $linkurl=&Apache::lonnet::clutter($key);
+            $r->print(
+                &Apache::loncommon::start_data_table_row().
+                '<td><b>'.&Apache::lonnet::gettitle($linkurl).'</b><br />'.
+                '<a href="'.$linkurl.'" target="cat">'.$linkurl.'</a></td>'.
+                '<td align="right">'.$currentversion.'<span class="LC_fontsize_medium"><br />('.
+                &Apache::lonlocal::locallocaltime($chg).')</span></td>'.
+                '<td align="right">'
+            );
+            # Used in course
+            my $usedversion=$hash{'version_'.$linkurl};
+            if (($usedversion) && ($usedversion ne 'mostrecent')) {
                 if ($usedversion != $currentversion) {
                     $r->print('<span class="LC_warning">'.$usedversion.'</span>');
                 } else {
@@ -3015,44 +4363,45 @@ ENDHEADERS
             } else {
                 $r->print($currentversion);
             }
-        $r->print('</td><td title="'.$lt{'vu'}.'">');
-        # Set version
-        $r->print(&Apache::loncommon::select_form(
-            $setversions{$linkurl},
-            'set_version_'.$linkurl,
-            {'select_form_order' => ['',1..$currentversion,'mostrecent'],
-             '' => '',
-             'mostrecent' => &mt('most recent'),
-             map {$_,$_} (1..$currentversion)}));
-        my $lastold=1;
-        for (my $prevvers=1;$prevvers<$currentversion;$prevvers++) {
-            my $url=$root.'.'.$prevvers.'.'.$extension;
-            if (&Apache::lonnet::metadata($url,'lastrevisiondate')<$starttime) {
-                $lastold=$prevvers;
-            }
-        }
-        $r->print('</td>');
-        # List all available versions
-        $r->print('<td valign="top"><span class="LC_fontsize_medium">');
-        for (my $prevvers=$lastold;$prevvers<$currentversion;$prevvers++) {
-            my $url=$root.'.'.$prevvers.'.'.$extension;
-            $r->print(
-                '<span class="LC_nobreak">'
-               .'<a href="'.&Apache::lonnet::clutter($url).'">'
-               .&mt('Version [_1]',$prevvers).'</a>'
-               .' ('.&Apache::lonlocal::locallocaltime(
-                         &Apache::lonnet::metadata($url,'lastrevisiondate'))
-               .')');
-            if (&Apache::loncommon::fileembstyle($extension) eq 'ssi') {
+            $r->print('</td><td title="'.$lt{'vu'}.'">');
+            # Set version
+            $r->print(&Apache::loncommon::select_form(
+                      $setversions{$linkurl},
+                      'set_version_'.$linkurl,
+                      {'select_form_order' => ['',1..$currentversion,'mostrecent'],
+                      '' => '',
+                      'mostrecent' => &mt('most recent'),
+                      map {$_,$_} (1..$currentversion)}));
+            my $lastold=1;
+            for (my $prevvers=1;$prevvers<$currentversion;$prevvers++) {
+                my $url=$root.'.'.$prevvers.'.'.$extension;
+                if (&Apache::lonnet::metadata($url,'lastrevisiondate')<$starttime) {
+                    $lastold=$prevvers;
+                }
+            }
+            $r->print('</td>');
+            # List all available versions
+            $r->print('<td valign="top"><span class="LC_fontsize_medium">');
+            for (my $prevvers=$lastold;$prevvers<$currentversion;$prevvers++) {
+                my $url=$root.'.'.$prevvers.'.'.$extension;
                 $r->print(
-                    ' <a href="/adm/diff?filename='.
-                    &Apache::lonnet::clutter($root.'.'.$extension).
-                    &HTML::Entities::encode('&versionone='.$prevvers,'"<>&').
-                    '" target="diffs">'.&mt('Diffs').'</a>');
+                    '<span class="LC_nobreak">'
+                   .'<a href="'.&Apache::lonnet::clutter($url).'">'
+                   .&mt('Version [_1]',$prevvers).'</a>'
+                   .' ('.&Apache::lonlocal::locallocaltime(
+                         &Apache::lonnet::metadata($url,'lastrevisiondate'))
+                   .')');
+                if (&Apache::loncommon::fileembstyle($extension) eq 'ssi') {
+                    $r->print(
+                        ' <a href="/adm/diff?filename='.
+                        &Apache::lonnet::clutter($root.'.'.$extension).
+                        &HTML::Entities::encode('&versionone='.$prevvers,'"<>&').
+                        '" target="diffs">'.&mt('Diffs').'</a>');
+                }
+                $r->print('</span><br />');
             }
-            $r->print('</span><br />');
+            $r->print('</span></td>'.&Apache::loncommon::end_data_table_row());
         }
-        $r->print('</span></td>'.&Apache::loncommon::end_data_table_row());
     }
     $r->print(
         &Apache::loncommon::end_data_table().
@@ -3062,6 +4411,7 @@ ENDHEADERS
 
     &untiehash();
     $r->print(&endContentScreen());
+    return;
 }
 
 sub mark_hash_old {
@@ -3116,13 +4466,13 @@ $help{'Caching'}.'</p></form>'."\n\n");
 
 
 sub init_breadcrumbs {
-    my ($form,$text)=@_;
+    my ($form,$text,$help)=@_;
     &Apache::lonhtmlcommon::clear_breadcrumbs();
     &Apache::lonhtmlcommon::add_breadcrumb({href=>"/adm/coursedocs?tools=1",
 					    text=>&Apache::loncommon::course_type().' Editor',
 					    faq=>273,
 					    bug=>'Instructor Interface',
-                                            help => 'Docs_Adding_Course_Doc'});
+                                            help => $help});
     &Apache::lonhtmlcommon::add_breadcrumb({href=>"/adm/coursedocs?".$form.'=1',
 					    text=>$text,
 					    faq=>273,
@@ -3161,7 +4511,7 @@ sub startContentScreen {
         $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 'docs')?' class="active"':'').' id="tabbededitor"><a href="/adm/coursedocs?forcestandard=1"><b>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'.&mt('Main 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>';
@@ -3182,7 +4532,7 @@ sub endContentScreen {
 }
 
 sub supplemental_base {
-    return 'supplemental&'.&escape(&mt('Supplemental '.&Apache::loncommon::course_type().' Content'));
+    return 'supplemental&'.&escape(&mt('Supplemental Content'));
 }
 
 sub handler {
@@ -3206,8 +4556,8 @@ sub handler {
 	               'Adding_Folders','Docs_Overview', 'Load_Map',
 	               'Supplemental','Score_Upload_Form','Adding_Pages',
 	               'Importing_LON-CAPA_Resource','Importing_IMS_Course',
-                       'Uploading_From_Harddrive',
-	               'Check_Resource_Versions','Verify_Content') {
+                       'Uploading_From_Harddrive','Course_Roster','Web_Page',
+                       'Dropbox','Simple_Problem') {
 	$help{$topic}=&Apache::loncommon::help_open_topic('Docs_'.$topic);
     }
     # Composite help files
@@ -3215,16 +4565,13 @@ sub handler {
 		    'Docs_About_Syllabus,Docs_Editing_Templated_Pages');
     $help{'Simple Page'} = &Apache::loncommon::help_open_topic(
 		    'Docs_About_Simple_Page,Docs_Editing_Templated_Pages');
-    $help{'Simple Problem'} = &Apache::loncommon::help_open_topic(
-		    'Option_Response_Simple');
     $help{'Bulletin Board'} = &Apache::loncommon::help_open_topic(
 		    'Docs_About_Bulletin_Board,Docs_Editing_Templated_Pages');
     $help{'My Personal Information Page'} = &Apache::loncommon::help_open_topic(
 		  'Docs_About_My_Personal_Info,Docs_Editing_Templated_Pages');
     $help{'Group Portfolio'} = &Apache::loncommon::help_open_topic('Docs_About_Group_Files');
     $help{'Caching'} = &Apache::loncommon::help_open_topic('Caching');
-
-    
+ 
     my $allowed;
 # URI is /adm/supplemental when viewing supplemental docs in non-edit mode.
     unless ($r->uri eq '/adm/supplemental') {
@@ -3232,13 +4579,9 @@ sub handler {
         $allowed = &Apache::lonnet::allowed('mdc',$env{'request.course.id'});
     }
 
-    &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');
+    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['inhibitmenu']);
+  if ($allowed && $env{'form.verify'}) {
+      &init_breadcrumbs('verify','Verify Content','Docs_Verify_Content');
       &verifycontent($r);
   } elsif ($allowed && $env{'form.listsymbs'}) {
       &init_breadcrumbs('listsymbs','List Content IDs');
@@ -3251,10 +4594,10 @@ sub handler {
       }
       &docs_change_log($r,$coursenum,$coursedom,$folder,$allowed,$crstype,$iconpath);
   } elsif ($allowed && $env{'form.versions'}) {
-      &init_breadcrumbs('versions','Check/Set Resource Versions');
+      &init_breadcrumbs('versions','Check/Set Resource Versions','Docs_Check_Resource_Versions');
       &checkversions($r);
   } elsif ($allowed && $env{'form.dumpcourse'}) {
-      &init_breadcrumbs('dumpcourse','Dump '.&Apache::loncommon::course_type().' Content to Authoring Space');
+      &init_breadcrumbs('dumpcourse','Copy '.&Apache::loncommon::course_type().' Content to Authoring Space');
       &dumpcourse($r);
   } elsif ($allowed && $env{'form.exportcourse'}) {
       &init_breadcrumbs('exportcourse','IMS Export');
@@ -3280,9 +4623,9 @@ sub handler {
 # supplementalflag=0: show standard documents
 # toolsflag=1: show utilities
 
-
-    my $supplementalflag=($env{'form.folderpath'}=~/^supplemental/);
-    if (($env{'form.folderpath'}=~/^default/) || ($env{'form.folderpath'} eq "")) {
+    my $unesc_folderpath = &unescape($env{'form.folderpath'});
+    my $supplementalflag=($unesc_folderpath=~/^supplemental/);
+    if (($unesc_folderpath=~/^default/) || ($unesc_folderpath eq "")) {
        $supplementalflag=0;
     }
     if ($env{'form.forcesupplement'}) { $supplementalflag=1; }
@@ -3314,12 +4657,11 @@ sub handler {
        }
    } elsif ($env{'form.command'} eq 'editdocs') {
        $env{'form.folderpath'} = 'default&'.
-                                 &Apache::lonhtmlcommon::entity_encode('Main Course Content').
-                                 ':::::';
+                                 &escape(&mt('Main Content').':::::');
        &Apache::lonnet::appenv({'docs.exit.'.$env{'request.course.id'} => $env{'form.command'}});
    } elsif ($env{'form.command'} eq 'editsupp') {
        $env{'form.folderpath'} = 'supplemental&'.
-                                  &Apache::lonhtmlcommon::entity_encode('Supplemental Content');
+                                  &escape('Supplemental Content');
        &Apache::lonnet::appenv({'docs.exit.'.$env{'request.course.id'} => '/adm/supplemental'});
    } elsif ($env{'form.command'} eq 'contents') {
        &Apache::lonnet::appenv({'docs.exit.'.$env{'request.course.id'} => '/adm/navmaps'});
@@ -3360,8 +4702,8 @@ sub handler {
        if ($supplementalflag) {
           $env{'form.folderpath'}=&supplemental_base();
        } else {
-          $env{'form.folderpath'}='default'.&escape(&mt('Main '.$crstype.' Documents')).
-                                  ':::::';
+          $env{'form.folderpath'}='default&'.&escape(&mt('Main Content').
+                                  ':::::');
        }
     }
 
@@ -3386,8 +4728,7 @@ sub handler {
             if ($env{'form.folder'} eq '' ||
                 $env{'form.folder'} eq 'supplemental') {
                 $folderpath='default&'.
-                            &escape(&mt('Main '.$crstype.' Documents')).
-                            ':::::';
+                            &escape(&mt('Main Content').':::::');
             }
         }
         $containertag = '<input type="hidden" name="folderpath" value="" />';
@@ -3424,9 +4765,11 @@ sub handler {
                 $script .= &dump_switchserver_js(@hosts); 
             }
         } else {
+            my $tid = 1;
             my @tabids;
             if ($supplementalflag) {
                 @tabids = ('002','ee2','ff2');
+                $tid = 2;
             } else {
                 @tabids = ('aa1','bb1','cc1','ff1');
                 unless ($env{'form.folderpath'} =~ /\:1$/) {
@@ -3438,15 +4781,13 @@ sub handler {
 	    $script .= &editing_js($udom,$uname,$supplementalflag).
                        &history_tab_js().
                        &inject_data_js().
-                       &Apache::lonhtmlcommon::resize_scrollbox_js('docs',$tabidstr).
+                       &Apache::lonhtmlcommon::resize_scrollbox_js('docs',$tabidstr,$tid).
                        &Apache::lonextresedit::extedit_javascript();
             $addentries = {
                             onload   => "javascript:resize_scrollbox('contentscroll','1','1');",
                           };
         }
-        if ($env{'docs.markedcopy_url'}) {
-            $script .= &paste_popup_js(); 
-        }
+        $script .= &paste_popup_js(); 
         my $confirm_switch = &mt("Editing requires switching to the resource's home server.").'\n'.
                              &mt('Switch server?');
         
@@ -3457,7 +4798,9 @@ sub handler {
               .'// <![CDATA['."\n"
               .$script."\n"
               .'// ]]>'."\n"
-              .'</script>'."\n";
+              .'</script>'."\n"
+              .'<script type="text/javascript" 
+                src="/res/adm/includes/file_upload.js"></script>'."\n";
 
     # Breadcrumbs
     &Apache::lonhtmlcommon::clear_breadcrumbs();
@@ -3465,6 +4808,14 @@ sub handler {
     if ($showdoc) {
         $r->print(&Apache::loncommon::start_page("$crstype documents",undef,
                                                 {'force_register' => $showdoc,}));
+    } elsif ($toolsflag) {
+        &Apache::lonhtmlcommon::add_breadcrumb({
+            href=>"/adm/coursedocs",text=>"$crstype Contents"});
+        $r->print(&Apache::loncommon::start_page("$crstype Contents", $script)
+                 .&Apache::loncommon::help_open_menu('','',273,'RAT')
+                 .&Apache::lonhtmlcommon::breadcrumbs(
+                     'Editing Course Contents')
+                 );
     } elsif ($r->uri eq '/adm/supplemental') {
         my $brcrum = &Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype);
         $r->print(&Apache::loncommon::start_page("Supplemental $crstype Content",undef,
@@ -3472,7 +4823,6 @@ sub handler {
     } else {
         &Apache::lonhtmlcommon::add_breadcrumb({
             href=>"/adm/coursedocs",text=>"$crstype Contents"});
-
         $r->print(&Apache::loncommon::start_page("$crstype Contents", $script,
                                                  {'add_entries'    => $addentries}
                                                 )
@@ -3493,7 +4843,7 @@ sub handler {
           # Process file upload - phase one - upload and parse primary file.
 	  undef($hadchanges);
           $uploadphase = &process_file_upload(\$upload_output,$coursenum,$coursedom,
-                                              \%allfiles,\%codebase,$context);
+                                              \%allfiles,\%codebase,$context,$crstype);
 	  if ($hadchanges) {
 	      &mark_hash_old();
 	  }
@@ -3545,7 +4895,7 @@ sub handler {
        my %lt=&Apache::lonlocal::texthash(
 		'copm' => 'All documents out of a published map into this folder',
                 'upfi' => 'Upload File',
-                'upld' => 'Import Content',
+                'upld' => 'Upload Content',
                 'srch' => 'Search',
                 'impo' => 'Import',
 		'lnks' => 'Import from Stored Links',
@@ -3558,6 +4908,7 @@ sub handler {
                 'navc' => 'Table of Contents',
                 'sipa' => 'Simple Course Page',
                 'sipr' => 'Simple Problem',
+                'webp' => 'Blank Web Page (editable)', 
                 'drbx' => 'Drop Box',
                 'scuf' => 'External Scores (handgrade, upload, clicker)',
                 'bull' => 'Discussion Board',
@@ -3565,19 +4916,44 @@ sub handler {
                 'grpo' => 'Group Portfolio',
                 'rost' => 'Course Roster',
                 'abou' => 'Personal Information Page for a User',
-                'imsf' => 'IMS Import',
-                'imsl' => 'Import IMS package',
+                'imsf' => 'IMS Upload',
+                'imsl' => 'Upload IMS package',
                 'cms'  => 'Origin of IMS package',
                 'se'   => 'Select',
                 'file' =>  'File',
                 'title' => 'Title',
                 'comment' => 'Comment',
                 'parse' => 'Upload embedded images/multimedia files if HTML file',
-					  );
+                'bb5'      => 'Blackboard 5',
+                'bb6'      => 'Blackboard 6',
+                'angel5'   => 'ANGEL 5.5',
+                'webctce4' => 'WebCT 4 Campus Edition',
+        );
 # -----------------------------------------------------------------------------
+
+    # Calculate free quota space for a user or course. A javascript function checks
+    # file size to determine if upload should be allowed.
+    my $quotatype = 'unofficial';
+    if ($crstype eq 'Community') {
+        $quotatype = 'community';    
+    } elsif ($env{'course.'.$coursedom.'_'.$coursenum.'.internal.coursecode'}) {
+        $quotatype = 'official';
+    } elsif ($env{'course.'.$coursedom.'_'.$coursenum.'.internal.textbook'}) {
+        $quotatype = 'textbook';
+    }
+    my $disk_quota = &Apache::loncommon::get_user_quota($coursenum,$coursedom,
+                     'course',$quotatype); # expressed in MB
+    my $current_disk_usage = 0;
+    foreach my $subdir ('docs','supplemental') {
+        $current_disk_usage += &Apache::lonnet::diskusage($coursedom,$coursenum,
+                               "userfiles/$subdir",1); # expressed in kB
+    }
+    my $free_space = 1024 * ((1024 * $disk_quota) - $current_disk_usage);
+
 	my $fileupload=(<<FIUP);
 	$lt{'file'}:<br />
-	<input type="file" name="uploaddoc" size="40" />
+	<input type="file" name="uploaddoc" class="flUpload" size="40" />
+    <input type="hidden" id="free_space" value="$free_space" />
 FIUP
 
 	my $checkbox=(<<CHBO);
@@ -3604,10 +4980,10 @@ CHBO
         $lt{'cms'}:&nbsp; 
         <select name="source">
         <option value="-1" selected="selected">$lt{'se'}</option>
-        <option value="bb5">Blackboard 5</option>
-        <option value="bb6">Blackboard 6</option>
-        <option value="angel5">ANGEL 5.5</option>
-        <option value="webctce4">WebCT 4 Campus Edition</option>
+        <option value="bb5">$lt{'bb5'}</option>
+        <option value="bb6">$lt{'bb6'}</option>
+        <option value="angel5">$lt{'angel5'}</option>
+        <option value="webctce4">$lt{'webctce4'}</option>
         </select>
         <input type="hidden" name="folder" value="$imsfolder" />
         </p>
@@ -3624,7 +5000,7 @@ IMSFORM
         <fieldset id="uploaddocform" style="display: none;">
         <legend>$lt{'upfi'}</legend>
 	<input type="hidden" name="active" value="aa" />
-	$fileupload
+    $fileupload
 	<br />
 	$lt{'title'}:<br />
 	<input type="text" size="60" name="comment" />
@@ -3672,7 +5048,10 @@ SEDFFORM
         if ($folder eq '') {
             $folder='default';
         }
-	&update_paste_buffer($coursenum,$coursedom,$folder);
+	my $output = &update_paste_buffer($coursenum,$coursedom,$folder);
+        if ($output) {
+            $r->print($output);
+        }
 	$r->print(<<HIDDENFORM);
 	<form name="renameform" method="post" action="/adm/coursedocs">
    <input type="hidden" name="title" />
@@ -3711,7 +5090,7 @@ HIDDENFORM
        if ($folder eq '' || $supplementalflag) {
            $folder='default';
 	   $savefolderpath = $env{'form.folderpath'};
-	   $env{'form.folderpath'}='default&'.&escape(&mt('Content'));
+	   $env{'form.folderpath'}='default&'.&escape(&mt('Main Content'));
            $pathitem = '<input type="hidden" name="folderpath" value="'.
 	       &HTML::Entities::encode($env{'form.folderpath'},'<>&"').'" />';
        }
@@ -3732,7 +5111,7 @@ HIDDENFORM
 
 	my $newnavform=(<<NNFORM);
 	<form action="/adm/coursedocs" method="post" name="newnav">
-	<input type="hidden" name="active" value="cc" />
+	<input type="hidden" name="active" value="ee" />
 	$pathitem
 	<input type="hidden" name="importdetail" 
 	value="$lt{'navc'}=/adm/navmaps" />
@@ -3742,7 +5121,7 @@ HIDDENFORM
 NNFORM
 	my $newsmppageform=(<<NSPFORM);
 	<form action="/adm/coursedocs" method="post" name="newsmppg">
-	<input type="hidden" name="active" value="cc" />
+	<input type="hidden" name="active" value="ee" />
 	$pathitem
 	<input type="hidden" name="importdetail" value="" />
 	<a class="LC_menubuttons_link" href="javascript:makesmppage();"> $lt{'sipa'}</a>
@@ -3756,7 +5135,7 @@ NSPFORM
 	$pathitem
 	<input type="hidden" name="importdetail" value="" />
 	<a class="LC_menubuttons_link" href="javascript:makesmpproblem();">$lt{'sipr'}</a>
-	$help{'Simple Problem'}
+	$help{'Simple_Problem'}
 	</form>
 
 NSPROBFORM
@@ -3767,6 +5146,7 @@ NSPROBFORM
 	$pathitem
 	<input type="hidden" name="importdetail" value="" />
 	<a class="LC_menubuttons_link" href="javascript:makedropbox();">$lt{'drbx'}</a>
+        $help{'Dropbox'}
 	</form>
 NDBFORM
 
@@ -3782,7 +5162,7 @@ NEXUFORM
 
 	my $newbulform=(<<NBFORM);
 	<form action="/adm/coursedocs" method="post" name="newbul">
-	<input type="hidden" name="active" value="cc" />
+	<input type="hidden" name="active" value="dd" />
 	$pathitem
 	<input type="hidden" name="importdetail" value="" />
 	<a class="LC_menubuttons_link" href="javascript:makebulboard();" >$lt{'bull'}</a>
@@ -3792,7 +5172,7 @@ NBFORM
 
 	my $newaboutmeform=(<<NAMFORM);
 	<form action="/adm/coursedocs" method="post" name="newaboutme">
-	<input type="hidden" name="active" value="cc" />
+	<input type="hidden" name="active" value="dd" />
 	$pathitem
 	<input type="hidden" name="importdetail" 
 	value="$plainname=/adm/$udom/$uname/aboutme" />
@@ -3803,25 +5183,45 @@ NAMFORM
 
 	my $newaboutsomeoneform=(<<NASOFORM);
 	<form action="/adm/coursedocs" method="post" name="newaboutsomeone">
-	<input type="hidden" name="active" value="cc" />
+	<input type="hidden" name="active" value="dd" />
 	$pathitem
 	<input type="hidden" name="importdetail" value="" />
 	<a class="LC_menubuttons_link" href="javascript:makeabout();">$lt{'abou'}</a>
 	</form>
 NASOFORM
 
-
 	my $newrosterform=(<<NROSTFORM);
 	<form action="/adm/coursedocs" method="post" name="newroster">
-	<input type="hidden" name="active" value="cc" />
+	<input type="hidden" name="active" value="dd" />
 	$pathitem
 	<input type="hidden" name="importdetail" 
 	value="$lt{'rost'}=/adm/viewclasslist" />
 	<a class="LC_menubuttons_link" href="javascript:document.newroster.submit()">$lt{'rost'}</a>
-	$help{'Course Roster'}
+	$help{'Course_Roster'}
 	</form>
 NROSTFORM
 
+        my $newwebpage;
+        if ($folder =~ /^default_?(\d*)$/) {
+            $newwebpage = "/uploaded/$coursedom/$coursenum/docs/";
+            if ($1) {
+                $newwebpage .= $1;
+            } else {
+                $newwebpage .= 'default';
+            }
+            $newwebpage .= '/new.html';
+        }
+        my $newwebpageform =(<<NWEBFORM);
+        <form action="/adm/coursedocs" method="post" name="newwebpage">
+        <input type="hidden" name="active" value="ee" />
+        $pathitem
+        <input type="hidden" name="importdetail" value="$newwebpage" />
+        <a class="LC_menubuttons_link" href="javascript:makewebpage();">$lt{'webp'}</a>
+        $help{'Web_Page'}
+        </form>
+NWEBFORM
+ 
+
 my $specialdocumentsform;
 my @specialdocumentsforma;
 my $gradingform;
@@ -3837,7 +5237,7 @@ my $newfolderb;
 	<form action="/adm/coursedocs" method="post" name="newpage">
 	<input type="hidden" name="folderpath" value="$path" />
 	<input type="hidden" name="importdetail" value="" />
-	<input type="hidden" name="active" value="cc" />
+	<input type="hidden" name="active" value="ee" />
 	<a class="LC_menubuttons_link" href="javascript:makenewpage(document.newpage,'$pageseq');">$lt{'newp'}</a>
 	$help{'Adding_Pages'}
 	</form>
@@ -3848,14 +5248,14 @@ NPFORM
 	<form action="/adm/coursedocs" method="post" name="newfolder">
 	$pathitem
 	<input type="hidden" name="importdetail" value="" />
-	<input type="hidden" name="active" value="aa" />
+	<input type="hidden" name="active" value="" />
 	<a href="javascript:makenewfolder(document.newfolder,'$folderseq');">$lt{'newf'}</a>$help{'Adding_Folders'}
 	</form>
 NFFORM
 
 	my $newsylform=(<<NSYLFORM);
 	<form action="/adm/coursedocs" method="post" name="newsyl">
-	<input type="hidden" name="active" value="cc" />
+	<input type="hidden" name="active" value="ee" />
 	$pathitem
 	<input type="hidden" name="importdetail" 
 	value="$lt{'syll'}=/public/$coursedom/$coursenum/syllabus" />
@@ -3867,7 +5267,7 @@ NSYLFORM
 
 	my $newgroupfileform=(<<NGFFORM);
 	<form action="/adm/coursedocs" method="post" name="newgroupfiles">
-	<input type="hidden" name="active" value="cc" />
+	<input type="hidden" name="active" value="dd" />
 	$pathitem
 	<input type="hidden" name="importdetail"
 	value="$lt{'grpo'}=/adm/$coursedom/$coursenum/aboutme" />
@@ -3880,6 +5280,7 @@ NGFFORM
 	{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/syllabus.png" alt="'.$lt{syll}.'" onclick="document.newsyl.submit()" />'=>$newsylform},
 	{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/navigation.png" alt="'.$lt{navc}.'" onclick="document.newnav.submit()" />'=>$newnavform},
         {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/simple.png" alt="'.$lt{sipa}.'" onclick="javascript:makesmppage();" />'=>$newsmppageform},
+        {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/webpage.png" alt="'.$lt{webp}.'" onclick="javascript:makewebpage();" />'=>$newwebpageform},
         );
         $specialdocumentsform = &create_form_ul(&create_list_elements(@specialdocumentsforma));
 
@@ -3893,7 +5294,7 @@ NGFFORM
             );
         }
         push(@importdoc,
-            {'<img class="LC_noBorder_LC_middle" src="/res/adm/pages/pdfupload.png" alt="'.$lt{upl}.'" onclick="javascript:toggleUpload(\'doc\');" />'=>$fileuploadform}
+            {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/pdfupload.png" alt="'.$lt{upl}.'" onclick="javascript:toggleUpload(\'doc\');" />'=>$fileuploadform}
         );
         $fileuploadform =  &create_form_ul(&create_list_elements(@importdoc));
 
@@ -3915,14 +5316,14 @@ NGFFORM
         $communityform = &create_form_ul(&create_list_elements(@communityforma));
 
 my %orderhash = (
-                'aa' => ['Import Content',$fileuploadform],
-                'bb' => ['Published Content',$importpubform],
-                'cc' => ['Grading Resources',$gradingform],
+                'aa' => ['Upload',$fileuploadform],
+                'bb' => ['Import',$importpubform],
+                'cc' => ['Grading',$gradingform],
                 );
 unless ($container eq 'page') {
     $orderhash{'00'} = ['Newfolder',$newfolderform];
     $orderhash{'dd'} = ['Collaboration',$communityform];
-    $orderhash{'ee'} = ['Special Pages',$specialdocumentsform];
+    $orderhash{'ee'} = ['Other',$specialdocumentsform];
 }
 
  $hadchanges=0;
@@ -3983,7 +5384,7 @@ SUPDOCFORM
 
 	my $supnewfolderform=(<<SNFFORM);
 	<form action="/adm/coursedocs" method="post" name="supnewfolder">
-	<input type="hidden" name="active" value="ee" />
+	<input type="hidden" name="active" value="" />
         $pathitem
 	<input type="hidden" name="importdetail" value="" />
 	<a class="LC_menubuttons_link" href="javascript:makenewfolder(document.supnewfolder,'$folderseq');">$lt{'newf'}</a> 
@@ -4017,12 +5418,34 @@ SNSFORM
 	</form>
 SNAMFORM
 
+        my $supwebpage;
+        if ($folder =~ /^supplemental_?(\d*)$/) {
+            $supwebpage = "/uploaded/$coursedom/$coursenum/supplemental/";
+            if ($1) {
+                $supwebpage .= $1;
+            } else {
+                $supwebpage .= 'default';
+            }
+            $supwebpage .= '/new.html';
+        }
+        my $supwebpageform =(<<SWEBFORM);
+        <form action="/adm/coursedocs" method="post" name="supwebpage">
+        <input type="hidden" name="active" value="cc" />
+        $pathitem
+        <input type="hidden" name="importdetail" value="$supwebpage" />
+        <a class="LC_menubuttons_link" href="javascript:makewebpage('supp');">$lt{'webp'}</a>
+        $help{'Web_Page'}
+        </form>
+SWEBFORM
+
 
 my @specialdocs = (
 		{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/syllabus.png" alt="'.$lt{syll}.'" onclick="document.supnewsyl.submit()" />'
             =>$supnewsylform},
 		{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/myaboutme.png" alt="'.$lt{mypi}.'" onclick="document.supnewaboutme.submit()" />'
             =>$supnewaboutmeform},
+                {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/webpage.png" alt="'.$lt{webp}.'" onclick="javascript:makewebpage('."'supp'".');" />'=>$supwebpageform},
+
 		);
 my @supimportdoc = (
 		{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/extres.png" alt="'.$lt{extr}.'" onclick="javascript:toggleUpload(\'suppext\')" />'
@@ -4034,15 +5457,28 @@ my @supimportdoc = (
 $supupdocform =  &create_form_ul(&create_list_elements(@supimportdoc));
 my %suporderhash = (
 		'00' => ['Supnewfolder', $supnewfolderform],
-                'ee' => ['Import Content',$supupdocform],
-                'ff' => ['Special Pages',&create_form_ul(&create_list_elements(@specialdocs))]
+                'ee' => ['Upload',$supupdocform],
+                'ff' => ['Other',&create_form_ul(&create_list_elements(@specialdocs))]
                 );
         if ($supplementalflag) {
            my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$crstype,
                                $supplementalflag,\%suporderhash,$iconpath,$pathitem);
            if ($error) {
               $r->print('<p><span class="LC_error">'.$error.'</span></p>');
-           }
+           } else {
+               if ($suppchanges) {
+                   my %servers = &Apache::lonnet::internet_dom_servers($coursedom);
+                   my @ids=&Apache::lonnet::current_machine_ids();
+                   foreach my $server (keys(%servers)) {
+                       next if (grep(/^\Q$server\E$/,@ids));
+                       my $hashid=$coursenum.':'.$coursedom;
+                       my $cachekey = &escape('suppcount').':'.&escape($hashid);
+                       &Apache::lonnet::remote_devalidate_cache($server,[$cachekey]);
+                   }
+                   &Apache::lonnet::get_numsuppfiles($coursenum,$coursedom,1);
+                   undef($suppchanges);
+               }  
+           } 
         }
     } elsif ($supplementalflag) {
         my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$crstype,
@@ -4120,7 +5556,7 @@ sub decompression_info {
     my $docuname=$env{'course.'.$env{'request.course.id'}.'.num'};
     my $container='sequence';
     my ($pathitem,$hiddenelem);
-    my @hiddens = ('newidx','comment','position','folderpath');
+    my @hiddens = ('newidx','comment','position','folderpath','archiveurl');
     if ($env{'form.folderpath'} =~ /\:1$/) {
         $container='page';
     }
@@ -4128,7 +5564,7 @@ sub decompression_info {
     foreach my $item (@hiddens) {
         if ($env{'form.'.$item}) {
             $hiddenelem .= '<input type="hidden" name="'.$item.'" value="'.
-                           $env{'form.'.$item}.'" />'."\n";
+                           &HTML::Entities::encode($env{'form.'.$item},'<>&"').'" />'."\n";
         }
     }
     return ($destination,$dir_root,$londocroot,$docudom,$docuname,$container,
@@ -4185,25 +5621,34 @@ sub remove_archive {
         } else {
             $delwarning = &mt('An error occurred retrieving the contents of the current folder.');
         }
-        $delwarning .= &mt('As a result the archive file has not been removed.');
+        $delwarning .= ' '.&mt('As a result the archive file has not been removed.');
     } else {
         my $currcmd = $env{'form.cmd'};
         my $position = $env{'form.position'};
-        if ($position > 0) { 
-            $env{'form.cmd'} = 'del_'.$position;
-            my ($title,$url,@rrest) = 
-                split(/:/,$LONCAPA::map::resources[$LONCAPA::map::order[$position]]);
-            if (&handle_edit_cmd($docuname,$docudom)) {
-                ($errtext,$fatal) = &storemap($docuname,$docudom,$map,1);
-                if ($fatal) {
-                    if ($container eq 'page') {
-                        $delwarning = &mt('An error occurred updating the contents of the current page.');
+        my $archiveidx = $position;
+        if ($position > 0) {
+            if (($env{'form.autoextract_camtasia'}) && (scalar(@LONCAPA::map::order) == 2)) {
+                $archiveidx = $position-1;
+            }
+            $env{'form.cmd'} = 'remove_'.$archiveidx;
+            my ($title,$url,@rrest) =
+                split(/:/,$LONCAPA::map::resources[$LONCAPA::map::order[$archiveidx]]);
+            if ($url eq $env{'form.archiveurl'}) {
+                if (&handle_edit_cmd($docuname,$docudom)) {
+                    ($errtext,$fatal) = &storemap($docuname,$docudom,$map,1);
+                    if ($fatal) {
+                        if ($container eq 'page') {
+                            $delwarning = &mt('An error occurred updating the contents of the current page.');
+                        } else {
+                            $delwarning = &mt('An error occurred updating the contents of the current folder.');
+                        }
                     } else {
-                        $delwarning = &mt('An error occurred updating the contents of the current folder.');
+                        $delresult = &mt('Archive file removed.');
                     }
-                } else {
-                    $delresult = &mt('Archive file removed.');
                 }
+            } else {
+                $delwarning .=  &mt('Archive file had unexpected item number in folder.').
+                                ' '.&mt('As a result the archive file has not been removed.');
             }
         }
         $env{'form.cmd'} = $currcmd;
@@ -4225,13 +5670,13 @@ sub generate_admin_menu {
     my ($crstype) = @_;
     my $lc_crstype = lc($crstype);
     my ($home,$other,%outhash)=&authorhosts();
-    my %lt=&Apache::lonlocal::texthash (
+    my %lt= ( # do not translate here
                                          '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",
-                                       );
+                                         'dcd'  => "Copy $crstype Content to Authoring Space",
+            );
     my ($candump,$dumpurl);
     if ($home + $other > 0) {
         $candump = 'F';
@@ -4242,7 +5687,7 @@ sub generate_admin_menu {
             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].
@@ -4261,14 +5706,14 @@ sub generate_admin_menu {
                 {   linktext   => $lt{'vc'},
                     url        => "javascript:injectData(document.courseverify,'dummy','verify','$lt{'vc'}')",
                     permission => 'F',
-                    help       => 'Verify_Content',
+                    help       => 'Docs_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',
+                    help       => 'Docs_Check_Resource_Versions',
                     icon       => 'resversion.png',
                     linktitle  => "View version information for resources in your $lc_crstype, and fix/unfix use of specific versions",
                 },
@@ -4293,7 +5738,7 @@ sub generate_admin_menu {
                 {   linktext   => $lt{'dcd'},
                     url        => $dumpurl,
                     permission => $candump,
-                    #help => '',
+                    help       => 'Docs_Dump_Course_Docs',
                     icon       => 'dump.png',
                     linktitle  => $lt{'dcd'},
                 },
@@ -4306,13 +5751,14 @@ sub generate_admin_menu {
 }
 
 sub generate_edit_table {
-    my ($tid,$orderhash_ref,$to_show,$iconpath,$jumpto,$readfile) = @_;
+    my ($tid,$orderhash_ref,$to_show,$iconpath,$jumpto,$readfile,
+        $need_save,$copyfolder) = @_;
     return unless(ref($orderhash_ref) eq 'HASH');
     my %orderhash = %{$orderhash_ref};
     my $form;
     my $activetab;
     my $active;
-    if (($env{'form.active'} ne '') && ($env{'form.active'} ne 'aa')) {
+    if (($env{'form.active'} ne '') && ($env{'form.active'} ne '00')) {
         $activetab = $env{'form.active'};
     }
     my $backicon = $iconpath.'clickhere.gif';
@@ -4320,7 +5766,7 @@ sub generate_edit_table {
     $form = '<div class="LC_Box" style="margin:0;">'.
             '<ul id="navigation'.$tid.'" class="LC_TabContent">'."\n".
             '<li class="goback">'.
-            '<a href="javascript:toContents('.$jumpto.');">'.
+            '<a href="javascript:toContents('."'$jumpto'".');">'.
             '<img src="'.$backicon.'" class="LC_icon" style="border: none; vertical-align: top;"'.
             '  alt="'.$backtext.'" />'.$backtext.'</a></li>'."\n".
             '<li>'.
@@ -4347,7 +5793,7 @@ sub generate_edit_table {
             $form .= '<li style="float:right" '.$active
                 .' onclick="javascript:showPage(this, \''.$name.$tid.'\', \'navigation'.$tid.'\',\'content'.$tid.'\');"><a href="javascript:;"><b>'.&mt(${$orderhash{$name}}[0]).'</b></a></li>'."\n";
         } else {
-	    $form .= '<li '.$active.' style="float:right">'.${$orderhash{$name}}[1].'</li>'."\n";
+	    $form .= '<li style="float:right">'.${$orderhash{$name}}[1].'</li>'."\n";
 
 	}
     }
@@ -4355,7 +5801,35 @@ sub generate_edit_table {
     $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>'."\n";
+        my $saveform;
+        if ($need_save) {
+            my $button = &mt('Make changes');
+            my $path;
+            if ($env{'form.folderpath'}) {
+                $path =
+                    &HTML::Entities::encode($env{'form.folderpath'},'<>&"');
+            }
+            $saveform = <<"END";
+<div id="multisave" style="display:none; clear:both;" >
+<form name="saveactions" method="post" action="/adm/coursedocs" onsubmit="return checkSubmits();">
+<input type="hidden" name="folderpath" value="$path" />
+<input type="hidden" name="symb" value="$env{'form.symb'}" />
+<input type="hidden" name="allhiddenresource" value="" />
+<input type="hidden" name="allencrypturl" value="" />
+<input type="hidden" name="allrandompick" value="" />
+<input type="hidden" name="allrandomorder" value="" />
+<input type="hidden" name="changeparms" value="" />
+<input type="hidden" name="multiremove" value="" />
+<input type="hidden" name="multicut" value="" />
+<input type="hidden" name="multicopy" value="" />
+<input type="hidden" name="multichange" value="" />
+<input type="hidden" name="copyfolder" value="$copyfolder" />
+<input type="submit" name="savemultiples" value="$button" />
+</form>
+</div>
+END
+        }
+        $form .= '<div style="padding:0;margin:0;float:left">'.$to_show.'</div>'.$saveform."\n";
     }
     foreach my $field (keys(%orderhash)){
 	if($field ne '00'){
@@ -4377,8 +5851,7 @@ sub generate_edit_table {
 
 sub editing_js {
     my ($udom,$uname,$supplementalflag) = @_;
-    my $now = time();
-    my %lt = &Apache::lonlocal::texthash(
+    my %js_lt = &Apache::lonlocal::texthash(
                                           p_mnf => 'Name of New Folder',
                                           t_mnf => 'New Folder',
                                           p_mnp => 'Name of New Page',
@@ -4388,6 +5861,7 @@ sub editing_js {
                                           p_msb => 'Title for the Problem',
                                           p_mdb => 'Title for the Drop Box',
                                           p_mbb => 'Title for the Discussion Board',
+                                          p_mwp => 'Title for Web Page', 
                                           p_mab => "Enter user:domain for User's Personal Information Page",
                                           p_mab2 => 'Personal Information Page of ',
                                           p_mab_alrt1 => 'Not a valid user:domain',
@@ -4396,24 +5870,34 @@ sub editing_js {
                                           p_rmr1 => 'WARNING: Removing a resource makes associated grades and scores inaccessible!',
                                           p_rmr2a => 'Remove[_99]',
                                           p_rmr2b => '?[_99]',
+                                          p_rmr3a => 'Remove those [_2]',
+                                          p_rmr3b => 'items?[_2]',
                                           p_ctr1a => 'WARNING: Cutting a resource makes associated grades and scores inaccessible!',
                                           p_ctr1b => 'Grades remain inaccessible if resource is pasted into another folder.',
                                           p_ctr2a => 'Cut[_98]',
                                           p_ctr2b => '?[_98]',
+                                          p_ctr3a => 'Cut those[_2]',
+                                          p_ctr3b => 'items?[_2]',
                                           rpck    => 'Enter number to pick (e.g., 3)',
                                           imsfile => 'You must choose an IMS package for import',
                                           imscms  => 'You must select which Course Management System was the source of the IMS package',
                                           invurl  => 'Invalid URL',
                                           titbl   => 'Title is blank',
+                                          more    => '(More ...)',
+                                          less    => '(Less ...)',
+                                          noor    => 'No actions selected or changes to settings specified.',
+                                          noch    => 'No changes to settings specified.',
+                                          noac    => 'No actions selected.',
                                         );
-
+    &js_escape(\%js_lt);
     my $crstype = &Apache::loncommon::course_type();
     my $docs_folderpath = &HTML::Entities::encode($env{'environment.internal.'.$env{'request.course.id'}.'.docs_folderpath.folderpath'},'<>&"');
     my $main_container_page;
     if (&HTML::Entities::decode($env{'environment.internal.'.$env{'request.course.id'}.'.docs_folderpath.folderpath'}) =~ /\:1$/) {
         $main_container_page = 1;
     }
-    my $toplevelmain = 'default&Main%20'.$crstype.'%20Documents%3A%3A%3A%3A%3A';
+    my $toplevelmain = 
+        &escape(&mt('Main Content').':::::');
     my $toplevelsupp = &supplemental_base();
 
     my $backtourl;
@@ -4427,6 +5911,9 @@ sub editing_js {
             if (&Apache::lonnet::is_on_map($res)) {
                 $backtourl = &HTML::Entities::encode(&Apache::lonnet::clutter($res),'<>&"').'?symb='.
                              &HTML::Entities::encode($caller,'<>&"');
+                $backtourl = &Apache::loncommon::escape_single($backtourl);
+            } else {
+                $backtourl = '/adm/navmaps';
             }
         }
     } elsif ($env{'docs.exit.'.$env{'request.course.id'}} eq '/adm/menu') {
@@ -4447,7 +5934,7 @@ sub editing_js {
 
     return <<ENDNEWSCRIPT;
 function makenewfolder(targetform,folderseq) {
-    var foldername=prompt('$lt{"p_mnf"}','$lt{"t_mnf"}');
+    var foldername=prompt('$js_lt{"p_mnf"}','$js_lt{"t_mnf"}');
     if (foldername) {
        targetform.importdetail.value=escape(foldername)+"="+folderseq;
         targetform.submit();
@@ -4455,7 +5942,7 @@ function makenewfolder(targetform,folder
 }
 
 function makenewpage(targetform,folderseq) {
-    var pagename=prompt('$lt{"p_mnp"}','$lt{"t_mnp"}');
+    var pagename=prompt('$js_lt{"p_mnp"}','$js_lt{"t_mnp"}');
     if (pagename) {
         targetform.importdetail.value=escape(pagename)+"="+folderseq;
         targetform.submit();
@@ -4463,7 +5950,7 @@ function makenewpage(targetform,folderse
 }
 
 function makeexamupload() {
-   var title=prompt('$lt{"p_mxu"}');
+   var title=prompt('$js_lt{"p_mxu"}');
    if (title) {
     this.document.forms.newexamupload.importdetail.value=
 	escape(title)+'=/res/lib/templates/examupload.problem';
@@ -4472,16 +5959,31 @@ function makeexamupload() {
 }
 
 function makesmppage() {
-   var title=prompt('$lt{"p_msp"}');
+   var title=prompt('$js_lt{"p_msp"}');
    if (title) {
     this.document.forms.newsmppg.importdetail.value=
-	escape(title)+'=/adm/$udom/$uname/$now/smppg';
+	escape(title)+'=/adm/$udom/$uname/new/smppg';
     this.document.forms.newsmppg.submit();
    }
 }
 
+function makewebpage(type) {
+   var title=prompt('$js_lt{"p_mwp"}');
+   var formname;
+   if (type == 'supp') {
+       formname = this.document.forms.supwebpage;
+   } else {
+       formname = this.document.forms.newwebpage;
+   }
+   if (title) {
+       var webpage = formname.importdetail.value; 
+       formname.importdetail.value = escape(title)+'='+webpage;
+       formname.submit();
+   }
+}
+
 function makesmpproblem() {
-   var title=prompt('$lt{"p_msb"}');
+   var title=prompt('$js_lt{"p_msb"}');
    if (title) {
     this.document.forms.newsmpproblem.importdetail.value=
 	escape(title)+'=/res/lib/templates/simpleproblem.problem';
@@ -4490,7 +5992,7 @@ function makesmpproblem() {
 }
 
 function makedropbox() {
-   var title=prompt('$lt{"p_mdb"}');
+   var title=prompt('$js_lt{"p_mdb"}');
    if (title) {
     this.document.forms.newdropbox.importdetail.value=
         escape(title)+'=/res/lib/templates/DropBox.problem';
@@ -4499,29 +6001,29 @@ function makedropbox() {
 }
 
 function makebulboard() {
-   var title=prompt('$lt{"p_mbb"}');
+   var title=prompt('$js_lt{"p_mbb"}');
    if (title) {
     this.document.forms.newbul.importdetail.value=
-	escape(title)+'=/adm/$udom/$uname/$now/bulletinboard';
+	escape(title)+'=/adm/$udom/$uname/new/bulletinboard';
     this.document.forms.newbul.submit();
    }
 }
 
 function makeabout() {
-   var user=prompt("$lt{'p_mab'}");
+   var user=prompt("$js_lt{'p_mab'}");
    if (user) {
        var comp=new Array();
        comp=user.split(':');
        if ((typeof(comp[0])!=undefined) && (typeof(comp[1])!=undefined)) {
 	   if ((comp[0]) && (comp[1])) {
 	       this.document.forms.newaboutsomeone.importdetail.value=
-		   '$lt{"p_mab2"}'+escape(user)+'=/adm/'+comp[1]+'/'+comp[0]+'/aboutme';
+		   '$js_lt{"p_mab2"}'+escape(user)+'=/adm/'+comp[1]+'/'+comp[0]+'/aboutme';
        this.document.forms.newaboutsomeone.submit();
    } else {
-       alert("$lt{'p_mab_alrt1'}");
+       alert("$js_lt{'p_mab_alrt1'}");
    }
 } else {
-   alert("$lt{'p_mab_alrt2'}");
+   alert("$js_lt{'p_mab_alrt2'}");
 }
 }
 }
@@ -4559,11 +6061,11 @@ function toggleMap(caller) {
 
 function makeims(imsform) {
     if ((imsform.uploaddoc.value == '')  || (!imsform.uploaddoc.value)) {
-        alert("$lt{'imsfile'}");
+        alert("$js_lt{'imsfile'}");
         return;
     }
     if (imsform.source.selectedIndex == 0) {
-        alert("$lt{'imscms'}");
+        alert("$js_lt{'imscms'}");
         return;
     }
     newWindow = window.open('', 'IMSimport',"HEIGHT=700,WIDTH=750,scrollbars=yes");
@@ -4571,9 +6073,9 @@ function makeims(imsform) {
 }
 
 function changename(folderpath,index,oldtitle) {
-var title=prompt('$lt{"p_chn"}',oldtitle);
+var title=prompt('$js_lt{"p_chn"}',oldtitle);
 if (title) {
-this.document.forms.renameform.markcopy.value=-1;
+this.document.forms.renameform.markcopy.value='';
 this.document.forms.renameform.title.value=title;
 this.document.forms.renameform.cmd.value='rename_'+index;
 this.document.forms.renameform.folderpath.value=folderpath;
@@ -4581,61 +6083,260 @@ this.document.forms.renameform.submit();
 }
 }
 
-function removeres(folderpath,index,oldtitle,skip_confirm) {
-if (skip_confirm || confirm('$lt{"p_rmr1"}\\n\\n$lt{"p_rmr2a"} "'+oldtitle+'" $lt{"p_rmr2b"}')) {
-this.document.forms.renameform.markcopy.value=-1;
-this.document.forms.renameform.cmd.value='del_'+index;
-this.document.forms.renameform.folderpath.value=folderpath;
-this.document.forms.renameform.submit();
-}
-}
-
-function cutres(folderpath,index,oldtitle,container,folder,skip_confirm) {
-if (skip_confirm || confirm('$lt{"p_ctr1a"}\\n$lt{"p_ctr1b"}\\n\\n$lt{"p_ctr2a"} "'+oldtitle+'" $lt{"p_ctr2b"}')) {
-this.document.forms.renameform.cmd.value='cut_'+index;
-this.document.forms.renameform.markcopy.value=index;
-this.document.forms.renameform.copyfolder.value=folder+'.'+container;
-this.document.forms.renameform.folderpath.value=folderpath;
-this.document.forms.renameform.submit();
-}
-}
-
-function markcopy(folderpath,index,oldtitle,container,folder) {
-this.document.forms.renameform.markcopy.value=index;
-this.document.forms.renameform.copyfolder.value=folder+'.'+container;
-this.document.forms.renameform.folderpath.value=folderpath;
-this.document.forms.renameform.submit();
-}
-
 function updatePick(targetform,index,caller) {
-    var pickitem = document.getElementById('rpick_'+index);
-    var picknumitem = document.getElementById('rpicknum_'+index);
+    var pickitem;
+    var picknumitem;
+    var picknumtext;
+    if (index == 'all') {
+        pickitem = document.getElementById('randompickall');
+        picknumitem = document.getElementById('rpicknumall');
+        picknumtext = document.getElementById('rpicktextall');
+    } else {
+        pickitem = document.getElementById('randompick_'+index);
+        picknumitem = document.getElementById('rpicknum_'+index);
+        picknumtext = document.getElementById('randompicknum_'+index);
+    }
     if (pickitem.checked) {
-        var picknum=prompt('$lt{"rpck"}',picknumitem.value);
+        var picknum=prompt('$js_lt{"rpck"}',picknumitem.value);
         if (picknum == '' || picknum == null) {
             if (caller == 'check') {
                 pickitem.checked=false;
-                return;
+                if (index == 'all') {
+                    picknumtext.innerHTML = '';
+                    if (caller == 'link') {
+                        propagateState(targetform,'rpicknum');
+                    }
+                } else {
+                    checkForSubmit(targetform,'randompick','settings');
+                }
             }
         } else {
             picknum.toString();
             var regexdigit=/^\\d+\$/;
             if (regexdigit.test(picknum)) {
                 picknumitem.value = picknum;
-                targetform.changeparms.value='randompick';
-                targetform.submit();
+                if (index == 'all') {
+                    picknumtext.innerHTML = '&nbsp;<a href="javascript:updatePick(document.cumulativesettings,\\'all\\',\\'link\\');">'+picknum+'</a>';
+                    if (caller == 'link') {
+                        propagateState(targetform,'rpicknum');
+                    }
+                } else {
+                    picknumtext.innerHTML = '&nbsp;<a href="javascript:updatePick(document.edit_randompick_'+index+',\\''+index+'\\',\\'link\\');">'+picknum+'</a>';
+                    checkForSubmit(targetform,'randompick','settings');
+                }
             } else {
                 if (caller == 'check') {
-                    pickitem.checked=false;
+                    if (index == 'all') {
+                        picknumtext.innerHTML = '';
+                        if (caller == 'link') {
+                            propagateState(targetform,'rpicknum');
+                        }
+                    } else {
+                        pickitem.checked=false;
+                        checkForSubmit(targetform,'randompick','settings');
+                    }
                 }
                 return;
             }
         }
     } else {
-        picknumitem.value = 0;
-        targetform.changeparms.value='randompick';
-        targetform.submit();
+        picknumitem.value = '';
+        picknumtext.innerHTML = '';
+        if (index == 'all') {
+            if (caller == 'link') {
+                propagateState(targetform,'rpicknum');
+            }
+        } else {
+            checkForSubmit(targetform,'randompick','settings');
+        }
+    }
+}
+
+function propagateState(form,param) {
+    if (document.getElementById(param+'all')) {
+        var setcheck = 0;
+        var rpick = 0;
+        if (param == 'rpicknum') {
+            if (document.getElementById('randompickall')) {
+                if (document.getElementById('randompickall').checked) {
+                    if (document.getElementById('rpicknumall')) {
+                        rpick = document.getElementById('rpicknumall').value;
+                    }
+                }
+            }
+        } else {
+            if (document.getElementById(param+'all').checked) {
+                setcheck = 1;
+            }
+        }
+        var allidxlist;
+        if ((param == 'remove') || (param == 'cut') || (param == 'copy')) {
+            if (document.getElementById('all'+param+'idx')) {
+                allidxlist = document.getElementById('all'+param+'idx').value;
+            }
+            var actions = new Array ('remove','cut','copy');
+            for (var i=0; i<actions.length; i++) {
+                if (actions[i] != param) {
+                    if (document.getElementById(actions[i]+'all')) {
+                        document.getElementById(actions[i]+'all').checked = false; 
+                    }
+                }
+            }
+        }
+        if ((param == 'encrypturl') || (param == 'hiddenresource')) {
+            allidxlist = form.allidx.value;
+        }
+        if ((param == 'randompick') || (param == 'rpicknum') || (param == 'randomorder')) {
+            allidxlist = form.allmapidx.value;
+        }
+        if ((allidxlist != '') && (allidxlist != null)) {
+            var allidxs = allidxlist.split(',');
+            if (allidxs.length > 1) {
+                for (var i=0; i<allidxs.length; i++) {
+                    if (document.getElementById(param+'_'+allidxs[i])) {
+                        if (param == 'rpicknum') {
+                            if (document.getElementById('randompick_'+allidxs[i])) {
+                                if (document.getElementById('randompick_'+allidxs[i]).checked) {
+                                    document.getElementById(param+'_'+allidxs[i]).value = rpick;
+                                    if (rpick > 0) {
+                                        document.getElementById('randompicknum_'+allidxs[i]).innerHTML = ':&nbsp;<a href="javascript:updatePick(document.edit_randompick_'+allidxs[i]+',\\''+allidxs[i]+'\\',\\'link\\')">'+rpick+'</a>';
+                                    } else {
+                                        document.getElementById('randompicknum_'+allidxs[i]).innerHTML =  '';
+                                    }
+                                }
+                            }
+                        } else {
+                            if (setcheck == 1) {
+                                document.getElementById(param+'_'+allidxs[i]).checked = true;
+                            } else {
+                                document.getElementById(param+'_'+allidxs[i]).checked = false;
+                                if (param == 'randompick') {
+                                    document.getElementById('randompicknum_'+allidxs[i]).innerHTML =  '';
+                                }
+                            }
+                        }
+                    }
+                }
+                if (setcheck == 1) {
+                    if ((param == 'remove') || (param == 'cut') || (param == 'copy')) {
+                        var actions = new Array('copy','cut','remove');
+                        for (var i=0; i<actions.length; i++) {
+                            var otheractions;
+                            var otheridxs;
+                            if (actions[i] === param) {
+                                continue;
+                            } else {
+                                if (document.getElementById('all'+actions[i]+'idx')) {
+                                    otheractions = document.getElementById('all'+actions[i]+'idx').value;
+                                    otheridxs = otheractions.split(',');
+                                    if (otheridxs.length > 1) {
+                                        for (var j=0; j<otheridxs.length; j++) {
+                                            if (document.getElementById(actions[i]+'_'+otheridxs[j])) {
+                                                document.getElementById(actions[i]+'_'+otheridxs[j]).checked = false;
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        } 
+                    }
+                }
+            }
+        }
+    }
+    return;
+}
+
+function checkForSubmit(targetform,param,context,idx,folderpath,index,oldtitle,skip_confirm,container,folder) {
+    var dosettings;
+    var doaction;
+    var control = document.togglemultsettings;
+    if (context == 'actions') {
+        control = document.togglemultactions;
+        doaction = 1; 
+    } else {
+        dosettings = 1;
     }
+    if (control) {
+        if (control.showmultpick.length) {
+            for (var i=0; i<control.showmultpick.length; i++) {
+                if (control.showmultpick[i].checked) {
+                    if (control.showmultpick[i].value == 1) {
+                        if (context == 'settings') {
+                            dosettings = 0;
+                        } else {
+                            doaction = 0;
+                        }
+                    }
+                }
+            }
+        }
+    }
+    if (context == 'settings') {
+        if (dosettings == 1) {
+            targetform.changeparms.value=param;
+            targetform.submit();
+        }
+    }
+    if (context == 'actions') {
+        if (doaction == 1) {
+            targetform.cmd.value=param+'_'+index;
+            targetform.folderpath.value=folderpath;
+            targetform.markcopy.value=idx+':'+param;
+            targetform.copyfolder.value=folder+'.'+container;
+            if (param == 'remove') {
+                if (skip_confirm || confirm('$js_lt{"p_rmr1"}\\n\\n$js_lt{"p_rmr2a"} "'+oldtitle+'" $js_lt{"p_rmr2b"}')) {
+                    targetform.markcopy.value='';
+                    targetform.copyfolder.value='';
+                    targetform.submit();
+                }
+            }
+            if (param == 'cut') {
+                if (skip_confirm || confirm('$js_lt{"p_ctr1a"}\\n$js_lt{"p_ctr1b"}\\n\\n$js_lt{"p_ctr2a"} "'+oldtitle+'" $js_lt{"p_ctr2b"}')) {
+                    targetform.submit();
+                    return;
+                }
+            }
+            if (param == 'copy') {
+                targetform.submit();
+                return;
+            }
+            targetform.markcopy.value='';
+            targetform.copyfolder.value='';
+            targetform.cmd.value='';
+            targetform.folderpath.value='';
+            return;
+        } else {
+            if (document.getElementById(param+'_'+idx)) {
+                item = document.getElementById(param+'_'+idx);
+                if (item.type == 'checkbox') {
+                    if (item.checked) {
+                        item.checked = false;
+                    } else {
+                        item.checked = true;
+                        singleCheck(item,idx,param);
+                    }
+                }
+            }
+        }
+    }
+    return;
+}
+
+function singleCheck(caller,idx,action) {
+    actions = new Array('cut','copy','remove');
+    if (caller.checked) {
+        for (var i=0; i<actions.length; i++) {
+            if (actions[i] != action) {
+                if (document.getElementById(actions[i]+'_'+idx)) {
+                    if (document.getElementById(actions[i]+'_'+idx).checked) {
+                        document.getElementById(actions[i]+'_'+idx).checked = false;
+                    }
+                }
+            }
+        }
+    }
+    return;
 }
 
 function unselectInactive(nav) {
@@ -4656,10 +6357,12 @@ for (i = 0; i < currentLis.length; i++)
 
 function hideAll(current, nav, data) {
 unselectInactive(nav);
-if(current.className == 'right'){
-	current.className = 'right active'
-	}else{
-	current.className = 'active';
+if (current) { 
+    if (current.className == 'right'){
+        current.className = 'right active'
+    } else {
+        current.className = 'active';
+    }
 }
 currentData = document.getElementById(data);
 currentDivs = currentData.getElementsByTagName('DIV');
@@ -4690,10 +6393,24 @@ function openTabs(pageId) {
 }
 
 function showPage(current, pageId, nav, data) {
+        currstate = current.className;
 	hideAll(current, nav, data);
 	openTabs(pageId);
 	unselectInactive(nav);
-	current.className = 'active';
+        if ((currstate == 'active') || (currstate == 'right active')) {
+            if (currstate == 'active') {
+	        current.className = '';
+            } else {
+                current.className = 'right';
+            }
+            activeTab = ''; 
+            toggleUpload();
+            toggleMap();
+            resize_scrollbox('contentscroll','1','0');
+            return;
+        } else {
+            current.className = 'active';
+        }
 	currentData = document.getElementById(pageId);
 	currentData.style.display = 'block';
         activeTab = pageId;
@@ -4742,6 +6459,315 @@ function toContents(jumpto) {
     location.href=newurl;
 }
 
+function togglePick(caller,value) {
+    var disp = 'none';
+    if (document.getElementById('multi'+caller)) {
+        var curr = document.getElementById('multi'+caller).style.display;
+        if (value == 1) {
+            disp='block';
+        }
+        if (curr == disp) {
+            return; 
+        }
+        document.getElementById('multi'+caller).style.display=disp;
+        if (value == 1) {
+            document.getElementById('more'+caller).innerHTML = '&nbsp;&nbsp;<a href="javascript:toggleCheckUncheck(\\''+caller+'\\',1);" style="text-decoration:none;">$js_lt{'more'}</a>'; 
+        } else {
+            document.getElementById('more'+caller).innerHTML = '';
+        }
+        if (caller == 'actions') { 
+            setClass(value);
+            setBoxes(value);
+        }
+    }
+    var showButton = multiSettings();
+    if (showButton != 1) {
+        showButton = multiActions();
+    }
+    if (document.getElementById('multisave')) {
+        if (showButton == 1) {
+            document.getElementById('multisave').style.display='block';
+        } else {
+            document.getElementById('multisave').style.display='none';
+        }
+    }
+    resize_scrollbox('contentscroll','1','1');
+    return;
+}
+
+function toggleCheckUncheck(caller,more) {
+    if (more == 1) {
+        document.getElementById('more'+caller).innerHTML = '&nbsp;&nbsp;<a href="javascript:toggleCheckUncheck(\\''+caller+'\\',0);" style="text-decoration:none;">$js_lt{'less'}</a>';
+        document.getElementById('allfields'+caller).style.display='block';
+    } else {
+        document.getElementById('more'+caller).innerHTML = '&nbsp;&nbsp;<a href="javascript:toggleCheckUncheck(\\''+caller+'\\',1);" style="text-decoration:none;">$js_lt{'more'}</a>';
+        document.getElementById('allfields'+caller).style.display='none';
+    }
+    resize_scrollbox('contentscroll','1','1');
+}
+
+function multiSettings() {
+    var inuse = 0;
+    var settingsform = document.togglemultsettings;
+    if (settingsform.showmultpick.length > 1) {
+        for (var i=0; i<settingsform.showmultpick.length; i++) {
+            if (settingsform.showmultpick[i].checked) {
+                if (settingsform.showmultpick[i].value == 1) {
+                    inuse = 1;  
+                }
+            }
+        }
+    }
+    return inuse;
+}
+
+function multiActions() {
+    var inuse = 0;
+    var actionsform = document.togglemultactions;
+    if (actionsform.showmultpick.length > 1) {
+        for (var i=0; i<actionsform.showmultpick.length; i++) {
+            if (actionsform.showmultpick[i].checked) {
+                if (actionsform.showmultpick[i].value == 1) {
+                    inuse = 1;
+                }
+            }
+        }
+    }
+    return inuse;
+} 
+
+function checkSubmits() {
+    var numchanges = 0;
+    var form = document.saveactions;
+    var doactions = multiActions();
+    var cutwarnings = 0;
+    var remwarnings = 0;
+    if (doactions == 1) {
+        var remidxlist = document.cumulativeactions.allremoveidx.value;
+        if ((remidxlist != '') && (remidxlist != null)) {
+            var remidxs = remidxlist.split(',');
+            for (var i=0; i<remidxs.length; i++) {
+                if (document.getElementById('remove_'+remidxs[i])) {
+                    if (document.getElementById('remove_'+remidxs[i]).checked) {
+                        form.multiremove.value += remidxs[i]+',';
+                        numchanges ++;
+                        if (document.getElementById('skip_remove_'+remidxs[i])) {
+                            if (document.getElementById('skip_remove_'+remidxs[i]).value == 0) {
+                                remwarnings ++;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        var cutidxlist = document.cumulativeactions.allcutidx.value;
+        if ((cutidxlist != '') && (cutidxlist != null)) {
+            var cutidxs = cutidxlist.split(',');
+            for (var i=0; i<cutidxs.length; i++) {
+                if (document.getElementById('cut_'+cutidxs[i])) {
+                    if (document.getElementById('cut_'+cutidxs[i]).checked == true) {
+                        form.multicut.value += cutidxs[i]+',';
+                        numchanges ++;
+                        if (document.getElementById('skip_cut_'+cutidxs[i])) {
+                            if (document.getElementById('skip_cut_'+cutidxs[i]).value == 0) {
+                                cutwarnings ++;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        var copyidxlist = document.cumulativeactions.allcopyidx.value;
+        if ((copyidxlist != '') && (copyidxlist != null)) {
+            var copyidxs = copyidxlist.split(',');
+            for (var i=0; i<copyidxs.length; i++) {
+                if (document.getElementById('copy_'+copyidxs[i])) {
+                    if (document.getElementById('copy_'+copyidxs[i]).checked) {
+                        form.multicopy.value += copyidxs[i]+',';
+                        numchanges ++;
+                    }
+                }
+            }
+        }
+        if (numchanges > 0) {
+            form.multichange.value = numchanges;
+        }
+    }
+    var dosettings = multiSettings();
+    var haschanges = 0;
+    if (dosettings == 1) {
+        form.allencrypturl.value = '';
+        form.allhiddenresource.value = '';
+        form.changeparms.value = 'all';
+        var patt=new RegExp(",\$");
+        var allidxlist = document.cumulativesettings.allidx.value;
+        if ((allidxlist != '') && (allidxlist != null)) {
+            var allidxs = allidxlist.split(',');
+            if (allidxs.length > 1) {
+                for (var i=0; i<allidxs.length; i++) {
+                    if (document.getElementById('hiddenresource_'+allidxs[i])) {
+                        if (document.getElementById('hiddenresource_'+allidxs[i]).checked) {
+                            form.allhiddenresource.value += allidxs[i]+',';
+                        }
+                    }
+                    if (document.getElementById('encrypturl_'+allidxs[i])) {
+                        if (document.getElementById('encrypturl_'+allidxs[i]).checked) {
+                            form.allencrypturl.value += allidxs[i]+',';
+                        }
+                    }
+                }
+                form.allhiddenresource.value = form.allhiddenresource.value.replace(patt,"");
+                form.allencrypturl.value = form.allencrypturl.value.replace(patt,"");
+            }
+        }
+        form.allrandompick.value = '';
+        form.allrandomorder.value = '';
+        var allmapidxlist = document.cumulativesettings.allmapidx.value;
+        if ((allmapidxlist != '') && (allmapidxlist != null)) {
+            var allmapidxs = allmapidxlist.split(',');
+            for (var i=0; i<allmapidxs.length; i++) {
+                var randompick = document.getElementById('randompick_'+allmapidxs[i]);
+                var rpicknum = document.getElementById('rpicknum_'+allmapidxs[i]);
+                var randorder = document.getElementById('randomorder_'+allmapidxs[i]);
+                if ((randompick.checked) && (rpicknum.value != '')) {
+                    form.allrandompick.value += allmapidxs[i]+':'+rpicknum.value+',';
+                }
+                if (randorder.checked) {
+                    form.allrandomorder.value += allmapidxs[i]+',';
+                }
+            }
+            form.allrandompick.value = form.allrandompick.value.replace(patt,"");
+            form.allrandomorder.value = form.allrandomorder.value.replace(patt,"");
+        }
+        if (document.cumulativesettings.currhiddenresource.value != form.allhiddenresource.value) {
+            haschanges = 1;
+        }
+        if (document.cumulativesettings.currencrypturl.value != form.allencrypturl.value) {
+            haschanges = 1;
+        }
+        if (document.cumulativesettings.currrandomorder.value != form.allrandomorder.value) {
+            haschanges = 1;
+        }
+        if (document.cumulativesettings.currrandompick.value != form.allrandompick.value) {
+            haschanges = 1;
+        }
+    }
+    if (doactions == 1) {
+        if (numchanges > 0) {
+            if ((cutwarnings > 0) || (remwarnings > 0)) {
+                if (remwarnings > 0) {
+                    if (!confirm('$js_lt{"p_rmr1"}\\n\\n$js_lt{"p_rmr3a"} '+remwarnings+' $js_lt{"p_rmr3b"}')) {
+                        return false;
+                    }
+                }
+                if (cutwarnings > 0) {
+                    if (!confirm('$js_lt{"p_ctr1a"}\\n$js_lt{"p_ctr1b"}\\n\\n$js_lt{"p_ctr3a"} '+cutwarnings+' $js_lt{"p_ctr3b"}')) {
+                        return false;
+                    }
+                }
+            }
+            form.submit();
+            return true;
+        }
+    }
+    if (dosettings == 1) {
+        if (haschanges == 1) {
+            form.submit();
+            return true;
+        }
+    }
+    if ((dosettings == 1) && (doactions == 1)) {
+        alert("$js_lt{'noor'}");
+    } else {
+        if (dosettings == 1) {
+            alert("$js_lt{'noch'}");
+        } else {
+            alert("$js_lt{'noac'}");
+        }
+    }
+    return false;
+}
+
+function setClass(value) {
+    var cutclass = 'LC_docs_cut';
+    var copyclass = 'LC_docs_copy';
+    var removeclass = 'LC_docs_remove';
+    var cutreg = new RegExp("\\\\b"+cutclass+"\\\\b");
+    var copyreg = new RegExp("\\\\b"+copyclass+"\\\\b");
+    var removereg = new RegExp("\\\\"+removeclass+"\\\\b");
+    var links = document.getElementsByTagName('a');
+    for (var i=0; i<links.length; i++) {
+        var classes = links[i].className;
+        if (cutreg.test(classes)) {
+            links[i].className = cutclass;
+            if (value == 1) {
+                links[i].className += " LC_menubuttons_link";
+            }
+        } else {
+            if (copyreg.test(classes)) {
+                links[i].className = copyclass;
+                if (value == 1) {
+                    links[i].className += " LC_menubuttons_link";
+                } 
+            } else {
+                if (removereg.test(classes)) {
+                    links[i].className = removeclass;
+                    if (value == 1) {
+                        links[i].className += " LC_menubuttons_link";
+                    }
+                }
+            }
+        }
+    }
+    return;
+}
+
+function setBoxes(value) {
+    var remidxlist = document.cumulativeactions.allremoveidx.value;
+    if ((remidxlist != '') && (remidxlist != null)) {
+        var remidxs = remidxlist.split(',');
+        for (var i=0; i<remidxs.length; i++) {
+            if (document.getElementById('remove_'+remidxs[i])) {
+                var item = document.getElementById('remove_'+remidxs[i]);
+                if (value == 1) {
+                    item.className = 'LC_docs_remove';
+                } else {
+                    item.className = 'LC_hidden';
+                }
+            }
+        }
+    }
+    var cutidxlist = document.cumulativeactions.allcutidx.value;
+    if ((cutidxlist != '') && (cutidxlist != null)) {
+        var cutidxs = cutidxlist.split(',');
+        for (var i=0; i<cutidxs.length; i++) {
+            if (document.getElementById('cut_'+cutidxs[i])) {
+                var item = document.getElementById('cut_'+cutidxs[i]);
+                if (value == 1) {
+                    item.className = 'LC_docs_cut';
+                } else {
+                    item.className = 'LC_hidden';
+                }
+            }
+        }
+    }
+    var copyidxlist = document.cumulativeactions.allcopyidx.value;
+    if ((copyidxlist != '') && (copyidxlist != null)) {
+        var copyidxs = copyidxlist.split(',');
+        for (var i=0; i<copyidxs.length; i++) {
+            if (document.getElementById('copy_'+copyidxs[i])) {
+                var item = document.getElementById('copy_'+copyidxs[i]);
+                if (value == 1) {
+                    item.className = 'LC_docs_copy';
+                } else {
+                    item.className = 'LC_hidden';
+                }
+            }
+        }
+    }
+    return;
+}
+
 ENDNEWSCRIPT
 }
 
@@ -4771,13 +6797,19 @@ ENDINJECT
 
 sub dump_switchserver_js {
     my @hosts = @_;
-    my %lt = &Apache::lonlocal::texthash(
-        dump => 'Dumping to Authoring Space requires switching server.',
+    my %js_lt = &Apache::lonlocal::texthash(
+        dump => 'Copying content to Authoring Space requires switching server.',
+        swit => 'Switch server?',
+    );
+    my %html_js_lt = &Apache::lonlocal::texthash(
         swit => 'Switch server?',
-        duco => 'Dump content to Authoring Space',
+        duco => 'Copying 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',
     );
+    &js_escape(\%js_lt);
+    &html_escape(\%html_js_lt);
+    &js_escape(\%html_js_lt);
     my $role = $env{'request.role'};
     my $js = <<"ENDSWJS";
 <script type="text/javascript">
@@ -4818,7 +6850,7 @@ ENDSWJS
 
 function dump_needs_switchserver(url) {
     if (url!='' && url!= null) {
-        if (confirm("$lt{'dump'}\\n$lt{'swit'}")) {
+        if (confirm("$js_lt{'dump'}\\n$js_lt{'swit'}")) {
             go(url);
         }
     }
@@ -4829,13 +6861,13 @@ 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'+
+    newWindow.document.write('<h3>$html_js_lt{'duco'}<\\/h3>\\n'+
+       '<p>$html_js_lt{'yone'}<\\/p>\\n'+
+       '<div class="LC_left_float"><fieldset><legend>$html_js_lt{'chos'}<\\/legend>\\n'+
        '<form name="setserver" method="post" action="" \\/>\\n'+
        '$hostpicker\\n'+
        '<br \\/><br \\/>\\n'+
-       '<input type="button" name="makeswitch" value="$lt{'swit'}" '+
+       '<input type="button" name="makeswitch" value="$html_js_lt{'swit'}" '+
        'onclick="write_switchserver();" \\/>\\n'+
        '<\\/form><\\/fieldset><\\/div><br clear="all" \\/>\\n');
     newWindow.document.writeln('$endpage');
@@ -4921,6 +6953,10 @@ Return hash with valid author names
 
 =item do_paste_from_buffer()
 
+=item do_buffer_empty() 
+
+=item clear_from_buffer()
+
 =item get_newmap_url()
 
 =item dbcopy()