--- loncom/interface/londocs.pm	2002/12/04 16:19:05	1.39
+++ loncom/interface/londocs.pm	2003/09/15 15:24:18	1.78
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.39 2002/12/04 16:19:05 www Exp $
+# $Id: londocs.pm,v 1.78 2003/09/15 15:24:18 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -35,6 +35,7 @@ use Apache::loncommon;
 use Apache::lonratedt;
 use Apache::lonratsrv;
 use Apache::lonxml;
+use Apache::loncreatecourse;
 use HTML::Entities;
 use GDBM_File;
 
@@ -45,6 +46,12 @@ my %hash;
 my $hashtied;
 my %alreadyseen=();
 
+my $hadchanges;
+
+# Available help topics
+
+my %help=();
+
 # Mapread read maps into lonratedt::global arrays 
 # @order and @resources, determines status
 # sets @order - pointer to resources in right order
@@ -60,11 +67,147 @@ sub mapread {
 
 sub storemap {
     my ($coursenum,$coursedom,$map)=@_;
+    $hadchanges=1;
     return
       &Apache::lonratedt::storemap('/uploaded/'.$coursedom.'/'.$coursenum.'/'.
                                 $map,1);
 }
 
+# ----------------------------------------- Return hash with valid author names
+
+sub authorhosts {
+    my %outhash=();
+    my $home=0;
+    my $other=0;
+    foreach (keys %ENV) {
+	if ($_=~/^user\.role\.(au|ca)\.(.+)$/) {
+	    my $role=$1;
+	    my $realm=$2;
+	    my ($start,$end)=split(/\./,$ENV{$_});
+	    if (($start) && ($start>time)) { next; }
+	    if (($end) && (time>$end)) { next; }
+	    my $ca; my $cd;
+	    if ($1 eq 'au') {
+		$ca=$ENV{'user.name'};
+		$cd=$ENV{'user.domain'};
+	    } else {
+		($cd,$ca)=($realm=~/^\/(\w+)\/(\w+)$/);
+	    }
+	    if (&Apache::lonnet::homeserver($ca,$cd) eq 
+		$Apache::lonnet::perlvar{'lonHostID'}) {
+		$home++;
+		$outhash{'home_'.$ca.'@'.$cd}=1;
+	    } else {
+		$outhash{'otherhome_'.$ca.'@'.$cd}=
+		    &Apache::lonnet::homeserver($ca,$cd);
+		$other++;
+	    }
+	}
+    }
+    return ($home,$other,%outhash);
+}
+# ------------------------------------------------------ Generate "dump" button
+
+sub dumpbutton {
+    my ($home,$other,%outhash)=&authorhosts();
+    if ($home+$other==0) { return ''; }
+    my $output='</td><td bgcolor="#DDDDCC">';
+    if ($home) {
+	return '</td><td bgcolor="#DDDDCC">'.
+	    '<input type="submit" name="dumpcourse" value="Dump Course DOCS to Construction Space" />';
+    } else {
+	return'</td><td bgcolor="#DDDDCC">'.
+      'Dump Course DOCS to Construction Space: available on other servers';
+    }
+}
+
+# -------------------------------------------------------- Actually dump course
+
+sub dumpcourse {
+    my $r=shift;
+    $r->print('<html><head><title>Dump DOCS</title></head>'.
+        &Apache::loncommon::bodytag('Dump Course DOCS to Construction Space').
+	      '<form name="dumpdoc" method="post">');
+    my ($home,$other,%outhash)=&authorhosts();
+    unless ($home) { return ''; }
+    my $origcrsid=$ENV{'request.course.id'};
+    my %origcrsdata=&Apache::lonnet::coursedescription($origcrsid);
+    if (($ENV{'form.authorspace'}) && ($ENV{'form.authorfolder'}=~/\w/)) {
+# Do the dumping
+	unless ($outhash{'home_'.$ENV{'form.authorspace'}}) { return ''; }
+	my ($ca,$cd)=split(/\@/,$ENV{'form.authorspace'});
+	my $title=$ENV{'form.authorfolder'};
+
+    } else {
+# Input form
+	unless ($home==1) {
+	    $r->print(
+		      '<h3>Select the Construction Space</h3><select name="authorspace">');
+	}
+	foreach (sort keys %outhash) {
+	    if ($_=~/^home_(.+)$/) {
+		if ($home==1) {
+		    $r->print(
+		  '<input type="hidden" name="authorspace" value="'.$1.'" />');
+		} else {
+		    $r->print('<option value="'.$1.'">'.$_.'</option>');
+		}
+	    }
+	}
+	unless ($home==1) {
+	    $r->print('</select>');
+	}
+	my $title=$origcrsdata{'description'};
+	$title=~s/\s+/\_/gs;
+	$title=~s/\W//gs;
+	$r->print('<h3>Folder in Construction Space</h3><input type="text" size="50" name="authorfolder" value="'.$title.'" /><br />');
+	&tiehash();
+	$r->print('<h3>Filenames in Construction Space</h3><table border="2"><tr><th>Internal Filename</th><th>Title</th><th>Save as ...</th></tr>');
+	foreach (&Apache::loncreatecourse::crsdirlist($origcrsid,'userfiles')) {
+	    $r->print('<tr><td>'.$_.'</td>');
+	    my ($ext)=($_=~/\.(\w+)$/);
+	    my $title=$hash{'title_'.$hash{
+		'ids_/uploaded/'.$origcrsdata{'domain'}.'/'.$origcrsdata{'num'}.'/'.$_}};
+	    $r->print('<td>'.($title?$title:'&nbsp;').'</td>');
+	    unless ($title) {
+		$title=$_;
+	    }
+	    $title=~s/\.(\w+)$//;
+	    $title=~s/\W+/\_/gs;
+	    $title.='.'.$ext;
+	    $r->print("\n<td><input type='text' size='60' name='".$_."' value='".$title."' /></td></tr>\n");
+	}
+	$r->print("</table>\n");
+	&untiehash();
+	$r->print(
+  '<p><input type="submit" name="dumpcourse" value="Dump Course DOCS" /></p></form>');
+    }
+}
+
+
+# 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/:/\&colon;/g;
+	    $name =~ s/:/\&colon;/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'}) {
@@ -151,26 +294,32 @@ 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/\:/\&colon;/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'})) {
+              foreach
+(&Apache::lonsequence::attemptread(&Apache::lonnet::filelocation('',$ENV{'form.importmap'}))) {
+                   my $idx=$#Apache::lonratedt::resources;
+                   $idx++;
+                   $Apache::lonratedt::resources[$idx]=$_;
+                   $Apache::lonratedt::order
+                            [$#Apache::lonratedt::order+1]=$idx;
+                }
+
+# Store the changed version
+		&storemap($coursenum,$coursedom,$folder.'.sequence');
+           }
        }
 # ---------------------------------------------------------------- End commands
 # ---------------------------------------------------------------- Print screen
