--- loncom/interface/londocs.pm	2003/05/01 16:13:50	1.54
+++ loncom/interface/londocs.pm	2003/07/22 19:39:58	1.69
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.54 2003/05/01 16:13:50 www Exp $
+# $Id: londocs.pm,v 1.69 2003/07/22 19:39:58 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,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);
@@ -565,6 +578,15 @@ function makenewext(targetname) {
     window.open('/adm/rat/extpickframe.html');
 }
 
+function makeexamupload() {
+   var title=prompt('Listed Title for the Uploaded Score');
+   if (title) { 
+    this.document.forms.newexamupload.importdetail.value=
+	title+'=/res/lib/templates/examupload.problem';
+    this.document.forms.newexamupload.submit();
+   }
+}
+
 function makesmppage() {
    var title=prompt('Listed Title for the Page');
    if (title) { 
@@ -574,6 +596,15 @@ function makesmppage() {
    }
 }
 
+function makesmpproblem() {
+   var title=prompt('Listed Title for the Problem');
+   if (title) { 
+    this.document.forms.newsmpproblem.importdetail.value=
+	title+'=/res/lib/templates/simpleproblem.problem';
+    this.document.forms.newsmpproblem.submit();
+   }
+}
+
 function makebulboard() {
    var title=prompt('Listed Title for the Bulletin Board');
    if (title) {
@@ -603,7 +634,7 @@ function changename(folder,index,oldtitl
 }
 
 function removeres(folder,index,oldtitle) {
-    if (confirm('Remove "'+oldtitle+'"?')) {
+    if ((oldtitle=='NO RESOURCE') || (confirm('Remove "'+oldtitle+'"?'))) {
 	this.document.forms.renameform.cmd.value='del_'+index;
 	this.document.forms.renameform.folder.value=folder;
         this.document.forms.renameform.submit();
@@ -657,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';
@@ -671,15 +703,18 @@ $ENV{'request.role'}.'" value="1" /><inp
 <tr><td bgcolor="#DDDDDD">
 File:<br />
 <form action="/adm/coursedocs" method="post" enctype="multipart/form-data">
-<input type="file" name="uploaddoc" size="50">
+<input type="file" name="uploaddoc" size="40">
 <br />
-Title:<br /> 
+Title:<br />
 <input type="text" size="50" name="comment">
 <input type="hidden" name="folder" value="$folder">
 <input type="hidden" name="foldername" value="$ENV{'form.foldername'}">
 <input type="hidden" name="cmd" value="upload_default">
 <input type="submit" value="Upload Document">
- $help{'Uploading_From_Harddrive'}</form>
+<nobr>
+ $help{'Uploading_From_Harddrive'}
+</nobr>
+</form>
 </td>
 <td bgcolor="#DDDDDD">
 <form action="/adm/coursedocs" method="post" name="simpleeditdefault">
@@ -687,66 +722,108 @@ Title:<br />
 <input type="hidden" name="foldername" value="$ENV{'form.foldername'}">
 <input type=button onClick=
 "javascript:document.forms.simpleedit.folder.value='$folder';groupsearch()" value="Search">
+<nobr>
 <input type=button onClick=
 "javascript:document.forms.simpleedit.folder.value='$folder';groupimport();" value="Import">
-$help{'Importing_LON-CAPA_Resource'}<br />
-<input type="text" size="20" name="importmap">
-<input type=button 
+$help{'Importing_LON-CAPA_Resource'}
+</nobr>
+<p>
+<hr />
+<input type="text" size="20" name="importmap"><br />
+<nobr><input type=button 
 onClick="javascript:openbrowser('simpleeditdefault','importmap','sequence,page','')"
-value="Browse"><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">
 <form action="/adm/coursedocs" method="post" name="newfolder">
 <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="newfolder" type="button"
 onClick="javascript:makenewfolder(this.form,'$folderseq');"
-value="New Folder" /> $help{'Adding_Folders'}
+value="New Folder" />$help{'Adding_Folders'}
+</nobr>
 </form>
 <form action="/adm/coursedocs" method="post" name="newext">
 <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="newext" type="button" onClick="javascript:makenewext('newext');"
 value="External Resource" /> $help{'Adding_External_Resource'}
+</nobr>
 </form>
 <form action="/adm/coursedocs" method="post" name="newsyl">
 <input type="hidden" name="folder" value="$folder">
 <input type="hidden" name="foldername" value="$ENV{'form.foldername'}">
 <input type=hidden name="importdetail" 
 value="Syllabus=/public/$coursedom/$coursenum/syllabus">
+<nobr>
 <input name="newsyl" type="submit" value="Syllabus" /> 
- $help{'Creating_From_Template'}</form>
+ $help{'Syllabus'}
+</nobr>
+</form>
 <form action="/adm/coursedocs" method="post" name="newnav">
 <input type="hidden" name="folder" value="$folder">
 <input type="hidden" name="foldername" value="$ENV{'form.foldername'}">
 <input type=hidden name="importdetail" 
 value="Navigate Content=/adm/navmaps">
+<nobr>
 <input name="newnav" type="submit" value="Navigate Content" />
 $help{'Navigate_Content'}
+</nobr>
 </form>
 <form action="/adm/coursedocs" method="post" name="newsmppg">
 <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="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">
+<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'}">
+<input type=hidden name="importdetail" value="">
+<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">
 <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="newbulletin" type="button" value="Bulletin Board"
 onClick="javascript:makebulboard();" />
-$help{'Creating_From_Template'}</form>
+$help{'Bulletin Board'}
+</nobr>
+</form>
 <form action="/adm/coursedocs" method="post" name="newaboutme">
 <input type="hidden" name="folder" value="$folder">
 <input type="hidden" name="foldername" value="$ENV{'form.foldername'}">
 <input type=hidden name="importdetail" 
 value="$plainname=/adm/$udom/$uname/aboutme">
+<nobr>
 <input name="newaboutme" type="submit" value="My Personal Info" />
-$help{'Creating_From_Template'}</form>
+$help{'My Personal Info'}
+</nobr>
+</form>
 </td></tr>
 </table>
 ENDFORM
@@ -773,15 +850,18 @@ ENDFORM
 </tr>
 <tr><td bgcolor="#DDDDDD">
 <form action="/adm/coursedocs" method="post" enctype="multipart/form-data">
-<input type="file" name="uploaddoc" size="50">
+<input type="file" name="uploaddoc" size="40">
 <br />Comment:<br />
 <textarea cols=50 rows=4 name='comment'>
 </textarea>
 <input type="hidden" name="folder" value="$folder">
 <input type="hidden" name="foldername" value="$ENV{'form.foldername'}">
 <input type="hidden" name="cmd" value="upload_supplemental">
+<nobr>
 <input type="submit" value="Upload Document">
- $help{'Uploading_From_Harddrive'}</form>
+ $help{'Uploading_From_Harddrive'}
+</nobr>
+</form>
 </td>
 <td bgcolor="#DDDDDD">
 <form action="/adm/coursedocs" method="post" name="simpleeditsupplement">
@@ -792,43 +872,55 @@ ENDFORM
 "javascript:document.forms.simpleedit.folder.value='$folder';groupsearch()" value="Search">
 <input type=button onClick=
 "javascript:document.forms.simpleedit.folder.value='$folder';groupimport();" value="Import">$help{'Importing_LON-CAPA_Resource'}
-<br />
+<p>
+<hr />
 <input type="text" size="20" name="importmap">
 <input type=button 
 onClick="javascript:openbrowser('simpleeditsupplement','importmap','sequence,page','')"
-value="Browse"><input type="submit" name="loadmap" value="Load Map">
+value="Select Map"><input type="submit" name="loadmap" value="Load Map">
+</p>
 </form>
 </td><td bgcolor="#DDDDDD">
 <form action="/adm/coursedocs" method="post" name="supnewfolder">
 <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="newfolder" type="button"
 onClick="javascript:makenewfolder(this.form,'$folderseq');"
 value="New Folder" /> $help{'Adding_Folders'}
+</nobr>
 </form>
 <form action="/adm/coursedocs" method="post" name="supnewext">
 <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="newext" type="button" 
 onClick="javascript:makenewext('supnewext');"
 value="External Resource" /> $help{'Adding_External_Resource'}
+</nobr>
 </form>
 <form action="/adm/coursedocs" method="post" name="supnewsyl">
 <input type="hidden" name="folder" value="$folder">
 <input type="hidden" name="foldername" value="$ENV{'form.foldername'}">
 <input type=hidden name="importdetail" 
 value="Syllabus=/public/$coursedom/$coursenum/syllabus">
+<nobr>
 <input name="newsyl" type="submit" value="Syllabus" />
-$help{'Creating_From_Template'}</form>
+$help{'Syllabus'}
+</nobr>
+</form>
 <form action="/adm/coursedocs" method="post" name="subnewaboutme">
 <input type="hidden" name="folder" value="$folder">
 <input type="hidden" name="foldername" value="$ENV{'form.foldername'}">
 <input type=hidden name="importdetail" 
 value="$plainname=/adm/$udom/$uname/aboutme">
+<nobr>
 <input name="newaboutme" type="submit" value="My Personal Info" />
-$help{'Creating_From_Template'}</form>
+$help{'My Personal Info'}
+</nobr>
+</form>
 </td></tr>
 </table></td></tr>
 ENDSUPFORM