--- loncom/interface/londocs.pm	2013/11/20 04:48:18	1.484.2.43
+++ loncom/interface/londocs.pm	2013/05/19 15:33:54	1.546
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.484.2.43 2013/11/20 04:48:18 raeburn Exp $
+# $Id: londocs.pm,v 1.546 2013/05/19 15:33:54 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -41,8 +41,6 @@ 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;
@@ -58,7 +56,6 @@ my $hashtied;
 my %alreadyseen=();
 
 my $hadchanges;
-my $suppchanges;
 
 
 my %help=();
@@ -82,11 +79,7 @@ sub storemap {
 			      $map,1,$report);
     if ($errtext) { return ($errtext,2); }
 
-    if ($map =~ /^default/) {
-        $hadchanges=1;
-    } else {
-        $suppchanges=1;
-    }
+    $hadchanges=1;
     return ($errtext,0);
 }
 
@@ -143,28 +136,8 @@ sub clean {
 sub dumpcourse {
     my ($r) = @_;
     my $crstype = &Apache::loncommon::course_type();
-    my ($starthash,$js);
-    unless (($env{'form.authorspace'}) && ($env{'form.authorfolder'}=~/\w/)) {
-        $js = <<"ENDJS";
-<script type="text/javascript">
-// <![CDATA[
-
-function hide_searching() {
-    if (document.getElementById('searching')) {
-        document.getElementById('searching').style.display = 'none';
-    }
-    return;
-}
-
-// ]]>
-</script>
-ENDJS
-        $starthash = {
-                         add_entries => {'onload' => "hide_searching();"},
-                     };
-    }
-    $r->print(&Apache::loncommon::start_page('Copy '.$crstype.' Content to Authoring Space',$js,$starthash)."\n".
-              &Apache::lonhtmlcommon::breadcrumbs('Copy '.$crstype.' Content to Authoring Space')."\n");
+    $r->print(&Apache::loncommon::start_page('Dump '.$crstype.' Content to Authoring Space')."\n".
+              &Apache::lonhtmlcommon::breadcrumbs('Dump '.$crstype.' Content to Authoring Space')."\n");
     $r->print(&startContentScreen('tools'));
     my ($home,$other,%outhash)=&authorhosts();
     unless ($home) {
@@ -183,407 +156,118 @@ ENDJS
 	$r->print('<h3>'.&mt('Copying Files').'</h3>');
 	my $title=$env{'form.authorfolder'};
 	$title=&clean($title);
-        my ($navmap,$errormsg) =
-            &Apache::loncourserespicker::get_navmap_object($crstype,'dumpdocs');
-        my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
-        my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
-        my (%maps,%resources,%titles);
-        if (!ref($navmap)) {
-            $r->print($errormsg.
-                      &endContentScreen());
-            return '';
-        } else {
-            &Apache::loncourserespicker::enumerate_course_contents($navmap,\%maps,\%resources,\%titles,
-                                                                   'dumpdocs',$cdom,$cnum);
-        }
-        my @todump = &Apache::loncommon::get_env_multiple('form.archive');
-        my (%tocopy,%replacehash,%lookup,%deps,%display,%result,%depresult,%simpleproblems,%simplepages,
-            %newcontent,%has_simpleprobs);
-        foreach my $item (sort {$a <=> $b} (@todump)) {
-            my $name = $env{'form.namefor_'.$item};
-            if ($resources{$item}) {
-                my ($map,$id,$res) = &Apache::lonnet::decode_symb($resources{$item});
-                if ($res =~ m{^uploaded/$cdom/$cnum/\E((?:docs|supplemental)/.+)$}) {
-                    $tocopy{$1} = $name;
-                    $display{$item} = $1;
-                    $lookup{$1} = $item;
-                } elsif ($res eq 'lib/templates/simpleproblem.problem') {
-                    $simpleproblems{$item} = {
-                                                symb => $resources{$item},
-                                                name => $name,
-                                             };
-                    $display{$item} = 'simpleproblem_'.$name;
-                    if ($map =~ m{^\Quploaded/$cdom/$cnum/\E(.+)$}) {
-                        $has_simpleprobs{$1}{$id} = $item;
-                    }
-                } elsif ($res =~ m{^adm/$match_domain/$match_username/(\d+)/smppg}) {
-                    my $marker = $1;
-                    my $db_name = &Apache::lonsimplepage::get_db_name($res,$marker,$cdom,$cnum);
-                    $simplepages{$item} = {
-                                            res    => $res,
-                                            title  => $titles{$item},
-                                            db     => $db_name,
-                                            marker => $marker,
-                                            symb   => $resources{$item},
-                                            name   => $name,
-                                          };
-                    $display{$item} = '/'.$res;
-                }
-            } elsif ($maps{$item}) {
-                if ($maps{$item} =~ m{^\Quploaded/$cdom/$cnum/\E((?:default|supplemental)_\d+\.(?:sequence|page))$}) {
-                    $tocopy{$1} = $name;
-                    $display{$item} = $1;
-                    $lookup{$1} = $item;
-                }
-            } else {
-                next;
-            }
-        }
+	my %replacehash=();
+	foreach my $key (keys(%env)) {
+	    if ($key=~/^form\.namefor\_(.+)/) {
+		$replacehash{$1}=$env{$key};
+	    }
+	}
 	my $crs='/uploaded/'.$env{'request.course.id'}.'/';
 	$crs=~s/\_/\//g;
-        my $mm = new File::MMagic;
-        my $prefix = "/uploaded/$cdom/$cnum/";
-        %replacehash = %tocopy;
-        foreach my $item (sort(keys(%simpleproblems))) {
-            my $content = &Apache::imsexport::simpleproblem($simpleproblems{$item}{'symb'});
-            $newcontent{$display{$item}} = $content;
-        }
-        my $gateway = Apache::lonhtmlgateway->new('web');
-        foreach my $item (sort(keys(%simplepages))) {
-            if (ref($simplepages{$item}) eq 'HASH') {
-                my $pagetitle = $simplepages{$item}{'title'};
-                my %fields = &Apache::lonnet::dump($simplepages{$item}{'db'},$cdom,$cnum);
-                my %contents;
-                foreach my $field (keys(%fields)) {
-                    if ($field =~ /^(?:aaa|bbb|ccc)_(\w+)$/) {
-                        my $name = $1;
-                        my $msg = $fields{$field};
-                        if ($name eq 'webreferences') {
-                            if ($msg =~ m{^https?://}) {
-                                $contents{$name} = '<a href="'.$msg.'"><tt>'.$msg.'</tt></a>';
-                            }
-                        } else {
-                            $msg = &Encode::decode('utf8',$msg);
-                            $msg = $gateway->process_outgoing_html($msg,1);
-                            $contents{$name} = $msg;
-                        }
-                    } elsif ($field eq 'uploaded.photourl') {
-                        my $marker = $simplepages{$item}{marker};
-                        if ($fields{$field} =~ m{^\Q$prefix\E(simplepage/$marker/.+)$}) {
-                            my $filepath = $1;
-                            my ($relpath,$fname) = ($filepath =~ m{^(.+/)([^/]+)$});
-                            if ($fname ne '') {
-                                $fname=~s/\.(\w+)$//;
-                                my $ext=$1;
-                                $fname = &clean($fname);
-                                $fname.='.'.$ext;
-                                $contents{image} = '<img src="'.$relpath.$fname.'" alt="Image" />';
-                                $replacehash{$filepath} = $relpath.$fname;
-                                $deps{$item}{$filepath} = 1;
-                            }
-                        }
-                    }
-                }
-                $replacehash{'/'.$simplepages{$item}{'res'}} = $simplepages{$item}{'name'};
-                $lookup{'/'.$simplepages{$item}{'res'}} = $item;
-                my $content = '
-<html>
-<head>
-<title>'.$pagetitle.'</title>
-</head>
-<body bgcolor="#ffffff">';
-                if ($contents{title}) {
-                    $content .= "\n".'<h2>'.$contents{title}.'</h2>';
-                }
-                if ($contents{image}) {
-                    $content .= "\n".$contents{image};
-                }
-                if ($contents{content}) {
-                    $content .= '
-<div class="LC_Box">
-<h4 class="LC_hcell">Content</h4>'.
-$contents{content}.'
-</div>';
-                }
-                if ($contents{webreferences}) {
-                    $content .= '
-<div class="LC_Box">
-<h4 class="LC_hcell">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,
@@ -666,7 +350,7 @@ $initialtext
 </html>
 END
                 $env{'form.output'}=$newhtml;
-                my $result =
+                my $result = 
                     &Apache::lonnet::finishuserfileupload($coursenum,$coursedom,
                                                           'output',
                                                           "$filepath/$residx/$fname.html");
@@ -691,7 +375,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 =
@@ -718,13 +402,6 @@ END
     }
     my ($errtext,$fatal) =
         &storemap($coursenum, $coursedom, $folder.'.'.$container,1);
-    unless ($fatal) {
-        if ($folder =~ /^supplemental/) {
-            &Apache::lonnet::get_numsuppfiles($coursenum,$coursedom,1);
-            my ($errtext,$fatal) = &mapread($coursenum,$coursedom,
-                                            $folder.'.'.$container);
-        }
-    }
     return ($errtext,$fatal,$fixuperrors);
 }
 
@@ -811,7 +488,7 @@ sub docs_change_log {
     }
     my $folderpath=$env{'form.folderpath'};
     if ($folderpath eq '') {
-        $folderpath = 'default&'.&escape(&mt('Main Content').':::::');
+        $folderpath = 'default&'.&escape(&mt('Main '.$crstype.' Content').':::::');
     }
     $pathitem = '<input type="hidden" name="folderpath" value="'.
                 &HTML::Entities::encode($folderpath,'<>&"').'" />';
@@ -1023,7 +700,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};
              }
         }
     }
@@ -1420,7 +1097,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});
@@ -1621,7 +1299,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;
@@ -1629,7 +1307,7 @@ sub do_paste_from_buffer {
                     next;
 	        }
                 if ($lockerr{$prefix}) {
-                    $lockerrs{$suffix} = $lockerr{$prefix};
+                    $lockerrs{$suffix} = $lockerr{$prefix};  
                 }
             }
         }
