--- loncom/interface/londocs.pm	2015/03/24 10:05:45	1.484.2.60
+++ loncom/interface/londocs.pm	2013/05/06 14:12:21	1.544
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.484.2.60 2015/03/24 10:05:45 raeburn Exp $
+# $Id: londocs.pm,v 1.544 2013/05/06 14:12:21 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -41,12 +41,9 @@ 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);
@@ -59,7 +56,6 @@ my $hashtied;
 my %alreadyseen=();
 
 my $hadchanges;
-my $suppchanges;
 
 
 my %help=();
@@ -83,11 +79,7 @@ sub storemap {
 			      $map,1,$report);
     if ($errtext) { return ($errtext,2); }
 
-    if ($map =~ /^default/) {
-        $hadchanges=1;
-    } else {
-        $suppchanges=1;
-    }
+    $hadchanges=1;
     return ($errtext,0);
 }
 
@@ -144,28 +136,8 @@ sub clean {
 sub dumpcourse {
     my ($r) = @_;
     my $crstype = &Apache::loncommon::course_type();
-    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(&Apache::loncommon::start_page('Dump '.$crstype.' Content to Authoring Space')."\n".
+              &Apache::lonhtmlcommon::breadcrumbs('Dump '.$crstype.' Content to Authoring Space')."\n");
     $r->print(&startContentScreen('tools'));
     my ($home,$other,%outhash)=&authorhosts();
     unless ($home) {
@@ -184,407 +156,118 @@ ENDJS
 	$r->print('<h3>'.&mt('Copying Files').'</h3>');
 	my $title=$env{'form.authorfolder'};
 	$title=&clean($title);
-        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 %replacehash=();
+	foreach my $key (keys(%env)) {
+	    if ($key=~/^form\.namefor\_(.+)/) {
+		$replacehash{$1}=$env{$key};
+	    }
+	}
 	my $crs='/uploaded/'.$env{'request.course.id'}.'/';
 	$crs=~s/\_/\//g;
-        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>');
-            }
-        }
+	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>');
+	    }
+	}
     } else {
-        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) {
-                    $preamble .= '<input type="hidden" name="authorspace" value="'.$user.'" />';
-                } else {
-                    $preamble .= '<option value="'.$user.'">'.$user.' - '.
-                                 &Apache::loncommon::plainname(split(/\:/,$user)).'</option>';
-                }
-            }
-            unless ($home==1) {
-                $preamble .= '</select></fieldset></div>'."\n";
-            }
-            my $title=$origcrsdata{'description'};
-            $title=~s/[\/\s]+/\_/gs;
-            $title=&clean($title);
-            $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(&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_(.+)$/) {
+		if ($home==1) {
+		    $r->print(
+		  '<input type="hidden" name="authorspace" value="'.$1.'" />');
+		} else {
+		    $r->print('<option value="'.$1.'">'.$1.' - '.
+			      &Apache::loncommon::plainname(split(/\:/,$1)).'</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;
+	    }
+	    $title=~s/\.(\w+)$//;
+	    $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>');
     }
     $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,
@@ -657,8 +340,10 @@ sub group_import {
                 }
                 my $initialtext = &mt('Replace with your own content.');
                 my $newhtml = <<END;
-<html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
 <head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <title>$name</title>
 </head>
 <body bgcolor="#ffffff">
@@ -667,7 +352,7 @@ $initialtext
 </html>
 END
                 $env{'form.output'}=$newhtml;
-                my $result =
+                my $result = 
                     &Apache::lonnet::finishuserfileupload($coursenum,$coursedom,
                                                           'output',
                                                           "$filepath/$residx/$fname.html");
@@ -692,7 +377,7 @@ END
                           removefrommap => \%removefrommap,
                           removeparam   => \%removeparam,
                       );
-        my ($result,$msgsarray,$lockerror) =
+        my ($result,$msgsarray,$lockerror) = 
             &apply_fixups($folder,1,$coursedom,$coursenum,\%import_errors,\%updated);
         if (keys(%import_errors) > 0) {
             $fixuperrors =
@@ -719,13 +404,6 @@ END
     }
     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);
 }
 
@@ -812,7 +490,7 @@ sub docs_change_log {
     }
     my $folderpath=$env{'form.folderpath'};
     if ($folderpath eq '') {
-        $folderpath = 'default&'.&escape(&mt('Main Content').':::::');
+        $folderpath = 'default&'.&escape(&mt('Main '.$crstype.' Content').':::::');
     }
     $pathitem = '<input type="hidden" name="folderpath" value="'.
                 &HTML::Entities::encode($folderpath,'<>&"').'" />';
@@ -977,7 +655,7 @@ sub docs_change_log {
 
 sub update_paste_buffer {
     my ($coursenum,$coursedom,$folder) = @_;
-    my (@possibles,%removals,%cuts,$output);
+    my (@possibles,%removals,%cuts);
     if ($env{'form.multiremove'}) {
         $env{'form.multiremove'} =~ s/,$//;
         map { $removals{$_} = 1; } split(/,/,$env{'form.multiremove'});
@@ -1024,7 +702,7 @@ sub update_paste_buffer {
              my $url = $env{'docs.markedcopy_url_'.$suffix};
              if (($cid =~ /^$match_domain(?:_)$match_courseid$/) &&
                  ($url ne '')) {
-                 $pasteurls{$cid.'_'.$url} = 1;
+                 $pasteurls{$cid.'_'.$url};
              }
         }
     }
@@ -1045,12 +723,10 @@ sub update_paste_buffer {
         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;
-            }
+        push(@newpaste,$suffix);
+        if ($locknotfreed) {
+            return $locknotfreed;
+            last;
         }
         if (&is_supplemental_title($title)) {
             &Apache::lonnet::appenv({'docs.markedcopy_supplemental_'.$suffix => $title});
@@ -1084,17 +760,12 @@ sub update_paste_buffer {
                 }
             }
         }
-        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 {
@@ -1132,7 +803,6 @@ sub print_paste_buffer {
 
     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) {
@@ -1141,7 +811,6 @@ sub print_paste_buffer {
         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];
@@ -1197,14 +866,10 @@ sub print_paste_buffer {
                     $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));
+                             &LONCAPA::map::qtescape($env{'docs.markedcopy_title_'.$suffix}));
             }
             $pasteitems .= '<div class="LC_left_float">';
             my ($options,$onclick);
