--- loncom/interface/londocs.pm	2012/12/29 17:37:21	1.525
+++ loncom/interface/londocs.pm	2013/01/09 04:01:16	1.528
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.525 2012/12/29 17:37:21 raeburn Exp $
+# $Id: londocs.pm,v 1.528 2013/01/09 04:01:16 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -651,7 +651,7 @@ sub print_paste_buffer {
         $is_external = 1;
     }
 
-    my ($canpaste,$nopaste,$othercrs,$areachange,$is_uploaded_map);
+    my ($canpaste,$nopaste,$othercrs,$areachange);
     if ($folder =~ /^supplemental/) {
         $canpaste = &supp_pasteable($env{'docs.markedcopy_url'});
         unless ($canpaste) {
@@ -1543,7 +1543,7 @@ sub apply_fixups {
             if ($folder !~ /^supplemental/) {
                 $report = 1;
             }
-            my ($outtext,$errtext) =
+            (my $outtext,$errtext) =
                 &LONCAPA::map::storemap("/uploaded/$cdom/$cnum/$storefn",1,$report);
             if ($errtext) {
                 return &mt('Paste failed: an error occurred saving the folder or page.');
@@ -3457,9 +3457,6 @@ sub handler {
   } elsif ((!$showdoc) && (!$uploadphase)) {
 # -----------------------------------------------------------------------------
        my %lt=&Apache::lonlocal::texthash(
-                'uplm' => 'Upload a new main '.lc($crstype).' document',
-                'upls' => 'Upload a new supplemental '.lc($crstype).' document',
-                'impp' => 'Import a document',
 		'copm' => 'All documents out of a published map into this folder',
                 'upfi' => 'Upload File',
                 'upld' => 'Import Content',
@@ -3469,10 +3466,8 @@ sub handler {
                 'impm' => 'Import from Assembled Map',
                 'selm' => 'Select Map',
                 'load' => 'Load Map',
-                'reco' => 'Recover Deleted Documents',
                 'newf' => 'New Folder',
                 'newp' => 'New Composite Page',
-                'extr' => 'External Resource',
                 'syll' => 'Syllabus',
                 'navc' => 'Table of Contents',
                 'sipa' => 'Simple Course Page',
@@ -3483,7 +3478,7 @@ sub handler {
                 'mypi' => 'My Personal Information Page',
                 'grpo' => 'Group Portfolio',
                 'rost' => 'Course Roster',
-				'abou' => 'Personal Information Page for a User',
+                'abou' => 'Personal Information Page for a User',
                 'imsf' => 'IMS Import',
                 'imsl' => 'Import IMS package',
                 'cms'  => 'Origin of IMS package',
@@ -3491,9 +3486,6 @@ sub handler {
                 'file' =>  'File',
                 'title' => 'Title',
                 'comment' => 'Comment',
-                'url'  => 'URL',
-                'prev' => 'Preview',
-                'lnk'  => 'Add Link', 
                 'parse' => 'Upload embedded images/multimedia files if HTML file',
 					  );
 # -----------------------------------------------------------------------------
@@ -4234,7 +4226,7 @@ sub generate_edit_table {
     my $form;
     my $activetab;
     my $active;
-    if($env{'form.active'} ne ''){
+    if (($env{'form.active'} ne '') && ($env{'form.active'} ne 'aa')) {
         $activetab = $env{'form.active'};
     }
     my $backicon = $iconpath.'clickhere.gif';