@@ -1668,7 +1346,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')) {
@@ -1871,11 +1549,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];
@@ -1896,7 +1574,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;
@@ -1910,12 +1588,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'});
                             }
@@ -1932,18 +1610,16 @@ sub dbcopy {
                     }
                 }
                 if (($freedlock ne 'ok') && (ref($lockerrorsref) eq 'HASH')) {
-                    $lockerrorsref->{$prefix} =
+                    $lockerrorsref->{$prefix} = 
                         '<div class="LC_error">'.
                         &mt('There was a problem removing a lockfile.');
                     if ($prefix eq 'smppg') {
-                        $lockerrorsref->{$prefix} .=
-                            ' '.&mt('This will prevent creation of additional simple pages in this course.');
+                        $lockerrorsref->{$prefix} .= 
+                            &mt('This will prevent creation of additional simple pages in this course.');
                     } else {
-                        $lockerrorsref->{$prefix} .= ' '.&mt('This will prevent creation of additional discussion boards in this course.');
+                        $lockerrorsref->{$prefix} .= &mt('This will prevent creation of additional bulletin boards in this course.');
                     }
-                    $lockerrorsref->{$prefix} .= ' '.&mt('Please contact the [_1]helpdesk[_2] for assistance.',
-                                                     '<a href="/adm/helpdesk" target="_helpdesk">','</a>').
-                                                 '</div>';
+                    $lockerrorsref->{$prefix} .= &mt('Please contact the domain coordinator for your LON-CAPA domain.').'</div>';
                 }
             }
         } elsif ($url =~ m{/syllabus$}) {
@@ -2060,7 +1736,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)/(.+)$}) {
@@ -2506,7 +2182,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);
@@ -2533,7 +2209,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}) {
@@ -2992,11 +2668,11 @@ sub editor {
                     if (@allidx > 0) {
                         my $path;
                         if ($env{'form.folderpath'}) {
-                            $path =
+                            $path = 
                                 &HTML::Entities::encode($env{'form.folderpath'},'<>&"');
                         }
                         if (@allidx > 1) {
-                            $to_show .=
+                            $to_show .= 
                                 &Apache::loncommon::continue_data_table_row().
                                 '<td colspan="2">&nbsp;</td>'.
                                 '<td>'.
@@ -3028,7 +2704,7 @@ sub editor {
             }
             $to_show .= &Apache::loncommon::start_scrollbox('400px','380px','200px','contentscroll')
                        .'<div class="LC_info" id="contentlist">'
-                       .&mt('Currently empty')
+                       .&mt('Currently no documents.')
                        .'</div>'
                        .&Apache::loncommon::end_scrollbox();
         }
@@ -3041,7 +2717,7 @@ sub editor {
                       .'</div>';
         } else {
             $to_show = '<div class="LC_info" id="contentlist">'
-                      .&mt('Currently empty')
+                      .&mt('Currently no documents.')
                       .'</div>'
         }
     }
@@ -3126,30 +2802,8 @@ sub multiple_check_form {
 }
 
 sub process_file_upload {
-    my ($upload_output,$coursenum,$coursedom,$allfiles,$codebase,$uploadcmd,$crstype) = @_;
+    my ($upload_output,$coursenum,$coursedom,$allfiles,$codebase,$uploadcmd) = @_;
 # upload a file, if present
-    my $filesize = length($env{'form.uploaddoc'});
-    if (!$filesize) {
-        $$upload_output = '<div class="LC_error">'.
-                           &mt('Unable to upload [_1]. (size = [_2] bytes)',
-                          '<span class="LC_filename">'.$env{'form.uploaddoc.filename'}.'</span>',
-                          $filesize).'<br />'.
-                          &mt('Either the file you attempted to upload was empty, or your web browser was unable to read its contents.').'<br />'.
-                          '</div>';
-        return;
-    }
-    my $quotatype = 'unofficial';
-    if ($crstype eq 'Community') {
-        $quotatype = 'community';
-    } elsif ($env{'course.'.$coursedom.'_'.$coursenum.'.internal.instcode'}) {
-        $quotatype = 'official';
-    }
-    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');
-        return if ($$upload_output);
-    }
     my ($parseaction,$showupload,$nextphase,$mimetype);
     if ($env{'form.parserflag'}) {
         $parseaction = 'parse';
@@ -3469,9 +3123,11 @@ ENDREM
                 push(@{$filtersref->{'canremove'}},$orderidx);
             }
         }
-        $renamelink=(<<ENDREN);
+        unless ($isexternal) {
+            $renamelink=(<<ENDREN);
 <a href='javascript:changename("$esc_path","$index","$renametitle");' class="LC_docs_rename">$lt{'rn'}</a>
 ENDREN
+        }
 	$line.=(<<END);
 <td>
 <div class="LC_docs_entry_move">
@@ -3604,13 +3260,13 @@ $form_common."\n".
                     push(@{$filtersref->{'randomorder'}},$orderidx);
                 }
             }