@@ -1239,23 +904,11 @@ sub print_paste_buffer {
         $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('Clear selected').'" />'.('&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);
+            $buttons = '<input type="submit" name="pastemarked" value="'.&mt('Paste selected').'" />'.('&nbsp;'x2);
         }
-        $form_end = '<input type="hidden" name="folderpath" value="'.&HTML::Entities::encode($env{'form.folderpath'},'<>&"').'" />'.
-                    '</form>';
+        $buttons .= '<input type="submit" name="clearmarked" value="'.&mt('Clear selected').'" />'.
+                    '<input type="hidden" name="folderpath" value="'.&HTML::Entities::encode($env{'form.folderpath'},'<>&"').'" />';
+        $form_end = '</form>';
     } else {
         $pasteitems = &mt('Clipboard is empty');
     }
@@ -1409,24 +1062,6 @@ function validateClipboard() {
     }
 }
 
-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
 
 }
@@ -1464,7 +1099,8 @@ sub do_paste_from_buffer {
     }
 
     my (%msgs,%before,%after,@dopaste,%is_map,%notinsupp,%notincrs,%duplicate,
-        %prefixchg,%srcdom,%srcnum,%marktomove,$save_err,$lockerrors,$allresult);
+        %prefixchg,%srcdom,%srcnum,%marktomove,$save_err,$lockerrors,$allresult,
+        %msgs);
 
     foreach my $suffix (@topaste) {
         my $url=&LONCAPA::map::qtescape($env{'docs.markedcopy_url_'.$suffix});
@@ -1665,7 +1301,7 @@ sub do_paste_from_buffer {
                     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;
+                        $msg = &mt('Paste failed: An error occurred when copying the bulletin board.').' '.$errtext;
                     }
                     $results{$suffix} = $result;
                     $msgerrs{$suffix} = $msg;
@@ -1673,7 +1309,7 @@ sub do_paste_from_buffer {
                     next;
 	        }
                 if ($lockerr{$prefix}) {
-                    $lockerrs{$suffix} = $lockerr{$prefix};
+                    $lockerrs{$suffix} = $lockerr{$prefix};  
                 }
             }
         }
