--- loncom/interface/londocs.pm	2023/01/20 16:30:43	1.484.2.93.2.8
+++ loncom/interface/londocs.pm	2013/04/02 00:07:08	1.541
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.484.2.93.2.8 2023/01/20 16:30:43 raeburn Exp $
+# $Id: londocs.pm,v 1.541 2013/04/02 00:07:08 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -41,13 +41,9 @@ use Apache::lonclonecourse;
 use Apache::lonnavmaps;
 use Apache::lonnavdisplay();
 use Apache::lonextresedit();
-use Apache::lontemplate();
-use Apache::lonsimplepage();
-use Apache::loncourserespicker();
 use HTML::Entities;
 use HTML::TokeParser;
 use GDBM_File;
-use File::MMagic;
 use Apache::lonlocal;
 use Cwd;
 use LONCAPA qw(:DEFAULT :match);
@@ -60,7 +56,6 @@ my $hashtied;
 my %alreadyseen=();
 
 my $hadchanges;
-my $suppchanges;
 
 
 my %help=();
@@ -84,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);
 }
 
@@ -140,108 +131,13 @@ sub clean {
     return $title;
 }
 
-sub default_folderpath {
-    my ($coursenum,$coursedom,$navmapref) = @_;
-    return unless ($coursenum && $coursedom && ref($navmapref));
-# Check if entire course is hidden and/or encrypted
-    my ($hiddenmap,$encryptmap,$folderpath,$hiddentop);
-    my $toplevel = "uploaded/$coursedom/$coursenum/default.sequence";
-    unless (ref($$navmapref)) {
-        $$navmapref = Apache::lonnavmaps::navmap->new();
-    }
-    if (ref($$navmapref)) {
-        if (lc($$navmapref->get_mapparam(undef,$toplevel,"0.hiddenresource")) eq 'yes') {
-            my $filterFunc = sub { my $res = shift; return (!$res->randomout() && !$res->is_map()) };
-            my @resources = $$navmapref->retrieveResources($toplevel,$filterFunc,1,1);
-            unless (@resources) {
-                $hiddenmap = 1;
-                unless ($env{'request.role.adv'}) {
-                    $hiddentop = 1;
-                    if ($env{'form.folder'}) {
-                        undef($env{'form.folder'});
-                    }
-                }
-            }
-        }
-        if (lc($$navmapref->get_mapparam(undef,$toplevel,"0.encrypturl")) eq 'yes') {
-            $encryptmap = 1;
-        }
-    }
-    unless ($hiddentop) {
-        $folderpath='default&'.&escape(&mt('Main Content')).
-                    '::'.$hiddenmap.':'.$encryptmap.'::';
-    }
-    if (wantarray) {
-        return ($folderpath,$hiddentop);
-    } else {
-        return $folderpath;
-    }
-}
-
-sub validate_folderpath {
-    my ($supplementalflag) = @_;
-    if ($env{'form.folderpath'} ne '') {
-        my @items = split(/\&/,$env{'form.folderpath'});
-        my $badpath;
-        for (my $i=0; $i<@items; $i++) {
-            my $odd = $i%2;
-            if (($odd) && (!$supplementalflag) && ($items[$i] !~ /^[^:]*:(|\d+):(|1):(|1):(|1):(|1)$/)) {
-                $badpath = 1;
-            } elsif ((!$odd) && ($items[$i] !~ /^(default|supplemental)(|_\d+)$/)) {
-                $badpath = 1;
-            }
-            last if ($badpath);
-        }
-        if ($badpath) {
-            delete($env{'form.folderpath'});
-        }
-    }
-    return;
-}
 
-sub validate_suppath {
-    if ($env{'form.supppath'} ne '') {
-        my @items = split(/\&/,$env{'form.supppath'});
-        my $badpath;
-        for (my $i=0; $i<@items; $i++) {
-            my $odd = $i%2;
-            if ((!$odd) && ($items[$i] !~ /^supplemental(|_\d+)$/)) {
-                $badpath = 1;
-            }
-            last if ($badpath);
-        }
-        if ($badpath) {
-            delete($env{'form.supppath'});
-        }
-    }
-    return;
-}
 
 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) {
@@ -260,409 +156,120 @@ 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, $ltitoolsref, @files) = @_;
+    my ($coursenum, $coursedom, $folder, $container, $caller, @files) = @_;
     my ($donechk,$allmaps,%hierarchy,%titles,%addedmaps,%removefrommap,
         %removeparam,$importuploaded,$fixuperrors);
     $allmaps = {};