-            $formname = 'edit_rorder_'.$orderidx;
+            my $formname = 'edit_rorder_'.$orderidx;
 	    $rand_order_text = 
 '<form action="/adm/coursedocs" method="post" name="'.$formname.'">'."\n".
 $form_param."\n".
 $form_common."\n".
 '<span class="LC_nobreak"><label><input type="checkbox" name="randomorder_'.$orderidx.'" id="randomorder_'.$orderidx.'" onclick="checkForSubmit(this.form,'."'randomorder','settings'".');" '.$ro_set.' /> '.&mt('Random Order').' </label></span>'.
-$form_end;
+$form_end; 
         }
     } elsif ($supplementalflag && !$allowed) {
         $url .= ($url =~ /\?/) ? '&amp;':'?';
@@ -3807,14 +3463,14 @@ 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') {
@@ -3826,12 +3482,11 @@ sub new_timebased_suffix {
                 &mt('This will prevent creation of additional simple pages in this course.');
         } else {
             $locknotfreed .=
-                &mt('This will prevent creation of additional discussion boards in this course.');
+                &mt('This will prevent creation of additional bulletin boards in this course.');
         }
         unless ($type eq 'paste') {
             $locknotfreed .=
-                ' '.&mt('Please contact the [_1]helpdesk[_2] for assistance.',
-                        '<a href="/adm/helpdesk" target="_helpdesk">','</a>');
+                ' '.&mt('Please contact the domain coordinator for your LON-CAPA domain.');
         }
         $locknotfreed .= '</div>';
     }