@@ -180,7 +329,7 @@ sub editor {
            my ($name,$url)=split(/\:/,$Apache::lonratedt::resources[$_]);
            unless ($name) {  $name=(split(/\//,$url))[-1]; }
            unless ($name) { $name='NO RESOURCE'; $url='/adm/notfound.html'; }
-           $r->print(&entryline($idx,$name,$url,$folder,$allowed));
+           $r->print(&entryline($idx,$name,$url,$folder,$allowed,$_));
            $idx++;
         }
         $r->print('</table>');
@@ -190,7 +339,7 @@ sub editor {
 # --------------------------------------------------------------- An entry line
 
 sub entryline {
-    my ($index,$title,$url,$folder,$allowed)=@_;
+    my ($index,$title,$url,$folder,$allowed,$residx)=@_;
     $title=~s/\&colon\;/\:/g;
     $title=&HTML::Entities::encode(&HTML::Entities::decode(
      &Apache::lonnet::unescape($title)),'\"\<\>\&\'');
@@ -210,16 +359,18 @@ sub entryline {
 # Edit commands
     if ($allowed) {
        $line.=(<<END);
-<td><table border='0' cellspacing='0' cellpadding='0'>
-<tr><td><a href='/adm/coursedocs?folder=$folder&cmd=up_$index'>
+<td><table border='0' cellspacing='2' cellpadding='0'>
+<tr><td bgcolor="#DDDDDD">
+<a href='/adm/coursedocs?folder=$folder&cmd=up_$index'>
 <img src="${iconpath}move_up.gif" alt='UP' border='0' /></a></td></tr>
-<tr><td><a href='/adm/coursedocs?folder=$folder&cmd=down_$index'>
+<tr><td bgcolor="#DDDDDD">
+<a href='/adm/coursedocs?folder=$folder&cmd=down_$index'>
 <img src="${iconpath}move_down.gif" alt='DOWN' border='0' /></a></td></tr>
-</table></td><td>
-<a href='/adm/coursedocs?folder=$folder&cmd=del_$index'>
-<font size="-2">Remove</font></a>
+</table></td><td bgcolor="#DDDDDD">
+<a href='javascript:removeres("$folder","$index","$renametitle");'>
+<font size="-2" color="#990000">Remove</font></a>
 <a href='javascript:changename("$folder","$index","$renametitle");'>
-<font size="-2">Rename</font></a></td>
+<font size="-2" color="#009900">Rename</font></a></td>
 END
     }
 # Figure out what kind of a resource this is
@@ -241,7 +392,18 @@ END
        } 
     }
     $url=~s/^http\&colon\;\/\//\/adm\/wrapper\/ext\//;
-    if ($isfolder) { $url.='&foldername='.$foldertitle; }
+    if (($residx) && ($folder!~/supplemental/)) {
+       $url.=(($url=~/\?/)?'&':'?').'symb='.
+       &Apache::lonnet::escape(&Apache::lonnet::symbclean(
+          &Apache::lonnet::declutter('uploaded/'.
+           $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}.'/'.
+           $ENV{'course.'.$ENV{'request.course.id'}.'.num'}.'/'.$folder.
+           '.sequence').
+           '___'.$residx.'___'.
+	   &Apache::lonnet::declutter($url)));
+    }
+    if ($isfolder) { $url.='&foldername='.
+       &Apache::lonnet::escape($foldertitle); }
     $line.='<td bgcolor="#FFFFBB"><a href="'.$url.'" target="cat_'.$folder.
 '"><img src="/adm/lonIcons/'.
         $icon.'.gif" border="0"></a></td>'.
@@ -272,7 +434,7 @@ sub checkonthis {
     my ($r,$url,$level,$title)=@_;
     $alreadyseen{$url}=1;
     $r->rflush();
-    if ($url) {
+    if (($url) && ($url!~/^\/uploaded\//) && ($url!~/\*$/)) {
        $r->print('<br />');
        for (my $i=0;$i<=$level*5;$i++) {
            $r->print('&nbsp;');
@@ -294,9 +456,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) {
@@ -330,16 +495,12 @@ sub checkonthis {
    }
 }
 
-# ================================================================ Main Handler
-sub handler {
-    my $r = shift;
-    $r->content_type('text/html');
-    $r->send_http_header;
-    return OK if $r->header_only;
 
-  
-  if ($ENV{'form.verify'}) {
- 
+#
+# -------------------------------------------------------------- Verify Content
+# 
+sub verifycontent {
+   my $r=shift; 
    my $loaderror=&Apache::lonnet::overloaderror($r);
    if ($loaderror) { return $loaderror; }
 
@@ -355,8 +516,14 @@ sub handler {
        }
    }
    &untiehash();
-  } elsif ($ENV{'form.versions'}) {
-    $r->print('<html><head><title>Check Versions</title></head>'.
+   $r->print('<h1>Done.</h1>');
+}
+
+# -------------------------------------------------------------- Check Versions
+
+sub checkversions {
+    my $r=shift;
+   $r->print('<html><head><title>Check Versions</title></head>'.
               &Apache::loncommon::bodytag('Check Course Document Versions'));
    $hashtied=0;
    &tiehash();
@@ -389,7 +556,7 @@ sub handler {
            $seltext='since yesterday ('.localtime($starttime).')';
            $daysel='selected';
        }
- 
+
        $r->print(<<ENDHEADERS);
 <form action="/adm/coursedocs" method="post">
 <select name="timerange">
@@ -442,10 +609,45 @@ ENDHEADERS
           }
        }
        $r->print('</table>');
+       $r->print('<h1>Done.</h1>');
    } else {
        $r->print('<p>No content modifications yet.</p>');
    }
    &untiehash();
+}
+
+# ================================================================ Main Handler
+sub handler {
+    my $r = shift;
+    $r->content_type('text/html');
+    $r->send_http_header;
+    return OK if $r->header_only;
+
+# --------------------------------------------- Initialize help topics for this
+  foreach ('Adding_Course_Doc','Main_Course_Documents',
+           'Adding_External_Resource','Navigate_Content',
+           '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'}) {
+      &verifycontent($r);
+  } elsif ($ENV{'form.versions'}) {
+      &checkversions($r);
+  } elsif ($ENV{'form.dumpcourse'}) {
+      &dumpcourse($r);
   } else {
 # is this a standard course?
 
@@ -466,16 +668,16 @@ ENDHEADERS
        $forcesupplement=($ENV{'form.folder'}=~/^supplemental_/);
 
 # does this user have privileges to post, etc?
-       $allowed=&Apache::lonnet::allowed('srm',$ENV{'request.course.id'});
+       $allowed=&Apache::lonnet::allowed('mdc',$ENV{'request.course.id'});
        if ($allowed) { 
          &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['cmd']);
          $script=&Apache::lonratedt::editscript('simple'); 
        }
     } else { # got called in sequence from course
        $allowed=0;
-       $script='</script>'.&Apache::lonxml::registerurl(1,undef).'<script>';
-       $events='onLoad="'.&Apache::lonxml::loadevents.
-           '" onUnload="'.&Apache::lonxml::unloadevents.'"';
+       $script='</script>'.&Apache::lonmenu::registerurl(1,undef).'<script>';
+       $events='onLoad="'.&Apache::lonmenu::loadevents.
+           '" onUnload="'.&Apache::lonmenu::unloadevents.'"';
     }
 
 # get course data
@@ -520,6 +722,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) { 
@@ -529,6 +740,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) {
@@ -556,7 +776,26 @@ function changename(folder,index,oldtitl
         this.document.forms.renameform.submit();
     }
 }
+
+function removeres(folder,index,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();
+    }
+}
 </script>
+
+ENDNEWSCRIPT
+  }
+# -------------------------------------------------------------------- Body tag
+  $r->print('</head>'.
+            &Apache::loncommon::bodytag('Course Documents','',$events,
+					'','',$showdoc));
+  unless ($showdoc) {
+    if ($allowed) {
+       my $dumpbut=&dumpbutton();
+       $r->print(<<ENDCOURSEVERIFY);
 <form name="renameform" method="post" action="/adm/coursedocs">
 <input type="hidden" name="title" />
 <input type="hidden" name="cmd" />
@@ -566,32 +805,47 @@ function changename(folder,index,oldtitl
 <input type=hidden name="importdetail" value="">
 <input type="hidden" name="folder" />
 </form>
-
-ENDNEWSCRIPT
-  }
-# -------------------------------------------------------------------- Body tag
-  $r->print('</head>'.
-            &Apache::loncommon::bodytag('Course Documents','',$events));
-  unless ($showdoc) {
-    if ($allowed) {
-       $r->print(<<ENDCOURSEVERIFY);
 <form action="/adm/coursedocs" method="post" name="courseverify">
+<table bgcolor="#AAAAAA" width="100%" cellspacing="4" cellpadding="4">
+<tr><td bgcolor="#DDDDCC">
 <input type="submit" name="verify" value="Verify Content" />
+</td><td bgcolor="#DDDDCC">
 <input type="submit" name="versions" value="Check Resource Versions" />
+$dumpbut
+</td></tr></table>
 </form>
 ENDCOURSEVERIFY
+       $r->print(&Apache::loncommon::help_open_topic('Docs_Adding_Course_Doc',
+		     'Editing the Table of Contents for your Course'));
     }
 # --------------------------------------------------------- Standard documents
-    $r->print('<table>');
+    $r->print('<table border=2 cellspacing=4 cellpadding=4>');
     if (($standard) && ($allowed) && (!$forcesupplement)) {
-       $r->print('<tr><td bgcolor="#FFFFBB"><h2>Main Course Documents</h2>');
+       $r->print('<tr><td bgcolor="#BBBBBB"><h2>Main Course Documents'.
+  ($allowed?' '.$help{'Main_Course_Documents'}:'').'</h2>');
        my $folder=$ENV{'form.folder'};
        unless ($folder=~/^default/) { $folder='default'; }
+       my $postexec='';
+       if ($folder eq 'default') {
+	   $r->print('<script>this.window.name="loncapaclient";</script>');
+       } else {
+           $postexec='self.close();';
+       }
+       $hadchanges=0;
        &editor($r,$coursenum,$coursedom,$folder,$allowed);
+       if ($hadchanges) {
+	   $r->print(
+'<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.'.
+$help{'Caching'}.'</font></h3></form>');
+       }
        my $folderseq='/uploaded/'.$coursedom.'/'.$coursenum.'/default_'.time.
                      '.sequence';
+
        $r->print(<<ENDFORM);
-<table cellspacing=2><tr>
+<table cellspacing=4 cellpadding=4><tr>
 <th bgcolor="#DDDDDD">Upload a new main course document</th>
 <th bgcolor="#DDDDDD">Import a published document</th>
 <th bgcolor="#DDDDDD">Special documents</th>
@@ -599,73 +853,126 @@ ENDCOURSEVERIFY
 <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">
+<nobr>
+ $help{'Uploading_From_Harddrive'}
+</nobr>
 </form>
 </td>
 <td bgcolor="#DDDDDD">
 <form action="/adm/coursedocs" method="post" name="simpleeditdefault">
+<input type="hidden" name="folder" value="$folder">
+<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'}
+</nobr>
+<p>
+<hr />
+<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">
+$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" />
+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" />
+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">
-<input name="newsyl" type="submit" value="Syllabus" />
+<nobr>
+<input name="newsyl" type="submit" value="Syllabus" /> 
+ $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();" />
+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{'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{'My Personal Info'}
+</nobr>
 </form>
 </td></tr>
 </table>
@@ -675,7 +982,8 @@ ENDFORM
 # ----------------------------------------------------- Supplemental documents
     if (!$forcestandard) {
        $r->print(
-  '<tr><td bgcolor="#BBFFFF"><h2>Supplemental Course Documents</h2>');
+  '<tr><td bgcolor="#BBBBBB"><h2>Supplemental Course Documents'.
+  ($allowed?' '.$help{'Supplemental'}:'').'</h2>');
        my $folder=$ENV{'form.folder'};
        unless ($folder=~/supplemental/) { $folder='supplemental'; }
        &editor($r,$coursenum,$coursedom,$folder,$allowed);
@@ -685,61 +993,83 @@ ENDFORM
                      '.sequence';
 
           $r->print(<<ENDSUPFORM);
-<table cellspacing=2><tr>
+<table cellspacing=4 cellpadding=4><tr>
 <th bgcolor="#DDDDDD">Upload a new supplemental course document</th>
 <th bgcolor="#DDDDDD">Import a published document</th>
 <th bgcolor="#DDDDDD">Special documents</th>
 </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'}
+</nobr>
 </form>
 </td>
 <td bgcolor="#DDDDDD">
 <form action="/adm/coursedocs" method="post" name="simpleeditsupplement">
+<input type="hidden" name="folder" value="$folder">
+<input type="hidden" name="foldername" value="$ENV{'form.foldername'}">
 <input type=hidden name="importdetail" value="">
 <input type=button onClick=
 "javascript:document.forms.simpleedit.folder.value='$folder';groupsearch()" value="Search">
 <input type=button onClick=
-"javascript:document.forms.simpleedit.folder.value='$folder';groupimport();" value="Import">
+"javascript:document.forms.simpleedit.folder.value='$folder';groupimport();" value="Import">$help{'Importing_LON-CAPA_Resource'}
+<p>
+<hr />
+<input type="text" size="20" name="importmap">
+<input type=button 
+onClick="javascript:openbrowser('simpleeditsupplement','importmap','sequence,page','')"
+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" />
+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" />
+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{'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{'My Personal Info'}
+</nobr>
 </form>
 </td></tr>
 </table></td></tr>