--- loncom/interface/londocs.pm 2003/07/15 19:52:47 1.65 +++ loncom/interface/londocs.pm 2003/08/07 19:12:13 1.69.2.1.2.1 @@ -1,7 +1,7 @@ # The LearningOnline Network # Documents # -# $Id: londocs.pm,v 1.65 2003/07/15 19:52:47 bowersj2 Exp $ +# $Id: londocs.pm,v 1.69.2.1.2.1 2003/08/07 19:12:13 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -329,9 +329,12 @@ sub checkonthis { $r->print(' '); } $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,8 +378,8 @@ sub handler { # --------------------------------------------- Initialize help topics for this foreach ('Adding_Course_Doc','Main_Course_Documents', 'Adding_External_Resource','Navigate_Content', - 'Adding_Folders','Docs_Overview', - '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_'.$_); } @@ -388,9 +391,9 @@ sub handler { $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'); - - + '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); @@ -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>'); } @@ -685,7 +690,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'; @@ -725,10 +731,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"> @@ -780,15 +787,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'}"> @@ -796,6 +794,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">