@@ -3996,8 +3651,8 @@ sub list_symbs {
 sub verifycontent {
     my ($r) = @_;
     my $crstype = &Apache::loncommon::course_type();
-    $r->print(&Apache::loncommon::start_page('Verify '.$crstype.' Content'));
-    $r->print(&Apache::lonhtmlcommon::breadcrumbs('Verify '.$crstype.' Content'));
+    $r->print(&Apache::loncommon::start_page('Verify '.$crstype.' Documents'));
+    $r->print(&Apache::lonhtmlcommon::breadcrumbs('Verify '.$crstype.' Documents'));
     $r->print(&startContentScreen('tools'));
     $r->print('<h4 class="LC_info">'.&mt($crstype.' content verification').'</h4>'); 
    $hashtied=0;
@@ -4099,7 +3754,7 @@ sub checkversions {
     &changewarning($r,'');
     if ($env{'form.timerange'} eq 'all') {
 # show all documents
-	$header=&mt('All content in '.$crstype);
+	$header=&mt('All Documents in '.$crstype);
 	$allsel=' selected="selected"';
 	foreach my $key (keys(%hash)) {
 	    if ($key=~/^ids\_(\/res\/.+)$/) {
@@ -4374,9 +4029,10 @@ sub startContentScreen {
     if (($mode eq 'navmaps') || ($mode eq 'supplemental')) {
         $output .= '<li'.(($mode eq 'navmaps')?' class="active"':'').'><a href="/adm/navmaps"><b>&nbsp;&nbsp;&nbsp;&nbsp;'.&mt('Content Overview').'&nbsp;&nbsp;&nbsp;&nbsp;</b></a></li>'."\n";
         $output .= '<li'.(($mode eq 'coursesearch')?' class="active"':'').'><a href="/adm/searchcourse"><b>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'.&mt('Content Search').'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b></a></li>'."\n";
+        $output .= '<li'.(($mode eq 'courseindex')?' class="active"':'').'><a href="/adm/indexcourse"><b>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'.&mt('Content Index').'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b></a></li>'."\n";
         $output .= '<li '.(($mode eq 'suppdocs')?' class="active"':'').'><a href="/adm/supplemental"><b>'.&mt('Supplemental Content').'</b></a></li>';
     } else {
-        $output .= '<li '.(($mode eq 'docs')?' class="active"':'').' id="tabbededitor"><a href="/adm/coursedocs?forcestandard=1"><b>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'.&mt('Main Content Editor').'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b></a></li>'."\n";
+        $output .= '<li '.(($mode eq 'docs')?' class="active"':'').' id="tabbededitor"><a href="/adm/coursedocs?forcestandard=1"><b>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'.&mt('Content Editor').'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b></a></li>'."\n";
         $output .= '<li '.(($mode eq 'suppdocs')?' class="active"':'').'><a href="/adm/coursedocs?forcesupplement=1"><b>'.&mt('Supplemental Content Editor').'</b></a></li>'."\n";
         $output .= '<li '.(($mode eq 'tools')?' class="active"':'').'><a href="/adm/coursedocs?tools=1"><b>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'.&mt('Content Utilities').'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b></a></li>'."\n";
                    '><a href="/adm/coursedocs?tools=1"><b>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'.&mt('Content Utilities').'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b></a></li>';
@@ -4397,7 +4053,7 @@ sub endContentScreen {
 }
 
 sub supplemental_base {
-    return 'supplemental&'.&escape(&mt('Supplemental Content'));
+    return 'supplemental&'.&escape(&mt('Supplemental '.&Apache::loncommon::course_type().' Content'));
 }
 
 sub handler {
@@ -4422,8 +4078,7 @@ sub handler {
 	               'Supplemental','Score_Upload_Form','Adding_Pages',
 	               'Importing_LON-CAPA_Resource','Importing_IMS_Course',
                        'Uploading_From_Harddrive',
-	               'Check_Resource_Versions','Verify_Content',
-                       'Course_Roster','Web_Page','Dropbox') {
+	               'Check_Resource_Versions','Verify_Content') {
 	$help{$topic}=&Apache::loncommon::help_open_topic('Docs_'.$topic);
     }
     # Composite help files
@@ -4439,6 +4094,8 @@ sub handler {
 		  'Docs_About_My_Personal_Info,Docs_Editing_Templated_Pages');
     $help{'Group Portfolio'} = &Apache::loncommon::help_open_topic('Docs_About_Group_Files');
     $help{'Caching'} = &Apache::loncommon::help_open_topic('Caching');
+    $help{'Course Roster'} = &Apache::loncommon::help_open_topic('Docs_Course_Roster');
+    $help{'Web Page'} =  &Apache::loncommon::help_open_topic('Docs_Web_Page');
  
     my $allowed;
 # URI is /adm/supplemental when viewing supplemental docs in non-edit mode.
@@ -4469,7 +4126,7 @@ sub handler {
       &init_breadcrumbs('versions','Check/Set Resource Versions');
       &checkversions($r);
   } elsif ($allowed && $env{'form.dumpcourse'}) {
-      &init_breadcrumbs('dumpcourse','Copy '.&Apache::loncommon::course_type().' Content to Authoring Space');
+      &init_breadcrumbs('dumpcourse','Dump '.&Apache::loncommon::course_type().' Content to Authoring Space');
       &dumpcourse($r);
   } elsif ($allowed && $env{'form.exportcourse'}) {
       &init_breadcrumbs('exportcourse','IMS Export');
@@ -4495,9 +4152,9 @@ sub handler {
 # supplementalflag=0: show standard documents
 # toolsflag=1: show utilities
 
-    my $unesc_folderpath = &unescape($env{'form.folderpath'});
-    my $supplementalflag=($unesc_folderpath=~/^supplemental/);
-    if (($unesc_folderpath=~/^default/) || ($unesc_folderpath eq "")) {
+    $env{'form.folderpath'} = &unescape($env{'form.folderpath'});
+    my $supplementalflag=($env{'form.folderpath'}=~/^supplemental/);
+    if (($env{'form.folderpath'}=~/^default/) || ($env{'form.folderpath'} eq "")) {
        $supplementalflag=0;
     }
     if ($env{'form.forcesupplement'}) { $supplementalflag=1; }
@@ -4529,7 +4186,7 @@ sub handler {
        }
    } elsif ($env{'form.command'} eq 'editdocs') {
        $env{'form.folderpath'} = 'default&'.
-                                 &escape(&mt('Main Content').':::::');
+                                 &escape(&mt('Main '.$crstype.' Content').':::::');
        &Apache::lonnet::appenv({'docs.exit.'.$env{'request.course.id'} => $env{'form.command'}});
    } elsif ($env{'form.command'} eq 'editsupp') {
        $env{'form.folderpath'} = 'supplemental&'.
@@ -4574,7 +4231,7 @@ sub handler {
        if ($supplementalflag) {
           $env{'form.folderpath'}=&supplemental_base();
        } else {
-          $env{'form.folderpath'}='default&'.&escape(&mt('Main Content').
+          $env{'form.folderpath'}='default'.&escape(&mt('Main '.$crstype.' Content').
                                   ':::::');
        }
     }
@@ -4600,7 +4257,7 @@ sub handler {
             if ($env{'form.folder'} eq '' ||
                 $env{'form.folder'} eq 'supplemental') {
                 $folderpath='default&'.
-                            &escape(&mt('Main Content').':::::');
+                            &escape(&mt('Main '.$crstype.' Content').':::::');
             }
         }
         $containertag = '<input type="hidden" name="folderpath" value="" />';
@@ -4637,11 +4294,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$/) {
@@ -4653,7 +4308,7 @@ sub handler {
 	    $script .= &editing_js($udom,$uname,$supplementalflag).
                        &history_tab_js().
                        &inject_data_js().
-                       &Apache::lonhtmlcommon::resize_scrollbox_js('docs',$tabidstr,$tid).
+                       &Apache::lonhtmlcommon::resize_scrollbox_js('docs',$tabidstr).
                        &Apache::lonextresedit::extedit_javascript();
             $addentries = {
                             onload   => "javascript:resize_scrollbox('contentscroll','1','1');",
@@ -4705,7 +4360,7 @@ sub handler {
           # Process file upload - phase one - upload and parse primary file.
 	  undef($hadchanges);
           $uploadphase = &process_file_upload(\$upload_output,$coursenum,$coursedom,
-                                              \%allfiles,\%codebase,$context,$crstype);
+                                              \%allfiles,\%codebase,$context);
 	  if ($hadchanges) {
 	      &mark_hash_old();
 	  }
@@ -4757,7 +4412,7 @@ sub handler {
        my %lt=&Apache::lonlocal::texthash(
 		'copm' => 'All documents out of a published map into this folder',
                 'upfi' => 'Upload File',
-                'upld' => 'Upload Content',
+                'upld' => 'Import Content',
                 'srch' => 'Search',
                 'impo' => 'Import',
 		'lnks' => 'Import from Stored Links',
@@ -4770,7 +4425,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',
@@ -4778,8 +4433,8 @@ sub handler {
                 'grpo' => 'Group Portfolio',
                 'rost' => 'Course Roster',
                 'abou' => 'Personal Information Page for a User',
-                'imsf' => 'IMS Upload',
-                'imsl' => 'Upload IMS package',
+                'imsf' => 'IMS Import',
+                'imsl' => 'Import IMS package',
                 'cms'  => 'Origin of IMS package',
                 'se'   => 'Select',
                 'file' =>  'File',
@@ -4927,7 +4582,7 @@ HIDDENFORM
        if ($folder eq '' || $supplementalflag) {
            $folder='default';
 	   $savefolderpath = $env{'form.folderpath'};
-	   $env{'form.folderpath'}='default&'.&escape(&mt('Main Content'));
+	   $env{'form.folderpath'}='default&'.&escape(&mt('Content'));
            $pathitem = '<input type="hidden" name="folderpath" value="'.
 	       &HTML::Entities::encode($env{'form.folderpath'},'<>&"').'" />';
        }
@@ -4948,7 +4603,7 @@ HIDDENFORM
 
 	my $newnavform=(<<NNFORM);
 	<form action="/adm/coursedocs" method="post" name="newnav">
-	<input type="hidden" name="active" value="ee" />
+	<input type="hidden" name="active" value="cc" />
 	$pathitem
 	<input type="hidden" name="importdetail" 
 	value="$lt{'navc'}=/adm/navmaps" />
@@ -4958,7 +4613,7 @@ HIDDENFORM
 NNFORM
 	my $newsmppageform=(<<NSPFORM);
 	<form action="/adm/coursedocs" method="post" name="newsmppg">
-	<input type="hidden" name="active" value="ee" />
+	<input type="hidden" name="active" value="cc" />
 	$pathitem
 	<input type="hidden" name="importdetail" value="" />
 	<a class="LC_menubuttons_link" href="javascript:makesmppage();"> $lt{'sipa'}</a>
@@ -4983,7 +4638,6 @@ NSPROBFORM
 	$pathitem
 	<input type="hidden" name="importdetail" value="" />
 	<a class="LC_menubuttons_link" href="javascript:makedropbox();">$lt{'drbx'}</a>
-        $help{'Dropbox'}
 	</form>
 NDBFORM
 
@@ -4999,7 +4653,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>
@@ -5009,7 +4663,7 @@ NBFORM
 
 	my $newaboutmeform=(<<NAMFORM);
 	<form action="/adm/coursedocs" method="post" name="newaboutme">
-	<input type="hidden" name="active" value="dd" />
+	<input type="hidden" name="active" value="cc" />
 	$pathitem
 	<input type="hidden" name="importdetail" 
 	value="$plainname=/adm/$udom/$uname/aboutme" />
@@ -5020,7 +4674,7 @@ NAMFORM
 
 	my $newaboutsomeoneform=(<<NASOFORM);
 	<form action="/adm/coursedocs" method="post" name="newaboutsomeone">
-	<input type="hidden" name="active" value="dd" />
+	<input type="hidden" name="active" value="cc" />
 	$pathitem
 	<input type="hidden" name="importdetail" value="" />
 	<a class="LC_menubuttons_link" href="javascript:makeabout();">$lt{'abou'}</a>
@@ -5029,12 +4683,12 @@ NASOFORM
 
 	my $newrosterform=(<<NROSTFORM);
 	<form action="/adm/coursedocs" method="post" name="newroster">
-	<input type="hidden" name="active" value="dd" />
+	<input type="hidden" name="active" value="cc" />
 	$pathitem
 	<input type="hidden" name="importdetail" 
 	value="$lt{'rost'}=/adm/viewclasslist" />
 	<a class="LC_menubuttons_link" href="javascript:document.newroster.submit()">$lt{'rost'}</a>
-	$help{'Course_Roster'}
+	$help{'Course Roster'}
 	</form>
 NROSTFORM
 
@@ -5050,11 +4704,11 @@ NROSTFORM
         }
         my $newwebpageform =(<<NWEBFORM);
         <form action="/adm/coursedocs" method="post" name="newwebpage">
-        <input type="hidden" name="active" value="ee" />
+        <input type="hidden" name="active" value="cc" />
         $pathitem
         <input type="hidden" name="importdetail" value="$newwebpage" />
         <a class="LC_menubuttons_link" href="javascript:makewebpage();">$lt{'webp'}</a>
-        $help{'Web_Page'}
+        $help{'Web Page'}
         </form>
 NWEBFORM
  
@@ -5074,7 +4728,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>
@@ -5085,14 +4739,14 @@ NPFORM
 	<form action="/adm/coursedocs" method="post" name="newfolder">
 	$pathitem
 	<input type="hidden" name="importdetail" value="" />
-	<input type="hidden" name="active" value="" />
+	<input type="hidden" name="active" value="aa" />
 	<a href="javascript:makenewfolder(document.newfolder,'$folderseq');">$lt{'newf'}</a>$help{'Adding_Folders'}
 	</form>
 NFFORM
 
 	my $newsylform=(<<NSYLFORM);
 	<form action="/adm/coursedocs" method="post" name="newsyl">
-	<input type="hidden" name="active" value="ee" />
+	<input type="hidden" name="active" value="cc" />
 	$pathitem
 	<input type="hidden" name="importdetail" 
 	value="$lt{'syll'}=/public/$coursedom/$coursenum/syllabus" />
@@ -5104,7 +4758,7 @@ NSYLFORM
 
 	my $newgroupfileform=(<<NGFFORM);
 	<form action="/adm/coursedocs" method="post" name="newgroupfiles">
-	<input type="hidden" name="active" value="dd" />
+	<input type="hidden" name="active" value="cc" />
 	$pathitem
 	<input type="hidden" name="importdetail"
 	value="$lt{'grpo'}=/adm/$coursedom/$coursenum/aboutme" />
@@ -5131,7 +4785,7 @@ NGFFORM
             );
         }
         push(@importdoc,
-            {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/pdfupload.png" alt="'.$lt{upl}.'" onclick="javascript:toggleUpload(\'doc\');" />'=>$fileuploadform}
+            {'<img class="LC_noBorder_LC_middle" src="/res/adm/pages/pdfupload.png" alt="'.$lt{upl}.'" onclick="javascript:toggleUpload(\'doc\');" />'=>$fileuploadform}
         );
         $fileuploadform =  &create_form_ul(&create_list_elements(@importdoc));
 
@@ -5153,14 +4807,14 @@ NGFFORM
         $communityform = &create_form_ul(&create_list_elements(@communityforma));
 
 my %orderhash = (
-                'aa' => ['Upload',$fileuploadform],
-                'bb' => ['Import',$importpubform],
-                'cc' => ['Grading',$gradingform],
+                'aa' => ['Import Content',$fileuploadform],
+                'bb' => ['Published Content',$importpubform],
+                'cc' => ['Grading Resources',$gradingform],
                 );
 unless ($container eq 'page') {
     $orderhash{'00'} = ['Newfolder',$newfolderform];
     $orderhash{'dd'} = ['Collaboration',$communityform];
-    $orderhash{'ee'} = ['Other',$specialdocumentsform];
+    $orderhash{'ee'} = ['Special Pages',$specialdocumentsform];
 }
 
  $hadchanges=0;
@@ -5221,7 +4875,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> 
@@ -5271,7 +4925,7 @@ SNAMFORM
         $pathitem
         <input type="hidden" name="importdetail" value="$supwebpage" />
         <a class="LC_menubuttons_link" href="javascript:makewebpage('supp');">$lt{'webp'}</a>
-        $help{'Web_Page'}
+        $help{'Web Page'}
         </form>
 SWEBFORM
 
@@ -5294,27 +4948,14 @@ my @supimportdoc = (
 $supupdocform =  &create_form_ul(&create_list_elements(@supimportdoc));
 my %suporderhash = (
 		'00' => ['Supnewfolder', $supnewfolderform],
-                'ee' => ['Upload',$supupdocform],
-                'ff' => ['Other',&create_form_ul(&create_list_elements(@specialdocs))]
+                'ee' => ['Import Content',$supupdocform],
+                'ff' => ['Special Pages',&create_form_ul(&create_list_elements(@specialdocs))]
                 );
         if ($supplementalflag) {
            my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$crstype,
                                $supplementalflag,\%suporderhash,$iconpath,$pathitem);
            if ($error) {
               $r->print('<p><span class="LC_error">'.$error.'</span></p>');
-           } else {
-               if ($suppchanges) {
-                   my %servers = &Apache::lonnet::internet_dom_servers($coursedom);
-                   my @ids=&Apache::lonnet::current_machine_ids();
-                   foreach my $server (keys(%servers)) {
-                       next if (grep(/^\Q$server\E$/,@ids));
-                       my $hashid=$coursenum.':'.$coursedom;
-                       my $cachekey = &escape('suppcount').':'.&escape($hashid);
-                       &Apache::lonnet::remote_devalidate_cache($server,[$cachekey]);
-                   }
-                   &Apache::lonnet::get_numsuppfiles($coursenum,$coursedom,1);
-                   undef($suppchanges);
-               }
            }
         }
     } elsif ($supplementalflag) {
@@ -5463,7 +5104,7 @@ sub remove_archive {
         my $currcmd = $env{'form.cmd'};
         my $position = $env{'form.position'};
         if ($position > 0) { 
-            $env{'form.cmd'} = 'remove_'.$position;
+            $env{'form.cmd'} = 'del_'.$position;
             my ($title,$url,@rrest) = 
                 split(/:/,$LONCAPA::map::resources[$LONCAPA::map::order[$position]]);
             if (&handle_edit_cmd($docuname,$docudom)) {
@@ -5498,13 +5139,13 @@ sub generate_admin_menu {
     my ($crstype) = @_;
     my $lc_crstype = lc($crstype);
     my ($home,$other,%outhash)=&authorhosts();
-    my %lt= ( # do not translate here
+    my %lt=&Apache::lonlocal::texthash (
                                          'vc'   => 'Verify Content',
                                          'cv'   => 'Check/Set Resource Versions',
                                          'ls'   => 'List Resource Identifiers',
                                          'imse' => 'Export contents to IMS Archive',
-                                         'dcd'  => "Copy $crstype Content to Authoring Space",
-            );
+                                         'dcd'  => "Dump $crstype Content to Authoring Space",
+                                       );
     my ($candump,$dumpurl);
     if ($home + $other > 0) {
         $candump = 'F';
@@ -5586,7 +5227,7 @@ sub generate_edit_table {
     my $form;
     my $activetab;
     my $active;
-    if (($env{'form.active'} ne '') && ($env{'form.active'} ne '00')) {
+    if (($env{'form.active'} ne '') && ($env{'form.active'} ne 'aa')) {
         $activetab = $env{'form.active'};
     }
     my $backicon = $iconpath.'clickhere.gif';
@@ -5621,7 +5262,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";
 
 	}
     }
@@ -5689,7 +5330,7 @@ sub editing_js {
                                           p_msb => 'Title for the Problem',
                                           p_mdb => 'Title for the Drop Box',
                                           p_mbb => 'Title for the Discussion Board',
-                                          p_mwp => 'Title for Web Page',
+                                          p_mwp => 'Title for Web Page', 
                                           p_mab => "Enter user:domain for User's Personal Information Page",
                                           p_mab2 => 'Personal Information Page of ',
                                           p_mab_alrt1 => 'Not a valid user:domain',
@@ -5725,7 +5366,7 @@ sub editing_js {
         $main_container_page = 1;
     }
     my $toplevelmain = 
-        &escape(&mt('Main Content').':::::');
+        &escape(&mt('Main '.$crstype.' Content').':::::');
     my $toplevelsupp = &supplemental_base();
 
     my $backtourl;
@@ -5803,7 +5444,7 @@ function makewebpage(type) {
        formname = this.document.forms.newwebpage;
    }
    if (title) {
-       var webpage = formname.importdetail.value;
+       var webpage = formname.importdetail.value; 
        formname.importdetail.value = escape(title)+'='+webpage;
        formname.submit();
    }
@@ -6184,12 +5825,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');
@@ -6220,24 +5859,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;
@@ -6625,9 +6250,9 @@ ENDINJECT
 sub dump_switchserver_js {
     my @hosts = @_;
     my %lt = &Apache::lonlocal::texthash(
-        dump => 'Copying Content to Authoring Space requires switching server.',
+        dump => 'Dumping to Authoring Space requires switching server.',
         swit => 'Switch server?',
-        duco => 'Copying Content to Authoring Space',
+        duco => 'Dump content to Authoring Space',
         yone => 'You need to switch to a server housing an Authoring Space for which you are author or co-author.',
         chos => 'Choose server',
     );