@@ -1712,7 +1348,7 @@ sub do_paste_from_buffer {
                     if ($newdocsdir eq '') {
                         $newdocsdir = 'default';
                     }
-                    if (($prefixchg{$suffix}) ||
+                    if (($prefixchg{$suffix}) || 
                         ($srcdom{$suffix} ne $coursedom) || 
                         ($srcnum{$suffix} ne $coursenum) ||
                         ($env{'form.docs.markedcopy_options_'.$suffix} ne 'move')) {
@@ -1915,11 +1551,11 @@ sub get_newmap_url {
 sub dbcopy {
     my ($dbref,$coursedom,$coursenum,$lockerrorsref) = @_;
     my ($url,$result,$errtext);
-    $url = $dbref->{'src'};
+    my $url = $dbref->{'src'};
     if (ref($dbref) eq 'HASH') {
         if ($url =~ m{/(smppg|bulletinboard)$}) {
             my $prefix = $1;
-            if (($dbref->{'cdom'} =~ /^$match_domain$/) &&
+            if (($dbref->{'cdom'} =~ /^$match_domain$/) && 
                 ($dbref->{'cnum'} =~ /^$match_courseid$/)) {
                 my $db_name;
                 my $marker = (split(m{/},$url))[4];
@@ -1940,7 +1576,7 @@ sub dbcopy {
                     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);
+                        $errtext = &mt('Failed to acquire a unique timestamp-based suffix when copying a bulletin board [_1].',$url);
                     }
                     if ($error) {
                         $errtext .= '<br />'.$error;
@@ -1954,12 +1590,12 @@ sub dbcopy {
                         my $photo = $contents{'uploaded.photourl'};
                         my ($subdir,$fname) =
                             ($photo =~ m{^/uploaded/$match_domain/$match_courseid/+(bulletin|simplepage)/(?:|\d+/)([^/]+)$});
-                        my $newphoto;
+                        my $newphoto; 
                         if ($fname ne '') {
                             my $content = &Apache::lonnet::getfile($photo);
                             unless ($content eq '-1') {
                                 $env{'form.'.$suffix.'.photourl'} = $content;
-                                $newphoto =
+                                $newphoto = 
                                     &Apache::lonnet::finishuserfileupload($coursenum,$coursedom,$suffix.'.photourl',"$subdir/$suffix/$fname");
                                 delete($env{'form.'.$suffix.'.photourl'});
                             }
@@ -1976,18 +1612,16 @@ sub dbcopy {
                     }
                 }
                 if (($freedlock ne 'ok') && (ref($lockerrorsref) eq 'HASH')) {
-                    $lockerrorsref->{$prefix} =
+                    $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.');
+                        $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('This will prevent creation of additional bulletin boards in this course.');
                     }
-                    $lockerrorsref->{$prefix} .= ' '.&mt('Please contact the [_1]helpdesk[_2] for assistance.',
-                                                     '<a href="/adm/helpdesk" target="_helpdesk">','</a>').
-                                                 '</div>';
+                    $lockerrorsref->{$prefix} .= &mt('Please contact the domain coordinator for your LON-CAPA domain.').'</div>';
                 }
             }
         } elsif ($url =~ m{/syllabus$}) {
@@ -2104,7 +1738,7 @@ sub url_paste_fixups {
             }
             next if ($token->[2]->{'type'} eq 'external');
             if ($token->[2]->{'type'} eq 'zombie') {
-                next if ($skip);
+                next if ($skip);  
                 $zombies->{$oldurl}{$id} = $ressrc;
                 $changed = 1;
             } elsif ($ressrc =~ m{^/uploaded/($match_domain)/($match_courseid)/(.+)$}) {
@@ -2550,7 +2184,7 @@ sub update_parameter {
                          'randomorder'    => {},
                       );
         foreach my $which (keys(%allchecked)) {
-            $env{'form.all'.$which} =~ s/,$//;
+            $env{'form.all'.$which} =~ s/,$//;   
             if ($which eq 'randompick') {
                 foreach my $item (split(/,/,$env{'form.all'.$which})) {
                     my ($res,$value) = split(/:/,$item);
@@ -2577,7 +2211,7 @@ sub update_parameter {
             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}) {
@@ -2613,45 +2247,26 @@ sub update_parameter {
         }
         return $haschanges;
     } else {
-        my $haschanges = 0;
-        return $haschanges if ($env{'form.changeparms'} !~ /^($valid_parameters_re)$/);
+        return 0 if ($env{'form.changeparms'} !~ /^($valid_parameters_re)$/);
 
         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');
-            }
+	    my $value = ($which eq 'randompick') ? $env{'form.rpicknum_'.$idx}
+	                                         : 'yes';
+	    &LONCAPA::map::storeparameter($idx, 'parameter_'.$which, $value,
+				          $parameter_type{$which});
+	    &remember_parms($idx,$which,'set',$value);
+        } else {
+	    &LONCAPA::map::delparameter($idx,'parameter_'.$which);
+
+	    &remember_parms($idx,$which,'del');
         }
-        return $haschanges;
+        return 1;
     }
-    return;
 }
 
+
 sub handle_edit_cmd {
     my ($coursenum,$coursedom) =@_;
     if ($env{'form.cmd'} eq '') {
@@ -2717,7 +2332,7 @@ sub editor {
     my $jumpto;
 
     unless ($supplementalflag) {
-        $jumpto = "uploaded/$coursedom/$coursenum/$folder.$container";
+        $jumpto = "'uploaded/$coursedom/$coursenum/$folder.$container'";
     }
 
     unless ($allowed) {
@@ -2743,7 +2358,7 @@ sub editor {
 	&snapshotbefore();
 
 	if (&update_parameter()) {
-	    ($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container,1);
+	    ($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container);
 	    return $errtext if ($fatal);
 	}
 
@@ -2807,7 +2422,7 @@ sub editor {
 # Rename, cut, copy or remove a single resource
 	if (&handle_edit_cmd()) {
             my $contentchg;
-            if ($env{'form.cmd'} =~ m{^(remove|cut)_}) {
+            if ($env{'form.cmd'} =~ m{^(del|cut)_}) {
                 $contentchg = 1;
             }
 	    ($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container,$contentchg);
@@ -2839,7 +2454,7 @@ sub editor {
                     my ($name,$url)=split(/\:/,$LONCAPA::map::resources[$res]);
                     $name=&LONCAPA::map::qtescape($name);
                     $url=&LONCAPA::map::qtescape($url);
-                    next unless $url;
+                    next unless ($name && $url);
                     my %denied =
                         &action_restrictions($coursenum,$coursedom,$url,
                                              $env{'form.folderpath'},\%curr_groups);
@@ -3055,11 +2670,11 @@ sub editor {
                     if (@allidx > 0) {
                         my $path;
                         if ($env{'form.folderpath'}) {
-                            $path =
+                            $path = 
                                 &HTML::Entities::encode($env{'form.folderpath'},'<>&"');
                         }
                         if (@allidx > 1) {
-                            $to_show .=
+                            $to_show .= 
                                 &Apache::loncommon::continue_data_table_row().
                                 '<td colspan="2">&nbsp;</td>'.
                                 '<td>'.
@@ -3091,7 +2706,7 @@ sub editor {
             }
             $to_show .= &Apache::loncommon::start_scrollbox('400px','380px','200px','contentscroll')
                        .'<div class="LC_info" id="contentlist">'
-                       .&mt('Currently empty')
+                       .&mt('Currently no documents.')
                        .'</div>'
                        .&Apache::loncommon::end_scrollbox();
         }
@@ -3104,7 +2719,7 @@ sub editor {
                       .'</div>';
         } else {
             $to_show = '<div class="LC_info" id="contentlist">'
-                      .&mt('Currently empty')
+                      .&mt('Currently no documents.')
                       .'</div>'
         }
     }
@@ -3189,33 +2804,8 @@ sub multiple_check_form {
 }
 
 sub process_file_upload {
-    my ($upload_output,$coursenum,$coursedom,$allfiles,$codebase,$uploadcmd,$crstype) = @_;
+    my ($upload_output,$coursenum,$coursedom,$allfiles,$codebase,$uploadcmd) = @_;
 # 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';
@@ -3311,8 +2901,7 @@ 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)) &&
-                     ($env{'form.uploaddoc.filename'} =~ /\.(zip|tar|bz2|gz|tar.gz|tar.bz2|tgz)$/i)) {
+            } elsif (&Apache::loncommon::is_archive_file($mimetype)) {
                 $nextphase = 'decompress_uploaded';
                 my $position = scalar(@LONCAPA::map::order)-1;
                 my $noextract = &return_to_editor();
@@ -3374,7 +2963,7 @@ sub is_supplemental_title {
 sub entryline {
     my ($index,$title,$url,$folder,$allowed,$residx,$coursenum,$coursedom,
         $crstype,$pathitem,$supplementalflag,$container,$filtersref,$currgroups)=@_;
-    my ($foldertitle,$renametitle,$oldtitle);
+    my ($foldertitle,$renametitle);
     if (&is_supplemental_title($title)) {
 	($title,$foldertitle,$renametitle) = &Apache::loncommon::parse_supplemental_title($title);
     } else {
@@ -3387,10 +2976,7 @@ 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,$form_param);
 # Edit commands
@@ -3539,9 +3125,11 @@ ENDREM
                 push(@{$filtersref->{'canremove'}},$orderidx);
             }
         }
-        $renamelink=(<<ENDREN);
-<a href='javascript:changename("$esc_path","$index","$oldtitle");' class="LC_docs_rename">$lt{'rn'}</a>
+        unless ($isexternal) {
+            $renamelink=(<<ENDREN);
+<a href='javascript:changename("$esc_path","$index","$renametitle");' class="LC_docs_rename">$lt{'rn'}</a>
 ENDREN
+        }
 	$line.=(<<END);
 <td>
 <div class="LC_docs_entry_move">
@@ -3674,13 +3262,13 @@ $form_common."\n".
                     push(@{$filtersref->{'randomorder'}},$orderidx);
                 }
             }
-            $formname = 'edit_rorder_'.$orderidx;
+            my $formname = 'edit_rorder_'.$orderidx;
 	    $rand_order_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="randomorder_'.$orderidx.'" id="randomorder_'.$orderidx.'" onclick="checkForSubmit(this.form,'."'randomorder','settings'".');" '.$ro_set.' /> '.&mt('Random Order').' </label></span>'.
-$form_end;
+$form_end; 
         }
     } elsif ($supplementalflag && !$allowed) {
         $url .= ($url =~ /\?/) ? '&amp;':'?';
@@ -3855,7 +3443,6 @@ sub new_timebased_suffix {
     if ($type eq 'paste') {
         $prefix = $type;
         $namespace = 'courseeditor';
-        $idtype = 'addcode';
     } elsif ($type eq 'map') {
         $prefix = 'docs';
         if ($area eq 'supplemental') {
@@ -3867,8 +3454,9 @@ sub new_timebased_suffix {
         $prefix = $type;
         $namespace = 'templated';
     }
+    $idtype = 'concat';
     my ($suffix,$freedlock,$error) =
-        &Apache::lonnet::get_timebased_id($prefix,'num',$namespace,$dom,$num,$idtype);
+        &Apache::lonnet::get_timebased_id($prefix,'num',$namespace,$dom,$num);
     if (!$suffix) {
         if ($type eq 'paste') {
             $errtext = &mt('Failed to acquire a unique timestamp-based suffix when adding to the paste buffer.');
@@ -3877,41 +3465,30 @@ sub new_timebased_suffix {
         } 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.');
+            $errtext = &mt('Failed to acquire a unique timestamp-based suffix for the new bulletin board.');
         }
         if ($error) {
             $errtext .= '<br />'.$error;
         }
     }
     if ($freedlock ne 'ok') {
-        $locknotfreed =
+        $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.');
-            }
+            &mt('This will prevent use of the paste buffer until th next log-in.');
         } elsif ($type eq 'map') {
-            $locknotfreed .=
-                &mt('This will prevent creation of additional folders or composite pages in this course.');
+            &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.');
+                &mt('This will prevent creation of additional bulletin 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>');
+                ' '.&mt('Please contact the domain coordinator for your LON-CAPA domain.');
         }
         $locknotfreed .= '</div>';
     }
@@ -4076,8 +3653,8 @@ sub list_symbs {
 sub verifycontent {
     my ($r) = @_;
     my $crstype = &Apache::loncommon::course_type();
-    $r->print(&Apache::loncommon::start_page('Verify '.$crstype.' Content'));
-    $r->print(&Apache::lonhtmlcommon::breadcrumbs('Verify '.$crstype.' Content'));
+    $r->print(&Apache::loncommon::start_page('Verify '.$crstype.' Documents'));
+    $r->print(&Apache::lonhtmlcommon::breadcrumbs('Verify '.$crstype.' Documents'));
     $r->print(&startContentScreen('tools'));
     $r->print('<h4 class="LC_info">'.&mt($crstype.' content verification').'</h4>'); 
    $hashtied=0;
@@ -4113,8 +3690,8 @@ sub devalidateversioncache {
 sub checkversions {
     my ($r) = @_;
     my $crstype = &Apache::loncommon::course_type();
-    $r->print(&Apache::loncommon::start_page("Check $crstype Resource Versions"));
-    $r->print(&Apache::lonhtmlcommon::breadcrumbs("Check $crstype Resource Versions"));
+    $r->print(&Apache::loncommon::start_page("Check $crstype Document Versions"));
+    $r->print(&Apache::lonhtmlcommon::breadcrumbs("Check $crstype Document Versions"));
     $r->print(&startContentScreen('tools'));
 
     my $header='';
@@ -4179,7 +3756,7 @@ sub checkversions {
     &changewarning($r,'');
     if ($env{'form.timerange'} eq 'all') {
 # show all documents
-	$header=&mt('All content in '.$crstype);
+	$header=&mt('All Documents in '.$crstype);
 	$allsel=' selected="selected"';
 	foreach my $key (keys(%hash)) {
 	    if ($key=~/^ids\_(\/res\/.+)$/) {
@@ -4270,30 +3847,10 @@ $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>'.
@@ -4303,25 +3860,26 @@ ENDHEADERS
         '<th>'.&mt('History').'</th>'.
         &Apache::loncommon::end_data_table_header_row()
     );
-    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')) {
+    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')) {
                 if ($usedversion != $currentversion) {
                     $r->print('<span class="LC_warning">'.$usedversion.'</span>');
                 } else {
@@ -4330,45 +3888,44 @@ 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(
+        $r->print('</td><td title="'.$lt{'vu'}.'">');
+        # Set version
+        $r->print(&Apache::loncommon::select_form(
+            $setversions{$linkurl},
+            'set_version_'.$linkurl,
+            {'select_form_order' => ['',1..$currentversion,'mostrecent'],
+             '' => '',
+             'mostrecent' => &mt('most recent'),
+             map {$_,$_} (1..$currentversion)}));
+        my $lastold=1;
+        for (my $prevvers=1;$prevvers<$currentversion;$prevvers++) {
+            my $url=$root.'.'.$prevvers.'.'.$extension;
+            if (&Apache::lonnet::metadata($url,'lastrevisiondate')<$starttime) {
+                $lastold=$prevvers;
+            }
+        }
+        $r->print('</td>');
+        # List all available versions
+        $r->print('<td valign="top"><span class="LC_fontsize_medium">');
+        for (my $prevvers=$lastold;$prevvers<$currentversion;$prevvers++) {
+            my $url=$root.'.'.$prevvers.'.'.$extension;
+            $r->print(
+                '<span class="LC_nobreak">'
+               .'<a href="'.&Apache::lonnet::clutter($url).'">'
+               .&mt('Version [_1]',$prevvers).'</a>'
+               .' ('.&Apache::lonlocal::locallocaltime(
                          &Apache::lonnet::metadata($url,'lastrevisiondate'))
-                   .')');
-                if (&Apache::loncommon::fileembstyle($extension) eq 'ssi') {
-                    $r->print(
-                        ' <a href="/adm/diff?filename='.
-                        &Apache::lonnet::clutter($root.'.'.$extension).
-                        &HTML::Entities::encode('&versionone='.$prevvers,'"<>&').
-                        '" target="diffs">'.&mt('Diffs').'</a>');
-                }
-                $r->print('</span><br />');
+               .')');
+            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></td>'.&Apache::loncommon::end_data_table_row());
+            $r->print('</span><br />');
         }
+        $r->print('</span></td>'.&Apache::loncommon::end_data_table_row());
     }
     $r->print(
         &Apache::loncommon::end_data_table().
@@ -4378,7 +3935,6 @@ ENDHEADERS
 
     &untiehash();
     $r->print(&endContentScreen());
-    return;
 }
 
 sub mark_hash_old {
@@ -4433,13 +3989,13 @@ $help{'Caching'}.'</p></form>'."\n\n");
 
 
 sub init_breadcrumbs {
-    my ($form,$text,$help)=@_;
+    my ($form,$text)=@_;
     &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 => $help});
+                                            help => 'Docs_Adding_Course_Doc'});
     &Apache::lonhtmlcommon::add_breadcrumb({href=>"/adm/coursedocs?".$form.'=1',
 					    text=>$text,
 					    faq=>273,
@@ -4475,9 +4031,10 @@ sub startContentScreen {
     if (($mode eq 'navmaps') || ($mode eq 'supplemental')) {
         $output .= '<li'.(($mode eq 'navmaps')?' class="active"':'').'><a href="/adm/navmaps"><b>&nbsp;&nbsp;&nbsp;&nbsp;'.&mt('Content Overview').'&nbsp;&nbsp;&nbsp;&nbsp;</b></a></li>'."\n";
         $output .= '<li'.(($mode eq 'coursesearch')?' class="active"':'').'><a href="/adm/searchcourse"><b>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'.&mt('Content Search').'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b></a></li>'."\n";
+        $output .= '<li'.(($mode eq 'courseindex')?' class="active"':'').'><a href="/adm/indexcourse"><b>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'.&mt('Content Index').'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b></a></li>'."\n";
         $output .= '<li '.(($mode eq 'suppdocs')?' class="active"':'').'><a href="/adm/supplemental"><b>'.&mt('Supplemental Content').'</b></a></li>';
     } else {
-        $output .= '<li '.(($mode eq 'docs')?' class="active"':'').' id="tabbededitor"><a href="/adm/coursedocs?forcestandard=1"><b>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'.&mt('Main 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('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>';
@@ -4498,7 +4055,7 @@ sub endContentScreen {
 }
 
 sub supplemental_base {
-    return 'supplemental&'.&escape(&mt('Supplemental Content'));
+    return 'supplemental&'.&escape(&mt('Supplemental '.&Apache::loncommon::course_type().' Content'));
 }
 
 sub handler {
@@ -4522,8 +4079,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','Course_Roster','Web_Page',
-                       'Dropbox','Simple_Problem') {
+                       'Uploading_From_Harddrive',
+	               'Check_Resource_Versions','Verify_Content') {
 	$help{$topic}=&Apache::loncommon::help_open_topic('Docs_'.$topic);
     }
     # Composite help files
@@ -4531,12 +4088,16 @@ 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');
+    $help{'Course Roster'} = &Apache::loncommon::help_open_topic('Docs_Course_Roster');
+    $help{'Web Page'} =  &Apache::loncommon::help_open_topic('Docs_Web_Page');
  
     my $allowed;
 # URI is /adm/supplemental when viewing supplemental docs in non-edit mode.
@@ -4545,9 +4106,13 @@ sub handler {
         $allowed = &Apache::lonnet::allowed('mdc',$env{'request.course.id'});
     }
 
-    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['inhibitmenu']);
-  if ($allowed && $env{'form.verify'}) {
-      &init_breadcrumbs('verify','Verify Content','Docs_Verify_Content');
+    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['chooseserver',
+                                            'inhibitmenu']);
+  if ($allowed && $env{'form.chooseserver'}) {
+      &choose_dump_server($r);
+      return OK;
+  } elsif ($allowed && $env{'form.verify'}) {
+      &init_breadcrumbs('verify','Verify Content');
       &verifycontent($r);
   } elsif ($allowed && $env{'form.listsymbs'}) {
       &init_breadcrumbs('listsymbs','List Content IDs');
@@ -4560,10 +4125,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','Docs_Check_Resource_Versions');
+      &init_breadcrumbs('versions','Check/Set Resource Versions');
       &checkversions($r);
   } elsif ($allowed && $env{'form.dumpcourse'}) {
-      &init_breadcrumbs('dumpcourse','Copy '.&Apache::loncommon::course_type().' Content to Authoring Space');
+      &init_breadcrumbs('dumpcourse','Dump '.&Apache::loncommon::course_type().' Content to Authoring Space');
       &dumpcourse($r);
   } elsif ($allowed && $env{'form.exportcourse'}) {
       &init_breadcrumbs('exportcourse','IMS Export');
@@ -4589,9 +4154,9 @@ sub handler {
 # supplementalflag=0: show standard documents
 # toolsflag=1: show utilities
 
-    my $unesc_folderpath = &unescape($env{'form.folderpath'});
-    my $supplementalflag=($unesc_folderpath=~/^supplemental/);
-    if (($unesc_folderpath=~/^default/) || ($unesc_folderpath eq "")) {
+    $env{'form.folderpath'} = &unescape($env{'form.folderpath'});
+    my $supplementalflag=($env{'form.folderpath'}=~/^supplemental/);
+    if (($env{'form.folderpath'}=~/^default/) || ($env{'form.folderpath'} eq "")) {
        $supplementalflag=0;
     }
     if ($env{'form.forcesupplement'}) { $supplementalflag=1; }
@@ -4623,7 +4188,7 @@ sub handler {
        }
    } elsif ($env{'form.command'} eq 'editdocs') {
        $env{'form.folderpath'} = 'default&'.
-                                 &escape(&mt('Main Content').':::::');
+                                 &escape(&mt('Main '.$crstype.' Content').':::::');
        &Apache::lonnet::appenv({'docs.exit.'.$env{'request.course.id'} => $env{'form.command'}});
    } elsif ($env{'form.command'} eq 'editsupp') {
        $env{'form.folderpath'} = 'supplemental&'.
@@ -4668,7 +4233,7 @@ sub handler {
        if ($supplementalflag) {
           $env{'form.folderpath'}=&supplemental_base();
        } else {
-          $env{'form.folderpath'}='default&'.&escape(&mt('Main Content').
+          $env{'form.folderpath'}='default'.&escape(&mt('Main '.$crstype.' Content').
                                   ':::::');
        }
     }
@@ -4694,7 +4259,7 @@ sub handler {
             if ($env{'form.folder'} eq '' ||
                 $env{'form.folder'} eq 'supplemental') {
                 $folderpath='default&'.
-                            &escape(&mt('Main Content').':::::');
+                            &escape(&mt('Main '.$crstype.' Content').':::::');
             }
         }
         $containertag = '<input type="hidden" name="folderpath" value="" />';
@@ -4731,11 +4296,9 @@ 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$/) {
@@ -4747,7 +4310,7 @@ sub handler {
 	    $script .= &editing_js($udom,$uname,$supplementalflag).
                        &history_tab_js().
                        &inject_data_js().
-                       &Apache::lonhtmlcommon::resize_scrollbox_js('docs',$tabidstr,$tid).
+                       &Apache::lonhtmlcommon::resize_scrollbox_js('docs',$tabidstr).
                        &Apache::lonextresedit::extedit_javascript();
             $addentries = {
                             onload   => "javascript:resize_scrollbox('contentscroll','1','1');",
@@ -4772,14 +4335,6 @@ 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,
@@ -4807,7 +4362,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,$crstype);
+                                              \%allfiles,\%codebase,$context);
 	  if ($hadchanges) {
 	      &mark_hash_old();
 	  }
@@ -4859,7 +4414,7 @@ sub handler {
        my %lt=&Apache::lonlocal::texthash(
 		'copm' => 'All documents out of a published map into this folder',
                 'upfi' => 'Upload File',
-                'upld' => 'Upload Content',
+                'upld' => 'Import Content',
                 'srch' => 'Search',
                 'impo' => 'Import',
 		'lnks' => 'Import from Stored Links',
@@ -4872,7 +4427,7 @@ sub handler {
                 'navc' => 'Table of Contents',
                 'sipa' => 'Simple Course Page',
                 'sipr' => 'Simple Problem',
-                'webp' => 'Blank Web Page (editable)',
+                'webp' => 'Blank Web Page (editable)', 
                 'drbx' => 'Drop Box',
                 'scuf' => 'External Scores (handgrade, upload, clicker)',
                 'bull' => 'Discussion Board',
@@ -4880,19 +4435,15 @@ sub handler {
                 'grpo' => 'Group Portfolio',
                 'rost' => 'Course Roster',
                 'abou' => 'Personal Information Page for a User',
-                'imsf' => 'IMS Upload',
-                'imsl' => 'Upload IMS package',
+                'imsf' => 'IMS Import',
+                'imsl' => 'Import IMS package',
                 'cms'  => 'Origin of IMS package',
                 'se'   => 'Select',
                 'file' =>  'File',
                 'title' => 'Title',
                 'comment' => 'Comment',
                 'parse' => 'Upload embedded images/multimedia files if HTML file',
-                'bb5'      => 'Blackboard 5',
-                'bb6'      => 'Blackboard 6',
-                'angel5'   => 'ANGEL 5.5',
-                'webctce4' => 'WebCT 4 Campus Edition',
-        );
+					  );
 # -----------------------------------------------------------------------------
 	my $fileupload=(<<FIUP);
 	$lt{'file'}:<br />
@@ -4923,10 +4474,10 @@ CHBO
         $lt{'cms'}:&nbsp; 
         <select name="source">
         <option value="-1" selected="selected">$lt{'se'}</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>
+        <option value="bb5">Blackboard 5</option>
+        <option value="bb6">Blackboard 6</option>
+        <option value="angel5">ANGEL 5.5</option>
+        <option value="webctce4">WebCT 4 Campus Edition</option>
         </select>
         <input type="hidden" name="folder" value="$imsfolder" />
         </p>
@@ -5033,7 +4584,7 @@ HIDDENFORM
        if ($folder eq '' || $supplementalflag) {
            $folder='default';
 	   $savefolderpath = $env{'form.folderpath'};
-	   $env{'form.folderpath'}='default&'.&escape(&mt('Main Content'));
+	   $env{'form.folderpath'}='default&'.&escape(&mt('Content'));
            $pathitem = '<input type="hidden" name="folderpath" value="'.
 	       &HTML::Entities::encode($env{'form.folderpath'},'<>&"').'" />';
        }
@@ -5054,7 +4605,7 @@ HIDDENFORM
 
 	my $newnavform=(<<NNFORM);
 	<form action="/adm/coursedocs" method="post" name="newnav">
-	<input type="hidden" name="active" value="ee" />
+	<input type="hidden" name="active" value="cc" />
 	$pathitem
 	<input type="hidden" name="importdetail" 
 	value="$lt{'navc'}=/adm/navmaps" />
@@ -5064,7 +4615,7 @@ HIDDENFORM
 NNFORM
 	my $newsmppageform=(<<NSPFORM);
 	<form action="/adm/coursedocs" method="post" name="newsmppg">
-	<input type="hidden" name="active" value="ee" />
+	<input type="hidden" name="active" value="cc" />
 	$pathitem
 	<input type="hidden" name="importdetail" value="" />
 	<a class="LC_menubuttons_link" href="javascript:makesmppage();"> $lt{'sipa'}</a>
@@ -5078,7 +4629,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
@@ -5089,7 +4640,6 @@ NSPROBFORM
 	$pathitem
 	<input type="hidden" name="importdetail" value="" />
 	<a class="LC_menubuttons_link" href="javascript:makedropbox();">$lt{'drbx'}</a>
-        $help{'Dropbox'}
 	</form>
 NDBFORM
 
@@ -5105,7 +4655,7 @@ NEXUFORM
 
 	my $newbulform=(<<NBFORM);
 	<form action="/adm/coursedocs" method="post" name="newbul">
-	<input type="hidden" name="active" value="dd" />
+	<input type="hidden" name="active" value="cc" />
 	$pathitem
 	<input type="hidden" name="importdetail" value="" />
 	<a class="LC_menubuttons_link" href="javascript:makebulboard();" >$lt{'bull'}</a>
@@ -5115,7 +4665,7 @@ NBFORM
 
 	my $newaboutmeform=(<<NAMFORM);
 	<form action="/adm/coursedocs" method="post" name="newaboutme">
-	<input type="hidden" name="active" value="dd" />
+	<input type="hidden" name="active" value="cc" />
 	$pathitem
 	<input type="hidden" name="importdetail" 
 	value="$plainname=/adm/$udom/$uname/aboutme" />
@@ -5126,7 +4676,7 @@ NAMFORM
 
 	my $newaboutsomeoneform=(<<NASOFORM);
 	<form action="/adm/coursedocs" method="post" name="newaboutsomeone">
-	<input type="hidden" name="active" value="dd" />
+	<input type="hidden" name="active" value="cc" />
 	$pathitem
 	<input type="hidden" name="importdetail" value="" />
 	<a class="LC_menubuttons_link" href="javascript:makeabout();">$lt{'abou'}</a>
@@ -5135,12 +4685,12 @@ NASOFORM
 
 	my $newrosterform=(<<NROSTFORM);
 	<form action="/adm/coursedocs" method="post" name="newroster">
-	<input type="hidden" name="active" value="dd" />
+	<input type="hidden" name="active" value="cc" />
 	$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
 
@@ -5156,11 +4706,11 @@ NROSTFORM
         }
         my $newwebpageform =(<<NWEBFORM);
         <form action="/adm/coursedocs" method="post" name="newwebpage">
-        <input type="hidden" name="active" value="ee" />
+        <input type="hidden" name="active" value="cc" />
         $pathitem
         <input type="hidden" name="importdetail" value="$newwebpage" />
         <a class="LC_menubuttons_link" href="javascript:makewebpage();">$lt{'webp'}</a>
-        $help{'Web_Page'}
+        $help{'Web Page'}
         </form>
 NWEBFORM
  
@@ -5180,7 +4730,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="ee" />
+	<input type="hidden" name="active" value="cc" />
 	<a class="LC_menubuttons_link" href="javascript:makenewpage(document.newpage,'$pageseq');">$lt{'newp'}</a>
 	$help{'Adding_Pages'}
 	</form>
@@ -5191,14 +4741,14 @@ NPFORM
 	<form action="/adm/coursedocs" method="post" name="newfolder">
 	$pathitem
 	<input type="hidden" name="importdetail" value="" />
-	<input type="hidden" name="active" value="" />
+	<input type="hidden" name="active" value="aa" />
 	<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="ee" />
+	<input type="hidden" name="active" value="cc" />
 	$pathitem
 	<input type="hidden" name="importdetail" 
 	value="$lt{'syll'}=/public/$coursedom/$coursenum/syllabus" />
@@ -5210,7 +4760,7 @@ NSYLFORM
 
 	my $newgroupfileform=(<<NGFFORM);
 	<form action="/adm/coursedocs" method="post" name="newgroupfiles">
-	<input type="hidden" name="active" value="dd" />
+	<input type="hidden" name="active" value="cc" />
 	$pathitem
 	<input type="hidden" name="importdetail"
 	value="$lt{'grpo'}=/adm/$coursedom/$coursenum/aboutme" />
@@ -5237,7 +4787,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));
 
@@ -5259,14 +4809,14 @@ NGFFORM
         $communityform = &create_form_ul(&create_list_elements(@communityforma));
 
 my %orderhash = (
-                'aa' => ['Upload',$fileuploadform],
-                'bb' => ['Import',$importpubform],
-                'cc' => ['Grading',$gradingform],
+                'aa' => ['Import Content',$fileuploadform],
+                'bb' => ['Published Content',$importpubform],
+                'cc' => ['Grading Resources',$gradingform],
                 );
 unless ($container eq 'page') {
     $orderhash{'00'} = ['Newfolder',$newfolderform];
     $orderhash{'dd'} = ['Collaboration',$communityform];
-    $orderhash{'ee'} = ['Other',$specialdocumentsform];
+    $orderhash{'ee'} = ['Special Pages',$specialdocumentsform];
 }
 
  $hadchanges=0;
@@ -5327,7 +4877,7 @@ SUPDOCFORM
 
 	my $supnewfolderform=(<<SNFFORM);
 	<form action="/adm/coursedocs" method="post" name="supnewfolder">
-	<input type="hidden" name="active" value="" />
+	<input type="hidden" name="active" value="ee" />
         $pathitem
 	<input type="hidden" name="importdetail" value="" />
 	<a class="LC_menubuttons_link" href="javascript:makenewfolder(document.supnewfolder,'$folderseq');">$lt{'newf'}</a> 
@@ -5377,7 +4927,7 @@ SNAMFORM
         $pathitem
         <input type="hidden" name="importdetail" value="$supwebpage" />
         <a class="LC_menubuttons_link" href="javascript:makewebpage('supp');">$lt{'webp'}</a>
-        $help{'Web_Page'}
+        $help{'Web Page'}
         </form>
 SWEBFORM
 
@@ -5400,27 +4950,14 @@ my @supimportdoc = (
 $supupdocform =  &create_form_ul(&create_list_elements(@supimportdoc));
 my %suporderhash = (
 		'00' => ['Supnewfolder', $supnewfolderform],
-                'ee' => ['Upload',$supupdocform],
-                'ff' => ['Other',&create_form_ul(&create_list_elements(@specialdocs))]
+                'ee' => ['Import Content',$supupdocform],
+                'ff' => ['Special Pages',&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) {
@@ -5499,7 +5036,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','archiveurl');
+    my @hiddens = ('newidx','comment','position','folderpath');
     if ($env{'form.folderpath'} =~ /\:1$/) {
         $container='page';
     }
@@ -5507,7 +5044,7 @@ sub decompression_info {
     foreach my $item (@hiddens) {
         if ($env{'form.'.$item}) {
             $hiddenelem .= '<input type="hidden" name="'.$item.'" value="'.
-                           &HTML::Entities::encode($env{'form.'.$item},'<>&"').'" />'."\n";
+                           $env{'form.'.$item}.'" />'."\n";
         }
     }
     return ($destination,$dir_root,$londocroot,$docudom,$docuname,$container,
@@ -5564,34 +5101,25 @@ 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'};
-        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.');
-                        }
+        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.');
                     } else {
-                        $delresult = &mt('Archive file removed.');
+                        $delwarning = &mt('An error occurred updating the contents of the current folder.');
                     }
+                } 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;
@@ -5613,13 +5141,13 @@ sub generate_admin_menu {
     my ($crstype) = @_;
     my $lc_crstype = lc($crstype);
     my ($home,$other,%outhash)=&authorhosts();
-    my %lt= ( # do not translate here
+    my %lt=&Apache::lonlocal::texthash (
                                          'vc'   => 'Verify Content',
                                          'cv'   => 'Check/Set Resource Versions',
                                          'ls'   => 'List Resource Identifiers',
                                          'imse' => 'Export contents to IMS Archive',
-                                         'dcd'  => "Copy $crstype Content to Authoring Space",
-            );
+                                         'dcd'  => "Dump $crstype Content to Authoring Space",
+                                       );
     my ($candump,$dumpurl);
     if ($home + $other > 0) {
         $candump = 'F';
@@ -5649,14 +5177,14 @@ sub generate_admin_menu {
                 {   linktext   => $lt{'vc'},
                     url        => "javascript:injectData(document.courseverify,'dummy','verify','$lt{'vc'}')",
                     permission => 'F',
-                    help       => 'Docs_Verify_Content',
+                    help       => 'Verify_Content',
                     icon       => 'verify.png',
                     linktitle  => 'Verify contents can be retrieved/rendered',
                 },
                 {   linktext => $lt{'cv'},
                     url => "javascript:injectData(document.courseverify,'dummy','versions','$lt{'cv'}')",
                     permission => 'F',
-                    help       => 'Docs_Check_Resource_Versions',
+                    help       => 'Check_Resource_Versions',
                     icon       => 'resversion.png',
                     linktitle  => "View version information for resources in your $lc_crstype, and fix/unfix use of specific versions",
                 },
@@ -5681,7 +5209,7 @@ sub generate_admin_menu {
                 {   linktext   => $lt{'dcd'},
                     url        => $dumpurl,
                     permission => $candump,
-                    help       => 'Docs_Dump_Course_Docs',
+                    #help => '',
                     icon       => 'dump.png',
                     linktitle  => $lt{'dcd'},
                 },
@@ -5701,7 +5229,7 @@ sub generate_edit_table {
     my $form;
     my $activetab;
     my $active;
-    if (($env{'form.active'} ne '') && ($env{'form.active'} ne '00')) {
+    if (($env{'form.active'} ne '') && ($env{'form.active'} ne 'aa')) {
         $activetab = $env{'form.active'};
     }
     my $backicon = $iconpath.'clickhere.gif';
@@ -5709,7 +5237,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>'.
@@ -5736,7 +5264,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 style="float:right">'.${$orderhash{$name}}[1].'</li>'."\n";
+	    $form .= '<li '.$active.' style="float:right">'.${$orderhash{$name}}[1].'</li>'."\n";
 
 	}
     }
@@ -5804,7 +5332,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_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',
@@ -5840,7 +5368,7 @@ sub editing_js {
         $main_container_page = 1;
     }
     my $toplevelmain = 
-        &escape(&mt('Main Content').':::::');
+        &escape(&mt('Main '.$crstype.' Content').':::::');
     my $toplevelsupp = &supplemental_base();
 
     my $backtourl;
@@ -5854,7 +5382,6 @@ 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';
             }
@@ -5919,7 +5446,7 @@ function makewebpage(type) {
        formname = this.document.forms.newwebpage;
    }
    if (title) {
-       var webpage = formname.importdetail.value;
+       var webpage = formname.importdetail.value; 
        formname.importdetail.value = escape(title)+'='+webpage;
        formname.submit();
    }
@@ -6300,12 +5827,10 @@ for (i = 0; i < currentLis.length; i++)
 
 function hideAll(current, nav, data) {
 unselectInactive(nav);
-if (current) {
-    if (current.className == 'right'){
+if(current.className == 'right'){
 	current.className = 'right active'
-    } else {
+	}else{
 	current.className = 'active';
-    }
 }
 currentData = document.getElementById(data);
 currentDivs = currentData.getElementsByTagName('DIV');
@@ -6336,24 +5861,10 @@ function openTabs(pageId) {
 }
 
 function showPage(current, pageId, nav, data) {
-        currstate = current.className;
 	hideAll(current, nav, data);
 	openTabs(pageId);
 	unselectInactive(nav);
-        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';
-        }
+	current.className = 'active';
 	currentData = document.getElementById(pageId);
 	currentData.style.display = 'block';
         activeTab = pageId;
@@ -6741,9 +6252,9 @@ ENDINJECT
 sub dump_switchserver_js {
     my @hosts = @_;
     my %lt = &Apache::lonlocal::texthash(
-        dump => 'Copying content to Authoring Space requires switching server.',
+        dump => 'Dumping to Authoring Space requires switching server.',
         swit => 'Switch server?',
-        duco => 'Copying Content to Authoring Space',
+        duco => 'Dump content to Authoring Space',
         yone => 'You need to switch to a server housing an Authoring Space for which you are author or co-author.',
         chos => 'Choose server',
     );