--- loncom/interface/londocs.pm	2003/07/18 14:31:43	1.68
+++ loncom/interface/londocs.pm	2003/09/02 18:31:08	1.69.2.1.2.3
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.68 2003/07/18 14:31:43 bowersj2 Exp $
+# $Id: londocs.pm,v 1.69.2.1.2.3 2003/09/02 18:31:08 albertel 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) {
@@ -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',
@@ -782,15 +785,6 @@ $help{'Navigate_Content'}
 onClick="javascript:makesmppage();" /> $help{'Simple Page'}
 </nobr>
 </form>
-<form action="/adm/coursedocs" method="post" name="newsmpproblem">
-<input type="hidden" name="folder" value="$folder">
-<input type="hidden" name="foldername" value="$ENV{'form.foldername'}">
-<input type=hidden name="importdetail" value="">
-<nobr>
-<input name="newsmpproblem" type="button" value="Simple Problem"
-onClick="javascript:makesmpproblem();" />$help{'Simple Problem'}
-</nobr>
-</form>
 <form action="/adm/coursedocs" method="post" name="newexamupload">
 <input type="hidden" name="folder" value="$folder">
 <input type="hidden" name="foldername" value="$ENV{'form.foldername'}">
