--- loncom/interface/londocs.pm	2017/01/24 15:54:02	1.484.2.69
+++ loncom/interface/londocs.pm	2013/08/21 15:42:23	1.562
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.484.2.69 2017/01/24 15:54:02 raeburn Exp $
+# $Id: londocs.pm,v 1.562 2013/08/21 15:42:23 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -41,12 +41,9 @@ use Apache::lonclonecourse;
 use Apache::lonnavmaps;
 use Apache::lonnavdisplay();
 use Apache::lonextresedit();
-use Apache::lontemplate();
-use Apache::lonsimplepage();
 use HTML::Entities;
 use HTML::TokeParser;
 use GDBM_File;
-use File::MMagic;
 use Apache::lonlocal;
 use Cwd;
 use LONCAPA qw(:DEFAULT :match);
@@ -139,69 +136,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 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) {
@@ -220,407 +161,118 @@ ENDJS
 	$r->print('<h3>'.&mt('Copying Files').'</h3>');
 	my $title=$env{'form.authorfolder'};
 	$title=&clean($title);
-        my ($navmap,$errormsg) =
-            &Apache::loncourserespicker::get_navmap_object($crstype,'dumpdocs');
-        my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
-        my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
-        my (%maps,%resources,%titles);
-        if (!ref($navmap)) {
-            $r->print($errormsg.
-                      &endContentScreen());
-            return '';
-        } else {
-            &Apache::loncourserespicker::enumerate_course_contents($navmap,\%maps,\%resources,\%titles,
-                                                                   'dumpdocs',$cdom,$cnum);
-        }
-        my @todump = &Apache::loncommon::get_env_multiple('form.archive');
-        my (%tocopy,%replacehash,%lookup,%deps,%display,%result,%depresult,%simpleproblems,%simplepages,
-            %newcontent,%has_simpleprobs);
-        foreach my $item (sort {$a <=> $b} (@todump)) {
-            my $name = $env{'form.namefor_'.$item};
-            if ($resources{$item}) {
-                my ($map,$id,$res) = &Apache::lonnet::decode_symb($resources{$item});
-                if ($res =~ m{^uploaded/$cdom/$cnum/\E((?:docs|supplemental)/.+)$}) {
-                    $tocopy{$1} = $name;
-                    $display{$item} = $1;
-                    $lookup{$1} = $item;
-                } elsif ($res eq 'lib/templates/simpleproblem.problem') {
-                    $simpleproblems{$item} = {
-                                                symb => $resources{$item},
-                                                name => $name,
-                                             };
-                    $display{$item} = 'simpleproblem_'.$name;
-                    if ($map =~ m{^\Quploaded/$cdom/$cnum/\E(.+)$}) {
-                        $has_simpleprobs{$1}{$id} = $item;
-                    }
-                } elsif ($res =~ m{^adm/$match_domain/$match_username/(\d+)/smppg}) {
-                    my $marker = $1;
-                    my $db_name = &Apache::lonsimplepage::get_db_name($res,$marker,$cdom,$cnum);
-                    $simplepages{$item} = {
-                                            res    => $res,
-                                            title  => $titles{$item},
-                                            db     => $db_name,
-                                            marker => $marker,
-                                            symb   => $resources{$item},
-                                            name   => $name,
-                                          };
-                    $display{$item} = '/'.$res;
-                }
-            } elsif ($maps{$item}) {
-                if ($maps{$item} =~ m{^\Quploaded/$cdom/$cnum/\E((?:default|supplemental)_\d+\.(?:sequence|page))$}) {
-                    $tocopy{$1} = $name;
-                    $display{$item} = $1;
-                    $lookup{$1} = $item;
-                }
-            } else {
-                next;
-            }
-        }
+	my %replacehash=();
+	foreach my $key (keys(%env)) {
+	    if ($key=~/^form\.namefor\_(.+)/) {
+		$replacehash{$1}=$env{$key};
+	    }
+	}
 	my $crs='/uploaded/'.$env{'request.course.id'}.'/';
 	$crs=~s/\_/\//g;
-        my $mm = new File::MMagic;
-        my $prefix = "/uploaded/$cdom/$cnum/";
-        %replacehash = %tocopy;
-        foreach my $item (sort(keys(%simpleproblems))) {
-            my $content = &Apache::imsexport::simpleproblem($simpleproblems{$item}{'symb'});
-            $newcontent{$display{$item}} = $content;
-        }
-        my $gateway = Apache::lonhtmlgateway->new('web');
-        foreach my $item (sort(keys(%simplepages))) {
-            if (ref($simplepages{$item}) eq 'HASH') {
-                my $pagetitle = $simplepages{$item}{'title'};
-                my %fields = &Apache::lonnet::dump($simplepages{$item}{'db'},$cdom,$cnum);
-                my %contents;
-                foreach my $field (keys(%fields)) {
-                    if ($field =~ /^(?:aaa|bbb|ccc)_(\w+)$/) {
-                        my $name = $1;
-                        my $msg = $fields{$field};
-                        if ($name eq 'webreferences') {
-                            if ($msg =~ m{^https?://}) {
-                                $contents{$name} = '<a href="'.$msg.'"><tt>'.$msg.'</tt></a>';
-                            }
-                        } else {
-                            $msg = &Encode::decode('utf8',$msg);
-                            $msg = $gateway->process_outgoing_html($msg,1);
-                            $contents{$name} = $msg;
-                        }
-                    } elsif ($field eq 'uploaded.photourl') {
-                        my $marker = $simplepages{$item}{marker};
-                        if ($fields{$field} =~ m{^\Q$prefix\E(simplepage/$marker/.+)$}) {
-                            my $filepath = $1;
-                            my ($relpath,$fname) = ($filepath =~ m{^(.+/)([^/]+)$});
-                            if ($fname ne '') {
-                                $fname=~s/\.(\w+)$//;
-                                my $ext=$1;
-                                $fname = &clean($fname);
-                                $fname.='.'.$ext;
-                                $contents{image} = '<img src="'.$relpath.$fname.'" alt="Image" />';
-                                $replacehash{$filepath} = $relpath.$fname;
-                                $deps{$item}{$filepath} = 1;
-                            }
-                        }
-                    }
-                }
-                $replacehash{'/'.$simplepages{$item}{'res'}} = $simplepages{$item}{'name'};
-                $lookup{'/'.$simplepages{$item}{'res'}} = $item;
-                my $content = '
-<html>
-<head>
-<title>'.$pagetitle.'</title>
-</head>
-<body bgcolor="#ffffff">';
-                if ($contents{title}) {
-                    $content .= "\n".'<h2>'.$contents{title}.'</h2>';
-                }
-                if ($contents{image}) {
-                    $content .= "\n".$contents{image};
-                }
-                if ($contents{content}) {
-                    $content .= '
-<div class="LC_Box">
-<h4 class="LC_hcell">'.&mt('Content').'</h4>'.
-$contents{content}.'
-</div>';
-                }
-                if ($contents{webreferences}) {
-                    $content .= '
-<div class="LC_Box">
-<h4 class="LC_hcell">'.&mt('Web References').'</h4>'.
-$contents{webreferences}.'
-</div>';
-                }
-                $content .= '
-</body>
-</html>
-';
-                $newcontent{'/'.$simplepages{$item}{res}} = $content;
-            }
-        }
-        foreach my $item (keys(%tocopy)) {
-            unless ($item=~/\.(sequence|page)$/) {
-                my $currurlpath = $prefix.$item;
-                my $currdirpath = &Apache::lonnet::filelocation('',$currurlpath);
-                &recurse_html($mm,$prefix,$currdirpath,$currurlpath,$item,$lookup{$item},\%replacehash,\%deps);
-            }
-        }
-        foreach my $num (sort {$a <=> $b} (@todump)) {
-            my $src = $display{$num};
-            next if ($src eq '');
-            my @needcopy = ();
-            if ($replacehash{$src}) {
-                push(@needcopy,$src);
-                if (ref($deps{$num}) eq 'HASH') {
-                    foreach my $dep (sort(keys(%{$deps{$num}}))) {
-                        if ($replacehash{$dep}) {
-                            push(@needcopy,$dep);
-                        }
-                    }
-                }
-            } elsif ($src =~ /^simpleproblem_/) {
-                push(@needcopy,$src);
-            }
-            next if (@needcopy == 0);
-            my ($result,$depresult);
-            for (my $i=0; $i<@needcopy; $i++) {
-                my $item = $needcopy[$i];
-                my $newfilename;
-                if ($simpleproblems{$num}) {
-                    $newfilename=$title.'/'.$simpleproblems{$num}{'name'};
-                } else {
-                    $newfilename=$title.'/'.$replacehash{$item};
-                }
-                $newfilename=~s/\.(\w+)$//;
-               my $ext=$1;
-                $newfilename=&clean($newfilename);
-                $newfilename.='.'.$ext;
-                my ($newrelpath) = ($newfilename =~ m{^\Q$title/\E(.+)$});
-                if ($newrelpath ne $replacehash{$item}) {
-                    $replacehash{$item} = $newrelpath;
-                }
-                my @dirs=split(/\//,$newfilename);
-                my $path=$r->dir_config('lonDocRoot')."/priv/$cd/$ca";
-                my $makepath=$path;
-                my $fail;
-                my $origin;
-                for (my $i=0;$i<$#dirs;$i++) {
-                    $makepath.='/'.$dirs[$i];
-                    unless (-e $makepath) {
-                        unless(mkdir($makepath,0755)) {
-                            $fail = &mt('Directory creation failed.');
-                        }
-                    }
-                }
-                if ($i == 0) {
-                    $result = '<br /><tt>'.$item.'</tt> => <tt>'.$newfilename.'</tt>: ';
-                } else {
-                    $depresult .= '<li><tt>'.$item.'</tt> => <tt>'.$newfilename.'</tt> '.
-                                  '<span class="LC_fontsize_small" style="font-weight: bold;">'.
-                                  &mt('(dependency)').'</span>: ';
-                }
-                if (-e $path.'/'.$newfilename) {
-                    $fail = &mt('Destination already exists -- not overwriting.');
-                } else {
-                    if (my $fh=Apache::File->new('>'.$path.'/'.$newfilename)) {
-                        if (($item =~ m{^/adm/$match_domain/$match_username/\d+/smppg}) ||
-                            ($item =~ /^simpleproblem_/)) {
-                            print $fh $newcontent{$item};
-                        } else {
-                            my $fileloc = &Apache::lonnet::filelocation('',$prefix.$item);
-                            if (-e $fileloc) {
-                                if ($item=~/\.(sequence|page|html|htm|xml|xhtml)$/) {
-                                    if ((($1 eq 'sequence') || ($1 eq 'page')) &&
-                                        (ref($has_simpleprobs{$item}) eq 'HASH')) {
-                                        my %changes = %{$has_simpleprobs{$item}};
-                                        my $content = &Apache::lonclonecourse::rewritefile(
-                     &Apache::lonclonecourse::readfile($env{'request.course.id'},$item),
-                                                      (%replacehash,$crs => '')
-                                                                                          );
-                                        my $updatedcontent = '';
-                                        my $parser = HTML::TokeParser->new(\$content);
-                                        $parser->attr_encoded(1);
-                                        while (my $token = $parser->get_token) {
-                                            if ($token->[0] eq 'S') {
-                                                if (($token->[1] eq 'resource') &&
-                                                    ($token->[2]->{'src'} eq '/res/lib/templates/simpleproblem.problem') &&
-                                                    ($changes{$token->[2]->{'id'}})) {
-                                                    my $id = $token->[2]->{'id'};
-                                                    $updatedcontent .= '<'.$token->[1];
-                                                    foreach my $attrib (@{$token->[3]}) {
-                                                       next unless ($attrib =~ /^(src|type|title|id)$/);
-                                                        if ($attrib eq 'src') {
-                                                            my ($file) = ($display{$changes{$id}} =~ /^\Qsimpleproblem_\E(.+)$/);
-                                                            if ($file) {
-                                                                $updatedcontent .= ' '.$attrib.'="'.$file.'"';
-                                                            } else {
-                                                                $updatedcontent .= ' '.$attrib.'="'.$token->[2]->{$attrib}.'"';
-                                                            }
-                                                        } else {
-                                                            $updatedcontent .= ' '.$attrib.'="'.$token->[2]->{$attrib}.'"';
-                                                        }
-                                                    }
-                                                    $updatedcontent .= ' />'."\n";
-                                                } else {
-                                                    $updatedcontent .= $token->[4]."\n";
-                                                }
-                                             } else {
-                                                 $updatedcontent .= $token->[2];
-                                             }
-                                         }
-                                         print $fh $updatedcontent;
-                                    } else {
-                                        print $fh &Apache::lonclonecourse::rewritefile(
-                     &Apache::lonclonecourse::readfile($env{'request.course.id'},$item),
-                                                      (%replacehash,$crs => '')
-                                                                                      );
-                                    }
-                                } else {
-                                    print $fh
-                                        &Apache::lonclonecourse::readfile($env{'request.course.id'},$item);
-                                }
-                            } else {
-                                $fail = &mt('Source does not exist.');
-                            }
-                        }
-                        $fh->close();
-                    } else {
-                        $fail = &mt('Could not write to destination.');
-                    }
-                }
-                my $text;
-                if ($fail) {
-                    $text = '<span class="LC_error">'.&mt('fail').('&nbsp;'x3).$fail.'</span>';
-                } else {
-                    $text = '<span class="LC_success">'.&mt('ok').'</span>';
-                }
-                if ($i == 0) {
-                    $result .= $text;
-                } else {
-                    $depresult .= $text.'</li>';
-                }
-            }
-            $r->print($result);
-            if ($depresult) {
-                $r->print('<ul>'.$depresult.'</ul>');
-            }
-        }
+	foreach my $item (keys(%replacehash)) {
+	    my $newfilename=$title.'/'.$replacehash{$item};
+	    $newfilename=~s/\.(\w+)$//;
+	    my $ext=$1;
+	    $newfilename=&clean($newfilename);
+	    $newfilename.='.'.$ext;
+	    my @dirs=split(/\//,$newfilename);
+	    my $path=$r->dir_config('lonDocRoot')."/priv/$cd/$ca";
+	    my $makepath=$path;
+	    my $fail=0;
+	    for (my $i=0;$i<$#dirs;$i++) {
+		$makepath.='/'.$dirs[$i];
+		unless (-e $makepath) {
+		    unless(mkdir($makepath,0777)) { $fail=1; }
+		}
+	    }
+	    $r->print('<br /><tt>'.$item.'</tt> => <tt>'.$newfilename.'</tt>: ');
+	    if (my $fh=Apache::File->new('>'.$path.'/'.$newfilename)) {
+		if ($item=~/\.(sequence|page|html|htm|xml|xhtml)$/) {
+		    print $fh &Apache::lonclonecourse::rewritefile(
+         &Apache::lonclonecourse::readfile($env{'request.course.id'},$item),
+				     (%replacehash,$crs => '')
+								    );
+		} else {
+		    print $fh
+         &Apache::lonclonecourse::readfile($env{'request.course.id'},$item);
+		       }
+		$fh->close();
+	    } else {
+		$fail=1;
+	    }
+	    if ($fail) {
+		$r->print('<span class="LC_error">'.&mt('fail').'</span>');
+	    } else {
+		$r->print('<span class="LC_success">'.&mt('ok').'</span>');
+	    }
+	}
     } else {
-        my ($navmap,$errormsg) =
-            &Apache::loncourserespicker::get_navmap_object($crstype,'dumpdocs');
-        if (!ref($navmap)) {
-            $r->print($errormsg);
-        } else {
-            $r->print('<div id="searching">'.&mt('Searching ...').'</div>');
-            $r->rflush();
-            my ($preamble,$formname);
-            $formname = 'dumpdoc';
-            unless ($home==1) {
-                $preamble = '<div class="LC_left_float">'.
-                            '<fieldset><legend>'.
-                            &mt('Select the Authoring Space').
-                            '</legend><select name="authorspace">';
-            }
-            my @orderspaces = ();
-            foreach my $key (sort(keys(%outhash))) {
-                if ($key=~/^home_(.+)$/) {
-                    if ($1 eq $env{'user.name'}.':'.$env{'user.domain'}) {
-                        unshift(@orderspaces,$1);
-                    } else {
-                        push(@orderspaces,$1);
-                    }
-                }
-            }
-            if ($home>1) {
-                $preamble .= '<option value="" selected="selected">'.&mt('Select').'</option>';
-            }
-            foreach my $user (@orderspaces) {
-                if ($home==1) {
-                    $preamble .= '<input type="hidden" name="authorspace" value="'.$user.'" />';
-                } else {
-                    $preamble .= '<option value="'.$user.'">'.$user.' - '.
-                                 &Apache::loncommon::plainname(split(/\:/,$user)).'</option>';
-                }
-            }
-            unless ($home==1) {
-                $preamble .= '</select></fieldset></div>'."\n";
-            }
-            my $title=$origcrsdata{'description'};
-            $title=~s/[\/\s]+/\_/gs;
-            $title=&clean($title);
-            $preamble .= '<div class="LC_left_float">'.
-                         '<fieldset><legend>'.&mt('Folder in Authoring Space').'</legend>'.
-                         '<input type="text" size="50" name="authorfolder" value="'.
-                         $title.'" />'.
-                         '</fieldset></div><div style="padding:0;clear:both;margin:0;border:0"></div>'."\n";
-            my %uploadedfiles;
-            &tiehash();
-            foreach my $file (&Apache::lonclonecourse::crsdirlist($origcrsid,'userfiles')) {
-                my ($ext)=($file=~/\.(\w+)$/);
-# FIXME Check supplemental here
-                my $title=$hash{'title_'.$hash{
-                                'ids_/uploaded/'.$origcrsdata{'domain'}.'/'.$origcrsdata{'num'}.'/'.$file}};
-                if (!$title) {
-                    $title=$file;
-                } else {
-                    $title=~s|/|_|g;
-                }
-                $title=~s/\.(\w+)$//;
-                $title=&clean($title);
-                $title.='.'.$ext;
-#           $r->print("\n<td><input type='text' size='60' name='namefor_".$file."' value='".$title."' /></td>"
-                $uploadedfiles{$file} = $title;
-            }
-            &untiehash();
-            $r->print(&Apache::loncourserespicker::create_picker($navmap,'dumpdocs',$formname,$crstype,undef,
-                                                                 undef,undef,$preamble,$home,\%uploadedfiles));
-        }
+        $r->print(&mt('Searching ...').'<br />');
+        $r->rflush();
+# Input form
+        $r->print('<form name="dumpdoc" action="" method="post">'."\n");
+	unless ($home==1) {
+	    $r->print('<div class="LC_left_float">'.
+		      '<fieldset><legend>'.
+                      &mt('Select the Authoring Space').
+                      '</legend><select name="authorspace">');
+	}
+	foreach my $key (sort(keys(%outhash))) {
+	    if ($key=~/^home_(.+)$/) {
+		if ($home==1) {
+		    $r->print(
+		  '<input type="hidden" name="authorspace" value="'.$1.'" />');
+		} else {
+		    $r->print('<option value="'.$1.'">'.$1.' - '.
+			      &Apache::loncommon::plainname(split(/\:/,$1)).'</option>');
+		}
+	    }
+	}
+	unless ($home==1) {
+	    $r->print('</select></fieldset></div>'."\n");
+	}
+	my $title=$origcrsdata{'description'};
+	$title=~s/[\/\s]+/\_/gs;
+	$title=&clean($title);
+	$r->print('<div class="LC_left_float">'.
+                  '<fieldset><legend>'.&mt('Folder in Authoring Space').'</legend>'.
+                  '<input type="text" size="50" name="authorfolder" value="'.
+                  $title.'" />'.
+                  '</fieldset></div><br clear="all" />'."\n");
+	&tiehash();
+	$r->print('<h4>'.&mt('Filenames in Authoring Space').'</h4>'
+                 .&Apache::loncommon::start_data_table()
+                 .&Apache::loncommon::start_data_table_header_row()
+                 .'<th>'.&mt('Internal Filename').'</th>'
+                 .'<th>'.&mt('Title').'</th>'
+                 .'<th>'.&mt('Save as ...').'</th>'
+                 .&Apache::loncommon::end_data_table_header_row());
+	foreach my $file (&Apache::lonclonecourse::crsdirlist($origcrsid,'userfiles')) {
+	    $r->print(&Apache::loncommon::start_data_table_row()
+                     .'<td>'.$file.'</td>');
+	    my ($ext)=($file=~/\.(\w+)$/);
+	    my $title=$hash{'title_'.$hash{
+		'ids_/uploaded/'.$origcrsdata{'domain'}.'/'.$origcrsdata{'num'}.'/'.$file}};
+	    $r->print('<td>'.($title?$title:'&nbsp;').'</td>');
+	    if (!$title) {
+		$title=$file;
+	    } else {
+		$title=~s|/|_|g;
+	    }
+	    $title=~s/\.(\w+)$//;
+	    $title=&clean($title);
+	    $title.='.'.$ext;
+	    $r->print("\n<td><input type='text' size='60' name='namefor_".$file."' value='".$title."' /></td>"
+                     .&Apache::loncommon::end_data_table_row());
+	}
+	$r->print(&Apache::loncommon::end_data_table());
+	&untiehash();
+	$r->print(
+  '<p><input type="submit" name="dumpcourse" value="'.&mt("Dump $crstype Content").'" /></p></form>');
     }
     $r->print(&endContentScreen());
 }
 
-sub recurse_html {
-    my ($mm,$prefix,$currdirpath,$currurlpath,$container,$item,$replacehash,$deps) = @_;
-    return unless ((ref($replacehash) eq 'HASH') && (ref($deps) eq 'HASH'));
-    my (%allfiles,%codebase);
-    if (&Apache::lonnet::extract_embedded_items($currdirpath,\%allfiles,\%codebase) eq 'ok') {
-        if (keys(%allfiles)) {
-            foreach my $dependency (keys(%allfiles)) {
-                next if (($dependency =~ m{^/(res|adm)/}) || ($dependency =~ m{^https?://}));
-                my ($depurl,$relfile,$newcontainer);
-                if ($dependency =~ m{^/}) {
-                    if ($dependency =~ m{^\Q$currurlpath/\E(.+)$}) {
-                        $relfile = $1;
-                        if ($dependency =~ m{^\Q$prefix\E(.+)$}) {
-                            $newcontainer = $1;
-                            next if ($replacehash->{$newcontainer});
-                        }
-                        $depurl = $dependency;
-                    } else {
-                        next;
-                    }
-                } else {
-                    $relfile = $dependency;
-                    $depurl = $currurlpath;
-                    $depurl =~ s{[^/]+$}{}; 
-                    $depurl .= $dependency;
-                    ($newcontainer) = ($depurl =~ m{^\Q$prefix\E(.+)$});
-                }
-                next if ($relfile eq '');
-                my $newname = $replacehash->{$container};
-                $newname =~ s{[^/]+$}{};
-                $replacehash->{$newcontainer} = $newname.$relfile;
-                $deps->{$item}{$newcontainer} = 1;
-                my ($newurlpath) = ($depurl =~ m{^(.*)/[^/]+$});
-                my $depfile = &Apache::lonnet::filelocation('',$depurl);
-                my $type = $mm->checktype_filename($depfile);
-                if ($type eq 'text/html') {
-                    &recurse_html($mm,$prefix,$depfile,$newurlpath,$newcontainer,$item,$replacehash,$deps);
-                }
-            }
-        }
-    }
-    return;
-}
-
 sub group_import {
     my ($coursenum, $coursedom, $folder, $container, $caller, @files) = @_;
     my ($donechk,$allmaps,%hierarchy,%titles,%addedmaps,%removefrommap,
@@ -688,7 +340,7 @@ sub group_import {
                 } else {
                     $fname =~ s/\W/_/g;
                 }
-                if (length($fname) > 15) {
+                if (length($fname > 15)) {
                     $fname = substr($fname,0,14);
                 }
                 my $initialtext = &mt('Replace with your own content.');
@@ -703,7 +355,7 @@ $initialtext
 </html>
 END
                 $env{'form.output'}=$newhtml;
-                my $result =
+                my $result = 
                     &Apache::lonnet::finishuserfileupload($coursenum,$coursedom,
                                                           'output',
                                                           "$filepath/$residx/$fname.html");
@@ -728,7 +380,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 =
@@ -827,14 +479,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".
@@ -850,9 +500,8 @@ sub docs_change_log {
     }
     my $folderpath=$env{'form.folderpath'};
     if ($folderpath eq '') {
-        $folderpath = &default_folderpath($coursenum,$coursedom,\$navmap);
+        $folderpath = 'default&'.&escape(&mt('Main Content').':::::');
     }
-    undef($navmap);
     $pathitem = '<input type="hidden" name="folderpath" value="'.
                 &HTML::Entities::encode($folderpath,'<>&"').'" />';
     my $readfile="/uploaded/$coursedom/$coursenum/$folder.$container";
@@ -1016,7 +665,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'});
@@ -1063,7 +712,7 @@ sub update_paste_buffer {
              my $url = $env{'docs.markedcopy_url_'.$suffix};
              if (($cid =~ /^$match_domain(?:_)$match_courseid$/) &&
                  ($url ne '')) {
-                 $pasteurls{$cid.'_'.$url} = 1;
+                 $pasteurls{$cid.'_'.$url};
              }
         }
     }
@@ -1084,12 +733,10 @@ sub update_paste_buffer {
         next if (exists($pasteurls{$coursedom.'_'.$coursenum.'_'.$url}));
         my ($suffix,$errortxt,$locknotfreed) =
             &new_timebased_suffix($env{'user.domain'},$env{'user.name'},'paste');
-        if ($suffix ne '') {
-            push(@newpaste,$suffix);
-        } else {
-            if ($locknotfreed) {
-                return $locknotfreed;
-            }
+        push(@newpaste,$suffix);
+        if ($locknotfreed) {
+            return $locknotfreed;
+            last;
         }
         if (&is_supplemental_title($title)) {
             &Apache::lonnet::appenv({'docs.markedcopy_supplemental_'.$suffix => $title});
@@ -1123,17 +770,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 {
@@ -1171,7 +813,6 @@ sub print_paste_buffer {
 
     my @currpaste = split(/,/,$env{'docs.markedcopies'});
     my ($pasteitems,@pasteable);
-    my $clipboardcount = 0;
 
 # Construct identifiers for current contents of user's paste buffer
     foreach my $suffix (@currpaste) {
@@ -1180,7 +821,6 @@ sub print_paste_buffer {
         my $url = $env{'docs.markedcopy_url_'.$suffix};
         if (($cid =~ /^$match_domain\_$match_courseid$/) &&
             ($url ne '')) {
-            $clipboardcount ++;
             my ($is_external,$othercourse,$fromsupp,$is_uploaded_map,$parent,
                 $canpaste,$nopaste,$othercrs,$areachange);
             my $extension = (split(/\./,$env{'docs.markedcopy_url_'.$suffix}))[-1];
@@ -1236,14 +876,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);
@@ -1278,23 +914,11 @@ sub print_paste_buffer {
         $pasteitems .= '<div style="padding:0;clear:both;margin:0;border:0"></div>';
         $form_start = '<form name="pasteform" action="/adm/coursedocs" method="post" onsubmit="return validateClipboard();">';
         if (@pasteable) {
-            my $value = &mt('Paste to current folder');
-            if ($container eq 'page') {
-                $value = &mt('Paste to current page');
-            }
-            $buttons = '<input type="submit" name="pastemarked" value="'.$value.'" />'.('&nbsp;'x2);
-        }
-        $buttons .= '<input type="submit" name="clearmarked" value="'.&mt('Clear selected').'" />'.('&nbsp;'x2);
-        if ($clipboardcount > 1) {
-            $buttons .=
-                '<span style="text-decoration:line-through">'.('&nbsp;'x20).'</span>'.('&nbsp;'x2).
-                '<input type="button" name="checkallclip" value="'.&mt('Check all').'" style="height:20px;" onclick="checkClipboard();" />'.
-                ('&nbsp;'x2).
-                '<input type="button" name="uncheckallclip" value="'.&mt('Uncheck all').'" style="height:20px;" onclick="uncheckClipboard();" />'.
-                ('&nbsp;'x2);
+            $buttons = '<input type="submit" name="pastemarked" value="'.&mt('Paste selected').'" />'.('&nbsp;'x2);
         }
-        $form_end = '<input type="hidden" name="folderpath" value="'.&HTML::Entities::encode($env{'form.folderpath'},'<>&"').'" />'.
-                    '</form>';
+        $buttons .= '<input type="submit" name="clearmarked" value="'.&mt('Clear selected').'" />'.
+                    '<input type="hidden" name="folderpath" value="'.&HTML::Entities::encode($env{'form.folderpath'},'<>&"').'" />';
+        $form_end = '</form>';
     } else {
         $pasteitems = &mt('Clipboard is empty');
     }
@@ -1392,34 +1016,29 @@ sub supp_pasteable {
 }
 
 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 ='';
         }
@@ -1448,29 +1067,11 @@ 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
 
 }
@@ -1508,7 +1109,8 @@ sub do_paste_from_buffer {
     }
 
     my (%msgs,%before,%after,@dopaste,%is_map,%notinsupp,%notincrs,%duplicate,
-        %prefixchg,%srcdom,%srcnum,%marktomove,$save_err,$lockerrors,$allresult);
+        %prefixchg,%srcdom,%srcnum,%marktomove,$save_err,$lockerrors,$allresult,
+        %msgs);
 
     foreach my $suffix (@topaste) {
         my $url=&LONCAPA::map::qtescape($env{'docs.markedcopy_url_'.$suffix});
@@ -1709,7 +1311,7 @@ sub do_paste_from_buffer {
                     if ($prefix eq 'smppg') {
                         $msg = &mt('Paste failed: An error occurred when copying the simple page.').' '.$errtext;
                     } elsif ($prefix eq 'bulletinboard') {
-                        $msg = &mt('Paste failed: An error occurred when copying the discussion board.').' '.$errtext;
+                        $msg = &mt('Paste failed: An error occurred when copying the bulletin board.').' '.$errtext;
                     }
                     $results{$suffix} = $result;
                     $msgerrs{$suffix} = $msg;
@@ -1717,7 +1319,7 @@ sub do_paste_from_buffer {
                     next;
 	        }
                 if ($lockerr{$prefix}) {
-                    $lockerrs{$suffix} = $lockerr{$prefix};
+                    $lockerrs{$suffix} = $lockerr{$prefix};  
                 }
             }
         }
@@ -1756,7 +1358,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')) {
@@ -1959,11 +1561,11 @@ sub get_newmap_url {
 sub dbcopy {
     my ($dbref,$coursedom,$coursenum,$lockerrorsref) = @_;
     my ($url,$result,$errtext);
-    $url = $dbref->{'src'};
+    my $url = $dbref->{'src'};
     if (ref($dbref) eq 'HASH') {
         if ($url =~ m{/(smppg|bulletinboard)$}) {
             my $prefix = $1;
-            if (($dbref->{'cdom'} =~ /^$match_domain$/) &&
+            if (($dbref->{'cdom'} =~ /^$match_domain$/) && 
                 ($dbref->{'cnum'} =~ /^$match_courseid$/)) {
                 my $db_name;
                 my $marker = (split(m{/},$url))[4];
@@ -1984,7 +1586,7 @@ sub dbcopy {
                     if ($prefix eq 'smppg') {
                         $errtext = &mt('Failed to acquire a unique timestamp-based suffix when copying a simple page [_1].',$url);
                     } else {
-                        $errtext = &mt('Failed to acquire a unique timestamp-based suffix when copying a discussion board [_1].',$url);
+                        $errtext = &mt('Failed to acquire a unique timestamp-based suffix when copying a bulletin board [_1].',$url);
                     }
                     if ($error) {
                         $errtext .= '<br />'.$error;
@@ -1998,12 +1600,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'});
                             }
@@ -2027,7 +1629,7 @@ sub dbcopy {
                         $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>').
@@ -2148,7 +1750,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)/(.+)$}) {
@@ -2594,7 +2196,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);
@@ -2621,7 +2223,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}) {
@@ -2657,45 +2259,26 @@ sub update_parameter {
         }
         return $haschanges;
     } else {
-        my $haschanges = 0;
-        return $haschanges if ($env{'form.changeparms'} !~ /^($valid_parameters_re)$/);
+        return 0 if ($env{'form.changeparms'} !~ /^($valid_parameters_re)$/);
 
         my $which = $env{'form.changeparms'};
         my $idx = $env{'form.setparms'};
-        my $oldvalue = 0;
-        my $newvalue = 0;
-        my $current = (&LONCAPA::map::getparameter($idx,'parameter_'.$which))[0];
-        if ($which eq 'randompick') {
-            if ($current =~ /^(\d+)$/) {
-                $oldvalue = $1;
-            }
-        } elsif ($current =~ /^yes$/i) {
-            $oldvalue = 1;
-        }
         if ($env{'form.'.$which.'_'.$idx}) {
-            $newvalue = ($which eq 'randompick') ? $env{'form.rpicknum_'.$idx}
-                                                 : 1;
-        }
-        if ($oldvalue ne $newvalue) {
-            $haschanges = 1;
-            if ($newvalue) {
-                my $storeval = 'yes';
-                if ($which eq 'randompick') {
-                    $storeval = $newvalue;
-                }
-                &LONCAPA::map::storeparameter($idx, 'parameter_'.$which, $storeval,
-                                              $parameter_type{$which});
-                &remember_parms($idx,$which,'set',$storeval);
-            } else {
-                &LONCAPA::map::delparameter($idx,'parameter_'.$which);
-                &remember_parms($idx,$which,'del');
-            }
+	    my $value = ($which eq 'randompick') ? $env{'form.rpicknum_'.$idx}
+	                                         : 'yes';
+	    &LONCAPA::map::storeparameter($idx, 'parameter_'.$which, $value,
+				          $parameter_type{$which});
+	    &remember_parms($idx,$which,'set',$value);
+        } else {
+	    &LONCAPA::map::delparameter($idx,'parameter_'.$which);
+
+	    &remember_parms($idx,$which,'del');
         }
-        return $haschanges;
+        return 1;
     }
-    return;
 }
 
+
 sub handle_edit_cmd {
     my ($coursenum,$coursedom) =@_;
     if ($env{'form.cmd'} eq '') {
@@ -2745,8 +2328,7 @@ sub handle_edit_cmd {
 
 sub editor {
     my ($r,$coursenum,$coursedom,$folder,$allowed,$upload_output,$crstype,
-        $supplementalflag,$orderhash,$iconpath,$pathitem,$canedit,$navmapref,
-        $hiddentop)=@_;
+        $supplementalflag,$orderhash,$iconpath,$pathitem)=@_;
     my ($randompick,$ishidden,$isencrypted,$plain,$is_random_order,$container);
     if ($allowed) {
         (my $breadcrumbtrail,$randompick,$ishidden,$isencrypted,$plain,
@@ -2769,21 +2351,9 @@ sub editor {
         $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();
@@ -2795,12 +2365,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);
 	}
 
@@ -2862,9 +2432,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);
@@ -2896,7 +2466,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);
@@ -3061,20 +2631,19 @@ 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,$canedit,$isencrypted,$navmapref);
+                              \%filters,\%curr_groups);
         $idx++;
         $shown++;
     }
     &Apache::loncommon::end_data_table_count();
 
     my $need_save;
-    if ($allowed || ($supplementalflag && $folder eq 'supplemental')) {
+    if (($allowed) || ($supplementalflag && $folder eq 'supplemental')) {
         my $toolslink;
-        if ($allowed) {
+        if ($allowed || &Apache::lonnet::allowed('mdc',$env{'request.course.id'})) {
             $toolslink = '<table><tr><td>'
                        .&Apache::loncommon::help_open_menu('Navigation Screen',
                                                            'Navigation_Screen',undef,'RAT')
@@ -3113,20 +2682,20 @@ sub editor {
                     if (@allidx > 0) {
                         my $path;
                         if ($env{'form.folderpath'}) {
-                            $path =
+                            $path = 
                                 &HTML::Entities::encode($env{'form.folderpath'},'<>&"');
                         }
                         if (@allidx > 1) {
-                            $to_show .=
+                            $to_show .= 
                                 &Apache::loncommon::continue_data_table_row().
                                 '<td colspan="2">&nbsp;</td>'.
                                 '<td>'.
-                                &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;
@@ -3147,15 +2716,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 empty')
                        .'</div>'
                        .&Apache::loncommon::end_scrollbox();
         }
@@ -3179,10 +2742,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);
     }
@@ -3190,12 +2751,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;">'.
@@ -3208,15 +2765,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 {
@@ -3224,15 +2781,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";
     }
@@ -3273,17 +2830,14 @@ sub process_file_upload {
     }
     my $quotatype = 'unofficial';
     if ($crstype eq 'Community') {
-        $quotatype = 'community';
-    } elsif ($env{'course.'.$coursedom.'_'.$coursenum.'.internal.coursecode'}) {
+        $quotatype = 'community';    
+    } elsif ($env{'course.'.$coursedom.'_'.$coursenum.'.internal.instcode'}) {
         $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);
+                                                                      $env{'form.uploaddoc.filename'},$filesize,'upload');
         return if ($$upload_output);
     }
     my ($parseaction,$showupload,$nextphase,$mimetype);
@@ -3381,8 +2935,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();
@@ -3443,9 +2996,8 @@ sub is_supplemental_title {
 
 sub entryline {
     my ($index,$title,$url,$folder,$allowed,$residx,$coursenum,$coursedom,
-        $crstype,$pathitem,$supplementalflag,$container,$filtersref,$currgroups,
-        $canedit,$isencrypted,$navmapref)=@_;
-    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 {
@@ -3454,20 +3006,11 @@ 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
@@ -3523,7 +3066,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>';
@@ -3545,15 +3088,13 @@ END
                 '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$
@@ -3564,10 +3105,6 @@ END
              || $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)
@@ -3579,7 +3116,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')) {
@@ -3597,7 +3134,7 @@ 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')) {
@@ -3610,13 +3147,12 @@ 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')) {
@@ -3624,25 +3160,17 @@ ENDREM
             }
         }
         $renamelink=(<<ENDREN);
-<a href='javascript:changename("$esc_path","$index","$oldtitle");' class="LC_docs_rename">$lt{'rn'}</a>
+<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>
@@ -3668,7 +3196,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$/;
@@ -3680,7 +3207,6 @@ END
                 $icon=$iconpath.'page.gif';
                 $ispage=1;
             }
-            $folderurl = &Apache::lonnet::declutter($url);
             if ($allowed) {
                 $url='/adm/coursedocs?';
             } else {
@@ -3691,7 +3217,7 @@ END
 	}
     }
 
-    my ($editlink,$extresform,$anchor,$hiddenres);
+    my ($editlink,$extresform);
     my $orig_url = $url;
     $orig_url=~s{http(&colon;|:)//https(&colon;|:)//}{https$2//};
     $url=~s{^http(|s)(&colon;|:)//}{/adm/wrapper/ext/};
@@ -3713,71 +3239,13 @@ END
 	        $url='/adm/wrapper'.$url;
 	    }
             if (&Apache::lonnet::symbverify($symb,$url)) {
-                my $shownsymb = $symb;
-                if ($isexternal) {
-                    if ($url =~ /^([^#]+)#([^#]+)$/) {
-                        $url = $1;
-                        $anchor = $2;
-                        if ($symb =~ m{^([^#]+)\Q#$anchor\E$}) {
-                            $shownsymb = $1.&escape('#').$anchor;
-                        }
-                    }
-                }
-                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.=(($url=~/\?/)?'&':'?').'symb='.&HTML::Entities::encode($shownsymb,'"<>&');
-                }
-            } elsif (!$env{'request.role.adv'}) {
-                my $checkencrypt;
-                if (((&LONCAPA::map::getparameter($orderidx,'parameter_encrypturl'))[0]=~/^yes$/i) ||
-                      $isencrypted || (&Apache::lonnet::EXT('resource.0.encrypturl',$symb) =~ /^yes$/i)) {
-                    $checkencrypt = 1;
-                } else {
-                    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 $shownsymb = &Apache::lonenc::encrypted($symb);
-                    my $shownurl = &Apache::lonenc::encrypted($url);
-                    if (&Apache::lonnet::symbverify($shownsymb,$shownurl)) {
-                        $url = $shownurl.(($shownurl=~/\?/)?'&':'?').'symb='.&HTML::Entities::encode($shownsymb,'"<>&');
-                        if ($env{'request.enc'} ne '') {
-                            delete($env{'request.enc'});
-                        }
-                    } else {
-                        $url='';
-                    }
-                } else {
-                    $url='';
-                }
+	        $url.=(($url=~/\?/)?'&':'?').'symb='.&escape($symb);
             } else {
                 $url='';
             }
 	}
-    } elsif ($supplementalflag) {
-        if ($isexternal) {
-            if ($url =~ /^([^#]+)#([^#]+)$/) {
-                $url = $1;
-                $anchor = $2;
-            }
-        }
     }
-    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'};
@@ -3786,44 +3254,21 @@ 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) {
-                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 (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"';
@@ -3836,26 +3281,26 @@ END
 '<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) {
+            if ((&LONCAPA::map::getparameter($orderidx,'parameter_randomorder'))[0]=~/^yes$/i) {
                 $ro_set = 'checked="checked"';
                 if (($ishash) && (ref($filtersref->{'randomorder'}) eq 'ARRAY')) {
                     push(@{$filtersref->{'randomorder'}},$orderidx);
                 }
             }
-            $formname = 'edit_rorder_'.$orderidx;
+            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) {
         $url .= ($url =~ /\?/) ? '&amp;':'?';
@@ -3866,9 +3311,6 @@ $form_end;
         if ($isexternal && $orderidx) {
             $url .= '&amp;idx='.$orderidx;
         }
-        if ($anchor ne '') {
-            $url .= '&amp;anchor='.&HTML::Entities::encode($anchor,'"<>&');
-        }
     }
     my ($tdalign,$tdwidth);
     if ($allowed) {
@@ -3876,23 +3318,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,$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,
                                                             &escape($env{'form.folderpath'}),
-                                                            $renametitle,'','',1,$suppanchor);
+                                                            $renametitle,'','',1);
                 if ($jscall) {
                     $editlink = '<a class="LC_docs_ext_edit" href="javascript:'.
                                 $jscall.'" >'.&mt('Edit').'</a>&nbsp;'."\n";
@@ -3912,15 +3349,7 @@ $form_end;
     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,'"<>&');
-           }
-       }
-       $line.=&Apache::loncommon::modal_link(&js_escape($url.(($url=~/\?/)?'&amp;':'?').'inhibitmenu=yes'.
-                                             (($anchor ne '')?$anchor:'')),
+       $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" />';
@@ -3929,11 +3358,8 @@ $form_end;
     if (($url=~m{/adm/(coursedocs|supplemental)}) || (!$allowed && $url)) {
        $line.='<a href="'.$url.'">'.$title.'</a>';
     } elsif ($url) {
-       $line.=&Apache::loncommon::modal_link(&js_escape($url.(($url=~/\?/)?'&amp;':'?').'inhibitmenu=yes'.
-                                             (($anchor ne '')?$anchor:'')),
+       $line.=&Apache::loncommon::modal_link($url.(($url=~/\?/)?'&amp;':'?').'inhibitmenu=yes',
                                              $title,600,500);
-    } elsif (($hiddenfolder) || ($hiddenres)) {
-       $line.=$title.' <span class="LC_warning LC_docs_reinit_warn">'.&mt('(Hidden)').'</span>';
     } else {
        $line.=$title.' <span class="LC_docs_reinit_warn">'.$reinit.'</span>';
     }
@@ -3964,13 +3390,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 />
@@ -4049,7 +3475,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') {
@@ -4061,8 +3486,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.');
@@ -4071,36 +3497,26 @@ sub new_timebased_suffix {
         } elsif ($type eq 'smppg') {
             $errtext = &mt('Failed to acquire a unique timestamp-based suffix for the new simple page.');
         } else {
-            $errtext = &mt('Failed to acquire a unique timestamp-based suffix for the new discussion board.');
+            $errtext = &mt('Failed to acquire a unique timestamp-based suffix for the new bulletin board.');
         }
         if ($error) {
             $errtext .= '<br />'.$error;
         }
     }
     if ($freedlock ne 'ok') {
-        $locknotfreed =
+        $locknotfreed = 
             '<div class="LC_error">'.
             &mt('There was a problem removing a lockfile.').' ';
         if ($type eq 'paste') {
-            if ($freedlock eq 'nolock') {
-                $locknotfreed =
-                    '<div class="LC_error">'.
-                    &mt('A lockfile was not released when you added content to the clipboard earlier in this session.').' '.
-
-                    &mt('As a result addition of items to the clipboard will be unavailable until your next log-in.');
-            } else {
-                $locknotfreed .=
-                    &mt('This will prevent addition of items to the clipboard until your next log-in.');
-            }
+            &mt('This will prevent use of the paste buffer until th next log-in.');
         } elsif ($type eq 'map') {
-            $locknotfreed .=
-                &mt('This will prevent creation of additional folders or composite pages in this course.');
+            &mt('This will prevent creation of additional folders or composite pages in this course.');
         } elsif ($type eq 'smppg') {
             $locknotfreed .=
                 &mt('This will prevent creation of additional simple pages in this course.');
         } else {
             $locknotfreed .=
-                &mt('This will prevent creation of additional discussion boards in this course.');
+                &mt('This will prevent creation of additional bulletin boards in this course.');
         }
         unless ($type eq 'paste') {
             $locknotfreed .=
@@ -4305,10 +3721,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='';
@@ -4326,53 +3742,51 @@ 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);
@@ -4439,11 +3853,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">
@@ -4464,37 +3873,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>'.
@@ -4504,25 +3893,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 {
@@ -4531,55 +3921,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 {
@@ -4634,13 +4022,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,
@@ -4676,6 +4064,7 @@ sub startContentScreen {
     if (($mode eq 'navmaps') || ($mode eq 'supplemental')) {
         $output .= '<li'.(($mode eq 'navmaps')?' class="active"':'').'><a href="/adm/navmaps"><b>&nbsp;&nbsp;&nbsp;&nbsp;'.&mt('Content Overview').'&nbsp;&nbsp;&nbsp;&nbsp;</b></a></li>'."\n";
         $output .= '<li'.(($mode eq 'coursesearch')?' class="active"':'').'><a href="/adm/searchcourse"><b>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'.&mt('Content Search').'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b></a></li>'."\n";
+        $output .= '<li'.(($mode eq 'courseindex')?' class="active"':'').'><a href="/adm/indexcourse"><b>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'.&mt('Content Index').'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b></a></li>'."\n";
         $output .= '<li '.(($mode eq 'suppdocs')?' class="active"':'').'><a href="/adm/supplemental"><b>'.&mt('Supplemental Content').'</b></a></li>';
     } else {
         $output .= '<li '.(($mode eq 'docs')?' class="active"':'').' id="tabbededitor"><a href="/adm/coursedocs?forcestandard=1"><b>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'.&mt('Main Content Editor').'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b></a></li>'."\n";
@@ -4723,8 +4112,9 @@ sub handler {
 	               'Adding_Folders','Docs_Overview', 'Load_Map',
 	               'Supplemental','Score_Upload_Form','Adding_Pages',
 	               'Importing_LON-CAPA_Resource','Importing_IMS_Course',
-                       'Uploading_From_Harddrive','Course_Roster','Web_Page',
-                       'Dropbox','Simple_Problem') {
+                       'Uploading_From_Harddrive',
+	               'Check_Resource_Versions','Verify_Content',
+                       'Course_Roster','Web_Page','Dropbox') {
 	$help{$topic}=&Apache::loncommon::help_open_topic('Docs_'.$topic);
     }
     # Composite help files
@@ -4732,6 +4122,8 @@ 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(
@@ -4739,25 +4131,20 @@ sub handler {
     $help{'Group Portfolio'} = &Apache::loncommon::help_open_topic('Docs_About_Group_Files');
     $help{'Caching'} = &Apache::loncommon::help_open_topic('Caching');
  
-    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;
-        }
+        $allowed = &Apache::lonnet::allowed('mdc',$env{'request.course.id'});
     }
-    unless ($canedit) {
-        $disabled = ' disabled="disabled"';
-    }
-    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['inhibitmenu']);
-  if ($allowed && $env{'form.verify'}) {
-      &init_breadcrumbs('verify','Verify Content','Docs_Verify_Content');
+
+    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['chooseserver',
+                                            'inhibitmenu']);
+  if ($allowed && $env{'form.chooseserver'}) {
+      &choose_dump_server($r);
+      return OK;
+  } elsif ($allowed && $env{'form.verify'}) {
+      &init_breadcrumbs('verify','Verify Content');
       &verifycontent($r);
   } elsif ($allowed && $env{'form.listsymbs'}) {
       &init_breadcrumbs('listsymbs','List Content IDs');
@@ -4768,12 +4155,12 @@ sub handler {
       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');
@@ -4817,15 +4204,13 @@ sub handler {
     my $container;
     my $containertag;
     my $pathitem;
-    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 '') {
@@ -4834,10 +4219,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 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'});
@@ -4856,14 +4243,7 @@ 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'});
         }
     }
@@ -4880,48 +4260,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]))[4]) {
-                $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 Content').
+                                  ':::::');
        }
     }
 
 # Store this
     unless ($toolsflag) {
-        if (($allowed) && ($env{'form.folderpath'} ne '')) {
+        if ($allowed) {
             &Apache::loncommon::store_course_settings($stored_folderpath,
                                                       {'folderpath' => 'scalar'});
         }
@@ -4939,12 +4290,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 Content').':::::');
             }
         }
         $containertag = '<input type="hidden" name="folderpath" value="" />';
@@ -4955,7 +4302,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');
             }
@@ -4981,11 +4328,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$/) {
@@ -4994,11 +4339,10 @@ sub handler {
                 }
             }
             my $tabidstr = join("','",@tabids);
-	    $script .= &editing_js($udom,$uname,$supplementalflag,$coursedom,$coursenum,
-                                   $canedit,\$navmap).
+	    $script .= &editing_js($udom,$uname,$supplementalflag).
                        &history_tab_js().
                        &inject_data_js().
-                       &Apache::lonhtmlcommon::resize_scrollbox_js('docs',$tabidstr,$tid).
+                       &Apache::lonhtmlcommon::resize_scrollbox_js('docs',$tabidstr).
                        &Apache::lonextresedit::extedit_javascript();
             $addentries = {
                             onload   => "javascript:resize_scrollbox('contentscroll','1','1');",
@@ -5023,53 +4367,27 @@ 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; 
@@ -5121,7 +4439,7 @@ 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)) {
 # -----------------------------------------------------------------------------
@@ -5141,7 +4459,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',
@@ -5157,48 +4475,11 @@ sub handler {
                 '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.
-    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" size="40" $disabled />
+	<input type="file" name="uploaddoc" size="40" />
 FIUP
 
 	my $checkbox=(<<CHBO);
@@ -5206,7 +4487,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'};
@@ -5223,17 +4504,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
@@ -5248,7 +4529,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 />
@@ -5256,17 +4537,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'}
@@ -5277,42 +4552,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,$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">
@@ -5349,7 +4613,7 @@ HIDDENFORM
 
     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'));
@@ -5373,17 +4637,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>
@@ -5397,7 +4661,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
@@ -5424,7 +4688,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>
@@ -5434,18 +4698,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>
@@ -5454,11 +4718,11 @@ 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>
+	<a class="LC_menubuttons_link" href="javascript:document.newroster.submit()">$lt{'rost'}</a>
 	$help{'Course_Roster'}
 	</form>
 NROSTFORM
@@ -5475,7 +4739,7 @@ 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>
@@ -5499,7 +4763,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>
@@ -5510,18 +4774,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>
@@ -5529,18 +4793,18 @@ 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
 	@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},
         );
@@ -5572,8 +4836,8 @@ 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));
 
@@ -5591,9 +4855,7 @@ unless ($container eq 'page') {
  $hadchanges=0;
        unless (($supplementalflag || $toolsflag)) {
           my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$crstype,
-                              $supplementalflag,\%orderhash,$iconpath,$pathitem,
-                              $canedit,\$navmap,$hiddentop);
-          undef($navmap);
+                              $supplementalflag,\%orderhash,$iconpath,$pathitem);
           if ($error) {
              $r->print('<p><span class="LC_error">'.$error.'</span></p>');
           }
@@ -5648,7 +4910,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> 
@@ -5658,8 +4920,7 @@ SNFFORM
 	
         my $supextform =
             &Apache::lonextresedit::extedit_form(1,0,undef,undef,$pathitem,
-                                                 $help{'Adding_External_Resource'},
-                                                 undef,undef,$disabled);
+                                                 $help{'Adding_External_Resource'});
 
 	my $supnewsylform=(<<SNSFORM);
 	<form action="/adm/coursedocs" method="post" name="supnewsyl">
@@ -5667,7 +4928,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
@@ -5678,7 +4939,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
@@ -5705,9 +4966,9 @@ 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},
 
@@ -5727,8 +4988,7 @@ my %suporderhash = (
                 );
         if ($supplementalflag) {
            my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$crstype,
-                               $supplementalflag,\%suporderhash,$iconpath,$pathitem,
-                               $canedit);
+                               $supplementalflag,\%suporderhash,$iconpath,$pathitem);
            if ($error) {
               $r->print('<p><span class="LC_error">'.$error.'</span></p>');
            } else {
@@ -5738,13 +4998,12 @@ my %suporderhash = (
                    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::remote_devalidate_cache($server,'suppcount',$hashid);
                    }
                    &Apache::lonnet::get_numsuppfiles($coursenum,$coursedom,1);
                    undef($suppchanges);
-               }
-           }
+               }  
+           } 
         }
     } elsif ($supplementalflag) {
         my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$crstype,
@@ -5822,7 +5081,7 @@ sub decompression_info {
     my $docuname=$env{'course.'.$env{'request.course.id'}.'.num'};
     my $container='sequence';
     my ($pathitem,$hiddenelem);
-    my @hiddens = ('newidx','comment','position','folderpath','archiveurl');
+    my @hiddens = ('newidx','comment','position','folderpath');
     if ($env{'form.folderpath'} =~ /\:1$/) {
         $container='page';
     }
@@ -5830,7 +5089,7 @@ sub decompression_info {
     foreach my $item (@hiddens) {
         if ($env{'form.'.$item}) {
             $hiddenelem .= '<input type="hidden" name="'.$item.'" value="'.
-                           &HTML::Entities::encode($env{'form.'.$item},'<>&"').'" />'."\n";
+                           $env{'form.'.$item}.'" />'."\n";
         }
     }
     return ($destination,$dir_root,$londocroot,$docudom,$docuname,$container,
@@ -5887,34 +5146,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;
@@ -5933,7 +5183,7 @@ 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
@@ -5941,7 +5191,7 @@ sub generate_admin_menu {
                                          'cv'   => 'Check/Set Resource Versions',
                                          'ls'   => 'List Resource Identifiers',
                                          'imse' => 'Export contents to IMS Archive',
-                                         'dcd'  => "Copy $crstype Content to Authoring Space",
+                                         'dcd'  => "Dump $crstype Content to Authoring Space",
             );
     my ($candump,$dumpurl);
     if ($home + $other > 0) {
@@ -5972,14 +5222,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",
                 },
@@ -5991,9 +5241,7 @@ sub generate_admin_menu {
                     linktitle  => "List the unique identifier used for each resource instance in your $lc_crstype"
                 },
                 ]
-        });
-    if ($canedit) {
-        push(@menu,
+        },
         {   categorytitle=>'Export',
             items =>[
                 {   linktext   => $lt{'imse'},
@@ -6006,13 +5254,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".
@@ -6021,16 +5268,15 @@ 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;">'.
@@ -6063,7 +5309,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";
 
 	}
     }
@@ -6094,7 +5340,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
@@ -6120,8 +5366,8 @@ END
 }
 
 sub editing_js {
-    my ($udom,$uname,$supplementalflag,$coursedom,$coursenum,$canedit,$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',
@@ -6131,25 +5377,23 @@ 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_rmr3a => 'Remove those [_2]',
+                                          p_rmr3b => 'items?[_2]',
                                           p_ctr1a => 'WARNING: Cutting a resource makes associated grades and scores inaccessible!',
                                           p_ctr1b => 'Grades remain inaccessible if resource is pasted into another folder.',
-                                          p_ctr2a => 'Cut',
-                                          p_ctr2b => '?',
-                                          p_ctr3a => 'Cut those',
-                                          p_ctr3b => 'items?',
+                                          p_ctr2a => 'Cut[_98]',
+                                          p_ctr2b => '?[_98]',
+                                          p_ctr3a => 'Cut those[_2]',
+                                          p_ctr3b => 'items?[_2]',
                                           rpck    => 'Enter number to pick (e.g., 3)',
                                           imsfile => 'You must choose an IMS package for import',
                                           imscms  => 'You must select which Course Management System was the source of the IMS package',
@@ -6160,20 +5404,19 @@ sub editing_js {
                                           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 Content').':::::');
     my $toplevelsupp = &supplemental_base();
 
+    my $backtourl;
     if ($env{'docs.exit.'.$env{'request.course.id'}} =~ /^direct_(.+)$/) {
         my $caller = $1;
         if ($caller =~ /^supplemental/) {
@@ -6182,22 +5425,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),'<>&"').'?symb='.
+                $backtourl = &HTML::Entities::encode(&Apache::lonnet::clutter($res),'<>&"').'?symb='.
                              &HTML::Entities::encode($caller,'<>&"');
-                if ($anchor ne '') {
-                    $backtourl .= '#'.&HTML::Entities::encode($anchor,'<>&"');
-                }
-                $backtourl = &Apache::loncommon::escape_single($backtourl); 
             } else {
                 $backtourl = '/adm/navmaps';
             }
@@ -6218,11 +5447,9 @@ sub editing_js {
         $fieldsets = "'suppext','suppdoc'";
     }
 
-    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=escape(foldername)+"="+folderseq;
         targetform.submit();
@@ -6230,7 +5457,7 @@ function makenewfolder(targetform,folder
 }
 
 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=escape(pagename)+"="+folderseq;
         targetform.submit();
@@ -6238,7 +5465,7 @@ function makenewpage(targetform,folderse
 }
 
 function makeexamupload() {
-   var title=prompt('$js_lt{"p_mxu"}');
+   var title=prompt('$lt{"p_mxu"}');
    if (title) {
     this.document.forms.newexamupload.importdetail.value=
 	escape(title)+'=/res/lib/templates/examupload.problem';
@@ -6247,7 +5474,7 @@ function makeexamupload() {
 }
 
 function makesmppage() {
-   var title=prompt('$js_lt{"p_msp"}');
+   var title=prompt('$lt{"p_msp"}');
    if (title) {
     this.document.forms.newsmppg.importdetail.value=
 	escape(title)+'=/adm/$udom/$uname/new/smppg';
@@ -6256,7 +5483,7 @@ function makesmppage() {
 }
 
 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;
@@ -6264,14 +5491,14 @@ function makewebpage(type) {
        formname = this.document.forms.newwebpage;
    }
    if (title) {
-       var webpage = formname.importdetail.value;
+       var webpage = formname.importdetail.value; 
        formname.importdetail.value = escape(title)+'='+webpage;
        formname.submit();
    }
 }
 
 function makesmpproblem() {
-   var title=prompt('$js_lt{"p_msb"}');
+   var title=prompt('$lt{"p_msb"}');
    if (title) {
     this.document.forms.newsmpproblem.importdetail.value=
 	escape(title)+'=/res/lib/templates/simpleproblem.problem';
@@ -6280,7 +5507,7 @@ function makesmpproblem() {
 }
 
 function makedropbox() {
-   var title=prompt('$js_lt{"p_mdb"}');
+   var title=prompt('$lt{"p_mdb"}');
    if (title) {
     this.document.forms.newdropbox.importdetail.value=
         escape(title)+'=/res/lib/templates/DropBox.problem';
@@ -6289,7 +5516,7 @@ function makedropbox() {
 }
 
 function makebulboard() {
-   var title=prompt('$js_lt{"p_mbb"}');
+   var title=prompt('$lt{"p_mbb"}');
    if (title) {
     this.document.forms.newbul.importdetail.value=
 	escape(title)+'=/adm/$udom/$uname/new/bulletinboard';
@@ -6298,109 +5525,24 @@ function makebulboard() {
 }
 
 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'}");
+		   '$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 groupimport() {
-    alert("$js_lt{'edri'}");
 }
-
-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++) {
@@ -6434,17 +5576,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;
@@ -6459,7 +5612,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;
@@ -6609,12 +5762,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;
@@ -6652,28 +5800,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;
                 }
@@ -6738,12 +5872,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');
@@ -6774,24 +5906,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;
@@ -6852,7 +5970,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 = '';
         }
@@ -6878,10 +5996,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');
@@ -6923,7 +6041,6 @@ function checkSubmits() {
     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)) {
@@ -6938,11 +6055,6 @@ function checkSubmits() {
                                 remwarnings ++;
                             }
                         }
-                        if (document.getElementById('confirm_removal_'+remidxs[i])) {
-                            if (document.getElementById('confirm_removal_'+remidxs[i]).value == 1) {
-                                removalinfo ++;
-                            }
-                        }
                     }
                 }
             }
@@ -7041,19 +6153,14 @@ function checkSubmits() {
     }
     if (doactions == 1) {
         if (numchanges > 0) {
-            if ((cutwarnings > 0) || (remwarnings > 0) || (removalinfo > 0)) {
+            if ((cutwarnings > 0) || (remwarnings > 0)) {
                 if (remwarnings > 0) {
-                    if (!confirm('$js_lt{"p_rmr1"}\\n\\n$js_lt{"p_rmr3a"} '+remwarnings+' $js_lt{"p_rmr3b"}')) {
-                        return false;
-                    }
-                }
-                if (removalinfo > 0) {
-                    if (!confirm('$js_lt{"p_rmr4"}\\n$js_lt{"p_rmr5"}\\n\\n$js_lt{"p_rmr3a"} '+removalinfo+' $js_lt{"p_rmr3b"}')) {
+                    if (!confirm('$lt{"p_rmr1"}\\n\\n$lt{"p_rmr3a"} '+remwarnings+' $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"}')) {
+                    if (!confirm('$lt{"p_ctr1a"}\\n$lt{"p_ctr1b"}\\n\\n$lt{"p_ctr3a"} '+cutwarnings+' $lt{"p_ctr3b"}')) {
                         return false;
                     }
                 }
@@ -7069,12 +6176,12 @@ function checkSubmits() {
         }
     }
     if ((dosettings == 1) && (doactions == 1)) {
-        alert("$js_lt{'noor'}");
+        alert("$lt{'noor'}");
     } else {
         if (dosettings == 1) {
-            alert("$js_lt{'noch'}");
+            alert("$lt{'noch'}");
         } else {
-            alert("$js_lt{'noac'}");
+            alert("$lt{'noac'}");
         }
     }
     return false;
@@ -7160,7 +6267,7 @@ function setBoxes(value) {
     return;
 }
 
-ENDSCRIPT
+ENDNEWSCRIPT
 }
 
 sub history_tab_js {
@@ -7189,19 +6296,13 @@ ENDINJECT
 
 sub dump_switchserver_js {
     my @hosts = @_;
-    my %js_lt = &Apache::lonlocal::texthash(
-        dump => 'Copying content to Authoring Space requires switching server.',
-        swit => 'Switch server?',
-    );
-    my %html_js_lt = &Apache::lonlocal::texthash(
+    my %lt = &Apache::lonlocal::texthash(
+        dump => 'Dumping to Authoring Space requires switching server.',
         swit => 'Switch server?',
-        duco => 'Copying Content to Authoring Space',
+        duco => 'Dump content to Authoring Space',
         yone => 'You need to switch to a server housing an Authoring Space for which you are author or co-author.',
         chos => 'Choose server',
     );
-    &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">
@@ -7242,7 +6343,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);
         }
     }
@@ -7253,13 +6354,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');