--- loncom/interface/londocs.pm	2003/07/07 07:32:16	1.63
+++ 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.63 2003/07/07 07:32:16 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,12 +378,22 @@ sub handler {
 # --------------------------------------------- Initialize help topics for this
   foreach ('Adding_Course_Doc','Main_Course_Documents',
            'Adding_External_Resource','Navigate_Content',
-           'Adding_Folders','Docs_Overview',
-           'Creating_From_Template','Supplemental',
+           'Adding_Folders','Docs_Overview', 'Load_Map',
+           'Supplemental', 'Score_Upload_Form',
            'Importing_LON-CAPA_Resource','Uploading_From_Harddrive') {
       $help{$_}=&Apache::loncommon::help_open_topic('Docs_'.$_);
   }
-
+    # Composite help files
+    $help{'Syllabus'} = &Apache::loncommon::help_open_topic(
+		    'Docs_About_Syllabus,Docs_Editing_Templated_Pages');
+    $help{'Simple Page'} = &Apache::loncommon::help_open_topic(
+		    'Docs_About_Simple_Page,Docs_Editing_Templated_Pages');
+    $help{'Bulletin Board'} = &Apache::loncommon::help_open_topic(
+		    'Docs_About_Bulletin_Board,Docs_Editing_Templated_Pages');
+    $help{'My Personal Info'} = &Apache::loncommon::help_open_topic(
+		  'Docs_About_My_Personal_Info,Docs_Editing_Templated_Pages');
+    $help{'Caching'} = &Apache::loncommon::help_open_topic('Caching');
+ 
   if ($ENV{'form.verify'}) {
  
    my $loaderror=&Apache::lonnet::overloaderror($r);
@@ -398,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'));
@@ -485,6 +499,7 @@ ENDHEADERS
           }
        }
        $r->print('</table>');
+       $r->print('<h1>Done.</h1>');
    } else {
        $r->print('<p>No content modifications yet.</p>');
    }
@@ -498,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']);
@@ -520,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
@@ -539,13 +552,7 @@ ENDHEADERS
     $iconpath = $r->dir_config('lonIconsURL') . "/";
 
     my $now=time;
-#
-# FIXME: hack to disable new problem
-#
-    my $noeggforyou='';
-    unless ($ENV{'user.debug'}) {
-	$noeggforyou='alert("Sorry, not implemented yet."); return 0;';
-    }
+
 # print screen
     $r->print(<<ENDDOCUMENT);
 <html>
@@ -590,7 +597,6 @@ function makesmppage() {
 }
 
 function makesmpproblem() {
-   $noeggforyou
    var title=prompt('Listed Title for the Problem');
    if (title) { 
     this.document.forms.newsmpproblem.importdetail.value=
@@ -640,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',
@@ -682,7 +688,8 @@ ENDCOURSEVERIFY
 '<script>function reinit(tf) { tf.submit();'.$postexec.' }</script>'. 
 '<form method="post" action="/adm/roles" target="loncapaclient">'.
 '<input type="hidden" name="orgurl" value="/adm/coursedocs" /><input type="hidden" name="selectrole" value="1" /><h3><font color="red">Changes will become active for your current session after <input type="hidden" name="'.
-$ENV{'request.role'}.'" value="1" /><input type="button" value="re-initializing course" onClick="reinit(this.form)"/>, or the next time you log in.</font></h3></form>');
+$ENV{'request.role'}.'" value="1" /><input type="button" value="re-initializing course" onClick="reinit(this.form)"/>, or the next time you log in.'.
+$help{'Caching'}.'</font></h3></form>');
        }
        my $folderseq='/uploaded/'.$coursedom.'/'.$coursenum.'/default_'.time.
                      '.sequence';
@@ -722,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">
@@ -755,7 +763,7 @@ value="External Resource" /> $help{'Addi
 value="Syllabus=/public/$coursedom/$coursenum/syllabus">
 <nobr>
 <input name="newsyl" type="submit" value="Syllabus" /> 
- $help{'Creating_From_Template'}
+ $help{'Syllabus'}
 </nobr>
 </form>
 <form action="/adm/coursedocs" method="post" name="newnav">
@@ -774,7 +782,7 @@ $help{'Navigate_Content'}
 <input type=hidden name="importdetail" value="">
 <nobr>
 <input name="newsmppg" type="button" value="Simple Page"
-onClick="javascript:makesmppage();" /> $help{'Creating_From_Template'}
+onClick="javascript:makesmppage();" /> $help{'Simple Page'}
 </nobr>
 </form>
 <form action="/adm/coursedocs" method="post" name="newsmpproblem">
@@ -783,7 +791,7 @@ onClick="javascript:makesmppage();" /> $
 <input type=hidden name="importdetail" value="">
 <nobr>
 <input name="newsmpproblem" type="button" value="Simple Problem"
-onClick="javascript:makesmpproblem();" />$help{'Creating_From_Template'}
+onClick="javascript:makesmpproblem();" />$help{'Simple Problem'}
 </nobr>
 </form>
 <form action="/adm/coursedocs" method="post" name="newexamupload">
@@ -793,6 +801,7 @@ onClick="javascript:makesmpproblem();" /
 <nobr>
 <input name="newexamupload" type="button" value="Score Upload Form"
 onClick="javascript:makeexamupload();" />
+$help{'Score_Upload_Form'}
 </nobr>
 </form>
 <form action="/adm/coursedocs" method="post" name="newbul">
@@ -802,7 +811,7 @@ onClick="javascript:makeexamupload();" /
 <nobr>
 <input name="newbulletin" type="button" value="Bulletin Board"
 onClick="javascript:makebulboard();" />
-$help{'Creating_From_Template'}
+$help{'Bulletin Board'}
 </nobr>
 </form>
 <form action="/adm/coursedocs" method="post" name="newaboutme">
@@ -812,7 +821,7 @@ $help{'Creating_From_Template'}
 value="$plainname=/adm/$udom/$uname/aboutme">
 <nobr>
 <input name="newaboutme" type="submit" value="My Personal Info" />
-$help{'Creating_From_Template'}
+$help{'My Personal Info'}
 </nobr>
 </form>
 </td></tr>
@@ -899,7 +908,7 @@ value="External Resource" /> $help{'Addi
 value="Syllabus=/public/$coursedom/$coursenum/syllabus">
 <nobr>
 <input name="newsyl" type="submit" value="Syllabus" />
-$help{'Creating_From_Template'}
+$help{'Syllabus'}
 </nobr>
 </form>
 <form action="/adm/coursedocs" method="post" name="subnewaboutme">
@@ -909,7 +918,7 @@ $help{'Creating_From_Template'}
 value="$plainname=/adm/$udom/$uname/aboutme">
 <nobr>
 <input name="newaboutme" type="submit" value="My Personal Info" />
-$help{'Creating_From_Template'}
+$help{'My Personal Info'}
 </nobr>
 </form>
 </td></tr>