@@ -691,114 +298,6 @@ sub group_import {
             }
         }
 	if ($url) {
-            if ($url =~ m{^(/adm/$coursedom/$coursenum/(\d+)/ext\.tool)\:?(.*)$}) {
-                $url = $1;
-                my $marker = $2;
-                my $info = $3;
-                my ($toolid,%toolhash,%toolsettings);
-                my @extras = ('linktext','explanation','crslabel','crstitle','crsappend');
-                my @toolinfo = split(/:/,$info);
-                if ($residx) {
-                    %toolsettings=&Apache::lonnet::dump('exttool_'.$marker,$coursedom,$coursenum);
-                    $toolid = $toolsettings{'id'};
-                } else {
-                    $toolid = shift(@toolinfo);
-                }
-                $toolid =~ s/\D//g;
-                ($toolhash{'target'},$toolhash{'width'},$toolhash{'height'},
-                 $toolhash{'linktext'},$toolhash{'explanation'},
-                 $toolhash{'crslabel'},$toolhash{'crstitle'},$toolhash{'crsappend'}) = @toolinfo;
-                foreach my $item (@extras) {
-                    $toolhash{$item} = &unescape($toolhash{$item});
-                }
-                if (ref($ltitoolsref) eq 'HASH') {
-                    my @deleted;
-                    if (ref($ltitoolsref->{$toolid}) eq 'HASH') {
-                        $toolhash{'id'} = $toolid;
-                        if (($toolhash{'target'} eq 'iframe') || ($toolhash{'target'} eq 'tab') ||
-                            ($toolhash{'target'} eq 'window')) {
-                            if ($toolhash{'target'} eq 'window') {
-                                foreach my $item ('width','height') {
-                                    $toolhash{$item} =~ s/^\s+//;
-                                    $toolhash{$item} =~ s/\s+$//;
-                                    if ($toolhash{$item} =~ /\D/) {
-                                        delete($toolhash{$item});
-                                        if ($residx) {
-                                            if ($toolsettings{$item}) {
-                                                push(@deleted,$item);
-                                            }
-                                        }
-                                    }
-                                }
-                            }
-                        } elsif ($residx) {
-                            $toolhash{'target'} = $toolsettings{'target'};
-                            if ($toolhash{'target'} eq 'window') {
-                                foreach my $item ('width','height') {
-                                    $toolhash{$item} = $toolsettings{$item};
-                                }
-                            }
-                        } elsif (ref($ltitoolsref->{$toolid}->{'display'}) eq 'HASH') {
-                            $toolhash{'target'} = $ltitoolsref->{$toolid}->{'display'}->{'target'};
-                            if ($toolhash{'target'} eq 'window') {
-                                $toolhash{'width'} = $ltitoolsref->{$toolid}->{'display'}->{'width'};
-                                $toolhash{'height'} = $ltitoolsref->{$toolid}->{'display'}->{'height'};
-                            }
-                        }
-                        if ($toolhash{'target'} eq 'iframe') {
-                            foreach my $item ('width','height','linktext','explanation') {
-                                delete($toolhash{$item});
-                                if ($residx) {
-                                    if ($toolsettings{$item}) {
-                                        push(@deleted,$item);
-                                    }
-                                }
-                            }
-                        } elsif ($toolhash{'target'} eq 'tab') {
-                            foreach my $item ('width','height') {
-                                delete($toolhash{$item});
-                                if ($residx) {
-                                    if ($toolsettings{$item}) {
-                                        push(@deleted,$item);
-                                    }
-                                }
-                            }
-                        }
-                        if (ref($ltitoolsref->{$toolid}->{'crsconf'}) eq 'HASH') {
-                            foreach my $item ('label','title','linktext','explanation') {
-                                my $crsitem;
-                                if (($item eq 'label') || ($item eq 'title')) {
-                                    $crsitem = 'crs'.$item;
-                                } else {
-                                    $crsitem = $item;
-                                }
-                                if ($ltitoolsref->{$toolid}->{'crsconf'}->{$item}) {
-                                    $toolhash{$crsitem} =~ s/^\s+//;
-                                    $toolhash{$crsitem} =~ s/\s+$//;
-                                    if ($toolhash{$crsitem} eq '') {
-                                        delete($toolhash{$crsitem});
-                                    }
-                                } else {
-                                    delete($toolhash{$crsitem});
-                                }
-                                if (($residx) && (exists($toolsettings{$crsitem}))) {
-                                    unless (exists($toolhash{$crsitem})) {
-                                        push(@deleted,$crsitem);
-                                    }
-                                }
-                            }
-                        }
-                        my $putres = &Apache::lonnet::put('exttool_'.$marker,\%toolhash,$coursedom,$coursenum);
-                        if ($putres eq 'ok') {
-                            if (@deleted) {
-                                &Apache::lonnet::del('exttool_'.$marker,\@deleted,$coursedom,$coursenum);
-                            }
-                        } else {
-                            return (&mt('Failed to save update to external tool.'),1);
-                        }
-                    }
-                }
-            }
             if (($caller eq 'londocs') &&
                 ($folder =~ /^default/)) {
                 if (($url =~ /\.(page|sequence)$/) && (!$donechk)) {
@@ -810,8 +309,8 @@ sub group_import {
                     $donechk = 1;
                 }
                 if ($url =~ m{^/uploaded/\Q$coursedom\E/\Q$coursenum\E/(default_\d+\.)(page|sequence)$}) {
-                    &contained_map_check($url,$folder,$coursenum,$coursedom,\%removefrommap,
-                                         \%removeparam,\%addedmaps,\%hierarchy,\%titles,$allmaps);
+                    &contained_map_check($url,$folder,\%removefrommap,\%removeparam,
+                                         \%addedmaps,\%hierarchy,\%titles,$allmaps);
                     $importuploaded = 1;
                 } elsif ($url =~ m{^/res/.+\.(page|sequence)$}) {
                     next if ($allmaps->{$url});
@@ -824,27 +323,28 @@ sub group_import {
 	    }
 	    my $ext = 'false';
 	    if ($url=~m{^http://} || $url=~m{^https://}) { $ext = 'true'; }
+	    $name = &LONCAPA::map::qtunescape($name);
+            if ($name eq '') {
+                $name = &LONCAPA::map::qtunescape(&mt('Web Page'));
+            }
             if ($url =~ m{^/uploaded/$coursedom/$coursenum/((?:docs|supplemental)/(?:default|\d+))/new\.html$}) {
                 my $filepath = $1;
-                my $fname;
-                if ($name eq '') {
-                    $name = &mt('Web Page');
+                my $fname = $name;
+                if ($fname =~ /^\W+$/) {
                     $fname = 'web';
                 } else {
-                    $fname = $name;
-                    $fname=&Apache::lonnet::clean_filename($fname);
-                    if ($fname eq '') {
-                        $fname = 'web';
-                    } elsif (length($fname) > 15) {
-                        $fname = substr($fname,0,14);
-                    }
+                    $fname =~ s/\W/_/g;
+                }
+                if (length($fname > 15)) {
+                    $fname = substr($fname,0,14);
                 }
-                my $title = &Apache::loncommon::cleanup_html($name);
                 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>
-<title>$title</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<title>$name</title>
 </head>
 <body bgcolor="#ffffff">
 $initialtext
@@ -852,7 +352,7 @@ $initialtext
 </html>
 END
                 $env{'form.output'}=$newhtml;
-                my $result =
+                my $result = 
                     &Apache::lonnet::finishuserfileupload($coursenum,$coursedom,
                                                           'output',
                                                           "$filepath/$residx/$fname.html");
@@ -866,7 +366,6 @@ END
                     return (&mt('Failed to save new web page.'),1);
                 }
             }
-            $name = &LONCAPA::map::qtunescape($name);
             $url  = &LONCAPA::map::qtunescape($url);
 	    $LONCAPA::map::resources[$residx] =
 		join(':', ($name, $url, $ext, 'normal', 'res'));
@@ -878,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 =
@@ -905,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);
 }
 
@@ -977,14 +469,12 @@ sub log_docs {
 }
 
 sub docs_change_log {
-    my ($r,$coursenum,$coursedom,$folder,$allowed,$crstype,$iconpath,$canedit)=@_;
+    my ($r,$coursenum,$coursedom,$folder,$allowed,$crstype,$iconpath)=@_;
     my $supplementalflag=($env{'form.folderpath'}=~/^supplemental/);
-    my $navmap;   
     my $js = '<script type="text/javascript">'."\n".
              '// <![CDATA['."\n".
              &Apache::loncommon::display_filter_js('docslog')."\n".
-             &editing_js($env{'user.domain'},$env{'user.name'},$supplementalflag,
-                         $coursedom,$coursenum,'',$canedit,'',\$navmap)."\n".
+             &editing_js($env{'user.domain'},$env{'user.name'},$supplementalflag)."\n".
              &history_tab_js()."\n".
              &Apache::lonratedt::editscript('simple')."\n".
              '// ]]>'."\n".
@@ -1000,9 +490,8 @@ sub docs_change_log {
     }
     my $folderpath=$env{'form.folderpath'};
     if ($folderpath eq '') {
-        $folderpath = &default_folderpath($coursenum,$coursedom,\$navmap);
+        $folderpath = 'default&'.&escape(&mt('Main '.$crstype.' Content').':::::');
     }
-    undef($navmap);
     $pathitem = '<input type="hidden" name="folderpath" value="'.
                 &HTML::Entities::encode($folderpath,'<>&"').'" />';
     my $readfile="/uploaded/$coursedom/$coursenum/$folder.$container";
@@ -1140,11 +629,7 @@ sub docs_change_log {
 	}
 	$r->print('</ul>');
 	if ($docslog{$id}{'logentry'}{'parameter_res'}) {
-            my ($title,$url) = split(/\:/,$docslog{$id}{'logentry'}{'parameter_res'},3);
-            if ($title eq '') {
-                ($title) = ($url =~ m{/([^/]+)$});
-            }
-            $r->print(&LONCAPA::map::qtescape($title).':<ul>');
+	    $r->print(&LONCAPA::map::qtescape((split(/\:/,$docslog{$id}{'logentry'}{'parameter_res'}))[0]).':<ul>');
 	    foreach my $parameter ('randompick','hiddenresource','encrypturl','randomorder') {
 		if ($docslog{$id}{'logentry'}{'parameter_action_'.$parameter}) {
 # FIXME: internationalization seems wrong here
@@ -1170,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'});
@@ -1213,55 +698,35 @@ sub update_paste_buffer {
 # Construct identifiers for current contents of user's paste buffer
     if (@currpaste) {
         foreach my $suffix (@currpaste) {
-            my $cid = $env{'docs.markedcopy_crs_'.$suffix};
-            my $url = $env{'docs.markedcopy_url_'.$suffix};
-            my $mapidx = $env{'docs.markedcopy_map_'.$suffix};
-            if (($cid =~ /^$match_domain(?:_)$match_courseid$/) &&
-                ($url ne '')) {
-                if ($url eq '/res/lib/templates/simpleproblem.problem') {
-                    $pasteurls{$cid.'_'.$mapidx} = 1;
-                } elsif ($url =~ m{^/res/$match_domain/$match_username/}) {
-                    $pasteurls{$url} = 1;
-                } else {
-                    $pasteurls{$cid.'_'.$url} = 1;
-                }
-            }
+             my $cid = $env{'docs.markedcopy_crs_'.$suffix};
+             my $url = $env{'docs.markedcopy_url_'.$suffix};
+             if (($cid =~ /^$match_domain(?:_)$match_courseid$/) &&
+                 ($url ne '')) {
+                 $pasteurls{$cid.'_'.$url};
+             }
         }
     }
 
 # Mark items for copying (skip any items already in user's paste buffer)
     my %addtoenv;
-
-    my @pathitems = split(/\&/,$env{'form.folderpath'});
-    my @folderconf = split(/\:/,$pathitems[-1]);
-    my $ispage = $folderconf[5];
-
+                  
     foreach my $item (@possibles) {
         my ($orderidx,$cmd) = split(/:/,$item);
         next if ($orderidx =~ /\D/);
         next unless (($cmd eq 'cut') || ($cmd eq 'copy') || ($cmd eq 'remove'));
-        my $mapidx = $folder.':'.$orderidx.':'.$ispage;
         my ($title,$url)=split(':',$LONCAPA::map::resources[$orderidx]);
         my %denied = &action_restrictions($coursenum,$coursedom,
                                           &LONCAPA::map::qtescape($url),
                                           $env{'form.folderpath'},\%curr_groups);
         next if ($denied{'copy'});
         $url=~s{http(&colon;|:)//https(&colon;|:)//}{https$2//};
-        if ($url eq '/res/lib/templates/simpleproblem.problem') {
-            next if (exists($pasteurls{$coursedom.'_'.$coursenum.'_'.$mapidx}));
-        } elsif ($url =~ m{^/res/$match_domain/$match_username/}) {
-            next if (exists($pasteurls{$url}));
-        } else {
-            next if (exists($pasteurls{$coursedom.'_'.$coursenum.'_'.$url}));
-        }
+        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});
@@ -1272,7 +737,7 @@ sub update_paste_buffer {
         $addtoenv{'docs.markedcopy_url_'.$suffix}   = $url,
         $addtoenv{'docs.markedcopy_cmd_'.$suffix}   = $cmd,
         $addtoenv{'docs.markedcopy_crs_'.$suffix}   = $env{'request.course.id'};
-        $addtoenv{'docs.markedcopy_map_'.$suffix}   = $mapidx;
+ 
         if ($url =~ m{^/uploaded/$match_domain/$match_courseid/(default|supplemental)_?(\d*)\.(page|sequence)$}) {
             my $prefix = $1;
             my $subdir =$2;
@@ -1280,8 +745,8 @@ sub update_paste_buffer {
                 $subdir = $prefix;
             }
             my (%addedmaps,%removefrommap,%removeparam,%hierarchy,%titles,%allmaps);
-            &contained_map_check($url,$folder,$coursenum,$coursedom,\%removefrommap,
-                                 \%removeparam,\%addedmaps,\%hierarchy,\%titles,\%allmaps);
+            &contained_map_check($url,$folder,\%removefrommap,\%removeparam,\%addedmaps,
+                                 \%hierarchy,\%titles,\%allmaps);
             if (ref($hierarchy{$url}) eq 'HASH') {
                 my ($nested,$nestednames);
                 &recurse_uploaded_maps($url,$subdir,\%hierarchy,\%titles,\$nested,\$nestednames);
@@ -1295,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 {
@@ -1343,24 +803,19 @@ 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) {
         next if ($suffix =~ /\D/);
         my $cid = $env{'docs.markedcopy_crs_'.$suffix};
         my $url = $env{'docs.markedcopy_url_'.$suffix};
-        my $mapidx = $env{'docs.markedcopy_map_'.$suffix}; 
         if (($cid =~ /^$match_domain\_$match_courseid$/) &&
             ($url ne '')) {
-            $clipboardcount ++;
             my ($is_external,$othercourse,$fromsupp,$is_uploaded_map,$parent,
-                $canpaste,$nopaste,$othercrs,$areachange,$is_exttool);
+                $canpaste,$nopaste,$othercrs,$areachange);
             my $extension = (split(/\./,$env{'docs.markedcopy_url_'.$suffix}))[-1];
             if ($url =~ m{^(?:/adm/wrapper/ext|(?:http|https)(?:&colon;|:))//} ) {
                 $is_external = 1;
-            } elsif ($url =~ m{^/adm/$match_domain/$match_courseid/\d+/ext\.tool$}) {
-                $is_exttool = 1;
             }
             if ($folder =~ /^supplemental/) {
                 $canpaste = &supp_pasteable($env{'docs.markedcopy_url_'.$suffix});
@@ -1378,7 +833,9 @@ sub print_paste_buffer {
                     if (($srcdom ne $coursedom) || ($srcnum ne $coursenum)) {
                         $othercourse = 1;
                         if ($env{"user.priv.cm./$srcdom/$srcnum"} =~ /\Q:mdc&F\E/) {
-                            $othercrs = '<br />'.&mt('(from another course)');
+                            if ($canpaste) {
+                                $othercrs = '<br />'.&mt('(from another course)');
+                            }
                         } else {
                             $canpaste = 0;
                             $nopaste = &mt('Paste from another course unavailable.'); 
@@ -1392,35 +849,16 @@ sub print_paste_buffer {
                         }
                         $is_uploaded_map = 1;
                     }
-                } elsif (($url =~ m{^/res/lib/templates/\w+\.problem$}) ||
-                         ($url =~ m{^/adm/($match_domain)/($match_username)/\d+/(bulletinboard|smppg|ext\.tool)$})) {
-                    if ($cid ne $env{'request.course.id'}) {
-                        my ($srcdom,$srcnum) = split(/_/,$cid);
-                        if ($env{"user.priv.cm./$srcdom/$srcnum"} =~ /\Q:mdc&F\E/) {
-                            if (($is_exttool) && ($srcdom ne $coursedom)) {
-                                $canpaste = 0;
-                                $nopaste = &mt('Paste from another domain unavailable.');
-                            } else {
-                                $othercrs = '<br />'.&mt('(from another course)');
-                            }
-                        } else {
-                            $canpaste = 0;
-                            $nopaste = &mt('Paste from another course unavailable.');
-                        }
-                    }
-                }
-                if ($canpaste) {
-                    push(@pasteable,$suffix);
                 }
             }
+            if ($canpaste) {
+               push(@pasteable,$suffix);
+            }
             my $buffer;
             if ($is_external) {
                 $buffer = &mt('External Resource').': '.
                     &LONCAPA::map::qtescape($env{'docs.markedcopy_title_'.$suffix}).' ('.
                     &LONCAPA::map::qtescape($url).')';
-            } elsif ($is_exttool) {
-                $buffer = &mt('External Tool').': '.
-                    &LONCAPA::map::qtescape($env{'docs.markedcopy_title_'.$suffix});
             } else {
                 my $icon = &Apache::loncommon::icon($extension);
                 if ($extension eq 'sequence' &&
@@ -1428,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);
@@ -1450,7 +884,7 @@ sub print_paste_buffer {
             }
             $pasteitems .= '<label><input type="checkbox" name="pasting" id="pasting_'.$suffix.'" value="'.$suffix.'" '.$onclick.'/>'.$buffer.'</label>';
             if ($nopaste) {
-                 $pasteitems .= ' <span class="LC_cusr_emph">'.$nopaste.'</span>';   
+                 $pasteitems .= $nopaste;   
             } else {
                 if ($othercrs) {
                     $pasteitems .= $othercrs;
@@ -1470,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('Remove from clipboard').'" />'.('&nbsp;'x2);
-        if ($clipboardcount > 1) {
-            $buttons .=
-                '<span style="text-decoration:line-through">'.('&nbsp;'x20).'</span>'.('&nbsp;'x2).
-                '<input type="button" name="checkallclip" value="'.&mt('Check all').'" style="height:20px;" onclick="checkClipboard();" />'.
-                ('&nbsp;'x2).
-                '<input type="button" name="uncheckallclip" value="'.&mt('Uncheck all').'" style="height:20px;" onclick="uncheckClipboard();" />'.
-                ('&nbsp;'x2);
+            $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');
     }
@@ -1577,42 +999,36 @@ sub supp_pasteable {
         (($url =~ /\.sequence$/) && ($url =~ m{^/uploaded/})) ||
         ($url =~ m{^/uploaded/$match_domain/$match_courseid/(docs|supplemental)/(default|\d+)/\d+/}) ||
         ($url =~ m{^/adm/$match_domain/$match_username/aboutme}) ||
-        ($url =~ m{^/public/$match_domain/$match_courseid/syllabus}) ||
-        ($url =~ m{^/adm/$match_domain/$match_courseid/\d+/ext\.tool$})) {
+        ($url =~ m{^/public/$match_domain/$match_courseid/syllabus})) {
         return 1;
     }
     return;
 }
 
 sub paste_popup_js {
-    my %html_js_lt = &Apache::lonlocal::texthash(
+    my %lt = &Apache::lonlocal::texthash(
                                           show => 'Show Options',
                                           hide => 'Hide Options',
-                                        );
-    my %js_lt = &Apache::lonlocal::texthash(
                                           none => 'No items selected from clipboard.',
                                         );
-    &html_escape(\%html_js_lt);
-    &js_escape(\%html_js_lt);
-    &js_escape(\%js_lt);
     return <<"END";
 
 function showPasteOptions(suffix) {
     document.getElementById('pasteoptions_'+suffix).style.display='block';
-    document.getElementById('pasteoptionstext_'+suffix).innerHTML = '&nbsp;&nbsp;&nbsp;&nbsp;<a href="javascript:hidePasteOptions(\\''+suffix+'\\');" class="LC_menubuttons_link">$html_js_lt{'hide'}</a>';
+    document.getElementById('pasteoptionstext_'+suffix).innerHTML = '&nbsp;&nbsp;&nbsp;&nbsp;<a href="javascript:hidePasteOptions(\\''+suffix+'\\');" class="LC_menubuttons_link">$lt{'hide'}</a>';
     return;
 }
 
 function hidePasteOptions(suffix) {
     document.getElementById('pasteoptions_'+suffix).style.display='none';
-    document.getElementById('pasteoptionstext_'+suffix).innerHTML ='&nbsp;&nbsp;&nbsp;&nbsp;<a href="javascript:showPasteOptions(\\''+suffix+'\\')" class="LC_menubuttons_link">$html_js_lt{'show'}</a>';
+    document.getElementById('pasteoptionstext_'+suffix).innerHTML ='&nbsp;&nbsp;&nbsp;&nbsp;<a href="javascript:showPasteOptions(\\''+suffix+'\\')" class="LC_menubuttons_link">$lt{'show'}</a>';
     return;
 }
 
 function showOptions(caller,suffix) {
     if (document.getElementById('pasteoptionstext_'+suffix)) {
         if (caller.checked) {
-            document.getElementById('pasteoptionstext_'+suffix).innerHTML ='&nbsp;&nbsp;&nbsp;&nbsp;<a href="javascript:showPasteOptions(\\''+suffix+'\\')" class="LC_menubuttons_link">$html_js_lt{'show'}</a>';
+            document.getElementById('pasteoptionstext_'+suffix).innerHTML ='&nbsp;&nbsp;&nbsp;&nbsp;<a href="javascript:showPasteOptions(\\''+suffix+'\\')" class="LC_menubuttons_link">$lt{'show'}</a>';
         } else {
             document.getElementById('pasteoptionstext_'+suffix).innerHTML ='';
         }
@@ -1641,33 +1057,16 @@ function validateClipboard() {
     if (numchk > 0) { 
         return true;
     } else {
-        alert("$js_lt{'none'}");
+        alert("$lt{'none'}");
         return false;
     }
 }
 
-function checkClipboard() {
-    if (document.pasteform.pasting.length > 1) {
-        for (var i=0; i<document.pasteform.pasting.length; i++) {
-            document.pasteform.pasting[i].checked = true;
-        }
-    }
-    return;
-}
-
-function uncheckClipboard() {
-    if (document.pasteform.pasting.length >1) {
-        for (var i=0; i<document.pasteform.pasting.length; i++) {
-            document.pasteform.pasting[i].checked = false;
-        }
-    }
-    return;
-}
-
 END
 
 }
 
+
 sub do_paste_from_buffer {
     my ($coursenum,$coursedom,$folder,$container,$errors) = @_;
 
@@ -1700,13 +1099,12 @@ sub do_paste_from_buffer {
         return();
     }
 
-    my (%msgs,%before,%after,@dopaste,%is_map,%notinsupp,%notincrs,%notindom,%duplicate,
-        %prefixchg,%srcdom,%srcnum,%srcmapidx,%marktomove,$save_err,$lockerrors,$allresult);
+    my (%msgs,%before,%after,@dopaste,%is_map,%notinsupp,%notincrs,%duplicate,
+        %prefixchg,%srcdom,%srcnum,%marktomove,$save_err,$lockerrors,$allresult,
+        %msgs);
 
     foreach my $suffix (@topaste) {
         my $url=&LONCAPA::map::qtescape($env{'docs.markedcopy_url_'.$suffix});
-        my $cid=&LONCAPA::map::qtescape($env{'docs.markedcopy_crs_'.$suffix});
-        my $mapidx=&LONCAPA::map::qtescape($env{'docs.markedcopy_map_'.$suffix});  
 # Supplemental content may only include certain types of content
 # Early out if pasted content is not supported in Supplemental area
         if ($folder =~ /^supplemental/) {
@@ -1728,39 +1126,8 @@ sub do_paste_from_buffer {
             }
             $srcdom{$suffix} = $srcd;
             $srcnum{$suffix} = $srcn;
-        } elsif ($url =~ m{^/adm/$match_domain/$match_courseid/\d+/ext\.tool$}) {
-            my ($srcd,$srcn) = split(/_/,$cid);
-# When paste buffer was populated using an active role in a different course
-# check for mdc privilege in the course from which the resource was pasted
-            if (($srcd ne $coursedom) || ($srcn ne $coursenum)) {
-                unless ($env{"user.priv.cm./$srcd/$srcn"} =~ /\Q:mdc&F\E/) {
-                    $notincrs{$suffix} = 1;
-                    next;
-                }
-            }
-# When buffer was populated using an active role in a different course
-# disallow pasting of External Tool if course is in a different domain.
-            if ($srcd ne $coursedom) {
-                $notindom{$suffix} = 1;
-                next;
-            }
-            $srcdom{$suffix} = $srcd;
-            $srcnum{$suffix} = $srcn;
-        } elsif (($url =~ m{^/res/lib/templates/\w+\.problem$}) ||
-                 ($url =~ m{^/adm/$match_domain/$match_username/\d+/(bulletinboard|smppg)$})) {
-            my ($srcd,$srcn) = split(/_/,$cid);
-# When paste buffer was populated using an active role in a different course
-# check for mdc privilege in the course from which the resource was pasted
-            if (($srcd ne $coursedom) || ($srcn ne $coursenum)) {
-                unless ($env{"user.priv.cm./$srcd/$srcn"} =~ /\Q:mdc&F\E/) {
-                    $notincrs{$suffix} = 1;
-                    next;
-                }
-            }
-            $srcdom{$suffix} = $srcd;
-            $srcnum{$suffix} = $srcn;
         }
-        $srcmapidx{$suffix} = $mapidx; 
+
         push(@dopaste,$suffix);
         if ($url=~/\.(page|sequence)$/) {
             $is_map{$suffix} = 1; 
@@ -1770,7 +1137,7 @@ sub do_paste_from_buffer {
             my $oldprefix = $1;
 # When pasting content from Main Content to Supplemental Content and vice versa 
 # URLs will contain different paths (which depend on whether pasted item is
-# a folder/page or a document).   
+# a folder/page or a document.   
             if (($folder =~ /^supplemental/) && (($oldprefix =~ /^default/) || ($oldprefix eq 'docs'))) {
                 $prefixchg{$suffix} = 'docstosupp';
             } elsif (($folder =~ /^default/) && ($oldprefix =~ /^supplemental/)) {
@@ -1810,7 +1177,6 @@ sub do_paste_from_buffer {
     %msgs = &Apache::lonlocal::texthash (
                 notinsupp => 'Paste failed: content type is not supported within Supplemental Content',
                 notincrs  => 'Paste failed: Item is from a different course which you do not have rights to edit.',
-                notindom  => 'Paste failed: Item is an external tool from a course in a different donain.',
                 duplicate => 'Paste failed: only one instance of a particular published sequence or page is allowed within each course.',
             );
 
@@ -1839,34 +1205,32 @@ sub do_paste_from_buffer {
 # Retrieve information about all course maps in main content area 
 
     my $allmaps = {};
-    my (@toclear,%mapurls,%lockerrs,%msgerrs,%results,$donechk);
+    if ($folder =~ /^default/) {
+        $allmaps =
+            &Apache::loncommon::allmaps_incourse($coursedom,$coursenum,
+                                                 $env{"course.$env{'request.course.id'}.home"},
+                                                 $env{'request.course.id'});
+    }
+
+    my (@toclear,%mapurls,%lockerrs,%msgerrs,%results);
 
 # Loop over the items to paste
     foreach my $suffix (@dopaste) {
 # Maps need to be copied first
         my (%removefrommap,%removeparam,%addedmaps,%rewrites,%retitles,%copies,
             %dbcopies,%zombies,%params,%docmoves,%mapmoves,%mapchanges,%newsubdir,
-            %newurls,%tomove,%resdatacopy);
+            %newurls,%tomove);
         if (ref($marktomove{$suffix}) eq 'ARRAY') {
             map { $tomove{$_} = 1; } @{$marktomove{$suffix}};
         }
         my $url=&LONCAPA::map::qtescape($env{'docs.markedcopy_url_'.$suffix});
         my $title=&LONCAPA::map::qtescape($env{'docs.markedcopy_title_'.$suffix});
-        my $cid=&LONCAPA::map::qtescape($env{'docs.markedcopy_crs_'.$suffix});
         my $oldurl = $url;
         if ($is_map{$suffix}) {
 # If pasting a map, check if map contains other maps
             my (%hierarchy,%titles);
-            if (($folder =~ /^default/) && (!$donechk)) {
-                $allmaps =
-                    &Apache::loncommon::allmaps_incourse($coursedom,$coursenum,
-                                                         $env{"course.$env{'request.course.id'}.home"},
-                                                         $env{'request.course.id'});
-                $donechk = 1; 
-            }
-            &contained_map_check($url,$folder,$coursenum,$coursedom,
-                                 \%removefrommap,\%removeparam,\%addedmaps,
-                                 \%hierarchy,\%titles,$allmaps);
+            &contained_map_check($url,$folder,\%removefrommap,\%removeparam,
+                                 \%addedmaps,\%hierarchy,\%titles,$allmaps);
             if ($url=~ m{^/uploaded/}) {
                 my $newurl;
                 unless ($env{'form.docs.markedcopy_options_'.$suffix} eq 'move') {
@@ -1896,7 +1260,7 @@ sub do_paste_from_buffer {
                                               \%retitles,\%copies,\%dbcopies,
                                               \%zombies,\%params,\%mapmoves,
                                               \%mapchanges,\%tomove,\%newsubdir,
-                                              \%newurls,\%resdatacopy)) {
+                                              \%newurls)) {
                         $mapmoves{$url} = 1;
                     }
                     $url = $newurl;
@@ -1905,10 +1269,10 @@ sub do_paste_from_buffer {
                                       $coursenum,$srcdom{$suffix},$srcnum{$suffix},
                                       $allmaps,\%rewrites,\%retitles,\%copies,\%dbcopies,
                                       \%zombies,\%params,\%mapmoves,\%mapchanges,
-                                      \%tomove,\%newsubdir,\%newurls,\%resdatacopy); 
+                                      \%tomove,\%newsubdir,\%newurls); 
                 }
             } elsif ($url=~m {^/res/}) {
-# published map can only exist once, so remove from paste buffer when done
+# published map can only exists once, so remove from paste buffer when done
                 push(@toclear,$suffix);
 # if pasting published map (main content area only) check map not already in course
                 if ($folder =~ /^default/) {
@@ -1919,23 +1283,15 @@ sub do_paste_from_buffer {
                 }
             }
         }
-        if ($url=~ m{/(bulletinboard|smppg|ext\.tool)$}) {
+        if ($url=~ m{/(bulletinboard|smppg)$}) {
             my $prefix = $1;
-            my $fromothercrs;
             #need to copy the db contents to a new one, unless this is a move.
             my %info = (
                          src  => $url,
                          cdom => $coursedom,
                          cnum => $coursenum,
-                       );
-            if (($srcdom{$suffix} =~ /^$match_domain$/) && ($srcnum{$suffix} =~ /^$match_courseid$/)) {
-                unless (($srcdom{$suffix} eq $coursedom) && ($srcnum{$suffix} eq $coursenum)) {
-                    $fromothercrs = 1;
-                    $info{'cdom'} = $srcdom{$suffix};
-                    $info{'cnum'} = $srcnum{$suffix};
-                }
-            }
-            unless (($env{'form.docs.markedcopy_options_'.$suffix} eq 'move') && (!$fromothercrs)) {
+            );
+            unless ($env{'form.docs.markedcopy_options_'.$suffix} eq 'move') {
                 my (%lockerr,$msg); 
                 my ($newurl,$result,$errtext) =
                     &dbcopy(\%info,$coursedom,$coursenum,\%lockerr);
@@ -1946,9 +1302,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;
-                    } elsif ($prefix eq 'ext.tool') {
-                        $msg = &mt('Paste failed: An error occurred when copying the external tool.').' '.$errtext;
+                        $msg = &mt('Paste failed: An error occurred when copying the bulletin board.').' '.$errtext;
                     }
                     $results{$suffix} = $result;
                     $msgerrs{$suffix} = $msg;
@@ -1956,7 +1310,7 @@ sub do_paste_from_buffer {
                     next;
 	        }
                 if ($lockerr{$prefix}) {
-                    $lockerrs{$suffix} = $lockerr{$prefix};
+                    $lockerrs{$suffix} = $lockerr{$prefix};  
                 }
             }
         }
@@ -1995,7 +1349,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')) {
@@ -2013,12 +1367,6 @@ sub do_paste_from_buffer {
                         }
                     }
                 }
-            } elsif ($url =~ m{^/res/lib/templates/(\w+)\.problem$}) {
-                my $template = $1;
-                if ($newidx) {
-                    &copy_templated_files($url,$srcdom{$suffix},$srcnum{$suffix},$srcmapidx{$suffix},
-                                          $coursedom,$coursenum,$template,$newidx,"$folder.$container");
-                }
             }
             $LONCAPA::map::resources[$newidx]=$title.':'.&LONCAPA::map::qtunescape($url).
                                               ':'.$ext.':normal:res';
@@ -2032,8 +1380,7 @@ sub do_paste_from_buffer {
             }
         }
 
-# Apply any changes to maps, or copy dependencies for uploaded HTML pages, or update 
-# resourcedata for simpleproblems copied from another course
+# Apply any changes to maps, or copy dependencies for uploaded HTML pages 
         unless ($allresult eq 'fail') {
             my %updated = (
                             rewrites      => \%rewrites,
@@ -2041,7 +1388,6 @@ sub do_paste_from_buffer {
                             removefrommap => \%removefrommap,
                             removeparam   => \%removeparam,
                             dbcopies      => \%dbcopies,
-                            resdatacopy   => \%resdatacopy,
                             retitles      => \%retitles,
                           );
             my %info = (
@@ -2206,14 +1552,11 @@ sub get_newmap_url {
 sub dbcopy {
     my ($dbref,$coursedom,$coursenum,$lockerrorsref) = @_;
     my ($url,$result,$errtext);
+    my $url = $dbref->{'src'};
     if (ref($dbref) eq 'HASH') {
-        $url = $dbref->{'src'};
-        if ($url =~ m{/(smppg|bulletinboard|ext\.tool)$}) {
+        if ($url =~ m{/(smppg|bulletinboard)$}) {
             my $prefix = $1;
-            if ($prefix eq 'ext.tool') {
-                $prefix = 'exttool';
-            }
-            if (($dbref->{'cdom'} =~ /^$match_domain$/) &&
+            if (($dbref->{'cdom'} =~ /^$match_domain$/) && 
                 ($dbref->{'cnum'} =~ /^$match_courseid$/)) {
                 my $db_name;
                 my $marker = (split(m{/},$url))[4];
@@ -2223,8 +1566,6 @@ sub dbcopy {
                         &Apache::lonsimplepage::get_db_name($url,$marker,
                                                             $dbref->{'cdom'},
                                                             $dbref->{'cnum'});
-                } elsif ($dbref->{'src'} =~ m{/ext\.tool$}) {
-                    $db_name = 'exttool_'.$marker;
                 } else {
                     $db_name = 'bulletinpage_'.$marker;
                 }
@@ -2235,10 +1576,8 @@ sub dbcopy {
                 if (!$suffix) {
                     if ($prefix eq 'smppg') {
                         $errtext = &mt('Failed to acquire a unique timestamp-based suffix when copying a simple page [_1].',$url);
-                    } elsif ($prefix eq 'exttool') {
-                        $errtext = &mt('Failed to acquire a unique timestamp-based suffix when copying an external tool [_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;
@@ -2252,12 +1591,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'});
                             }
@@ -2270,25 +1609,20 @@ sub dbcopy {
                     $result=&Apache::lonnet::put($db_name,\%contents,
                                                  $coursedom,$coursenum);
                     if ($result eq 'ok') {
-                        $url =~ s{/(\d*)/(smppg|bulletinboard|ext\.tool)$}{/$suffix/$2}x;
+                        $url =~ s{/(\d*)/(smppg|bulletinboard)$}{/$suffix/$2}x;
                     }
                 }
                 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.');
-                    } elsif ($prefix eq 'exttool') {
-                        $lockerrorsref->{$prefix} .=
-                            ' '.&mt('This will prevent addition of more external tools to 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$}) {
@@ -2308,97 +1642,6 @@ sub dbcopy {
     return ($url,$result,$errtext);
 }
 
-sub copy_templated_files {
-    my ($srcurl,$srcdom,$srcnum,$srcmapinfo,$coursedom,$coursenum,$template,$newidx,$newmapname) = @_;
-    my ($srcfolder,$srcid,$srcwaspage) = split(/:/,$srcmapinfo);
-    my $srccontainer = 'sequence';
-    if ($srcwaspage) {
-        $srccontainer = 'page';
-    }
-    my $srcsymb = "uploaded/$srcdom/$srcnum/$srcfolder.$srccontainer".
-                  '___'.$srcid.'___'.&Apache::lonnet::declutter($srcurl);
-    my $srcprefix = $srcdom.'_'.$srcnum.'.'.$srcsymb;
-    my %srcparms=&Apache::lonnet::dump('resourcedata',$srcdom,$srcnum,$srcprefix);
-    my $newsymb = "uploaded/$coursedom/$coursenum/$newmapname".'___'.$newidx.'___lib/templates/'.
-                  $template.'.problem';
-    my $newprefix = $coursedom.'_'.$coursenum.'.'.$newsymb;
-    if ($template eq 'simpleproblem') {
-        $srcprefix .= '.0.';
-        my $weightprefix = $newprefix;
-        $newprefix .= '.0.';
-        my @simpleprobqtypes = qw(radio option string essay numerical);
-        my $qtype=$srcparms{$srcprefix.'questiontype'};
-        if (grep(/^\Q$qtype\E$/,@simpleprobqtypes)) {
-            my %newdata = (
-                $newprefix.'questiontype' => $qtype,
-            );
-            foreach my $type (@simpleprobqtypes) {
-                if ($type eq $qtype) {
-                    $newdata{"$weightprefix.$type.weight"}=1;
-                } else {
-                    $newdata{"$weightprefix.$type.weight"}=0;
-                }
-            }
-            $newdata{$newprefix.'hiddenparts'} = '!'.$qtype;
-            $newdata{$newprefix.'questiontext'} = $srcparms{$srcprefix.'questiontext'};
-            $newdata{$newprefix.'hinttext'} = $srcparms{$srcprefix.'hinttext'};
-            if ($qtype eq 'numerical') {
-                $newdata{$newprefix.'numericalscript'} = $srcparms{$srcprefix.'numericalscript'};
-                $newdata{$newprefix.'numericalanswer'} = $srcparms{$srcprefix.'numericalanswer'};
-                $newdata{$newprefix.'numericaltolerance'} = $srcparms{$srcprefix.'numericaltolerance'};
-                $newdata{$newprefix.'numericalsigfigs'} = $srcparms{$srcprefix.'numericalsigfigs'};
-            } elsif (($qtype eq 'option') || ($qtype eq 'radio')) {
-                my $maxfoils=$srcparms{$srcprefix.'maxfoils'};
-                unless (defined($maxfoils)) { $maxfoils=10; }
-                    unless ($maxfoils=~/^\d+$/) { $maxfoils=10; }
-                        if ($maxfoils<=0) { $maxfoils=10; }
-                            my $randomize=$srcparms{$srcprefix.'randomize'};
-                            unless (defined($randomize)) { $randomize='yes'; }
-                            unless ($randomize eq 'no') { $randomize='yes'; }
-                            $newdata{$newprefix.'maxfoils'} = $maxfoils;
-                            $newdata{$newprefix.'randomize'} = $randomize;
-                            if ($qtype eq 'option') {
-                                $newdata{$newprefix.'options'} = $srcparms{$srcprefix.'options'};
-                            }
-                            for (my $i=1; $i<=10; $i++) {
-                                $newdata{$newprefix.'value'.$i} = $srcparms{$srcprefix.'value'.$i};
-                                $newdata{$newprefix.'position'.$i} = $srcparms{$srcprefix.'position'.$i};
-                                $newdata{$newprefix.'text'.$i} = $srcparms{$srcprefix.'text'.$i};
-                            }
-
-            } elsif (($qtype eq 'option') || ($qtype eq 'radio')) {
-                my $maxfoils=$srcparms{$srcprefix.'maxfoils'};
-                unless (defined($maxfoils)) { $maxfoils=10; }
-                unless ($maxfoils=~/^\d+$/) { $maxfoils=10; }
-                if ($maxfoils<=0) { $maxfoils=10; }
-                my $randomize=$srcparms{$srcprefix.'randomize'};
-                unless (defined($randomize)) { $randomize='yes'; }
-                unless ($randomize eq 'no') { $randomize='yes'; }
-                $newdata{$newprefix.'maxfoils'} = $maxfoils;
-                $newdata{$newprefix.'randomize'} = $randomize;
-                if ($qtype eq 'option') {
-                    $newdata{$newprefix.'options'} = $srcparms{$srcprefix.'options'};
-                }
-                for (my $i=1; $i<=10; $i++) {
-                    $newdata{$newprefix.'value'.$i} = $srcparms{$srcprefix.'value'.$i};
-                    $newdata{$newprefix.'position'.$i} = $srcparms{$srcprefix.'position'.$i};
-                    $newdata{$newprefix.'text'.$i} = $srcparms{$srcprefix.'text'.$i};
-                }
-            } elsif ($qtype eq 'string') {
-                $newdata{$newprefix.'stringanswer'} = $srcparms{$srcprefix.'stringanswer'};
-                $newdata{$newprefix.'stringtype'} = $srcparms{$srcprefix.'stringtype'};
-            }
-            if (keys(%newdata)) {
-                my $putres = &Apache::lonnet::cput('resourcedata',\%newdata,$coursedom,
-                                                   $coursenum);
-                if ($putres eq 'ok') {
-                    &Apache::lonnet::devalidatecourseresdata($coursenum,$coursedom);
-                }
-            }
-        }
-    }
-}
-
 sub uniqueness_check {
     my ($newurl) = @_;
     my $unique = 1;
@@ -2414,8 +1657,8 @@ sub uniqueness_check {
 }
 
 sub contained_map_check {
-    my ($url,$folder,$coursenum,$coursedom,$removefrommap,$removeparam,$addedmaps,
-        $hierarchy,$titles,$allmaps) = @_;
+    my ($url,$folder,$removefrommap,$removeparam,$addedmaps,$hierarchy,$titles,
+        $allmaps) = @_;
     my $content = &Apache::lonnet::getfile($url);
     unless ($content eq '-1') {
         my $parser = HTML::TokeParser->new(\$content);
@@ -2444,8 +1687,7 @@ sub contained_map_check {
                             $addedmaps->{$ressrc} = [$url];
                         }
                     }
-                    &contained_map_check($ressrc,$folder,$coursenum,$coursedom,
-                                         $removefrommap,$removeparam,
+                    &contained_map_check($ressrc,$folder,$removefrommap,$removeparam,
                                          $addedmaps,$hierarchy,$titles,$allmaps);
                 }
             } elsif ($token->[1] eq 'param') {
@@ -2465,7 +1707,7 @@ sub contained_map_check {
 sub url_paste_fixups {
     my ($oldurl,$folder,$prefixchg,$cdom,$cnum,$fromcdom,$fromcnum,$allmaps,
         $rewrites,$retitles,$copies,$dbcopies,$zombies,$params,$mapmoves,
-        $mapchanges,$tomove,$newsubdir,$newurls,$resdatacopy) = @_;
+        $mapchanges,$tomove,$newsubdir,$newurls) = @_;
     my $checktitle;
     if (($prefixchg) &&
         ($oldurl =~ m{^/uploaded/$match_domain/$match_courseid/supplemental})) {
@@ -2497,7 +1739,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)/(.+)$}) {
@@ -2514,7 +1756,7 @@ sub url_paste_fixups {
                                           $srcdom,$srcnum,$allmaps,$rewrites,
                                           $retitles,$copies,$dbcopies,$zombies,
                                           $params,$mapmoves,$mapchanges,$tomove,
-                                          $newsubdir,$newurls,$resdatacopy);
+                                          $newsubdir,$newurls);
                         next;
                     } else {
                         ($newurl,my $error) =
@@ -2538,7 +1780,7 @@ sub url_paste_fixups {
                                                   $cnum,$srcdom,$srcnum,$allmaps,
                                                   $rewrites,$retitles,$copies,$dbcopies,
                                                   $zombies,$params,$mapmoves,$mapchanges,
-                                                  $tomove,$newsubdir,$newurls,$resdatacopy)) {
+                                                  $tomove,$newsubdir,$newurls)) {
                             $mapmoves->{$ressrc} = 1;
                         }
                         $changed = 1;
@@ -2567,12 +1809,6 @@ sub url_paste_fixups {
                     $dbcopies->{$oldurl}{$id}{'cnum'} = $fromcnum;
                     $changed = 1;
                 }
-            } elsif ($ressrc eq '/res/lib/templates/simpleproblem.problem') {
-                if (($fromcdom ne $cdom) || ($fromcnum ne $cnum)) {
-                    $resdatacopy->{$oldurl}{$id}{'src'} = $ressrc;
-                    $resdatacopy->{$oldurl}{$id}{'cdom'} = $fromcdom;
-                    $resdatacopy->{$oldurl}{$id}{'cnum'} = $fromcnum;
-                }
             } elsif ($ressrc =~ m{^/public/($match_domain)/($match_courseid)/(.+)$}) {
                 next if ($skip);
                 my $srcdom = $1;
@@ -2604,7 +1840,7 @@ sub apply_fixups {
         $oldurl,$url,$caller) = @_;
     my (%rewrites,%zombies,%removefrommap,%removeparam,%dbcopies,%retitles,
         %params,%newsubdir,%before,%after,%copies,%docmoves,%mapmoves,@msgs,
-        %resdatacopy,%lockerrors,$lockmsg);
+        %lockerrors,$lockmsg);
     if (ref($updated) eq 'HASH') {
         if (ref($updated->{'rewrites'}) eq 'HASH') {
             %rewrites = %{$updated->{'rewrites'}};
@@ -2624,9 +1860,6 @@ sub apply_fixups {
         if (ref($updated->{'retitles'}) eq 'HASH') {
             %retitles = %{$updated->{'retitles'}};
         }
-        if (ref($updated->{'resdatacopy'}) eq 'HASH') {
-            %resdatacopy = %{$updated->{'resdatacopy'}};
-        }
     }
     if (ref($info) eq 'HASH') {
         if (ref($info->{'newsubdir'}) eq 'HASH') {
@@ -2720,15 +1953,6 @@ sub apply_fixups {
             $storefn =~ s/^((?:default|supplemental)_)(\d+)/$1$newsubdir{$key}/;
         }
         my $mapcontent = &Apache::lonnet::getfile($key);
-        if (($mapcontent eq '-1') && ($before{'map'} eq 'supplemental') &&
-            ($after{'map'} eq 'default') &&
-            ($key =~ m{^/uploaded/$match_domain/$match_courseid/supplemental_\d+\.sequence$})) {
-            $mapcontent = '<map>'."\n".
-                          '<resource id="1" src="" type="start" />'."\n".
-                          '<link from="1" to="2" index="1" />'."\n".
-                          '<resource id="2" src="" type="finish" />'."\n".
-                          '</map>';
-        }
         if ($mapcontent eq '-1') {
             if (ref($errors) eq 'HASH') {
                 $errors->{$key} = 1;
@@ -2786,36 +2010,6 @@ sub apply_fixups {
                     }
                 }
             }
-            if (ref($resdatacopy{$key}) eq 'HASH') {
-                my ($gotnewmapname,$newmapname,$srcfolder,$srccontainer);
-                foreach my $idx (keys(%{$resdatacopy{$key}})) {
-                    if (ref($resdatacopy{$key}{$idx}) eq 'HASH') {
-                        my $srcurl = $resdatacopy{$key}{$idx}{'src'};
-                        if ($srcurl =~ m{^/res/lib/templates/(\w+)\.problem$}) {
-                            my $template = $1;
-                            if (($resdatacopy{$key}{$idx}{'cdom'} =~ /^$match_domain$/) &&
-                                ($resdatacopy{$key}{$idx}{'cnum'} =~ /^$match_courseid$/)) {
-                                my $srcdom = $resdatacopy{$key}{$idx}{'cdom'};
-                                my $srcnum = $resdatacopy{$key}{$idx}{'cnum'};
-                                unless ($gotnewmapname) {
-                                    ($newmapname) = ($key =~ m{/([^/]+)$});
-                                    ($srcfolder,$srccontainer) = split(/\./,$newmapname);
-                                    if ($newsubdir{$key}) {
-                                        $newmapname =~ s/^((?:default|supplemental)_)(\d+)/$1$newsubdir{$key}/;
-                                    }
-                                    $gotnewmapname = 1;
-                                }
-                                my $srcmapinfo = $srcfolder.':'.$idx;
-                                if ($srccontainer eq 'page') {
-                                    $srcmapinfo .= ':1';
-                                }
-                                &copy_templated_files($srcurl,$srcdom,$srcnum,$srcmapinfo,$cdom,
-                                                      $cnum,$template,$idx,$newmapname);
-                            }
-                        }
-                    }
-                }
-            }
             if (ref($params{$key}) eq 'HASH') {
                 %currparam = %{$params{$key}};
             }
@@ -2831,8 +2025,7 @@ sub apply_fixups {
                     }
                 }
             }
-            my $total = scalar(@LONCAPA::map::order) - 1;
-            for (my $i=$total; $i>=0; $i--) {
+            for (my $i=0; $i<@LONCAPA::map::order; $i++) {
                 my $idx = $LONCAPA::map::order[$i];
                 if (defined($LONCAPA::map::resources[$idx])) {
                     my $changed;
@@ -2842,7 +2035,7 @@ sub apply_fixups {
                         splice(@LONCAPA::map::order,$i,1);
                         if (ref($currparam{$idx}) eq 'ARRAY') {
                             foreach my $name (@{$currparam{$idx}}) {
-                                &LONCAPA::map::delparameter($idx,$name);
+                                &LONCAPA::map::delparameter($idx,'parameter_'.$name);
                             }
                         }
                         next;
@@ -2884,7 +2077,7 @@ sub apply_fixups {
             foreach my $idx (keys(%remparam)) {
                 if (ref($remparam{$idx}) eq 'ARRAY') {
                     foreach my $name (@{$remparam{$idx}}) {   
-                        &LONCAPA::map::delparameter($idx,$name);
+                        &LONCAPA::map::delparameter($idx,'parameter_'.$name);
                     }
                 }
             }
@@ -2992,7 +2185,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);
@@ -3011,7 +2204,7 @@ sub update_parameter {
             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 $is_map;
             if ($url =~ m{/uploaded/.+\.(page|sequence)$}) {
                 $is_map = 1;
@@ -3019,7 +2212,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}) {
@@ -3055,50 +2248,29 @@ 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 '') {
-        return 0;
-    }
+    return if ($env{'form.cmd'} eq '');
     my ($cmd,$idx)=split('_',$env{'form.cmd'});
 
     my $ratstr = $LONCAPA::map::resources[$LONCAPA::map::order[$idx]];
@@ -3143,8 +2315,7 @@ sub handle_edit_cmd {
 
 sub editor {
     my ($r,$coursenum,$coursedom,$folder,$allowed,$upload_output,$crstype,
-        $supplementalflag,$orderhash,$iconpath,$pathitem,$ltitoolsref,
-        $canedit,$hostname,$navmapref,$hiddentop)=@_;
+        $supplementalflag,$orderhash,$iconpath,$pathitem)=@_;
     my ($randompick,$ishidden,$isencrypted,$plain,$is_random_order,$container);
     if ($allowed) {
         (my $breadcrumbtrail,$randompick,$ishidden,$isencrypted,$plain,
@@ -3160,28 +2331,16 @@ sub editor {
     my $jumpto;
 
     unless ($supplementalflag) {
-        $jumpto = "uploaded/$coursedom/$coursenum/$folder.$container";
+        $jumpto = "'uploaded/$coursedom/$coursenum/$folder.$container'";
     }
 
     unless ($allowed) {
         $randompick = -1;
     }
 
-    my ($errtext,$fatal);
-    if (($folder eq '') && (!$supplementalflag)) {
-        if (@LONCAPA::map::order) {
-            undef(@LONCAPA::map::order);
-            undef(@LONCAPA::map::resources);
-            undef(@LONCAPA::map::resparms);
-            undef(@LONCAPA::map::zombies);
-        }
-        $folder = 'default';
-        $container = 'sequence';
-    } else {
-        ($errtext,$fatal) = &mapread($coursenum,$coursedom,
-                                     $folder.'.'.$container);
-        return $errtext if ($fatal);
-    }
+    my ($errtext,$fatal) = &mapread($coursenum,$coursedom,
+				    $folder.'.'.$container);
+    return $errtext if ($fatal);
 
     if ($#LONCAPA::map::order<1) {
 	my $idx=&LONCAPA::map::getresidx();
@@ -3193,12 +2352,12 @@ sub editor {
 # ------------------------------------------------------------ Process commands
 
 # ---------------- if they are for this folder and user allowed to make changes
-    if (($allowed && $canedit) && ($env{'form.folder'} eq $folder)) {
+    if (($allowed) && ($env{'form.folder'} eq $folder)) {
 # set parameters and change order
 	&snapshotbefore();
 
 	if (&update_parameter()) {
-	    ($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container,1);
+	    ($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container);
 	    return $errtext if ($fatal);
 	}
 
@@ -3260,9 +2419,9 @@ sub editor {
 	$r->print($upload_output);
 
 # Rename, cut, copy or remove a single resource
-	if (&handle_edit_cmd($coursenum,$coursedom)) {
+	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);
@@ -3294,7 +2453,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);
@@ -3355,17 +2514,6 @@ sub editor {
                         } else {
                             return $errortxt;
                         }
-                    } elsif ($url =~ m{^/adm/$coursedom/$coursenum/new/ext\.tool}) {
-                        my ($suffix,$errortxt,$locknotfreed) =
-                            &new_timebased_suffix($coursedom,$coursenum,'exttool');
-                        if ($locknotfreed) {
-                            $r->print($locknotfreed);
-                        }
-                        if ($suffix) {
-                            $url =~ s{^(/adm/$coursedom/$coursenum)/new}{$1/$suffix};
-                        } else {
-                            return $errortxt;
-                        }
                     } elsif ($url =~ m{^/uploaded/$coursedom/$coursenum/(docs|supplemental)/(default|\d+)/new.html$}) {
                         if ($supplementalflag) {
                             next unless ($1 eq 'supplemental');
@@ -3388,7 +2536,7 @@ sub editor {
 	    }
             ($errtext,$fatal,my $fixuperrors) =
                 &group_import($coursenum, $coursedom, $folder,$container,
-                              'londocs',$ltitoolsref,@imports);
+                              'londocs',@imports);
 	    return $errtext if ($fatal);
             if ($fixuperrors) {
                 $r->print($fixuperrors);
@@ -3450,13 +2598,9 @@ sub editor {
 
     my ($to_show,$output,@allidx,@allmapidx,%filters,%lists,%curr_groups);
     %filters =  (
-                  canremove      => [],
-                  cancut         => [],
-                  cancopy        => [],
-                  hiddenresource => [],
-                  encrypturl     => [],
-                  randomorder    => [],
-                  randompick     => [],
+                  canremove => [],
+                  cancut    => [],
+                  cancopy   => [],
                 );
     %curr_groups = &Apache::longroup::coursegroups();
     &Apache::loncommon::start_data_table_count(); #setup a row counter 
@@ -3470,22 +2614,18 @@ sub editor {
         if ($url =~ m{/uploaded/.+\.(page|sequence)$}) {
             push(@allmapidx,$res);
         }
-
         $output .= &entryline($idx,$name,$url,$folder,$allowed,$res,
                               $coursenum,$coursedom,$crstype,
                               $pathitem,$supplementalflag,$container,
-                              \%filters,\%curr_groups,$ltitoolsref,$canedit,
-                              $isencrypted,$navmapref,$hostname);
+                              \%filters,\%curr_groups);
         $idx++;
         $shown++;
     }
     &Apache::loncommon::end_data_table_count();
 
     my $need_save;
-    if ($allowed || ($supplementalflag && $folder eq 'supplemental')) {
-        my $toolslink;
-        if ($allowed) {
-            $toolslink = '<table><tr><td>'
+    if (($allowed) || ($supplementalflag && $folder eq 'supplemental')) {
+        my $toolslink = '<table><tr><td>'
                        .&Apache::loncommon::help_open_menu('Navigation Screen',
                                                            'Navigation_Screen',undef,'RAT')
                        .'</td><td class="LC_middle">'.&mt('Tools:').'</td>'
@@ -3495,7 +2635,6 @@ sub editor {
                        .'class="LC_toolbarItem" '
                        .'title="'.&mt('Supplemental Content Editor').'">'
                        .'</a></li></ul></td></tr></table><br />';
-        }
         if ($shown) {
             if ($allowed) {
                 $to_show = &Apache::loncommon::start_scrollbox('900px','880px','400px','contentscroll')
@@ -3511,32 +2650,28 @@ sub editor {
                 if ($folder !~ /^supplemental/) {
                     $lists{'canhide'} = join(',',@allidx);
                     $lists{'canrandomlyorder'} = join(',',@allmapidx);
-                    my @possfilters = ('canremove','cancut','cancopy','hiddenresource','encrypturl',
-                                       'randomorder','randompick');
-                    foreach my $item (@possfilters) {
+                    foreach my $item ('canremove','cancut','cancopy') {
                         if (ref($filters{$item}) eq 'ARRAY') {
-                            if (@{$filters{$item}} > 0) {
-                                $lists{$item} = join(',',@{$filters{$item}});
-                            }
+                            $lists{$item} = join(',',@{$filters{$item}}); 
                         }
                     }
                     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>'.
-                                &multiple_check_form('actions',\%lists,$canedit).
+                                &multiple_check_form('actions',\%lists).
                                 '</td>'.
                                 '<td>&nbsp;</td>'.
                                 '<td>&nbsp;</td>'.
                                 '<td colspan="4">'.
-                                &multiple_check_form('settings',\%lists,$canedit).
+                                &multiple_check_form('settings',\%lists).
                                 '</td>'.
                                 &Apache::loncommon::end_data_table_row();
                              $need_save = 1;
@@ -3557,15 +2692,9 @@ sub editor {
             if (!$allowed) {
                 $to_show .= $toolslink;
             }
-            my $noresmsg;
-            if ($allowed && $hiddentop && !$supplementalflag) {
-                $noresmsg = &mt('Main Content Hidden');
-            } else {
-                $noresmsg = &mt('Currently empty');
-            }
             $to_show .= &Apache::loncommon::start_scrollbox('400px','380px','200px','contentscroll')
                        .'<div class="LC_info" id="contentlist">'
-                       .$noresmsg
+                       .&mt('Currently no documents.')
                        .'</div>'
                        .&Apache::loncommon::end_scrollbox();
         }
@@ -3578,7 +2707,7 @@ sub editor {
                       .'</div>';
         } else {
             $to_show = '<div class="LC_info" id="contentlist">'
-                      .&mt('Currently empty')
+                      .&mt('Currently no documents.')
                       .'</div>'
         }
     }
@@ -3589,10 +2718,8 @@ sub editor {
     if ($allowed) {
         my $readfile="/uploaded/$coursedom/$coursenum/$folder.$container";
         $r->print(&generate_edit_table($tid,$orderhash,$to_show,$iconpath,
-                                       $jumpto,$readfile,$need_save,"$folder.$container",$canedit));
-        if ($canedit) {
-            &print_paste_buffer($r,$container,$folder,$coursedom,$coursenum);
-        }
+                                       $jumpto,$readfile,$need_save,"$folder.$container"));
+        &print_paste_buffer($r,$container,$folder,$coursedom,$coursenum);
     } else {
         $r->print($to_show);
     }
@@ -3600,12 +2727,8 @@ sub editor {
 }
 
 sub multiple_check_form {
-    my ($caller,$listsref,$canedit) = @_;
+    my ($caller,$listsref) = @_;
     return unless (ref($listsref) eq 'HASH');
-    my $disabled;
-    unless ($canedit) {
-        $disabled = 'disabled="disabled"';
-    }
     my $output =
     '<form action="/adm/coursedocs" method="post" name="togglemult'.$caller.'">'.
     '<span class="LC_nobreak" style="font-size:x-small;font-weight:bold;">'.
@@ -3618,15 +2741,15 @@ sub multiple_check_form {
             '<table><tr>'.
             '<td class="LC_docs_entry_parameter">'.
             '<span class="LC_nobreak"><label>'.
-            '<input type="checkbox" name="hiddenresourceall" id="hiddenresourceall" onclick="propagateState(this.form,'."'hiddenresource'".')"'.$disabled.' />'.&mt('Hidden').
+            '<input type="checkbox" name="hiddenresourceall" id="hiddenresourceall" onclick="propagateState(this.form,'."'hiddenresource'".')" />'.&mt('Hidden').
             '</label></span></td>'.
             '<td class="LC_docs_entry_parameter">'.
-            '<span class="LC_nobreak"><label><input type="checkbox" name="randompickall" id="randompickall" onclick="updatePick(this.form,'."'all','check'".');propagateState(this.form,'."'randompick'".');propagateState(this.form,'."'rpicknum'".');"'.$disabled.' />'.&mt('Randomly Pick').'</label><span id="rpicktextall"></span><input type="hidden" name="rpicknumall" id="rpicknumall" value="" />'.
+            '<span class="LC_nobreak"><label><input type="checkbox" name="randompickall" id="randompickall" onclick="updatePick(this.form,'."'all','check'".');propagateState(this.form,'."'randompick'".');propagateState(this.form,'."'rpicknum'".');" />'.&mt('Randomly Pick').'</label><span id="rpicktextall"></span><input type="hidden" name="rpicknumall" id="rpicknumall" value="" />'.
             '</span></td>'.
             '</tr>'."\n".
             '<tr>'.
             '<td class="LC_docs_entry_parameter">'.
-            '<span class="LC_nobreak"><label><input type="checkbox" name="encrypturlall" id="encrypturlall" onclick="propagateState(this.form,'."'encrypturl'".')"'.$disabled.' />'.&mt('URL hidden').'</label></span></td><td class="LC_docs_entry_parameter"><span class="LC_nobreak"><label><input type="checkbox" name="randomorderall" id="randomorderall" onclick="propagateState(this.form,'."'randomorder'".')"'.$disabled.' />'.&mt('Random Order').
+            '<span class="LC_nobreak"><label><input type="checkbox" name="encrypturlall" id="encrypturlall" onclick="propagateState(this.form,'."'encrypturl'".')" />'.&mt('URL hidden').'</label></span></td><td class="LC_docs_entry_parameter"><span class="LC_nobreak"><label><input type="checkbox" name="randomorderall" id="randomorderall" onclick="propagateState(this.form,'."'randomorder'".')" />'.&mt('Random Order').
             '</label></span>'.
             '</td></tr></table>'."\n";
     } else {
@@ -3634,15 +2757,15 @@ sub multiple_check_form {
             '<table><tr>'.
             '<td class="LC_docs_entry_parameter">'.
             '<span class="LC_nobreak LC_docs_remove">'.
-            '<label><input type="checkbox" name="removeall" id="removeall" onclick="propagateState(this.form,'."'remove'".')"'.$disabled.' />'.&mt('Remove').
+            '<label><input type="checkbox" name="removeall" id="removeall" onclick="propagateState(this.form,'."'remove'".')" />'.&mt('Remove').
             '</label></span></td>'.
             '<td class="LC_docs_entry_parameter">'.
             '<span class="LC_nobreak LC_docs_cut">'.
-            '<label><input type="checkbox" name="cut" id="cutall" onclick="propagateState(this.form,'."'cut'".');"'.$disabled.' />'.&mt('Cut').
+            '<label><input type="checkbox" name="cut" id="cutall" onclick="propagateState(this.form,'."'cut'".');" />'.&mt('Cut').
             '</label></span></td>'."\n".
             '<td class="LC_docs_entry_parameter">'.
             '<span class="LC_nobreak LC_docs_copy">'.
-            '<label><input type="checkbox" name="copyall" id="copyall" onclick="propagateState(this.form,'."'copy'".')"'.$disabled.' />'.&mt('Copy').
+            '<label><input type="checkbox" name="copyall" id="copyall" onclick="propagateState(this.form,'."'copy'".')" />'.&mt('Copy').
             '</label></span></td>'.
             '</tr></table>'."\n";
     }
@@ -3651,11 +2774,7 @@ sub multiple_check_form {
         '<input type="hidden" name="allidx" value="'.$listsref->{'canhide'}.'" />';
     if ($caller eq 'settings') {
         $output .= 
-        '<input type="hidden" name="allmapidx" value="'.$listsref->{'canrandomlyorder'}.'" />'."\n".
-        '<input type="hidden" name="currhiddenresource" value="'.$listsref->{'hiddenresource'}.'" />'."\n".
-        '<input type="hidden" name="currencrypturl" value="'.$listsref->{'encrypturl'}.'" />'."\n".
-        '<input type="hidden" name="currrandomorder" value="'.$listsref->{'randomorder'}.'" />'."\n".
-        '<input type="hidden" name="currrandompick" value="'.$listsref->{'randompick'}.'" />'."\n";
+        '<input type="hidden" name="allmapidx" value="'.$listsref->{'canrandomlyorder'}.'" />';
     } elsif ($caller eq 'actions') {
         $output .=
         '<input type="hidden" name="allremoveidx" id="allremoveidx" value="'.$listsref->{'canremove'}.'" />'.
@@ -3669,33 +2788,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';
@@ -3791,8 +2885,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();
@@ -3853,9 +2946,8 @@ sub is_supplemental_title {
 
 sub entryline {
     my ($index,$title,$url,$folder,$allowed,$residx,$coursenum,$coursedom,
-        $crstype,$pathitem,$supplementalflag,$container,$filtersref,$currgroups,
-        $ltitoolsref,$canedit,$isencrypted,$navmapref,$hostname)=@_;
-    my ($foldertitle,$renametitle,$oldtitle);
+        $crstype,$pathitem,$supplementalflag,$container,$filtersref,$currgroups)=@_;
+    my ($foldertitle,$renametitle);
     if (&is_supplemental_title($title)) {
 	($title,$foldertitle,$renametitle) = &Apache::loncommon::parse_supplemental_title($title);
     } else {
@@ -3864,24 +2956,15 @@ sub entryline {
 	$foldertitle=$title;
     }
 
-    my ($disabled,$readonly,$js_lt);
-    unless ($canedit) {
-        $disabled = 'disabled="disabled"';
-        $readonly = 1;
-    }
-
     my $orderidx=$LONCAPA::map::order[$index];
 
     $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
-    my ($esc_path, $path, $symb, $shownsymb);
+    my ($esc_path, $path, $symb);
     if ($env{'form.folderpath'}) {
 	$esc_path=&escape($env{'form.folderpath'});
 	$path = &HTML::Entities::encode($env{'form.folderpath'},'<>&"');
@@ -3933,7 +3016,7 @@ END
 	     ne '')) {
 	    $selectbox=
 		'<input type="hidden" name="currentpos" value="'.$incindex.'" />'.
-		'<select name="newpos" onchange="this.form.submit()"'.$disabled.'>';
+		'<select name="newpos" onchange="this.form.submit()">';
 	    for (my $i=1;$i<=$#LONCAPA::map::order+1;$i++) {
 		if ($i==$incindex) {
 		    $selectbox.='<option value="" selected="selected">('.$i.')</option>';
@@ -3951,38 +3034,30 @@ END
 		'rn' => 'Rename',
 		'cp' => 'Copy',
                 'ex' => 'External Resource',
-                'et' => 'External Tool',
                 'ed' => 'Edit',
                 'pr' => 'Preview',
                 'sv' => 'Save',
                 'ul' => 'URL',
-                'ti' => 'Title',
-                'er' => 'Editing rights unavailable for your current role.',  
+                'ti' => 'Title', 
                 );
 	my %denied = &action_restrictions($coursenum,$coursedom,$url,
                                           $env{'form.folderpath'},
                                           $currgroups);
         my ($copylink,$cutlink,$removelink);
 	my $skip_confirm = 0;
-        my $confirm_removal = 0;
 	if ( $folder =~ /^supplemental/
 	     || ($url =~ m{( /smppg$
 			    |/syllabus$
 			    |/aboutme$
 			    |/navmaps$
 			    |/bulletinboard$
-                            |/ext\.tool$
 			    |\.html$)}x)
              || $isexternal) {
 	    $skip_confirm = 1;
 	}
-        if (($url=~m|/+uploaded/\Q$coursedom\E/\Q$coursenum\E/|) &&
-            ($url!~/$LONCAPA::assess_page_seq_re/)) {
-            $confirm_removal = 1;
-        }
 
 	if ($denied{'copy'}) {
-            $copylink=(<<ENDCOPY)
+            $copylink=(<<ENDCOPY);
 <span style="visibility: hidden;">$lt{'cp'}</span>
 ENDCOPY
         } else {
@@ -3991,7 +3066,7 @@ ENDCOPY
 	    $copylink=(<<ENDCOPY);
 <form name="$formname" method="post" action="/adm/coursedocs">
 $form_common
-<input type="checkbox" name="copy" id="copy_$orderidx" value="$orderidx" onclick="javascript:singleCheck(this,'$orderidx','copy');" class="LC_hidden" $disabled /><a href="$js" class="LC_docs_copy">$lt{'cp'}</a>
+<input type="checkbox" name="copy" id="copy_$orderidx" value="$orderidx" onclick="javascript:singleCheck(this,'$orderidx','copy');" class="LC_hidden" /><a href="$js" class="LC_docs_copy">$lt{'cp'}</a>
 $form_end
 ENDCOPY
             if (($ishash) && (ref($filtersref->{'cancopy'}) eq 'ARRAY')) {
@@ -4008,8 +3083,7 @@ ENDCUT
 	    $cutlink=(<<ENDCUT);
 <form name="$formname" method="post" action="/adm/coursedocs">
 $form_common
-<input type="hidden" name="skip_$orderidx" id="skip_cut_$orderidx" value="$skip_confirm" />
-<input type="checkbox" name="cut" id="cut_$orderidx" value="$orderidx" onclick="javascript:singleCheck(this,'$orderidx','cut');" class="LC_hidden" $disabled /><a href="$js" class="LC_docs_cut">$lt{'ct'}</a>
+<input type="checkbox" name="cut" id="cut_$orderidx" value="$orderidx" onclick="javascript:singleCheck(this,'$orderidx','cut');" class="LC_hidden" /><a href="$js" class="LC_docs_cut">$lt{'ct'}</a>
 $form_end
 ENDCUT
             if (($ishash) && (ref($filtersref->{'cancut'}) eq 'ARRAY')) {
@@ -4022,39 +3096,31 @@ ENDCUT
 ENDREM
         } else {
             my $formname = 'edit_remove_'.$orderidx;
-            my $js = "javascript:checkForSubmit(document.forms.renameform,'remove','actions','$orderidx','$esc_path','$index','$renametitle',$skip_confirm,'$container','$folder',$confirm_removal);";
+            my $js = "javascript:checkForSubmit(document.forms.renameform,'remove','actions','$orderidx','$esc_path','$index','$renametitle',$skip_confirm);";
             $removelink=(<<ENDREM);
 <form name="$formname" method="post" action="/adm/coursedocs">
 $form_common
-<input type="hidden" name="skip_$orderidx" id="skip_remove_$orderidx" value="$skip_confirm" />
-<input type="hidden" name="confirm_rem_$orderidx" id="confirm_removal_$orderidx" value="$confirm_removal" />
-<input type="checkbox" name="remove" id="remove_$orderidx" value="$orderidx" onclick="javascript:singleCheck(this,'$orderidx','remove');" class="LC_hidden" $disabled /><a href="$js" class="LC_docs_remove">$lt{'rm'}</a>
+<input type="checkbox" name="remove" id="remove_$orderidx" value="$orderidx" onclick="javascript:singleCheck(this,'$orderidx','remove');" class="LC_hidden" /><a href="$js" class="LC_docs_remove">$lt{'rm'}</a>
 $form_end
 ENDREM
             if (($ishash) && (ref($filtersref->{'canremove'}) eq 'ARRAY')) {
                 push(@{$filtersref->{'canremove'}},$orderidx);
             }
         }
-        $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
-        my ($uplink,$downlink);
-        if ($canedit) {
-            $uplink = "/adm/coursedocs?cmd=up_$index&amp;folderpath=$esc_path&amp;symb=$symb";
-            $downlink = "/adm/coursedocs?cmd=down_$index&amp;folderpath=$esc_path&amp;symb=$symb";
-        } else {
-            $uplink = "javascript:alert('".&js_escape($lt{'er'})."');";
-            $downlink = $uplink;
         }
 	$line.=(<<END);
 <td>
 <div class="LC_docs_entry_move">
-  <a href="$uplink">
+  <a href='/adm/coursedocs?cmd=up_$index&amp;folderpath=$esc_path&amp;symb=$symb'>
     <img src="${iconpath}move_up.gif" alt="$lt{'up'}" class="LC_icon" />
   </a>
 </div>
 <div class="LC_docs_entry_move">
-  <a href="$downlink">
+  <a href='/adm/coursedocs?cmd=down_$index&amp;folderpath=$esc_path&amp;symb=$symb'>
     <img src="${iconpath}move_down.gif" alt="$lt{'dw'}" class="LC_icon" />
   </a>
 </div>
@@ -4080,7 +3146,6 @@ END
     my $isfolder;
     my $ispage;
     my $containerarg;
-    my $folderurl;
     if ($uploaded) {
         if (($extension eq 'sequence') || ($extension eq 'page')) {
             $url=~/\Q$coursenum\E\/([\/\w]+)\.\Q$extension\E$/;
@@ -4092,7 +3157,6 @@ END
                 $icon=$iconpath.'page.gif';
                 $ispage=1;
             }
-            $folderurl = &Apache::lonnet::declutter($url);
             if ($allowed) {
                 $url='/adm/coursedocs?';
             } else {
@@ -4103,22 +3167,14 @@ END
 	}
     }
 
-    my ($editlink,$extresform,$anchor,$hiddenres,$nomodal);
+    my ($editlink,$extresform);
     my $orig_url = $url;
     $orig_url=~s{http(&colon;|:)//https(&colon;|:)//}{https$2//};
-    if ($container eq 'page') {
-        $url=~s{^http(|s)(&colon;|:)//}{/ext/};
-    } else {
-        $url=~s{^http(|s)(&colon;|:)//}{/adm/wrapper/ext/};
-    }
+    $url=~s{^http(|s)(&colon;|:)//}{/adm/wrapper/ext/};
     if (!$supplementalflag && $residx && $symb) {
         if ((!$isfolder) && (!$ispage)) {
 	    (undef,undef,$url)=&Apache::lonnet::decode_symb($symb);
-            if (($url =~ m{^ext/}) && ($container eq 'page')) {
-                $url=&Apache::lonnet::clutter_with_no_wrapper($url);
-            } else {
-                $url=&Apache::lonnet::clutter($url);
-            }
+	    $url=&Apache::lonnet::clutter($url);
 	    if ($url=~/^\/*uploaded\//) {
 	        $url=~/\.(\w+)$/;
 	        my $embstyle=&Apache::loncommon::fileembstyle($1);
@@ -4129,106 +3185,17 @@ END
 	        } elsif ($url!~/\.(sequence|page)$/) {
 		    $url='/adm/coursedocs/showdoc'.$url;
 	        }
-            } elsif ($url=~m{^(|/adm/wrapper)/ext/([^#]+)}) {
-                my $wrapped = $1;
-                my $exturl = $2;
-                if (($wrapped eq '') && ($container ne 'page')) {
-                    $url='/adm/wrapper'.$url;
-                }
-                if (($ENV{'SERVER_PORT'} == 443) && ($exturl !~ /^https:/)) {
-                    $nomodal = 1;
-                }
-            } elsif ($url=~m{^/adm/$coursedom/$coursenum/\d+/ext\.tool$}) {
-                $url='/adm/wrapper'.$url;
-            } elsif ($url eq "/public/$coursedom/$coursenum/syllabus") {
-                if (($ENV{'SERVER_PORT'} == 443) &&
-                    ($env{'course.'.$env{'request.course.id'}.'.externalsyllabus'} =~ m{^http://})) {
-                    unless ((&Apache::lonnet::uses_sts()) || (&Apache::lonnet::waf_allssl($hostname))) {
-                        $url .= '?usehttp=1';
-                    }
-                    $nomodal = 1;
-                }
+	    } elsif ($url=~m|^/ext/|) {
+	        $url='/adm/wrapper'.$url;
 	    }
-            my ($checkencrypt,$shownurl);
-            if (!$env{'request.role.adv'}) {
-                if (((&LONCAPA::map::getparameter($orderidx,'parameter_encrypturl'))[0]=~/^yes$/i) ||
-                    ($isencrypted) || (&Apache::lonnet::EXT('resource.0.encrypturl',$symb) =~ /^yes$/i)) {
-                    $checkencrypt = 1;
-                } elsif (ref($navmapref)) {
-                    unless (ref($$navmapref)) {
-                        $$navmapref = Apache::lonnavmaps::navmap->new();
-                    }
-                    if (ref($$navmapref)) {
-                        if (lc($$navmapref->get_mapparam($symb,undef,"0.encrypturl")) eq 'yes') {
-                            $checkencrypt = 1;
-                        }
-                    }
-                }
-            }
-            if ($checkencrypt) {
-                my $currenc = $env{'request.enc'};
-                $env{'request.enc'} = 1;
-                $shownsymb = &Apache::lonenc::encrypted($symb);
-                $shownurl = &Apache::lonenc::encrypted($url);
-                if (&Apache::lonnet::symbverify($symb,$url)) {
-                    $url = $shownurl;
-                } else {
-                    $url = '';
-                }
-                $env{'request.enc'} = $currenc;
-            } elsif (&Apache::lonnet::symbverify($symb,$url)) {
-                $shownsymb = $symb;
-                if ($isexternal) {
-                    $url =~ s/\#[^#]+$//;
-                    if ($container eq 'page') {
-                        $url = &Apache::lonnet::clutter($url);
-                    }
-                }
-                $shownurl = $url;
-            }
-            unless ($env{'request.role.adv'}) {
-                if ((&LONCAPA::map::getparameter($orderidx,'parameter_hiddenresource'))[0]=~/^yes$/i) {
-                    $url = '';
-                }
-                if (&Apache::lonnet::EXT('resource.0.hiddenresource',$symb) =~ /^yes$/i) {
-                    $url = '';
-                    $hiddenres = 1;
-                }
-            }
-            if ($url ne '') {
-                $url = $shownurl.(($shownurl=~/\?/)?'&':'?').'symb='.&escape($shownsymb);
+            if (&Apache::lonnet::symbverify($symb,$url)) {
+	        $url.=(($url=~/\?/)?'&':'?').'symb='.&escape($symb);
+            } else {
+                $url='';
             }
 	}
-    } elsif ($supplementalflag) {
-        if ($isexternal) {
-            if ($url =~ /^([^#]+)#([^#]+)$/) {
-                $url = $1;
-                $anchor = $2;
-                if (($url =~ m{^(|/adm/wrapper)/ext/(?!https:)}) && ($ENV{'SERVER_PORT'} == 443)) {
-                    unless ((&Apache::lonnet::uses_sts()) || (&Apache::lonnet::waf_allssl($hostname))) {
-                        if ($hostname ne '') {
-                            $url = 'http://'.$hostname.$url;
-                        }
-                        $url .= (($url =~ /\?/) ? '&amp;':'?').'usehttp=1';
-                    }
-                    $nomodal = 1;
-                }
-            }
-        } elsif ($url =~ m{^\Q/public/$coursedom/$coursenum/syllabus\E}) {
-            if (($ENV{'SERVER_PORT'} == 443) &&
-                ($env{'course.'.$env{'request.course.id'}.'.externalsyllabus'} =~ m{^http://})) {
-                unless ((&Apache::lonnet::uses_sts()) || (&Apache::lonnet::waf_allssl($hostname))) {
-                    if ($hostname ne '') {
-                        $url = 'http://'.$hostname.$url;
-                    }
-                    $url .= (($url =~ /\?/) ? '&amp;':'?').'usehttp=1';
-                }
-                $nomodal = 1;
-            }
-        }
     }
-    my ($rand_pick_text,$rand_order_text,$hiddenfolder);
-    my $filterFunc = sub { my $res = shift; return (!$res->randomout() && !$res->is_map()) };
+    my ($rand_pick_text,$rand_order_text);
     if ($isfolder || $ispage || $extension eq 'sequence' || $extension eq 'page') {
 	my $foldername=&escape($foldertitle);
 	my $folderpath=$env{'form.folderpath'};
@@ -4237,98 +3204,55 @@ END
             $folderpath.=$containerarg.'&'.$foldername;
             $url.='folderpath='.&escape($folderpath);
         } else {
-            my $rpicknum = (&LONCAPA::map::getparameter($orderidx,
-                                                        'parameter_randompick'))[0];
-            my $randorder = ((&LONCAPA::map::getparameter($orderidx,
-                                              'parameter_randomorder'))[0]=~/^yes$/i);
-            my $hiddenmap = ((&LONCAPA::map::getparameter($orderidx,
-                                              'parameter_hiddenresource'))[0]=~/^yes$/i);
-            my $encryptmap = ((&LONCAPA::map::getparameter($orderidx,
-                                              'parameter_encrypturl'))[0]=~/^yes$/i);
-            unless ($hiddenmap) {
-                if (ref($navmapref)) {
-                    unless (ref($$navmapref)) {
-                        $$navmapref = Apache::lonnavmaps::navmap->new();
-                    }
-                    if (ref($$navmapref)) {
-                        if (lc($$navmapref->get_mapparam(undef,$folderurl,"0.hiddenresource")) eq 'yes') {
-                            my @resources = $$navmapref->retrieveResources($folderurl,$filterFunc,1,1);
-                            unless (@resources) {
-                                $hiddenmap = 1;
-                                unless ($env{'request.role.adv'}) {
-                                    $url = '';
-                                    $hiddenfolder = 1;
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-            unless ($encryptmap) {
-                if ((ref($navmapref)) && (ref($$navmapref))) {
-                    if (lc($$navmapref->get_mapparam(undef,$folderurl,"0.encrypturl")) eq 'yes') {
-                        $encryptmap = 1;
-                    }
-                }
-            }
-
 # Append randompick number, hidden, and encrypted with ":" to foldername,
 # so it gets transferred between levels
-            $folderpath.=$containerarg.'&'.$foldername.
-                         ':'.$rpicknum.':'.$hiddenmap.':'.$encryptmap.':'.$randorder.':'.$ispage;
-            unless ($url eq '') {
-                $url.='folderpath='.&escape($folderpath);
-            }
+	    $folderpath.=$containerarg.'&'.$foldername.
+                                              ':'.(&LONCAPA::map::getparameter($orderidx,
+                                              'parameter_randompick'))[0]
+                                               .':'.((&LONCAPA::map::getparameter($orderidx,
+                                              'parameter_hiddenresource'))[0]=~/^yes$/i)
+                                               .':'.((&LONCAPA::map::getparameter($orderidx,
+                                              'parameter_encrypturl'))[0]=~/^yes$/i)
+                                               .':'.((&LONCAPA::map::getparameter($orderidx,
+                                              'parameter_randomorder'))[0]=~/^yes$/i)
+                                               .':'.$ispage;
+	    $url.='folderpath='.&escape($folderpath);
+            my $rpicknum = (&LONCAPA::map::getparameter($orderidx,
+                                                        'parameter_randompick'))[0];
             my $rpckchk;
             if ($rpicknum) {
                 $rpckchk = ' checked="checked"';
-                if (($ishash) && (ref($filtersref->{'randompick'}) eq 'ARRAY')) {
-                    push(@{$filtersref->{'randompick'}},$orderidx.':'.$rpicknum);
-                }
             }
             my $formname = 'edit_randompick_'.$orderidx;
 	    $rand_pick_text = 
 '<form action="/adm/coursedocs" method="post" name="'.$formname.'">'."\n".
 $form_param."\n".
 $form_common."\n".
-'<span class="LC_nobreak"><label><input type="checkbox" name="randompick_'.$orderidx.'" id="randompick_'.$orderidx.'" onclick="'."updatePick(this.form,'$orderidx','check');".'"'.$rpckchk.$disabled.' /> '.&mt('Randomly Pick').'</label><input type="hidden" name="rpicknum_'.$orderidx.'" id="rpicknum_'.$orderidx.'" value="'.$rpicknum.'" /><span id="randompicknum_'.$orderidx.'">';
+'<span class="LC_nobreak"><label><input type="checkbox" name="randompick_'.$orderidx.'" id="randompick_'.$orderidx.'" onclick="'."updatePick(this.form,'$orderidx','check');".'"'.$rpckchk.' /> '.&mt('Randomly Pick').'</label><input type="hidden" name="rpicknum_'.$orderidx.'" id="rpicknum_'.$orderidx.'" value="'.$rpicknum.'" /><span id="randompicknum_'.$orderidx.'">';
             if ($rpicknum ne '') {
                 $rand_pick_text .= ':&nbsp;<a href="javascript:updatePick('."document.$formname,'$orderidx','link'".')">'.$rpicknum.'</a>';
             }
             $rand_pick_text .= '</span></span>'.
                                $form_end;
-            my $ro_set;
-            if ($randorder) {
-                $ro_set = 'checked="checked"';
-                if (($ishash) && (ref($filtersref->{'randomorder'}) eq 'ARRAY')) {
-                    push(@{$filtersref->{'randomorder'}},$orderidx);
-                }
-            }
-            $formname = 'edit_rorder_'.$orderidx;
+    	    my $ro_set=
+	        ((&LONCAPA::map::getparameter($orderidx,'parameter_randomorder'))[0]=~/^yes$/i?' checked="checked"':'');
+            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.$disabled.' /> '.&mt('Random Order').' </label></span>'.
-$form_end;
+'<span class="LC_nobreak"><label><input type="checkbox" name="randomorder_'.$orderidx.'" id="randomorder_'.$orderidx.'" onclick="checkForSubmit(this.form,'."'randomorder','settings'".');" '.$ro_set.' /> '.&mt('Random Order').' </label></span>'.
+$form_end; 
         }
     } elsif ($supplementalflag && !$allowed) {
-        my $isexttool;
-        if ($url=~m{^/adm/$coursedom/$coursenum/\d+/ext\.tool$}) {
-            $url='/adm/wrapper'.$url;
-            $isexttool = 1;
-        }
         $url .= ($url =~ /\?/) ? '&amp;':'?';
         $url .= 'folderpath='.&HTML::Entities::encode($esc_path,'<>&"');
         if ($title) {
             $url .= '&amp;title='.&HTML::Entities::encode($renametitle,'<>&"');
         }
-        if ((($isexternal) || ($isexttool)) && $orderidx) {
+        if ($isexternal && $orderidx) {
             $url .= '&amp;idx='.$orderidx;
         }
-        if ($anchor ne '') {
-            $url .= '&amp;anchor='.&HTML::Entities::encode($anchor,'"<>&');
-        }
     }
     my ($tdalign,$tdwidth);
     if ($allowed) {
@@ -4336,30 +3260,18 @@ $form_end;
             &Apache::lonnet::declutter(&Apache::lonnet::filelocation('',$orig_url));
         if ($isexternal) {
             ($editlink,$extresform) = 
-                &Apache::lonextresedit::extedit_form(0,$residx,$orig_url,$title,$pathitem,
-                                                     undef,undef,undef,undef,undef,undef,
-                                                     undef,$disabled);
-        } elsif ($orig_url =~ m{^/adm/$coursedom/$coursenum/\d+/ext\.tool$}) {
-            ($editlink,$extresform) =
-                &Apache::lonextresedit::extedit_form(0,$residx,$orig_url,$title,$pathitem,
-                                                     undef,undef,undef,'tool',$coursedom,
-                                                     $coursenum,$ltitoolsref,$disabled);
+                &Apache::lonextresedit::extedit_form(0,$residx,$orig_url,$title,$pathitem);
         } elsif (!$isfolder && !$ispage) {
             my ($cfile,$home,$switchserver,$forceedit,$forceview) = 
                 &Apache::lonnet::can_edit_resource($fileloc,$coursenum,$coursedom,$orig_url);
             if (($cfile ne '') && ($symb ne '' || $supplementalflag)) {
-                my $suppanchor;
-                if ($supplementalflag) {
-                    $suppanchor = $anchor;
-                }
                 my $jscall = 
                     &Apache::lonhtmlcommon::jump_to_editres($cfile,$home,
                                                             $switchserver,
                                                             $forceedit,
-                                                            undef,$symb,$shownsymb,
+                                                            undef,$symb,
                                                             &escape($env{'form.folderpath'}),
-                                                            $renametitle,$hostname,
-                                                            '','',1,$suppanchor);
+                                                            $renametitle,'','',1);
                 if ($jscall) {
                     $editlink = '<a class="LC_docs_ext_edit" href="javascript:'.
                                 $jscall.'" >'.&mt('Edit').'</a>&nbsp;'."\n";
@@ -4376,31 +3288,11 @@ $form_end;
         $reinit = &mt('(re-initialize course to access)');
     }
     $line.='<td class="LC_docs_entry_commands"'.$tdalign.'><span class="LC_nobreak">'.$editlink.$renamelink;
-    my $link;
     if (($url=~m{/adm/(coursedocs|supplemental)}) || (!$allowed && $url)) {
        $line.='<a href="'.$url.'"><img src="'.$icon.'" alt="" class="LC_icon" /></a>';
     } elsif ($url) {
-       if ($anchor ne '') {
-           if ($supplementalflag) {
-               $anchor = '&amp;anchor='.&HTML::Entities::encode($anchor,'"<>&');
-           } else {
-               $anchor = '#'.&HTML::Entities::encode($anchor,'"<>&');
-           }
-       }
-
-       if ((!$supplementalflag) && ($nomodal) && ($hostname ne '')) {
-           $link = 'http://'.$hostname.$url;
-       } else {
-           $link = $url;
-       }
-       $link = &js_escape($link.(($url=~/\?/)?'&amp;':'?').'inhibitmenu=yes'.$anchor);
-       if ($nomodal) {
-           $line.='<a href="#" onclick="javascript:window.open('."'$link','syllabuspreview','height=400,width=500,scrollbars=1,resizable=1,menubar=0,location=1')".'; return false;" />'.
-                  '<img src="'.$icon.'" alt="" class="LC_icon" border="0" /></a>';
-       } else {
-           $line.=&Apache::loncommon::modal_link($link,
-                                                 '<img src="'.$icon.'" alt="" class="LC_icon" />',600,500);
-       }
+       $line.=&Apache::loncommon::modal_link($url.(($url=~/\?/)?'&amp;':'?').'inhibitmenu=yes',
+                                             '<img src="'.$icon.'" alt="" class="LC_icon" />',600,500);
     } else {
        $line.='<img src="'.$icon.'" alt="" class="LC_icon" />';
     }
@@ -4408,14 +3300,8 @@ $form_end;
     if (($url=~m{/adm/(coursedocs|supplemental)}) || (!$allowed && $url)) {
        $line.='<a href="'.$url.'">'.$title.'</a>';
     } elsif ($url) {
-       if ($nomodal) {
-           $line.='<a href="#" onclick="javascript:window.open('."'$link','syllabuspreview','height=400,width=500,scrollbars=1,resizable=1,menubar=0,location=1')".'; return false;" />'.
-                  $title.'</a>';
-       } else {
-           $line.=&Apache::loncommon::modal_link($link,$title,600,500);
-       }
-    } elsif (($hiddenfolder) || ($hiddenres)) {
-       $line.=$title.' <span class="LC_warning LC_docs_reinit_warn">('.&mt('Hidden').')</span>';
+       $line.=&Apache::loncommon::modal_link($url.(($url=~/\?/)?'&amp;':'?').'inhibitmenu=yes',
+                                             $title,600,500);
     } else {
        $line.=$title.' <span class="LC_docs_reinit_warn">'.$reinit.'</span>';
     }
@@ -4426,19 +3312,10 @@ $form_end;
  	my %lt=&Apache::lonlocal::texthash(
  			      'hd' => 'Hidden',
  			      'ec' => 'URL hidden');
-        my ($enctext,$hidtext);
-        if ((&LONCAPA::map::getparameter($orderidx,'parameter_encrypturl'))[0]=~/^yes$/i) {
-            $enctext = ' checked="checked"';
-            if (($ishash) && (ref($filtersref->{'encrypturl'}) eq 'ARRAY')) {
-                push(@{$filtersref->{'encrypturl'}},$orderidx);
-            }
-        }
-        if ((&LONCAPA::map::getparameter($orderidx,'parameter_hiddenresource'))[0]=~/^yes$/i) {
-            $hidtext = ' checked="checked"';
-            if (($ishash) && (ref($filtersref->{'randomorder'}) eq 'ARRAY')) {
-                push(@{$filtersref->{'hiddenresource'}},$orderidx);
-            }
-        }
+	my $enctext=
+	    ((&LONCAPA::map::getparameter($orderidx,'parameter_encrypturl'))[0]=~/^yes$/i?' checked="checked"':'');
+	my $hidtext=
+	    ((&LONCAPA::map::getparameter($orderidx,'parameter_hiddenresource'))[0]=~/^yes$/i?' checked="checked"':'');
         my $formhidden = 'edit_hiddenresource_'.$orderidx;
         my $formurlhidden = 'edit_encrypturl_'.$orderidx;
 	$line.=(<<ENDPARMS);
@@ -4446,13 +3323,13 @@ $form_end;
     <form action="/adm/coursedocs" method="post" name="$formhidden">
     $form_param
     $form_common
-    <label><input type="checkbox" name="hiddenresource_$orderidx" id="hiddenresource_$orderidx" onclick="checkForSubmit(this.form,'hiddenresource','settings');" $hidtext $disabled /> $lt{'hd'}</label>
+    <label><input type="checkbox" name="hiddenresource_$orderidx" id="hiddenresource_$orderidx" onclick="checkForSubmit(this.form,'hiddenresource','settings');" $hidtext /> $lt{'hd'}</label>
     $form_end
     <br />
     <form action="/adm/coursedocs" method="post" name="$formurlhidden">
     $form_param
     $form_common
-    <label><input type="checkbox" name="encrypturl_$orderidx" id="encrypturl_$orderidx" onclick="checkForSubmit(this.form,'encrypturl','settings');" $enctext $disabled /> $lt{'ec'}</label>
+    <label><input type="checkbox" name="encrypturl_$orderidx" id="encrypturl_$orderidx" onclick="checkForSubmit(this.form,'encrypturl','settings');" $enctext /> $lt{'ec'}</label>
     $form_end
   </td>
   <td class="LC_docs_entry_parameter">$rand_pick_text<br />
@@ -4473,11 +3350,9 @@ sub action_restrictions {
     if ($url=~ m{^/res/.+\.(page|sequence)$}) {
         # no copy for published maps
         $denied{'copy'} = 1;
-    } elsif ($url=~m{^/res/lib/templates/([^/]+)\.problem$}) {
-        unless ($1 eq 'simpleproblem') {
-            $denied{'copy'} = 1;
-        }
-        $denied{'cut'} = 1;
+    } elsif ($url=~m{^/res/lib/templates/}) {
+       $denied{'copy'} = 1;
+       $denied{'cut'} = 1;
     } elsif ($url eq "/uploaded/$cdom/$cnum/group_allfolders.sequence") {
         if ($folderpath =~ /^default&[^\&]+$/) {
             if ((ref($currgroups) eq 'HASH') && (keys(%{$currgroups}) > 0)) {
@@ -4533,7 +3408,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') {
@@ -4545,8 +3419,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.');
@@ -4554,47 +3429,31 @@ sub new_timebased_suffix {
             $errtext = &mt('Failed to acquire a unique timestamp-based suffix for the new folder/page.');
         } elsif ($type eq 'smppg') {
             $errtext = &mt('Failed to acquire a unique timestamp-based suffix for the new simple page.');
-        } elsif ($type eq 'exttool') {
-            $errtext = &mt('Failed to acquire a unique timestamp-based suffix for the new external tool.');
         } 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.');
-        } elsif ($type eq 'exttool') {
-            $locknotfreed .=
-                &mt('This will prevent creation of additional external tools 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>';
     }
@@ -4637,7 +3496,7 @@ sub untiehash {
 
 
 sub checkonthis {
-    my ($r,$url,$level,$title,$checkstale)=@_;
+    my ($r,$url,$level,$title)=@_;
     $url=&unescape($url);
     $alreadyseen{$url}=1;
     $r->rflush();
@@ -4652,22 +3511,10 @@ sub checkonthis {
        $r->print('<a href="'.$url.'" target="cat">'.
 		 ($title?$title:$url).'</a> ');
        if ($url=~/^\/res\//) {
-          my $updated;
-          if (($checkstale) && ($url !~ m{^/res/lib/templates/}) &&
-              ($url !~ /\.\d+\.\w+$/)) {
-              $updated = &Apache::lonnet::remove_stale_resfile($url);
-          }
 	  my $result=&Apache::lonnet::repcopy(
                               &Apache::lonnet::filelocation('',$url));
           if ($result eq 'ok') {
              $r->print('<span class="LC_success">'.&mt('ok').'</span>');
-             if ($updated) {
-                 $r->print('<br />');
-                 for (my $i=0;$i<=$level*5;$i++) {
-                     $r->print('&nbsp;');
-                 }
-                 $r->print('- '.&mt('Outdated copy removed'));
-             }
              $r->rflush();
              &Apache::lonnet::countacc($url);
              $url=~/\.(\w+)$/;
@@ -4701,7 +3548,7 @@ sub checkonthis {
                 &Apache::lonnet::metadata($url,'dependencies');
              foreach my $dep (split(/\,/,$dependencies)) {
 		 if (($dep=~/^\/res\//) && (!$alreadyseen{$dep})) {
-                    &checkonthis($r,$dep,$level+1,'',$checkstale);
+                    &checkonthis($r,$dep,$level+1);
                  }
              }
           } elsif ($result eq 'unavailable') {
@@ -4715,9 +3562,6 @@ sub checkonthis {
           } else {
              $r->print('<span class="LC_error">'.&mt('access denied').'</span>');
           }
-          if (($updated) && ($result ne 'ok')) {
-              $r->print('<br />'.&mt('Outdated copy removed'));
-          }
        }
     }
 }
@@ -4770,74 +3614,12 @@ sub list_symbs {
     $r->print(&endContentScreen());
 }
 
-sub short_urls {
-    my ($r,$canedit) = @_;
-    my $crstype = &Apache::loncommon::course_type();
-    my $formname = 'shortenurl';
-    $r->print(&Apache::loncommon::start_page('Display/Set Shortened URLs'));
-    $r->print(&Apache::lonhtmlcommon::breadcrumbs('Shortened URLs'));
-    $r->print(&startContentScreen('tools'));
-    my ($navmap,$errormsg) =
-        &Apache::loncourserespicker::get_navmap_object($crstype,'shorturls');
-    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 {
-        $r->print('<h4 class="LC_info">'.&mt('Tiny URLs for deep-linking into course').'</h4>'."\n");
-        $r->rflush();
-        my $readonly;
-        if ($canedit) {
-            my ($numnew,$errors) = &Apache::loncommon::get_requested_shorturls($cdom,$cnum,$navmap);
-            if ($numnew) {
-                $r->print('<p class="LC_info">'.&mt('Created [quant,_1,URL]',$numnew).'</p>');
-            }
-            if ((ref($errors) eq 'ARRAY') && (@{$errors} > 0)) {
-                $r->print(&mt('The following errors occurred when processing your request to create shortened URLs:').'<br /><ul>');
-                foreach my $error (@{$errors}) {
-                    $r->print('<li>'.$error.'</li>');
-                }
-                $r->print('</ul><br />');
-            }
-        } else {
-            $readonly = 1;
-        }
-        my %currtiny = &Apache::lonnet::dump('tiny',$cdom,$cnum);
-        $r->print(&Apache::loncourserespicker::create_picker($navmap,'shorturls',$formname,$crstype,undef,
-                                                             undef,undef,undef,undef,undef,\%currtiny,$readonly));
-    }
-    $r->print(&endContentScreen());
-}
-
-sub contentverifyform {
-    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(&startContentScreen('tools'));
-    $r->print('<h4 class="LC_info">'.&mt($crstype.' content verification').'</h4>');
-    $r->print('<form method="post" action="/adm/coursedocs"><p>'.
-              &mt('Include a check if files copied from elsewhere are up to date (will increase verification time)?').
-              '&nbsp;<span class="LC_nobreak">'.
-              '<label><input type="radio" name="checkstale" value="0" checked="checked" />'.
-              &mt('No').'</label>'.('&nbsp;'x2).
-              '<label><input type="radio" name="checkstale" value="1" />'.
-              &mt('Yes').'</label></span></p><p>'.
-              '<input type="submit" value="'.&mt('Verify Content').' "/>'.
-              '<input type="hidden" value="1" name="tools" />'.
-              '<input type="hidden" value="1" name="verify" /></p></form>');
-    $r->print(&endContentScreen());
-    return;
-}
 
 sub verifycontent {
-    my ($r,$checkstale) = @_;
+    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;
@@ -4855,7 +3637,7 @@ sub verifycontent {
 	   }
        }
        if (($key=~/^src\_(.+)$/) && (!$alreadyseen{&unescape($hash{$key})})) {
-           &checkonthis($r,$hash{$key},0,$hash{'title_'.$1},$checkstale);
+           &checkonthis($r,$hash{$key},0,$hash{'title_'.$1});
        }
    }
    &untiehash();
@@ -4871,10 +3653,10 @@ sub devalidateversioncache {
 }
 
 sub checkversions {
-    my ($r,$canedit) = @_;
+    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='';
@@ -4892,56 +3674,54 @@ sub checkversions {
 
     $hashtied=0;
     &tiehash();
-    if ($canedit) {
-        my %newsetversions=();
-        if ($env{'form.setmostrecent'}) {
-	    $haschanged=1;
-	    foreach my $key (keys(%hash)) {
-	        if ($key=~/^ids\_(\/res\/.+)$/) {
-		    $newsetversions{$1}='mostrecent';
-                    &devalidateversioncache($1);
-	        }
-	    }
-        } elsif ($env{'form.setcurrent'}) {
-	    $haschanged=1;
-	    foreach my $key (keys(%hash)) {
-	        if ($key=~/^ids\_(\/res\/.+)$/) {
-		    my $getvers=&Apache::lonnet::getversion($1);
-		    if ($getvers>0) {
-		        $newsetversions{$1}=$getvers;
-		        &devalidateversioncache($1);
-		    }
-	        }
+    my %newsetversions=();
+    if ($env{'form.setmostrecent'}) {
+	$haschanged=1;
+	foreach my $key (keys(%hash)) {
+	    if ($key=~/^ids\_(\/res\/.+)$/) {
+		$newsetversions{$1}='mostrecent';
+                &devalidateversioncache($1);
 	    }
-        } elsif ($env{'form.setversions'}) {
-	    $haschanged=1;
-	    foreach my $key (keys(%env)) {
-	        if ($key=~/^form\.set_version_(.+)$/) {
-		    my $src=$1;
-		    if (($env{$key}) && ($env{$key} ne $setversions{$src})) {
-		        $newsetversions{$src}=$env{$key};
-		        &devalidateversioncache($src);
-		    }
-	        }
+	}
+    } elsif ($env{'form.setcurrent'}) {
+	$haschanged=1;
+	foreach my $key (keys(%hash)) {
+	    if ($key=~/^ids\_(\/res\/.+)$/) {
+		my $getvers=&Apache::lonnet::getversion($1);
+		if ($getvers>0) {
+		    $newsetversions{$1}=$getvers;
+		    &devalidateversioncache($1);
+		}
 	    }
-        }
-        if ($haschanged) {
-            if (&Apache::lonnet::put('resourceversions',\%newsetversions,
-			      $env{'course.'.$env{'request.course.id'}.'.domain'},
-			      $env{'course.'.$env{'request.course.id'}.'.num'}) eq 'ok') {
-	        $r->print(&Apache::loncommon::confirmwrapper(
-                    &Apache::lonhtmlcommon::confirm_success(&mt('Your Version Settings have been Saved'))));
-	    } else {
-	        $r->print(&Apache::loncommon::confirmwrapper(
-                    &Apache::lonhtmlcommon::confirm_success(&mt('An Error Occured while Attempting to Save your Version Settings'),1)));
+	}
+    } elsif ($env{'form.setversions'}) {
+	$haschanged=1;
+	foreach my $key (keys(%env)) {
+	    if ($key=~/^form\.set_version_(.+)$/) {
+		my $src=$1;
+		if (($env{$key}) && ($env{$key} ne $setversions{$src})) {
+		    $newsetversions{$src}=$env{$key};
+		    &devalidateversioncache($src);
+		}
 	    }
-	    &mark_hash_old();
-        }
-        &changewarning($r,'');
+	}
+    }
+    if ($haschanged) {
+        if (&Apache::lonnet::put('resourceversions',\%newsetversions,
+			  $env{'course.'.$env{'request.course.id'}.'.domain'},
+			  $env{'course.'.$env{'request.course.id'}.'.num'}) eq 'ok') {
+	    $r->print(&Apache::loncommon::confirmwrapper(
+                &Apache::lonhtmlcommon::confirm_success(&mt('Your Version Settings have been Saved'))));
+	} else {
+	    $r->print(&Apache::loncommon::confirmwrapper(
+                &Apache::lonhtmlcommon::confirm_success(&mt('An Error Occured while Attempting to Save your Version Settings'),1)));
+	}
+	&mark_hash_old();
     }
+    &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\/.+)$/) {
@@ -5005,11 +3785,6 @@ sub checkversions {
 	       'save' => 'Save changes',
                'vers' => 'Version choice(s) for specific resources', 
 	       'act' => 'Actions');
-    my ($disabled,$readonly);
-    unless ($canedit) {
-        $disabled = 'disabled="disabled"';
-        $readonly = 1;
-    }
     $r->print(<<ENDHEADERS);
 <h4 class="LC_info">$header</h4>
 <form action="/adm/coursedocs" method="post">
@@ -5030,37 +3805,17 @@ sub checkversions {
 <div class="LC_left_float">
 <fieldset>
 <legend>$lt{'act'}</legend>
-$lt{'sm'}: <input type="submit" name="setmostrecent" value="Go" $disabled /><br />
-$lt{'sc'}: <input type="submit" name="setcurrent" value="Go" $disabled />
+$lt{'sm'}: <input type="submit" name="setmostrecent" value="Go" /><br />
+$lt{'sc'}: <input type="submit" name="setcurrent" value="Go" />
 </fieldset>
 </div>
 <br clear="all" />
 <hr />
 <h4>$lt{'vers'}</h4>
+<input type="submit" name="setversions" value="$lt{'save'}" />
 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'}.'"'.$disabled.' />'.
         &Apache::loncommon::start_data_table().
         &Apache::loncommon::start_data_table_header_row().
         '<th>'.&mt('Resources').'</th>'.
@@ -5070,25 +3825,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 {
@@ -5097,55 +3853,53 @@ 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)},'',$readonly));
-            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().
-        '<input type="submit" name="setversions" value="'.$lt{'save'}.'"'.$disabled.' />'.
+        '<input type="submit" name="setversions" value="'.$lt{'save'}.'" />'.
         '</form>'
     );
 
     &untiehash();
     $r->print(&endContentScreen());
-    return;
 }
 
 sub mark_hash_old {
@@ -5200,13 +3954,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,
@@ -5242,9 +3996,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>';
@@ -5265,7 +4020,7 @@ sub endContentScreen {
 }
 
 sub supplemental_base {
-    return 'supplemental&'.&escape(&mt('Supplemental Content'));
+    return 'supplemental&'.&escape(&mt('Supplemental '.&Apache::loncommon::course_type().' Content'));
 }
 
 sub handler {
@@ -5285,12 +4040,12 @@ sub handler {
 #
 # --------------------------------------------- Initialize help topics for this
     foreach my $topic ('Adding_Course_Doc','Main_Course_Documents',
-	               'Adding_External_Resource','Adding_External_Tool',
-                       'Navigate_Content','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') {
+	               'Adding_External_Resource','Navigate_Content',
+	               'Adding_Folders','Docs_Overview', 'Load_Map',
+	               'Supplemental','Score_Upload_Form','Adding_Pages',
+	               'Importing_LON-CAPA_Resource','Importing_IMS_Course',
+                       'Uploading_From_Harddrive',
+	               'Check_Resource_Versions','Verify_Content') {
 	$help{$topic}=&Apache::loncommon::help_open_topic('Docs_'.$topic);
     }
     # Composite help files
@@ -5298,67 +4053,47 @@ 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,$canedit,$canview,$disabled);
+    my $allowed;
 # URI is /adm/supplemental when viewing supplemental docs in non-edit mode.
     unless ($r->uri eq '/adm/supplemental') {
         # does this user have privileges to modify content.  
-        if (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) {
-            $allowed = 1;
-            $canedit = 1;
-            $canview = 1;
-        } elsif (&Apache::lonnet::allowed('cev',$env{'request.course.id'})) {
-            $allowed = 1;
-            $canview = 1;
-        }
-    }
-    unless ($canedit) {
-        $disabled = ' disabled="disabled"';
-    }
-    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['inhibitmenu']);
-    if ($env{'form.inhibitmenu'}) {
-        unless ($env{'form.inhibitmenu'} eq 'yes') {
-            delete($env{'form.inhibitmenu'});
-        }
+        $allowed = &Apache::lonnet::allowed('mdc',$env{'request.course.id'});
     }
 
-  if ($allowed && $env{'form.verify'}) {
-      &init_breadcrumbs('verify','Verify Content','Docs_Verify_Content');
-      if (!$canedit) {
-          &verifycontent($r);
-      } elsif (($env{'form.checkstale'} ne '') && ($env{'form.checkstale'} =~ /^\d$/)) {
-          &Apache::lonhtmlcommon::add_breadcrumb({href=>"/adm/coursedocs?tools=1&verify=1&checkstale=$env{'form.checkstale'}",
-                                                  text=>'Results',
-                                                  faq=>273,
-                                                  bug=>'Instructor Interface'});
-          &verifycontent($r,$env{'form.checkstale'});
-      } else {
-          &contentverifyform($r);
-      }
+    &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');
       &list_symbs($r);
-  } elsif ($allowed && $env{'form.shorturls'}) {
-      &init_breadcrumbs('shorturls','Set/Display Shortened URLs','Docs_Short_URLs');
-      &short_urls($r,$canedit);
   } elsif ($allowed && $env{'form.docslog'}) {
       &init_breadcrumbs('docslog','Show Log');
       my $folder = $env{'form.folder'};
       if ($folder eq '') {
           $folder='default';
       }
-      &docs_change_log($r,$coursenum,$coursedom,$folder,$allowed,$crstype,$iconpath,$canedit);
+      &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');
-      &checkversions($r,$canedit);
-  } elsif ($canedit && $env{'form.dumpcourse'}) {
-      &init_breadcrumbs('dumpcourse','Copy '.&Apache::loncommon::course_type().' Content to Authoring Space');
+      &init_breadcrumbs('versions','Check/Set Resource Versions');
+      &checkversions($r);
+  } elsif ($allowed && $env{'form.dumpcourse'}) {
+      &init_breadcrumbs('dumpcourse','Dump '.&Apache::loncommon::course_type().' Content to Authoring Space');
       &dumpcourse($r);
   } elsif ($allowed && $env{'form.exportcourse'}) {
       &init_breadcrumbs('exportcourse','IMS Export');
@@ -5374,26 +4109,6 @@ sub handler {
                                              'forcesupplement','forcestandard',
                                              'tools','symb','command','supppath']);
 
-    foreach my $item ('forcesupplement','forcestandard','tools') {
-        next if ($env{'form.'.$item} eq '');
-        unless ($env{'form.'.$item} eq '1') {
-            delete($env{'form.'.$item});
-        }
-    }
-
-    if ($env{'form.command'}) {
-        unless ($env{'form.command'} =~ /^(direct|directnav|editdocs|editsupp|contents|home)$/) {
-            delete($env{'form.command'});
-        }
-    }
-
-    if ($env{'form.symb'}) {
-        my ($mapurl,$id,$resurl) = &Apache::lonnet::decode_symb($env{'form.symb'});
-        unless (($id =~ /^\d+$/) && (&Apache::lonnet::is_on_map($resurl))) {
-            delete($env{'form.symb'});
-        }
-    }
-
 # standard=1: this is a "new-style" course with an uploaded map as top level
 # standard=2: this is a "old-style" course, and there is nothing we can do
 
@@ -5404,9 +4119,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; }
@@ -5416,30 +4131,19 @@ sub handler {
     my $toolsflag=0;
     if ($env{'form.tools'}) { $toolsflag=1; }
 
-    if ($env{'form.folderpath'} ne '') {
-        &validate_folderpath($supplementalflag);
-    }
-
-    if ($env{'form.supppath'} ne '') {
-        &validate_suppath();
-    }
-
     my $script='';
     my $showdoc=0;
     my $addentries = {};
     my $container;
     my $containertag;
     my $pathitem;
-    my %ltitools;
-    my $hiddentop;
-    my $navmap;
-    my $filterFunc = sub { my $res = shift; return (!$res->randomout() && !$res->is_map()) };
 
 # Do we directly jump somewhere?
+
    if (($env{'form.command'} eq 'direct') || ($env{'form.command'} eq 'directnav')) {
        if ($env{'form.symb'} ne '') {
            $env{'form.folderpath'}=
-               &Apache::loncommon::symb_to_docspath($env{'form.symb'},\$navmap);
+               &Apache::loncommon::symb_to_docspath($env{'form.symb'});
            &Apache::lonnet::appenv({'docs.exit.'.$env{'request.course.id'} =>
                $env{'form.command'}.'_'.$env{'form.symb'}});
        } elsif ($env{'form.supppath'} ne '') {
@@ -5448,10 +4152,12 @@ sub handler {
                $env{'form.command'}.'_'.$env{'form.supppath'}});
        }
    } elsif ($env{'form.command'} eq 'editdocs') {
-       $env{'form.folderpath'} = &default_folderpath($coursenum,$coursedom,\$navmap);
+       $env{'form.folderpath'} = 'default&'.
+                                 &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_base();
+       $env{'form.folderpath'} = 'supplemental&'.
+                                  &escape('Supplemental Content');
        &Apache::lonnet::appenv({'docs.exit.'.$env{'request.course.id'} => '/adm/supplemental'});
    } elsif ($env{'form.command'} eq 'contents') {
        &Apache::lonnet::appenv({'docs.exit.'.$env{'request.course.id'} => '/adm/navmaps'});
@@ -5470,19 +4176,9 @@ sub handler {
     if ((!$env{'form.folderpath'}) && $allowed) {
         &Apache::loncommon::restore_course_settings($stored_folderpath,
                                           {'folderpath' => 'scalar'});
-
-        if (&unescape($env{'form.folderpath'}) =~ m{^(default|supplemental)&}) {
-            if ($supplementalflag) {
-                undef($env{'form.folderpath'}) if ($1 eq 'default');
-            } else {
-                undef($env{'form.folderpath'}) if ($1 eq 'supplemental');
-            }
-        } else {
+        unless (&unescape($env{'form.folderpath'}) =~ m{^(default|supplemental)&}) {
             undef($env{'form.folderpath'});
         }
-        if ($env{'form.folderpath'} ne '') {
-            &validate_folderpath($supplementalflag);
-        }
     }
    
 # If we are not allowed to make changes, all we can see are supplemental docs
@@ -5497,48 +4193,19 @@ sub handler {
                                   .'&'.
                                   $env{'form.folderpath'};
     }
-# If allowed and user's role is not advanced check folderpath is not hidden
-    if (($allowed) && (!$env{'request.role.adv'}) &&
-        ($env{'form.folderpath'} ne '') && (!$supplementalflag)) {
-        my $folderurl;
-        my @pathitems = split(/\&/,$env{'form.folderpath'});
-        my $folder = $pathitems[-2];
-        if ($folder eq '') {
-            undef($env{'form.folderpath'});
-        } else {
-            $folderurl = "uploaded/$coursedom/$coursenum/$folder";
-            if ((split(/\:/,$pathitems[-1]))[5]) {
-                $folderurl .= '.page';
-            } else {
-                $folderurl .= '.sequence';
-            }
-            unless (ref($navmap)) {
-                $navmap = Apache::lonnavmaps::navmap->new();
-            }
-            if (ref($navmap)) {
-                if (lc($navmap->get_mapparam(undef,$folderurl,"0.hiddenresource")) eq 'yes') {
-                    my @resources = $navmap->retrieveResources($folderurl,$filterFunc,1,1);
-                    unless (@resources) {
-                        undef($env{'form.folderpath'});
-                    }
-                }
-            }
-        }
-    }
-
-
 # If after all of this, we still don't have any paths, make them
     unless ($env{'form.folderpath'}) {
        if ($supplementalflag) {
           $env{'form.folderpath'}=&supplemental_base();
-       } elsif ($allowed) {
-          ($env{'form.folderpath'},$hiddentop) = &default_folderpath($coursenum,$coursedom,\$navmap);
+       } else {
+          $env{'form.folderpath'}='default'.&escape(&mt('Main '.$crstype.' Content').
+                                  ':::::');
        }
     }
 
 # Store this
     unless ($toolsflag) {
-        if (($allowed) && ($env{'form.folderpath'} ne '')) {
+        if ($allowed) {
             &Apache::loncommon::store_course_settings($stored_folderpath,
                                                       {'folderpath' => 'scalar'});
         }
@@ -5556,12 +4223,8 @@ sub handler {
         } else {
             if ($env{'form.folder'} eq '' ||
                 $env{'form.folder'} eq 'supplemental') {
-                if ($env{'form.folder'} eq 'supplemental') {
-                    $folderpath=&supplemental_base();
-                } elsif (!$hiddentop) {
-                    $folderpath='default&'.
-                                 &escape(&mt('Main Content').':::::');
-                }
+                $folderpath='default&'.
+                            &escape(&mt('Main '.$crstype.' Content').':::::');
             }
         }
         $containertag = '<input type="hidden" name="folderpath" value="" />';
@@ -5572,7 +4235,7 @@ sub handler {
         if ($showdoc) { # got called in sequence from course
 	    $allowed=0; 
         } else {
-            if ($canedit) {
+            if ($allowed) {
                 &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['cmd']);
                 $script=&Apache::lonratedt::editscript('simple');
             }
@@ -5598,11 +4261,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$/) {
@@ -5611,15 +4272,11 @@ sub handler {
                 }
             }
             my $tabidstr = join("','",@tabids);
-            %ltitools = &Apache::lonnet::get_domain_lti($coursedom,'consumer');
-            my $posslti = keys(%ltitools);
-            my $hostname = $r->hostname();
-            $script .= &editing_js($udom,$uname,$supplementalflag,$coursedom,$coursenum,$posslti,
-                                   $canedit,$hostname,\$navmap).
+	    $script .= &editing_js($udom,$uname,$supplementalflag).
                        &history_tab_js().
                        &inject_data_js().
-                       &Apache::lonhtmlcommon::resize_scrollbox_js('docs',$tabidstr,$tid).
-                       &Apache::lonextresedit::extedit_javascript(\%ltitools);
+                       &Apache::lonhtmlcommon::resize_scrollbox_js('docs',$tabidstr).
+                       &Apache::lonextresedit::extedit_javascript();
             $addentries = {
                             onload   => "javascript:resize_scrollbox('contentscroll','1','1');",
                           };
@@ -5635,8 +4292,7 @@ sub handler {
               .'// <![CDATA['."\n"
               .$script."\n"
               .'// ]]>'."\n"
-              .'</script>'."\n"
-              .'<script type="text/javascript" src="/res/adm/includes/file_upload.js"></script>'."\n";
+              .'</script>'."\n";
 
     # Breadcrumbs
     &Apache::lonhtmlcommon::clear_breadcrumbs();
@@ -5644,61 +4300,34 @@ sub handler {
     if ($showdoc) {
         $r->print(&Apache::loncommon::start_page("$crstype documents",undef,
                                                 {'force_register' => $showdoc,}));
-    } elsif ($toolsflag) {
-        my ($breadtext,$breadtitle);
-        $breadtext = "$crstype Editor";
-        if ($canedit) {
-            $breadtitle = 'Editing '.$crstype.' Contents';
-        } else {
-            $breadtext .= ' (View-only mode)';
-            $breadtitle = 'Viewing '.$crstype.' Contents';
-        }
-        &Apache::lonhtmlcommon::add_breadcrumb({
-            href=>"/adm/coursedocs",text=>$breadtext});
-        $r->print(&Apache::loncommon::start_page("$crstype Contents", $script)
-                 .&Apache::loncommon::help_open_menu('','',273,'RAT')
-                 .&Apache::lonhtmlcommon::breadcrumbs(
-                     $breadtitle)
-                 );
     } elsif ($r->uri eq '/adm/supplemental') {
         my $brcrum = &Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype);
         $r->print(&Apache::loncommon::start_page("Supplemental $crstype Content",undef,
                                                 {'bread_crumbs' => $brcrum,}));
     } else {
-        my ($breadtext,$breadtitle,$helpitem);
-        $breadtext = "$crstype Editor";
-        if ($canedit) {
-            $breadtitle = 'Editing '.$crstype.' Contents';
-            $helpitem = 'Docs_Adding_Course_Doc';
-        } else {
-            $breadtext .= ' (View-only mode)';
-            $breadtitle = 'Viewing '.$crstype.' Contents';
-            $helpitem = 'Docs_Viewing_Course_Doc';
-        }
         &Apache::lonhtmlcommon::add_breadcrumb({
-            href=>"/adm/coursedocs",text=>$breadtext});
+            href=>"/adm/coursedocs",text=>"$crstype Contents"});
         $r->print(&Apache::loncommon::start_page("$crstype Contents", $script,
                                                  {'add_entries'    => $addentries}
                                                 )
                  .&Apache::loncommon::help_open_menu('','',273,'RAT')
                  .&Apache::lonhtmlcommon::breadcrumbs(
-                     $breadtitle,
-                     $helpitem)
+                     'Editing '.$crstype.' Contents',
+                     'Docs_Adding_Course_Doc')
         );
     }
 
   my %allfiles = ();
   my %codebase = ();
   my ($upload_result,$upload_output,$uploadphase);
-  if ($canedit) {
+  if ($allowed) {
       if (($env{'form.uploaddoc.filename'}) &&
 	  ($env{'form.cmd'}=~/^upload_(\w+)/)) {
           my $context = $1; 
           # Process file upload - phase one - upload and parse primary file.
 	  undef($hadchanges);
           $uploadphase = &process_file_upload(\$upload_output,$coursenum,$coursedom,
-                                              \%allfiles,\%codebase,$context,$crstype);
-          undef($navmap);
+                                              \%allfiles,\%codebase,$context);
 	  if ($hadchanges) {
 	      &mark_hash_old();
 	  }
@@ -5743,20 +4372,18 @@ sub handler {
 
   if ($allowed && $toolsflag) {
       $r->print(&startContentScreen('tools'));
-      $r->print(&generate_admin_menu($crstype,$canedit));
+      $r->print(&generate_admin_menu($crstype));
       $r->print(&endContentScreen());
   } elsif ((!$showdoc) && (!$uploadphase)) {
 # -----------------------------------------------------------------------------
        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',
                 'impm' => 'Import from Assembled Map',
-                'extr' => 'External Resource',
-                'extt' => 'External Tool',
                 'selm' => 'Select Map',
                 'load' => 'Load Map',
                 'newf' => 'New Folder',
@@ -5765,7 +4392,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',
@@ -5773,58 +4400,19 @@ 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',
-                'er' => 'Editing rights unavailable for your current role.',
-        );
+					  );
 # -----------------------------------------------------------------------------
-    # Calculate free quota space for a user or course. A javascript function checks
-    # file size to determine if upload should be allowed.
-    my $quotatype = 'unofficial';
-    if ($crstype eq 'Community') {
-        $quotatype = 'community';
-    } elsif ($env{'course.'.$coursedom.'_'.$coursenum.'.internal.coursecode'}) {
-        $quotatype = 'official';
-    } elsif ($env{'course.'.$coursedom.'_'.$coursenum.'.internal.textbook'}) {
-        $quotatype = 'textbook';
-    }
-    my $disk_quota = &Apache::loncommon::get_user_quota($coursenum,$coursedom,
-                     'course',$quotatype); # expressed in MB
-    my $current_disk_usage = 0;
-    foreach my $subdir ('docs','supplemental') {
-        $current_disk_usage += &Apache::lonnet::diskusage($coursedom,$coursenum,
-                               "userfiles/$subdir",1); # expressed in kB
-    }
-    my $free_space = 1024 * ((1024 * $disk_quota) - $current_disk_usage);
-    my $usage = $current_disk_usage/1024; # in MB
-    my $quota = $disk_quota;
-    my $percent;
-    if ($disk_quota == 0) {
-        $percent = 100.0;
-    } else {
-        $percent = 100*($usage/$disk_quota);
-    }
-    $usage = sprintf("%.2f",$usage);
-    $quota = sprintf("%.2f",$quota);
-    $percent = sprintf("%.0f",$percent);
-    my $quotainfo = '<p>'.&mt('Currently using [_1] of the [_2] available.',
-                              $percent.'%',$quota.' MB').'</p>';
-
 	my $fileupload=(<<FIUP);
-        $quotainfo
 	$lt{'file'}:<br />
-	<input type="file" name="uploaddoc" class="LC_flUpload" size="40" $disabled />
-        <input type="hidden" id="LC_free_space" value="$free_space" />
+	<input type="file" name="uploaddoc" size="40" />
 FIUP
 
 	my $checkbox=(<<CHBO);
@@ -5832,7 +4420,7 @@ FIUP
 	<input type="checkbox" name="parserflag" />
 	</label> -->
 	<label>
-	<input type="checkbox" name="parserflag" checked="checked" $disabled /> $lt{'parse'}
+	<input type="checkbox" name="parserflag" checked="checked" /> $lt{'parse'}
 	</label>
 CHBO
         my $imsfolder = $env{'form.folder'};
@@ -5849,17 +4437,17 @@ CHBO
         <br />
         <p>
         $lt{'cms'}:&nbsp; 
-        <select name="source" $disabled>
+        <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>
         <input type="hidden" name="phase" value="one" />
-        <input type="button" value="$lt{'imsl'}" onclick="makeims(this.form);" $disabled />
+        <input type="button" value="$lt{'imsl'}" onclick="makeims(this.form);" />
         </fieldset>
         </form>
 IMSFORM
@@ -5874,7 +4462,7 @@ IMSFORM
 	$fileupload
 	<br />
 	$lt{'title'}:<br />
-	<input type="text" size="60" name="comment" $disabled />
+	<input type="text" size="60" name="comment" />
 	$pathitem
 	<input type="hidden" name="cmd" value="upload_default" />
 	<br />
@@ -5882,17 +4470,11 @@ IMSFORM
 	$checkbox
 	</span>
         <br clear="all" />
-        <input type="submit" value="$lt{'upld'}" $disabled />
+        <input type="submit" value="$lt{'upld'}" />
         </fieldset>
         </form>
 FUFORM
 
-        my $mapimportjs;
-        if ($canedit) {
-            $mapimportjs = "javascript:openbrowser('mapimportform','importmap','sequence,page','');";
-        } else {
-            $mapimportjs = "javascript:alert('".&js_escape($lt{'er'})."');";
-        }
 	my $importpubform=(<<SEDFFORM);
         <a class="LC_menubuttons_link" href="javascript:toggleMap('map');">
         $lt{'impm'}</a>$help{'Load_Map'}
@@ -5903,47 +4485,31 @@ FUFORM
         $lt{'copm'}<br />
         <span class="LC_nobreak">
         <input type="text" name="importmap" size="40" value="" 
-        onfocus="this.blur();$mapimportjs" $disabled />
-        &nbsp;<a href="$mapimportjs">$lt{'selm'}</a></span><br />
-        <input type="submit" name="loadmap" value="$lt{'load'}" $disabled />
+        onfocus="this.blur();openbrowser('mapimportform','importmap','sequence,page','');" />
+        &nbsp;<a href="javascript:openbrowser('mapimportform','importmap','sequence,page','');">$lt{'selm'}</a></span><br />
+        <input type="submit" name="loadmap" value="$lt{'load'}" />
         </fieldset>
         </form>
 
 SEDFFORM
-
-        my $fromstoredjs;
-        if ($canedit) {
-            $fromstoredjs = 'open_StoredLinks_Import()';
-        } else {
-            $fromstoredjs = "alert('".&js_escape($lt{'er'})."')";
-        }
-
 	my @importpubforma = (
 	{ '<img class="LC_noBorder LC_middle" src="/res/adm/pages/src.png" alt="'.$lt{srch}.'"  onclick="javascript:groupsearch()" />' => $pathitem."<a class='LC_menubuttons_link' href='javascript:groupsearch()'>$lt{'srch'}</a>" },
 	{ '<img class="LC_noBorder LC_middle" src="/res/adm/pages/res.png" alt="'.$lt{impo}.'"  onclick="javascript:groupimport();"/>' => "<a class='LC_menubuttons_link' href='javascript:groupimport();'>$lt{'impo'}</a>$help{'Importing_LON-CAPA_Resource'}" },
-	{ '<img class="LC_noBorder LC_middle" src="/res/adm/pages/wishlist.png" alt="'.$lt{lnks}.'" onclick="javascript:'.$fromstoredjs.';" />' => '<a class="LC_menubuttons_link" href="javascript:'.$fromstoredjs.';">'.$lt{'lnks'}.'</a>' },
+	{ '<img class="LC_noBorder LC_middle" src="/res/adm/pages/wishlist.png" alt="'.$lt{lnks}.'" onclick="javascript:open_StoredLinks_Import();" />' => "<a class='LC_menubuttons_link' href='javascript:open_StoredLinks_Import();'>$lt{'lnks'}</a>" },
         { '<img class="LC_noBorder LC_middle" src="/res/adm/pages/sequence.png" alt="'.$lt{impm}.'" onclick="javascript:toggleMap(\'map\');" />' => $importpubform }
 	);
 	$importpubform = &create_form_ul(&create_list_elements(@importpubforma));
         my $extresourcesform =
             &Apache::lonextresedit::extedit_form(0,0,undef,undef,$pathitem,
-                                                 $help{'Adding_External_Resource'},
-                                                 undef,undef,undef,undef,undef,undef,$disabled);
-        my $exttoolform =
-            &Apache::lonextresedit::extedit_form(0,0,undef,undef,$pathitem,
-                                                 $help{'Adding_External_Tool'},undef,
-                                                 undef,'tool',$coursedom,$coursenum,
-                                                 \%ltitools,$disabled);
+                                                 $help{'Adding_External_Resource'});
     if ($allowed) {
         my $folder = $env{'form.folder'};
         if ($folder eq '') {
             $folder='default';
         }
-        if ($canedit) {
-	    my $output = &update_paste_buffer($coursenum,$coursedom,$folder);
-            if ($output) {
-                $r->print($output);
-            }
+	my $output = &update_paste_buffer($coursenum,$coursedom,$folder);
+        if ($output) {
+            $r->print($output);
         }
 	$r->print(<<HIDDENFORM);
 	<form name="renameform" method="post" action="/adm/coursedocs">
@@ -5977,14 +4543,13 @@ HIDDENFORM
 #
 
     my $savefolderpath;
-    my $hostname = $r->hostname();
 
     if ($allowed) {
        my $folder=$env{'form.folder'};
-       if ((($folder eq '') && (!$hiddentop)) || ($supplementalflag)) {
+       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'},'<>&"').'" />';
        }
@@ -6005,17 +4570,17 @@ 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" />
-	<a class="LC_menubuttons_link" href="javascript:makenew(document.newnav);">$lt{'navc'}</a>
+	<a class="LC_menubuttons_link" href="javascript:document.newnav.submit()">$lt{'navc'}</a>
 	$help{'Navigate_Content'}
 	</form>
 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>
@@ -6029,7 +4594,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
@@ -6040,7 +4605,6 @@ NSPROBFORM
 	$pathitem
 	<input type="hidden" name="importdetail" value="" />
 	<a class="LC_menubuttons_link" href="javascript:makedropbox();">$lt{'drbx'}</a>
-        $help{'Dropbox'}
 	</form>
 NDBFORM
 
@@ -6056,7 +4620,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>
@@ -6066,18 +4630,18 @@ 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" />
-	<a class="LC_menubuttons_link" href="javascript:makenew(document.newaboutme);">$lt{'mypi'}</a>
+	<a class="LC_menubuttons_link" href="javascript:document.newaboutme.submit()">$lt{'mypi'}</a>
 	$help{'My Personal Information Page'}
 	</form>
 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>
@@ -6086,12 +4650,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:makenew(document.newroster);">$lt{'rost'}</a>
-	$help{'Course_Roster'}
+	<a class="LC_menubuttons_link" href="javascript:document.newroster.submit()">$lt{'rost'}</a>
+	$help{'Course Roster'}
 	</form>
 NROSTFORM
 
@@ -6107,11 +4671,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
  
@@ -6131,7 +4695,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>
@@ -6142,18 +4706,18 @@ 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" />
-	<a class="LC_menubuttons_link" href="javascript:makenew(document.newsyl);">$lt{'syll'}</a>
+	<a class="LC_menubuttons_link" href="javascript:document.newsyl.submit()">$lt{'syll'}</a>
 	$help{'Syllabus'}
 
 	</form>
@@ -6161,45 +4725,34 @@ 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" />
-	<a class="LC_menubuttons_link" href="javascript:makenew(document.newgroupfiles);">$lt{'grpo'}</a>
+	<a class="LC_menubuttons_link" href="javascript:document.newgroupfiles.submit()">$lt{'grpo'}</a>
 	$help{'Group Portfolio'}
 	</form>
 NGFFORM
-        if ($container eq 'page') {
-            @specialdocumentsforma=(
-        {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/webpage.png" alt="'.$lt{webp}.'" onclick="javascript:makewebpage();" />'=>$newwebpageform},
-            );
-        } else {
-	    @specialdocumentsforma=(
+	@specialdocumentsforma=(
 	{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/page.png" alt="'.$lt{newp}.'"  onclick="javascript:makenewpage(document.newpage,\''.$pageseq.'\');" />'=>$newpageform},
-	{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/syllabus.png" alt="'.$lt{syll}.'" onclick="javascript:makenew(document.newsyl);" />'=>$newsylform},
-	{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/navigation.png" alt="'.$lt{navc}.'" onclick="javascript:makenew(document.newnav);" />'=>$newnavform},
+	{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/syllabus.png" alt="'.$lt{syll}.'" onclick="document.newsyl.submit()" />'=>$newsylform},
+	{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/navigation.png" alt="'.$lt{navc}.'" onclick="document.newnav.submit()" />'=>$newnavform},
         {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/simple.png" alt="'.$lt{sipa}.'" onclick="javascript:makesmppage();" />'=>$newsmppageform},
         {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/webpage.png" alt="'.$lt{webp}.'" onclick="javascript:makewebpage();" />'=>$newwebpageform},
-            );
-        }
+        );
         $specialdocumentsform = &create_form_ul(&create_list_elements(@specialdocumentsforma));
 
 
         my @importdoc = (
         {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/extres.png" alt="'.$lt{extr}.'" onclick="toggleUpload(\'ext\');" />'=>$extresourcesform}
         );
-        if (keys(%ltitools)) {
-            push(@importdoc,
-                {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/exttool.png" alt="'.$lt{extt}.'" onclick="toggleUpload(\'tool\');" />'=>$exttoolform},
-        );
-        }
         unless ($container eq 'page') {
             push(@importdoc,
                 {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/ims.png" alt="'.$lt{imsf}.'" onclick="javascript:toggleUpload(\'ims\');" />'=>$imspform}
             );
         }
         push(@importdoc,
-            {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/pdfupload.png" alt="'.$lt{upl}.'" onclick="javascript:toggleUpload(\'doc\');" />'=>$fileuploadform}
+            {'<img class="LC_noBorder_LC_middle" src="/res/adm/pages/pdfupload.png" alt="'.$lt{upl}.'" onclick="javascript:toggleUpload(\'doc\');" />'=>$fileuploadform}
         );
         $fileuploadform =  &create_form_ul(&create_list_elements(@importdoc));
 
@@ -6215,35 +4768,31 @@ NGFFORM
        {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/bchat.png" alt="'.$lt{bull}.'" onclick="javascript:makebulboard();" />'=>$newbulform},
         {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/myaboutme.png" alt="'.$lt{mypi}.'" onclick="javascript:makebulboard();" />'=>$newaboutmeform},
         {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/aboutme.png" alt="'.$lt{abou}.'" onclick="javascript:makeabout();" />'=>$newaboutsomeoneform},
-        {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/clst.png" alt="'.$lt{rost}.'" onclick="javascript:makenew(document.newroster);" />'=>$newrosterform},
-        {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/groupportfolio.png" alt="'.$lt{grpo}.'" onclick="javascript:makenew(document.newgroupfiles);" />'=>$newgroupfileform},
+        {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/clst.png" alt="'.$lt{rost}.'" onclick="document.newroster.submit()" />'=>$newrosterform},
+        {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/groupportfolio.png" alt="'.$lt{grpo}.'" onclick="document.newgroupfiles.submit()" />'=>$newgroupfileform},
         );
         $communityform = &create_form_ul(&create_list_elements(@communityforma));
 
 my %orderhash = (
-                'aa' => ['Upload',$fileuploadform],
-                'bb' => ['Import',$importpubform],
-                'cc' => ['Grading',$gradingform],
-                'ee' => ['Other',$specialdocumentsform],
+                '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'} = ['Special Pages',$specialdocumentsform];
 }
 
  $hadchanges=0;
        unless (($supplementalflag || $toolsflag)) {
           my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$crstype,
-                              $supplementalflag,\%orderhash,$iconpath,$pathitem,
-                              \%ltitools,$canedit,$hostname,\$navmap,$hiddentop);
-          undef($navmap);
+                              $supplementalflag,\%orderhash,$iconpath,$pathitem);
           if ($error) {
              $r->print('<p><span class="LC_error">'.$error.'</span></p>');
           }
           if ($hadchanges) {
-             unless (&is_hash_old()) {
-                 &mark_hash_old();
-             }
+             &mark_hash_old();
           }
 
           &changewarning($r,'');
@@ -6293,7 +4842,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> 
@@ -6303,13 +4852,7 @@ SNFFORM
 	
         my $supextform =
             &Apache::lonextresedit::extedit_form(1,0,undef,undef,$pathitem,
-                                                 $help{'Adding_External_Resource'},
-                                                 undef,undef,$disabled);
-        my $supexttoolform =
-            &Apache::lonextresedit::extedit_form(1,0,undef,undef,$pathitem,
-                                                 $help{'Adding_External_Tool'},
-                                                 undef,undef,'tool',$coursedom,
-                                                 $coursenum,\%ltitools,$disabled);
+                                                 $help{'Adding_External_Resource'});
 
 	my $supnewsylform=(<<SNSFORM);
 	<form action="/adm/coursedocs" method="post" name="supnewsyl">
@@ -6317,7 +4860,7 @@ SNFFORM
         $pathitem
 	<input type="hidden" name="importdetail" 
 	value="Syllabus=/public/$coursedom/$coursenum/syllabus" />
-	<a class="LC_menubuttons_link" href="javascript:makenew(document.supnewsyl);">$lt{'syll'}</a>
+	<a class="LC_menubuttons_link" href="javascript:document.supnewsyl.submit()">$lt{'syll'}</a>
 	$help{'Syllabus'}
 	</form>
 SNSFORM
@@ -6328,7 +4871,7 @@ SNSFORM
         $pathitem
 	<input type="hidden" name="importdetail" 
 	value="$plainname=/adm/$udom/$uname/aboutme" />
-	<a class="LC_menubuttons_link" href="javascript:makenew(document.supnewaboutme);">$lt{'mypi'}</a>
+	<a class="LC_menubuttons_link" href="javascript:document.supnewaboutme.submit()">$lt{'mypi'}</a>
 	$help{'My Personal Information Page'}
 	</form>
 SNAMFORM
@@ -6349,63 +4892,42 @@ 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
 
 
 my @specialdocs = (
-		{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/syllabus.png" alt="'.$lt{syll}.'" onclick="javascript:makenew(document.supnewsyl);" />'
+		{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/syllabus.png" alt="'.$lt{syll}.'" onclick="document.supnewsyl.submit()" />'
             =>$supnewsylform},
-		{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/myaboutme.png" alt="'.$lt{mypi}.'" onclick="javascript:makenew(document.supnewaboutme);" />'
+		{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/myaboutme.png" alt="'.$lt{mypi}.'" onclick="document.supnewaboutme.submit()" />'
             =>$supnewaboutmeform},
                 {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/webpage.png" alt="'.$lt{webp}.'" onclick="javascript:makewebpage('."'supp'".');" />'=>$supwebpageform},
 
 		);
 my @supimportdoc = (
 		{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/extres.png" alt="'.$lt{extr}.'" onclick="javascript:toggleUpload(\'suppext\')" />'
-            =>$supextform});
-        if (keys(%ltitools)) {
-            push(@supimportdoc,
-                {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/exttool.png" alt="'.$lt{extt}.'" onclick="javascript:toggleUpload(\'supptool\')" />'
-            =>$supexttoolform});
-        }
-        push(@supimportdoc,
+            =>$supextform},
                 {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/pdfupload.png" alt="'.$lt{upl}.'" onclick="javascript:toggleUpload(\'suppdoc\');" />'
             =>$supupdocform},
-        );
+                   );
 
 $supupdocform =  &create_form_ul(&create_list_elements(@supimportdoc));
 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,
-                               \%ltitools,$canedit,$hostname);
+                               $supplementalflag,\%suporderhash,$iconpath,$pathitem);
            if ($error) {
               $r->print('<p><span class="LC_error">'.$error.'</span></p>');
-           } else {
-               if ($suppchanges) {
-                   my %servers = &Apache::lonnet::internet_dom_servers($coursedom);
-                   my @ids=&Apache::lonnet::current_machine_ids();
-                   foreach my $server (keys(%servers)) {
-                       next if (grep(/^\Q$server\E$/,@ids));
-                       my $hashid=$coursenum.':'.$coursedom;
-                       my $cachekey = &escape('suppcount').':'.&escape($hashid);
-                       &Apache::lonnet::remote_devalidate_cache($server,[$cachekey]);
-                   }
-                   &Apache::lonnet::get_numsuppfiles($coursenum,$coursedom,1);
-                   undef($suppchanges);
-               }
            }
         }
     } elsif ($supplementalflag) {
         my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$crstype,
-                            $supplementalflag,'',$iconpath,$pathitem,'',$canedit,
-                            $hostname);
+                            $supplementalflag,'',$iconpath,$pathitem);
         if ($error) {
             $r->print('<p><span class="LC_error">'.$error.'</span></p>');
         }
@@ -6439,7 +4961,6 @@ my %suporderhash = (
 sub embedded_form_elems {
     my ($phase,$primaryurl,$newidx) = @_;
     my $folderpath = &HTML::Entities::encode($env{'form.folderpath'},'<>&"');
-    $newidx =~s /\D+//g;
     return <<STATE;
     <input type="hidden" name="folderpath" value="$folderpath" />
     <input type="hidden" name="cmd" value="upload_embedded" />
@@ -6460,11 +4981,7 @@ sub embedded_destination {
     } elsif ($folder =~ /^(default|supplemental)_(\d+)$/) {
         $destination .=  $2.'/';
     }
-    my $newidx = $env{'form.newidx'};
-    $newidx =~s /\D+//g;
-    if ($newidx) {
-        $destination .= $newidx;
-    }
+    $destination .= $env{'form.newidx'};
     my $dir_root = '/userfiles';
     return ($destination,$dir_root);
 }
@@ -6484,18 +5001,15 @@ 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';
     }
     unshift(@hiddens,$pathitem);
     foreach my $item (@hiddens) {
-        if ($item eq 'newidx') {
-            next if ($env{'form.'.$item} =~ /\D/);
-        }
         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,
@@ -6552,34 +5066,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;
@@ -6598,17 +5103,16 @@ sub remove_archive {
 }
 
 sub generate_admin_menu {
-    my ($crstype,$canedit) = @_;
+    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',
-                                         'ct'   => 'Display/Set Shortened URLs for Deep-linking',
                                          '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';
@@ -6638,14 +5142,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",
                 },
@@ -6656,17 +5160,8 @@ sub generate_admin_menu {
                     icon       => 'symbs.png',
                     linktitle  => "List the unique identifier used for each resource instance in your $lc_crstype"
                 },
-                {   linktext   => $lt{'ct'},
-                    url        => "javascript:injectData(document.courseverify,'dummy','shorturls','$lt{'ct'}')",
-                    permission => 'F',
-                    help       => 'Docs_Short_URLs',
-                    icon       => 'shorturls.png',
-                    linktitle  => "Set shortened URLs for a resource or folder in your $lc_crstype for use in deep-linking"
-                },
                 ]
-        });
-    if ($canedit) {
-        push(@menu,
+        },
         {   categorytitle=>'Export',
             items =>[
                 {   linktext   => $lt{'imse'},
@@ -6679,13 +5174,12 @@ sub generate_admin_menu {
                 {   linktext   => $lt{'dcd'},
                     url        => $dumpurl,
                     permission => $candump,
-                    help       => 'Docs_Dump_Course_Docs',
+                    #help => '',
                     icon       => 'dump.png',
                     linktitle  => $lt{'dcd'},
                 },
                 ]
         });
-    }
     return '<form action="/adm/coursedocs" method="post" name="courseverify">'."\n".
            '<input type="hidden" id="dummy" />'."\n".
            &Apache::lonhtmlcommon::generate_menu(@menu)."\n".
@@ -6694,22 +5188,21 @@ sub generate_admin_menu {
 
 sub generate_edit_table {
     my ($tid,$orderhash_ref,$to_show,$iconpath,$jumpto,$readfile,
-        $need_save,$copyfolder,$canedit) = @_;
+        $need_save,$copyfolder) = @_;
     return unless(ref($orderhash_ref) eq 'HASH');
     my %orderhash = %{$orderhash_ref};
-    my ($form, $activetab, $active, $disabled);
-    if (($env{'form.active'} ne '') && ($env{'form.active'} ne '00')) {
+    my $form;
+    my $activetab;
+    my $active;
+    if (($env{'form.active'} ne '') && ($env{'form.active'} ne 'aa')) {
         $activetab = $env{'form.active'};
     }
-    unless ($canedit) {
-        $disabled = ' disabled="disabled"';
-    }
     my $backicon = $iconpath.'clickhere.gif';
     my $backtext = &mt('Exit Editor');
     $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>'.
@@ -6736,7 +5229,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";
 
 	}
     }
@@ -6767,7 +5260,7 @@ sub generate_edit_table {
 <input type="hidden" name="multicopy" value="" />
 <input type="hidden" name="multichange" value="" />
 <input type="hidden" name="copyfolder" value="$copyfolder" />
-<input type="submit" name="savemultiples" value="$button" $disabled />
+<input type="submit" name="savemultiples" value="$button" />
 </form>
 </div>
 END
@@ -6793,9 +5286,8 @@ END
 }
 
 sub editing_js {
-    my ($udom,$uname,$supplementalflag,$coursedom,$coursenum,$posslti,
-        $canedit,$hostname,$navmapref) = @_;
-    my %js_lt = &Apache::lonlocal::texthash(
+    my ($udom,$uname,$supplementalflag) = @_;
+    my %lt = &Apache::lonlocal::texthash(
                                           p_mnf => 'Name of New Folder',
                                           t_mnf => 'New Folder',
                                           p_mnp => 'Name of New Page',
@@ -6805,25 +5297,19 @@ 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',
                                           p_mab_alrt2 => 'Please enter both user and domain in the format user:domain',
                                           p_chn => 'New Title',
                                           p_rmr1 => 'WARNING: Removing a resource makes associated grades and scores inaccessible!',
-                                          p_rmr2a => 'Remove',
-                                          p_rmr2b => '?',
-                                          p_rmr3a => 'Remove those',
-                                          p_rmr3b => 'items?',
-                                          p_rmr4  => 'WARNING: Removing a resource uploaded to a course cannot be undone via "Undo Delete".',
-                                          p_rmr5  => 'Push "Cancel" and then use "Cut" instead if you might need to undo this change.',
+                                          p_rmr2a => 'Remove[_99]',
+                                          p_rmr2b => '?[_99]',
                                           p_ctr1a => 'WARNING: Cutting a resource makes associated grades and scores inaccessible!',
                                           p_ctr1b => 'Grades remain inaccessible if resource is pasted into another folder.',
-                                          p_ctr2a => 'Cut',
-                                          p_ctr2b => '?',
-                                          p_ctr3a => 'Cut those',
-                                          p_ctr3b => 'items?',
+                                          p_ctr2a => 'Cut[_98]',
+                                          p_ctr2b => '?[_98]',
                                           rpck    => 'Enter number to pick (e.g., 3)',
                                           imsfile => 'You must choose an IMS package for import',
                                           imscms  => 'You must select which Course Management System was the source of the IMS package',
@@ -6831,23 +5317,19 @@ sub editing_js {
                                           titbl   => 'Title is blank',
                                           more    => '(More ...)',
                                           less    => '(Less ...)',
-                                          noor    => 'No actions selected or changes to settings specified.',
-                                          noch    => 'No changes to settings specified.',
-                                          noac    => 'No actions selected.',
-                                          edri    => 'Editing rights unavailable for your current role.',
                                         );
 
-    &js_escape(\%js_lt);
     my $crstype = &Apache::loncommon::course_type();
     my $docs_folderpath = &HTML::Entities::encode($env{'environment.internal.'.$env{'request.course.id'}.'.docs_folderpath.folderpath'},'<>&"');
     my $main_container_page;
     if (&HTML::Entities::decode($env{'environment.internal.'.$env{'request.course.id'}.'.docs_folderpath.folderpath'}) =~ /\:1$/) {
         $main_container_page = 1;
     }
-    my $backtourl;
-    my $toplevelmain = &escape(&default_folderpath($coursenum,$coursedom,$navmapref));
+    my $toplevelmain = 
+        &escape(&mt('Main '.$crstype.' Content').':::::');
     my $toplevelsupp = &supplemental_base();
 
+    my $backtourl;
     if ($env{'docs.exit.'.$env{'request.course.id'}} =~ /^direct_(.+)$/) {
         my $caller = $1;
         if ($caller =~ /^supplemental/) {
@@ -6856,49 +5338,8 @@ sub editing_js {
             my ($map,$id,$res)=&Apache::lonnet::decode_symb($caller);
             $res = &Apache::lonnet::clutter($res);
             if (&Apache::lonnet::is_on_map($res)) {
-                my ($url,$anchor);
-                if ($res =~ /^([^#]+)#([^#]+)$/) {
-                    $url = $1;
-                    $anchor = $2;
-                    if (($caller =~ m{^([^#]+)\Q#$anchor\E$})) {
-                        $caller = $1.&escape('#').$anchor;
-                    }
-                } else {
-                    $url = $res;
-                }
-                $backtourl = &HTML::Entities::encode(&Apache::lonnet::clutter($url),'<>&"');
-                if ($backtourl =~ m{^\Q/uploaded/$coursedom/$coursenum/\Edefault_\d+\.sequence$}) {
-                    $backtourl .= '?navmap=1';
-                } else {
-                    $backtourl .= '?symb='.
-                                  &HTML::Entities::encode($caller,'<>&"');
-                }
-                if ($backtourl =~ m{^\Q/public/$coursedom/$coursenum/syllabus\E}) {
-                    if (($ENV{'SERVER_PORT'} == 443) &&
-                        ($env{'course.'.$env{'request.course.id'}.'.externalsyllabus'} =~ m{^http://})) {
-                        unless ((&Apache::lonnet::uses_sts()) || (&Apache::lonnet::waf_allssl($hostname))) {
-                            if ($hostname ne '') {
-                                $backtourl = 'http://'.$hostname.$backtourl;
-                            }
-                            $backtourl .= (($backtourl =~ /\?/) ? '&amp;':'?').'usehttp=1';
-                        }
-                    }
-                } elsif ($backtourl =~ m{^/adm/wrapper/ext/(?!https:)}) {
-                    if (($ENV{'SERVER_PORT'} == 443) && ($hostname ne '')) {
-                        unless ((&Apache::lonnet::uses_sts()) || (&Apache::lonnet::waf_allssl($hostname))) {
-                            if ($hostname ne '') {
-                                $backtourl = 'http://'.$hostname.$backtourl;
-                            }
-                            $backtourl .= (($backtourl =~ /\?/) ? '&amp;':'?').'usehttp=1';
-                        }
-                    }
-                }
-                if ($anchor ne '') {
-                    $backtourl .= '#'.&HTML::Entities::encode($anchor,'<>&"');
-                }
-                $backtourl = &Apache::loncommon::escape_single($backtourl); 
-            } else {
-                $backtourl = '/adm/navmaps';
+                $backtourl = &HTML::Entities::encode(&Apache::lonnet::clutter($res),'<>&"').'?symb='.
+                             &HTML::Entities::encode($caller,'<>&"');
             }
         }
     } elsif ($env{'docs.exit.'.$env{'request.course.id'}} eq '/adm/menu') {
@@ -6910,58 +5351,50 @@ sub editing_js {
     }
 
     my $fieldsets = "'ext','doc'";
-    if ($posslti) {
-        $fieldsets .= ",'tool'";
-    }
     unless ($main_container_page) {
         $fieldsets .=",'ims'";
     }
     if ($supplementalflag) {
         $fieldsets = "'suppext','suppdoc'";
-        if ($posslti) {
-            $fieldsets .= ",'supptool'";
-        }
     }
 
-    my $jsmakefunctions;
-    if ($canedit) {
-        $jsmakefunctions = <<ENDNEWSCRIPT;
+    return <<ENDNEWSCRIPT;
 function makenewfolder(targetform,folderseq) {
-    var foldername=prompt('$js_lt{"p_mnf"}','$js_lt{"t_mnf"}');
+    var foldername=prompt('$lt{"p_mnf"}','$lt{"t_mnf"}');
     if (foldername) {
-       targetform.importdetail.value=encodeURIComponent(foldername)+"="+folderseq;
+       targetform.importdetail.value=escape(foldername)+"="+folderseq;
         targetform.submit();
     }
 }
 
 function makenewpage(targetform,folderseq) {
-    var pagename=prompt('$js_lt{"p_mnp"}','$js_lt{"t_mnp"}');
+    var pagename=prompt('$lt{"p_mnp"}','$lt{"t_mnp"}');
     if (pagename) {
-        targetform.importdetail.value=encodeURIComponent(pagename)+"="+folderseq;
+        targetform.importdetail.value=escape(pagename)+"="+folderseq;
         targetform.submit();
     }
 }
 
 function makeexamupload() {
-   var title=prompt('$js_lt{"p_mxu"}');
+   var title=prompt('$lt{"p_mxu"}');
    if (title) {
     this.document.forms.newexamupload.importdetail.value=
-	encodeURIComponent(title)+'=/res/lib/templates/examupload.problem';
+	escape(title)+'=/res/lib/templates/examupload.problem';
     this.document.forms.newexamupload.submit();
    }
 }
 
 function makesmppage() {
-   var title=prompt('$js_lt{"p_msp"}');
+   var title=prompt('$lt{"p_msp"}');
    if (title) {
     this.document.forms.newsmppg.importdetail.value=
-	encodeURIComponent(title)+'=/adm/$udom/$uname/new/smppg';
+	escape(title)+'=/adm/$udom/$uname/new/smppg';
     this.document.forms.newsmppg.submit();
    }
 }
 
 function makewebpage(type) {
-   var title=prompt('$js_lt{"p_mwp"}');
+   var title=prompt('$lt{"p_mwp"}');
    var formname;
    if (type == 'supp') {
        formname = this.document.forms.supwebpage;
@@ -6969,143 +5402,58 @@ function makewebpage(type) {
        formname = this.document.forms.newwebpage;
    }
    if (title) {
-       var webpage = formname.importdetail.value;
-       formname.importdetail.value = encodeURIComponent(title)+'='+webpage;
+       var webpage = formname.importdetail.value; 
+       formname.importdetail.value = escape(title)+'='+webpage;
        formname.submit();
    }
 }
 
 function makesmpproblem() {
-   var title=prompt('$js_lt{"p_msb"}');
+   var title=prompt('$lt{"p_msb"}');
    if (title) {
     this.document.forms.newsmpproblem.importdetail.value=
-	encodeURIComponent(title)+'=/res/lib/templates/simpleproblem.problem';
+	escape(title)+'=/res/lib/templates/simpleproblem.problem';
     this.document.forms.newsmpproblem.submit();
    }
 }
 
 function makedropbox() {
-   var title=prompt('$js_lt{"p_mdb"}');
+   var title=prompt('$lt{"p_mdb"}');
    if (title) {
     this.document.forms.newdropbox.importdetail.value=
-        encodeURIComponent(title)+'=/res/lib/templates/DropBox.problem';
+        escape(title)+'=/res/lib/templates/DropBox.problem';
     this.document.forms.newdropbox.submit();
    }
 }
 
 function makebulboard() {
-   var title=prompt('$js_lt{"p_mbb"}');
+   var title=prompt('$lt{"p_mbb"}');
    if (title) {
     this.document.forms.newbul.importdetail.value=
-	encodeURIComponent(title)+'=/adm/$udom/$uname/new/bulletinboard';
+	escape(title)+'=/adm/$udom/$uname/new/bulletinboard';
     this.document.forms.newbul.submit();
    }
 }
 
 function makeabout() {
-   var user=prompt("$js_lt{'p_mab'}");
+   var user=prompt("$lt{'p_mab'}");
    if (user) {
        var comp=new Array();
        comp=user.split(':');
        if ((typeof(comp[0])!=undefined) && (typeof(comp[1])!=undefined)) {
 	   if ((comp[0]) && (comp[1])) {
 	       this.document.forms.newaboutsomeone.importdetail.value=
-		   '$js_lt{"p_mab2"}'+escape(user)+'=/adm/'+comp[1]+'/'+comp[0]+'/aboutme';
-               this.document.forms.newaboutsomeone.submit();
-           } else {
-               alert("$js_lt{'p_mab_alrt1'}");
-           }
-       } else {
-           alert("$js_lt{'p_mab_alrt2'}");
-       }
-    }
-}
-
-function makenew(targetform) {
-    targetform.submit();
-}
-
-function changename(folderpath,index,oldtitle) {
-    var title=prompt('$js_lt{"p_chn"}',oldtitle);
-    if (title) {
-        this.document.forms.renameform.markcopy.value='';
-        this.document.forms.renameform.title.value=title;
-        this.document.forms.renameform.cmd.value='rename_'+index;
-        this.document.forms.renameform.folderpath.value=folderpath;
-        this.document.forms.renameform.submit();
-    }
-}
-
-ENDNEWSCRIPT
-    } else {
-        $jsmakefunctions = <<ENDNEWSCRIPT;
-
-function makenewfolder() {
-    alert("$js_lt{'edri'}");
-}
-
-function makenewpage() {
-    alert("$js_lt{'edri'}");
-}
-
-function makeexamupload() {
-    alert("$js_lt{'edri'}");
-}
-
-function makesmppage() {
-    alert("$js_lt{'edri'}");
-}
-
-function makewebpage(type) {
-    alert("$js_lt{'edri'}");
-}
-
-function makesmpproblem() {
-    alert("$js_lt{'edri'}");
-}
-
-function makedropbox() {
-    alert("$js_lt{'edri'}");
-}
-
-function makebulboard() {
-    alert("$js_lt{'edri'}");
-}
-
-function makeabout() {
-    alert("$js_lt{'edri'}");
-}
-
-function changename() {
-    alert("$js_lt{'edri'}");
-}
-
-function makenew() {
-    alert("$js_lt{'edri'}");
-}
-
-function groupimport() {
-    alert("$js_lt{'edri'}");
+		   '$lt{"p_mab2"}'+escape(user)+'=/adm/'+comp[1]+'/'+comp[0]+'/aboutme';
+       this.document.forms.newaboutsomeone.submit();
+   } else {
+       alert("$lt{'p_mab_alrt1'}");
+   }
+} else {
+   alert("$lt{'p_mab_alrt2'}");
 }
-
-function groupsearch() {
-    alert("$js_lt{'edri'}");
 }
-
-function groupopen(url,recover) {
-   var options="scrollbars=1,resizable=1,menubar=0";
-   idxflag=1;
-   idx=open("/adm/groupsort?inhibitmenu=yes&mode=simple&recover="+recover+"&readfile="+url,"idxout",options);
-   idx.focus();
 }
 
-ENDNEWSCRIPT
-
-    }
-    return <<ENDSCRIPT;
-
-$jsmakefunctions
-
 function toggleUpload(caller) {
     var blocks = Array($fieldsets);
     for (var i=0; i<blocks.length; i++) {
@@ -7117,19 +5465,6 @@ function toggleUpload(caller) {
             }
         }
         document.getElementById('upload'+blocks[i]+'form').style.display=disp;
-        if ((caller == 'tool') || (caller == 'supptool')) {
-            if (disp == 'block') {
-                if (document.getElementById('LC_exttoolid')) {
-                    var toolselector = document.getElementById('LC_exttoolid');
-                    var suppflag = 0;
-                    if (caller == 'supptool') {
-                        suppflag = 1;
-                    }
-                    currForm = document.getElementById('new'+caller);
-                    updateExttool(toolselector,currForm,suppflag);
-                }
-            }
-        }
     }
     resize_scrollbox('contentscroll','1','1');
     return;
@@ -7152,17 +5487,28 @@ function toggleMap(caller) {
 
 function makeims(imsform) {
     if ((imsform.uploaddoc.value == '')  || (!imsform.uploaddoc.value)) {
-        alert("$js_lt{'imsfile'}");
+        alert("$lt{'imsfile'}");
         return;
     }
     if (imsform.source.selectedIndex == 0) {
-        alert("$js_lt{'imscms'}");
+        alert("$lt{'imscms'}");
         return;
     }
     newWindow = window.open('', 'IMSimport',"HEIGHT=700,WIDTH=750,scrollbars=yes");
     imsform.submit();
 }
 
+function changename(folderpath,index,oldtitle) {
+var title=prompt('$lt{"p_chn"}',oldtitle);
+if (title) {
+this.document.forms.renameform.markcopy.value='';
+this.document.forms.renameform.title.value=title;
+this.document.forms.renameform.cmd.value='rename_'+index;
+this.document.forms.renameform.folderpath.value=folderpath;
+this.document.forms.renameform.submit();
+}
+}
+
 function updatePick(targetform,index,caller) {
     var pickitem;
     var picknumitem;
@@ -7177,7 +5523,7 @@ function updatePick(targetform,index,cal
         picknumtext = document.getElementById('randompicknum_'+index);
     }
     if (pickitem.checked) {
-        var picknum=prompt('$js_lt{"rpck"}',picknumitem.value);
+        var picknum=prompt('$lt{"rpck"}',picknumitem.value);
         if (picknum == '' || picknum == null) {
             if (caller == 'check') {
                 pickitem.checked=false;
@@ -7327,12 +5673,7 @@ function propagateState(form,param) {
     return;
 }
 
-function checkForSubmit(targetform,param,context,idx,folderpath,index,oldtitle,skip_confirm,container,folder,confirm_removal) {
-    var canedit = '$canedit';
-    if (canedit == '') {
-        alert("$js_lt{'edri'}");
-        return;
-    }
+function checkForSubmit(targetform,param,context,idx,folderpath,index,oldtitle,skip_confirm,container,folder) {
     var dosettings;
     var doaction;
     var control = document.togglemultsettings;
@@ -7370,28 +5711,14 @@ function checkForSubmit(targetform,param
             targetform.markcopy.value=idx+':'+param;
             targetform.copyfolder.value=folder+'.'+container;
             if (param == 'remove') {
-                var doremove = 0;
-                if (skip_confirm) {
-                    if (confirm_removal) {
-                        if (confirm('$js_lt{"p_rmr4"}\\n$js_lt{"p_rmr5"}\\n\\n$js_lt{"p_rmr2a"} "'+oldtitle+'"$js_lt{"p_rmr2b"}')) {
-                            doremove = 1;
-                        }
-                    } else {
-                        doremove = 1;
-                    }
-                } else {
-                    if (confirm('$js_lt{"p_rmr1"}\\n\\n$js_lt{"p_rmr2a"} "'+oldtitle+'" $js_lt{"p_rmr2b"}')) {
-                        doremove = 1;
-                    }
-                }
-                if (doremove) {
+                if (skip_confirm || confirm('$lt{"p_rmr1"}\\n\\n$lt{"p_rmr2a"} "'+oldtitle+'" $lt{"p_rmr2b"}')) {
                     targetform.markcopy.value='';
                     targetform.copyfolder.value='';
                     targetform.submit();
                 }
             }
             if (param == 'cut') {
-                if (skip_confirm || confirm('$js_lt{"p_ctr1a"}\\n$js_lt{"p_ctr1b"}\\n\\n$js_lt{"p_ctr2a"} "'+oldtitle+'" $js_lt{"p_ctr2b"}')) {
+                if (skip_confirm || confirm('$lt{"p_ctr1a"}\\n$lt{"p_ctr1b"}\\n\\n$lt{"p_ctr2a"} "'+oldtitle+'" $lt{"p_ctr2b"}')) {
                     targetform.submit();
                     return;
                 }
@@ -7456,12 +5783,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');
@@ -7492,24 +5817,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;
@@ -7570,7 +5881,7 @@ function togglePick(caller,value) {
         }
         document.getElementById('multi'+caller).style.display=disp;
         if (value == 1) {
-            document.getElementById('more'+caller).innerHTML = '&nbsp;&nbsp;<a href="javascript:toggleCheckUncheck(\\''+caller+'\\',1);" style="text-decoration:none;">$js_lt{'more'}</a>'; 
+            document.getElementById('more'+caller).innerHTML = '&nbsp;&nbsp;<a href="javascript:toggleCheckUncheck(\\''+caller+'\\',1);" style="text-decoration:none;">$lt{'more'}</a>'; 
         } else {
             document.getElementById('more'+caller).innerHTML = '';
         }
@@ -7596,10 +5907,10 @@ function togglePick(caller,value) {
 
 function toggleCheckUncheck(caller,more) {
     if (more == 1) {
-        document.getElementById('more'+caller).innerHTML = '&nbsp;&nbsp;<a href="javascript:toggleCheckUncheck(\\''+caller+'\\',0);" style="text-decoration:none;">$js_lt{'less'}</a>';
+        document.getElementById('more'+caller).innerHTML = '&nbsp;&nbsp;<a href="javascript:toggleCheckUncheck(\\''+caller+'\\',0);" style="text-decoration:none;">$lt{'less'}</a>';
         document.getElementById('allfields'+caller).style.display='block';
     } else {
-        document.getElementById('more'+caller).innerHTML = '&nbsp;&nbsp;<a href="javascript:toggleCheckUncheck(\\''+caller+'\\',1);" style="text-decoration:none;">$js_lt{'more'}</a>';
+        document.getElementById('more'+caller).innerHTML = '&nbsp;&nbsp;<a href="javascript:toggleCheckUncheck(\\''+caller+'\\',1);" style="text-decoration:none;">$lt{'more'}</a>';
         document.getElementById('allfields'+caller).style.display='none';
     }
     resize_scrollbox('contentscroll','1','1');
@@ -7639,9 +5950,6 @@ function checkSubmits() {
     var numchanges = 0;
     var form = document.saveactions;
     var doactions = multiActions();
-    var cutwarnings = 0;
-    var remwarnings = 0;
-    var removalinfo = 0;
     if (doactions == 1) {
         var remidxlist = document.cumulativeactions.allremoveidx.value;
         if ((remidxlist != '') && (remidxlist != null)) {
@@ -7651,16 +5959,6 @@ function checkSubmits() {
                     if (document.getElementById('remove_'+remidxs[i]).checked) {
                         form.multiremove.value += remidxs[i]+',';
                         numchanges ++;
-                        if (document.getElementById('skip_remove_'+remidxs[i])) {
-                            if (document.getElementById('skip_remove_'+remidxs[i]).value == 0) {
-                                remwarnings ++;
-                            }
-                        }
-                        if (document.getElementById('confirm_removal_'+remidxs[i])) {
-                            if (document.getElementById('confirm_removal_'+remidxs[i]).value == 1) {
-                                removalinfo ++;
-                            }
-                        }
                     }
                 }
             }
@@ -7673,11 +5971,6 @@ function checkSubmits() {
                     if (document.getElementById('cut_'+cutidxs[i]).checked == true) {
                         form.multicut.value += cutidxs[i]+',';
                         numchanges ++;
-                        if (document.getElementById('skip_cut_'+cutidxs[i])) {
-                            if (document.getElementById('skip_cut_'+cutidxs[i]).value == 0) {
-                                cutwarnings ++;
-                            }
-                        }
                     }
                 }
             }
@@ -7699,12 +5992,10 @@ function checkSubmits() {
         }
     }
     var dosettings = multiSettings();
-    var haschanges = 0;
     if (dosettings == 1) {
         form.allencrypturl.value = '';
         form.allhiddenresource.value = '';
-        form.changeparms.value = 'all';
-        var patt=new RegExp(",\$");
+        form.changeparms.value = 'all'; 
         var allidxlist = document.cumulativesettings.allidx.value;
         if ((allidxlist != '') && (allidxlist != null)) {
             var allidxs = allidxlist.split(',');
@@ -7721,8 +6012,6 @@ function checkSubmits() {
                         }
                     }
                 }
-                form.allhiddenresource.value = form.allhiddenresource.value.replace(patt,"");
-                form.allencrypturl.value = form.allencrypturl.value.replace(patt,"");
             }
         }
         form.allrandompick.value = '';
@@ -7741,60 +6030,12 @@ function checkSubmits() {
                     form.allrandomorder.value += allmapidxs[i]+',';
                 }
             }
-            form.allrandompick.value = form.allrandompick.value.replace(patt,"");
-            form.allrandomorder.value = form.allrandomorder.value.replace(patt,"");
-        }
-        if (document.cumulativesettings.currhiddenresource.value != form.allhiddenresource.value) {
-            haschanges = 1;
-        }
-        if (document.cumulativesettings.currencrypturl.value != form.allencrypturl.value) {
-            haschanges = 1;
-        }
-        if (document.cumulativesettings.currrandomorder.value != form.allrandomorder.value) {
-            haschanges = 1;
-        }
-        if (document.cumulativesettings.currrandompick.value != form.allrandompick.value) {
-            haschanges = 1;
-        }
-    }
-    if (doactions == 1) {
-        if (numchanges > 0) {
-            if ((cutwarnings > 0) || (remwarnings > 0) || (removalinfo > 0)) {
-                if (remwarnings > 0) {
-                    if (!confirm('$js_lt{"p_rmr1"}\\n\\n$js_lt{"p_rmr3a"} '+remwarnings+' $js_lt{"p_rmr3b"}')) {
-                        return false;
-                    }
-                }
-                if (removalinfo > 0) {
-                    if (!confirm('$js_lt{"p_rmr4"}\\n$js_lt{"p_rmr5"}\\n\\n$js_lt{"p_rmr3a"} '+removalinfo+' $js_lt{"p_rmr3b"}')) {
-                        return false;
-                    }
-                }
-                if (cutwarnings > 0) {
-                    if (!confirm('$js_lt{"p_ctr1a"}\\n$js_lt{"p_ctr1b"}\\n\\n$js_lt{"p_ctr3a"} '+cutwarnings+' $js_lt{"p_ctr3b"}')) {
-                        return false;
-                    }
-                }
-            }
-            form.submit();
-            return true;
-        }
-    }
-    if (dosettings == 1) {
-        if (haschanges == 1) {
-            form.submit();
-            return true;
-        }
-    }
-    if ((dosettings == 1) && (doactions == 1)) {
-        alert("$js_lt{'noor'}");
-    } else {
-        if (dosettings == 1) {
-            alert("$js_lt{'noch'}");
-        } else {
-            alert("$js_lt{'noac'}");
         }
     }
+    if ((numchanges > 0) || (dosettings == 1)) {
+        form.submit(); 
+        return true;
+    } 
     return false;
 }
 
@@ -7878,7 +6119,7 @@ function setBoxes(value) {
     return;
 }
 
-ENDSCRIPT
+ENDNEWSCRIPT
 }
 
 sub history_tab_js {
@@ -7907,19 +6148,13 @@ ENDINJECT
 
 sub dump_switchserver_js {
     my @hosts = @_;
-    my %js_lt = &Apache::lonlocal::texthash(
-        dump => 'Copying content to Authoring Space requires switching server.',
+    my %lt = &Apache::lonlocal::texthash(
+        dump => 'Dumping to Authoring Space requires switching server.',
         swit => 'Switch server?',
-    );
-    my %html_js_lt = &Apache::lonlocal::texthash(
-        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',
     );
-    &js_escape(\%js_lt);
-    &html_escape(\%html_js_lt);
-    &js_escape(\%html_js_lt);
     my $role = $env{'request.role'};
     my $js = <<"ENDSWJS";
 <script type="text/javascript">
@@ -7960,7 +6195,7 @@ ENDSWJS
 
 function dump_needs_switchserver(url) {
     if (url!='' && url!= null) {
-        if (confirm("$js_lt{'dump'}\\n$js_lt{'swit'}")) {
+        if (confirm("$lt{'dump'}\\n$lt{'swit'}")) {
             go(url);
         }
     }
@@ -7971,13 +6206,13 @@ function choose_switchserver_window() {
     newWindow = window.open('','ChooseServer','height=400,width=500,scrollbars=yes')
     newWindow.document.open();
     newWindow.document.writeln('$startpage');
-    newWindow.document.write('<h3>$html_js_lt{'duco'}<\\/h3>\\n'+
-       '<p>$html_js_lt{'yone'}<\\/p>\\n'+
-       '<div class="LC_left_float"><fieldset><legend>$html_js_lt{'chos'}<\\/legend>\\n'+
+    newWindow.document.write('<h3>$lt{'duco'}<\\/h3>\\n'+
+       '<p>$lt{'yone'}<\\/p>\\n'+
+       '<div class="LC_left_float"><fieldset><legend>$lt{'chos'}<\\/legend>\\n'+
        '<form name="setserver" method="post" action="" \\/>\\n'+
        '$hostpicker\\n'+
        '<br \\/><br \\/>\\n'+
-       '<input type="button" name="makeswitch" value="$html_js_lt{'swit'}" '+
+       '<input type="button" name="makeswitch" value="$lt{'swit'}" '+
        'onclick="write_switchserver();" \\/>\\n'+
        '<\\/form><\\/fieldset><\\/div><br clear="all" \\/>\\n');
     newWindow.document.writeln('$endpage');
@@ -8107,9 +6342,7 @@ check on this
 
 Verify Content
 
-=item devalidateversioncache()
-
-=item checkversions()
+=item devalidateversioncache() & checkversions()
 
 Check Versions