--- loncom/interface/londocs.pm	2003/07/16 19:36:02	1.67
+++ loncom/interface/londocs.pm	2003/09/02 15:49:42	1.72
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.67 2003/07/16 19:36:02 www Exp $
+# $Id: londocs.pm,v 1.72 2003/09/02 15:49:42 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -265,7 +265,7 @@ END
        } 
     }
     $url=~s/^http\&colon\;\/\//\/adm\/wrapper\/ext\//;
-    if ($residx) {
+    if (($residx) && ($folder!~/supplemental/)) {
        $url.=(($url=~/\?/)?'&':'?').'symb='.
        &Apache::lonnet::escape(&Apache::lonnet::symbclean(
           &Apache::lonnet::declutter('uploaded/'.
@@ -329,9 +329,12 @@ sub checkonthis {
                      $r->print('&nbsp;');
                  }
                  $r->print('- Rendering: ');
+                 my $oldpath=$ENV{'request.filename'};
+                 $ENV{'request.filename'}=&Apache::lonnet::filelocation('',$url);
                  &Apache::lonxml::xmlparse($r,'web',
                    &Apache::lonnet::getfile(
                     &Apache::lonnet::filelocation('',$url)));
+		 $ENV{'request.filename'}=$oldpath;
                  if (($Apache::lonxml::errorcount) ||
                      ($Apache::lonxml::warningcount)) {
 		     if ($Apache::lonxml::errorcount) {
@@ -375,7 +378,7 @@ sub handler {
 # --------------------------------------------- Initialize help topics for this
   foreach ('Adding_Course_Doc','Main_Course_Documents',
            'Adding_External_Resource','Navigate_Content',
-           'Adding_Folders','Docs_Overview',
+           'Adding_Folders','Docs_Overview', 'Load_Map',
            'Supplemental', 'Score_Upload_Form',
            'Importing_LON-CAPA_Resource','Uploading_From_Harddrive') {
       $help{$_}=&Apache::loncommon::help_open_topic('Docs_'.$_);
@@ -408,6 +411,7 @@ sub handler {
        }
    }
    &untiehash();
+   $r->print('<h1>Done.</h1>');
   } elsif ($ENV{'form.versions'}) {
     $r->print('<html><head><title>Check Versions</title></head>'.
               &Apache::loncommon::bodytag('Check Course Document Versions'));
@@ -495,6 +499,7 @@ ENDHEADERS
           }
        }
        $r->print('</table>');
+       $r->print('<h1>Done.</h1>');
    } else {
        $r->print('<p>No content modifications yet.</p>');
    }
@@ -508,7 +513,6 @@ ENDHEADERS
     my $script='';
     my $allowed;
     my $events='';
-    my $buttons='';
     my $showdoc=0;
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
        ['folder','foldername']);
@@ -530,7 +534,6 @@ ENDHEADERS
        $script='</script>'.&Apache::lonmenu::registerurl(1,undef).'<script>';
        $events='onLoad="'.&Apache::lonmenu::loadevents.
            '" onUnload="'.&Apache::lonmenu::unloadevents.'"';
-       $buttons=&Apache::lonmenu::menubuttons(1,undef);
     }
 
 # get course data
@@ -643,8 +646,8 @@ ENDNEWSCRIPT
   }
 # -------------------------------------------------------------------- Body tag
   $r->print('</head>'.
-            &Apache::loncommon::bodytag('Course Documents','',$events).
-            $buttons);
+            &Apache::loncommon::bodytag('Course Documents','',$events,
+					'','',$showdoc));
   unless ($showdoc) {
     if ($allowed) {
        $r->print(&Apache::loncommon::help_open_topic('Docs_Adding_Course_Doc',
@@ -726,10 +729,11 @@ $help{'Importing_LON-CAPA_Resource'}
 </nobr>
 <p>
 <hr />
-<input type="text" size="20" name="importmap">
-<input type=button 
+<input type="text" size="20" name="importmap"><br />
+<nobr><input type=button 
 onClick="javascript:openbrowser('simpleeditdefault','importmap','sequence,page','')"
-value="Select Map"><input type="submit" name="loadmap" value="Load Map">
+value="Select Map"> <input type="submit" name="loadmap" value="Load Map">
+$help{'Load_Map'}</nobr>
 </p>
 </form>
 </td><td bgcolor="#DDDDDD">
