--- loncom/interface/londocs.pm	2003/06/08 01:46:41	1.59
+++ loncom/interface/londocs.pm	2003/09/05 18:11:26	1.73
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.59 2003/06/08 01:46:41 www Exp $
+# $Id: londocs.pm,v 1.73 2003/09/05 18:11:26 bowersj2 Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -72,6 +72,29 @@ sub storemap {
                                 $map,1);
 }
 
+# Imports the given (name, url) resources into the course
+# coursenum, coursedom, and folder must precede the list
+sub group_import {
+    my $coursenum = shift;
+    my $coursedom = shift;
+    my $folder = shift;
+    while (@_) {
+	my $name = shift;
+	my $url = shift;
+	if ($url) {
+	    my $idx = $#Apache::lonratedt::resources + 1;
+	    $Apache::lonratedt::order[$#Apache::lonratedt::order+1]=$idx;
+	    my $ext = 'false';
+	    if ($url=~/^http:\/\//) { $ext = 'true'; }
+	    $url =~ s/:/\:/g;
+	    $name =~ s/:/\:/g;
+	    $Apache::lonratedt::resources[$idx] = 
+		join ':', ($name, $url, $ext, 'normal', 'res');
+	}
+    }
+    &storemap($coursenum, $coursedom, $folder);
+}
+
 sub editor {
     my ($r,$coursenum,$coursedom,$folder,$allowed)=@_;
     if ($ENV{'form.foldername'}) {
@@ -158,26 +181,17 @@ sub editor {
             }
 # Group import/search
 	    if ($ENV{'form.importdetail'}) {
-               foreach (split(/\&/,$ENV{'form.importdetail'})) {
-                  if (defined($_)) {
-	             my ($name,$url)=split(/\=/,$_);
-                     $name=&Apache::lonnet::unescape($name);
-                     $url=&Apache::lonnet::unescape($url);
-                     if ($url) {
-	                my $idx=$#Apache::lonratedt::resources+1;
-                        $Apache::lonratedt::order
-                           [$#Apache::lonratedt::order+1]=$idx;
-                        my $ext='false';
-                        if ($url=~/^http\:\/\//) { $ext='true'; }
-                        $url=~s/\:/\:/g;
-                        $name=~s/\:/\:/g;
-                        $Apache::lonratedt::resources[$idx]=
-                           $name.':'.$url.':'.$ext.':normal:res';
-	             }
-                 }
-	      }
+		my @imports;
+		foreach (split(/\&/,$ENV{'form.importdetail'})) {
+		    if (defined($_)) {
+			my ($name,$url)=split(/\=/,$_);
+			$name=&Apache::lonnet::unescape($name);
+			$url=&Apache::lonnet::unescape($url);
+			push @imports, $name, $url;
+		    }
+		}
 # Store the changed version
-		&storemap($coursenum,$coursedom,$folder.'.sequence');
+		group_import($coursenum, $coursedom, $folder, @imports);
             }
 # Loading a complete map
 	   if (($ENV{'form.importmap'}) && ($ENV{'form.loadmap'})) {
@@ -265,7 +279,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 +343,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 +392,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 +425,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 +513,7 @@ ENDHEADERS
           }
        }
        $r->print('</table>');
+       $r->print('<h1>Done.</h1>');
    } else {
        $r->print('<p>No content modifications yet.</p>');
    }
@@ -498,7 +527,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 +548,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 +566,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>
@@ -571,6 +592,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) { 
@@ -581,11 +611,10 @@ function makesmppage() {
 }
 
 function makesmpproblem() {
-   $noeggforyou
    var title=prompt('Listed Title for the Problem');
    if (title) { 
     this.document.forms.newsmpproblem.importdetail.value=
-	title+'=/adm/wrapper/uploaded/$udom/$uname/$now.problem';
+	title+'=/res/lib/templates/simpleproblem.problem';
     this.document.forms.newsmpproblem.submit();
    }
 }
@@ -631,8 +660,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',
@@ -673,7 +702,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';
@@ -696,8 +726,9 @@ Title:<br />
 <input type="hidden" name="cmd" value="upload_default">
 <input type="submit" value="Upload Document">
 <nobr>
- $help{'Uploading_From_Harddrive'}</form>
+ $help{'Uploading_From_Harddrive'}
 </nobr>
+</form>
 </td>
 <td bgcolor="#DDDDDD">
 <form action="/adm/coursedocs" method="post" name="simpleeditdefault">
@@ -712,10 +743,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="Browse for 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">
@@ -745,7 +777,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">
@@ -764,7 +796,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">
@@ -773,7 +805,17 @@ 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">
+<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">
@@ -783,7 +825,7 @@ onClick="javascript:makesmpproblem();" /
 <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">
@@ -793,7 +835,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>
@@ -849,7 +891,7 @@ ENDFORM
 <input type="text" size="20" name="importmap">
 <input type=button 
 onClick="javascript:openbrowser('simpleeditsupplement','importmap','sequence,page','')"
-value="Browse for Map"><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">
@@ -880,7 +922,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">
@@ -890,7 +932,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>