--- loncom/interface/londocs.pm	2012/12/13 00:51:34	1.484.2.12
+++ loncom/interface/londocs.pm	2012/12/13 04:11:51	1.484.2.17
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.484.2.12 2012/12/13 00:51:34 raeburn Exp $
+# $Id: londocs.pm,v 1.484.2.17 2012/12/13 04:11:51 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -454,7 +454,8 @@ sub docs_change_log {
         if ($folderpath eq '') {
             $folderpath = 'default&'.&escape(&mt('Main '.$crstype.' Documents'));
         }
-        $pathitem = '<input type="hidden" name="folderpath" value="'.&HTML::Entities::encode($folderpath,'<>&"').'" />';
+        $pathitem = '<input type="hidden" name="folderpath" value="'.
+                    &HTML::Entities::encode($folderpath,'<>&"').'" />';
     }
     my $readfile="/uploaded/$coursedom/$coursenum/$folder.$container";
     my $jumpto = $readfile;
@@ -1743,7 +1744,7 @@ sub handle_edit_cmd {
 
 sub editor {
     my ($r,$coursenum,$coursedom,$folder,$allowed,$upload_output,$crstype,
-        $supplementalflag,$orderhash,$iconpath,$uploadtag)=@_;
+        $supplementalflag,$orderhash,$iconpath,$pathitem)=@_;
     my $container= ($env{'form.pagepath'}) ? 'page'
 		                           : 'sequence';
 
@@ -1828,6 +1829,18 @@ sub editor {
 		if (defined($item)) {
 		    my ($name,$url,$residx)=
 			map {&unescape($_)} split(/\=/,$item);
+                    if ($url=~ m{^\Q/uploaded/$coursedom/$coursenum/\E(default|supplemental)_new\.(sequence|page)$}) {
+                        my ($suffix,$errortxt,$locknotfreed) =
+                            &newmap_suffix($1,$2,$coursedom,$coursenum);
+                        if ($locknotfreed) {
+                            $r->print($locknotfreed);
+                        }
+                        if ($suffix) {
+                            $url =~ s/_new\./_$suffix./;
+                        } else {
+                            return $errortxt;
+                        }
+                    }
 		    push(@imports, [$name, $url, $residx]);
 		}
 	    }
@@ -1900,7 +1913,7 @@ sub editor {
         unless ($name) { $idx++; next; }
         $output .= &entryline($idx,$name,$url,$folder,$allowed,$res,
                               $coursenum,$coursedom,$crstype,
-                              $uploadtag,$supplementalflag);
+                              $pathitem,$supplementalflag);
         $idx++;
         $shown++;
     }
@@ -1949,7 +1962,7 @@ sub editor {
                     &Apache::lonhtmlcommon::add_item_funclist(
                         '<a href="/adm/coursedocs?command=direct&forcesupplement=1&'.
                         'supppath='.&HTML::Entities::encode($env{'form.folderpath'}).'">'.
-                        '<img src="/res/adm/pages/docs.png" alt="'.$funcname.'" class="LC_icon" />'.
+                        '<img src="/res/adm/pages/docs-22x22.png" alt="'.$funcname.'" class="LC_icon" />'.
                         '<span class="LC_menubuttons_inline_text">'.$funcname.'</span></a>').
                           &Apache::lonhtmlcommon::end_funclist()));
         }
@@ -2118,7 +2131,7 @@ sub is_supplemental_title {
 
 sub entryline {
     my ($index,$title,$url,$folder,$allowed,$residx,$coursenum,$coursedom,
-        $crstype,$uploadtag,$supplementalflag)=@_;
+        $crstype,$pathitem,$supplementalflag)=@_;
     my ($foldertitle,$pagetitle,$renametitle);
     if (&is_supplemental_title($title)) {
 	($title,$foldertitle,$renametitle) = &Apache::loncommon::parse_supplemental_title($title);
@@ -2151,9 +2164,13 @@ sub entryline {
         $esc_path=&escape($env{'form.pagepath'});
 	$path = &HTML::Entities::encode($env{'form.pagepath'},'<>&"');
     }
+    my $isexternal;
     if (!$supplementalflag && $residx) {
         my $currurl = $url;
         $currurl =~ s{^http(|s)(&colon;|:)//}{/adm/wrapper/ext/};
+        if ($currurl =~ m{^/adm/wrapper/ext/}) {
+            $isexternal = 1;
+        }
         my $path = 'uploaded/'.
                    $env{'course.'.$env{'request.course.id'}.'.domain'}.'/'.
                    $env{'course.'.$env{'request.course.id'}.'.num'}.'/';
@@ -2258,9 +2275,7 @@ sub entryline {
                 $nocopy=1;
             }
         }
-        my $copylink='&nbsp;';
-        my $cutlink='&nbsp;';
-        my $removelink='&nbsp;';
+        my ($copylink,$cutlink,$removelink,$renamelink);
 
 	my $skip_confirm = 0;
 	if ( $folder =~ /^supplemental/
@@ -2269,26 +2284,40 @@ sub entryline {
 			    |/aboutme$
 			    |/navmaps$
 			    |/bulletinboard$
-			    |\.html$
-			    |^/adm/wrapper/ext)}x)) {
+			    |\.html$)}x)
+             || $isexternal) { 
 	    $skip_confirm = 1;
 	}
-
-	if (!$nocopy) {
-	    $copylink=(<<ENDCOPY);
+        if ($nocopy) {
+            $copylink=(<<ENDCOPY);
+<span style="visibility: hidden;">$lt{'cp'}</span>
+ENDCOPY
+        } else {
+            $copylink=(<<ENDCOPY);
 <a href="javascript:markcopy('$esc_path','$index','$renametitle','$container','$symb','$folder');" class="LC_docs_copy">$lt{'cp'}</a>
 ENDCOPY
         }
-	if (!$nocut) {
-	    $cutlink=(<<ENDCUT);
+        if ($nocut) {
+            $cutlink=(<<ENDCUT);
+<span style="visibility: hidden;">$lt{'ct'}</span>
+ENDCUT
+        } else {
+            $cutlink=(<<ENDCUT);
 <a href="javascript:cutres('$esc_path','$index','$renametitle','$container','$symb','$folder',$skip_confirm);" class="LC_docs_cut">$lt{'ct'}</a>
 ENDCUT
         }
-        if (!$noremove) {
+        if ($noremove) {
+            $removelink=(<<ENDREM);
+<span style="visibility: hidden;">$lt{'rm'}</a>
+ENDREM
+        } else {
             $removelink=(<<ENDREM);
 <a href='javascript:removeres("$esc_path","$index","$renametitle","$container","$symb",$skip_confirm);' class="LC_docs_remove">$lt{'rm'}</a>
 ENDREM
         }
+        $renamelink=(<<ENDREN);
+<a href='javascript:changename("$esc_path","$index","$renametitle","$container","$symb");' class="LC_docs_rename">$lt{'rn'}</a>
+ENDREN
 	$form_start = '
    <form action="/adm/coursedocs" method="post">
 ';
@@ -2318,11 +2347,12 @@ END
    $selectbox
    $form_end
 </td>
-<td class="LC_docs_entry_commands">
+<td class="LC_docs_entry_commands"><span class="LC_nobreak">
 $removelink
+$renamelink
 $cutlink
-   <a href='javascript:changename("$esc_path","$index","$renametitle","$container","$symb");' class="LC_docs_rename">$lt{'rn'}</a>
 $copylink
+</span>
 </td>
 END
 
@@ -2459,7 +2489,7 @@ $form_common.'
             <span class="LC_nobreak">
             <span class="LC_docs_ext_edit">$lt{'ti'}&nbsp;</span>
             <input type="text" size="40" name="exttitle" value="$title" />
-            $uploadtag
+            $pathitem
             <input type="hidden" name="importdetail" value="" />
             <input type="button" value="$lt{'sv'}" onclick="javascript:setExternal(this.form,'$residx')" />
             </span>
@@ -2467,13 +2497,22 @@ $form_common.'
             </form>
 EXTLNK
         } else {
-            my ($cfile,$home,$switchserver,$uploaded) =
-                &Apache::lonnet::can_edit_resource($fileloc,$coursenum,$coursedom);
-            if (($cfile ne '') && ($symb ne '')) {
+            my ($cfile,$home,$switchserver,$forceedit,$forceview) =
+                &Apache::lonnet::can_edit_resource($fileloc,$coursenum,$coursedom,$orig_url);
+            my $geteditlink;
+            if ($supplementalflag) {
+                if ($orig_url eq "/adm/$env{'user.domain'}/$env{'user.name'}/aboutme") {
+                    $geteditlink = 1;
+                }
+            } elsif (($cfile ne '') && ($symb ne '')) {
+                $geteditlink = 1;
+            }
+            if ($geteditlink) {
                 my $jscall =
                     &Apache::lonhtmlcommon::jump_to_editres($cfile,$home,
                                                             $switchserver,
-                                                            $uploaded,$symb);
+                                                            $forceedit,
+                                                            undef,$symb);
                 if ($jscall) {
                     $editlink = '&nbsp;<a class="LC_docs_ext_edit" href="javascript:'.
                                 $jscall.'" >'.&mt('Edit').'</a>';
@@ -2536,6 +2575,30 @@ ENDPARMS
     return $line;
 }
 
+sub newmap_suffix {
+    my ($area,$container,$coursedom,$coursenum) = @_;
+    my ($prefix,$idtype,$errtext,$locknotfreed);
+    $prefix = 'docs';
+    if ($area eq 'supplemental') {
+        $prefix = 'supp';
+    }
+    $prefix .= $container;
+    $idtype = 'concat';
+    my ($suffix,$freedlock,$error) =
+        &Apache::lonnet::get_timebased_id($prefix,'num','uploadedmaps',
+                                          $coursedom,$coursenum);
+    if (!$suffix) {
+        $errtext = &mt('Failed to acquire a unique timestamp-based suffix for the new folder/page.');
+        if ($error) {
+            $errtext .= '<br />'.$error;
+        }
+    }
+    if ($freedlock ne 'ok') {
+        $locknotfreed = '<div class="LC_error">'.&mt('There was a problem removing a lockfile. This will prevent creation of additional folders or composite pages in this course.  Please contact the domain coordinator for your LON-CAPA domain.').'</div>';
+    }
+    return ($suffix,$errtext,$locknotfreed);
+}
+
 =pod
 
 =item tiehash()
@@ -3231,7 +3294,7 @@ sub handler {
     my $addentries = {};
     my $container;
     my $containertag;
-    my $uploadtag;
+    my $pathitem;
 
 # Do we directly jump somewhere?
 
@@ -3364,7 +3427,7 @@ sub handler {
             $container='page';
             $containertag = '<input type="hidden" name="pagepath" value="" />'.
 	                    '<input type="hidden" name="pagesymb" value="" />';
-            $uploadtag = 
+            $pathitem = 
                 '<input type="hidden" name="pagepath" value="'.&HTML::Entities::encode($env{'form.pagepath'},'<>&"').'" />'.
 	        '<input type="hidden" name="pagesymb" value="'.&HTML::Entities::encode($env{'form.pagesymb'},'<>&"').'" />'.
                 '<input type="hidden" name="folderpath" value="" />';
@@ -3378,7 +3441,7 @@ sub handler {
                 }
             }
             $containertag = '<input type="hidden" name="folderpath" value="" />';
-            $uploadtag = '<input type="hidden" name="folderpath" value="'.&HTML::Entities::encode($folderpath,'<>&"').'" />';
+            $pathitem = '<input type="hidden" name="folderpath" value="'.&HTML::Entities::encode($folderpath,'<>&"').'" />';
         }
         if ($r->uri=~/^\/adm\/coursedocs\/showdoc\/(.*)$/) {
            $showdoc='/'.$1;
@@ -3533,6 +3596,7 @@ sub handler {
                 'srch' => 'Search',
                 'impo' => 'Import',
                 'lnks' => 'Import from Stored Links',
+                'impm' => 'Import from Assembled Map',
                 'selm' => 'Select Map',
                 'load' => 'Load Map',
                 'reco' => 'Recover Deleted Documents',
@@ -3620,7 +3684,7 @@ IMSFORM
 	<br />
 	$lt{'title'}:<br />
 	<input type="text" size="60" name="comment" />
-	$uploadtag
+	$pathitem
 	<input type="hidden" name="cmd" value="upload_default" />
 	<br />
 	<span class="LC_nobreak" style="float:left">
@@ -3632,26 +3696,31 @@ IMSFORM
         </form>
 FUFORM
 
-	my $simpleeditdefaultform=(<<SEDFFORM);
-	<form action="/adm/coursedocs" method="post" name="simpleeditdefault">
-	<input type="hidden" name="active" value="bb" />
+        my $importpubform=(<<SEDFFORM);
+        <a class="LC_menubuttons_link" href="javascript:toggleMap();">
+        $lt{'impm'}</a>$help{'Load_Map'}
+        <form action="/adm/coursedocs" method="post" name="mapimportform">
+        <fieldset id="importmapform" style="display: none;" />
+        <legend>$lt{'impm'}</legend>
+        <input type="hidden" name="active" value="bb" />
+        $lt{'copm'}<br />
+        <span class="LC_nobreak">
+        <input type="text" name="importmap" size="40" value=""
+        onfocus="this.blur();openbrowser('mapimportform','importmap','sequence,page','');" />
+        &nbsp;<a href="javascript:openbrowser('mapimportform','importmap','sequence,page','');">$lt{'selm'}</a><br />
+        <input type="submit" name="loadmap" value="$lt{'load'}" />
+        </fieldset>
+        </form>
+
 SEDFFORM
+
 	my @simpleeditdefaultforma = ( 
-	{ '<img class="LC_noBorder LC_middle" src="/res/adm/pages/src.png" alt="'.$lt{srch}.'"  onclick="javascript:groupsearch()" />' => "$uploadtag<a class='LC_menubuttons_link' href='javascript:groupsearch()'>$lt{'srch'}</a>" },
+	{ '<img class="LC_noBorder LC_middle" src="/res/adm/pages/src.png" alt="'.$lt{srch}.'"  onclick="javascript:groupsearch()" />' => "$pathitem<a class='LC_menubuttons_link' href='javascript:groupsearch()'>$lt{'srch'}</a>" },
 	{ '<img class="LC_noBorder LC_middle" src="/res/adm/pages/res.png" alt="'.$lt{impo}.'"  onclick="javascript:groupimport();"/>' => "<a class='LC_menubuttons_link' href='javascript:groupimport();'>$lt{'impo'}</a>$help{'Importing_LON-CAPA_Resource'}" },
         { '<img class="LC_noBorder LC_middle" src="/res/adm/pages/wishlist.png" alt="'.$lt{lnks}.'" onclick="javascript:open_StoredLinks_Import();" />' => "<a class='LC_menubuttons_link' href='javascript:open_StoredLinks_Import();'>$lt{'lnks'}</a>" },
-	);
-	$simpleeditdefaultform .= &create_form_ul(&create_list_elements(@simpleeditdefaultforma));
-	$simpleeditdefaultform .=(<<SEDFFORM);
-	<hr id="bb_hrule" style="width:0px;text-align:left;margin-left:0" />
-	$lt{'copm'}<br />
-	<input type="text" size="40" name="importmap" /><br />
-	<span class="LC_nobreak" style="float:left"><input type="button"
-	onclick="javascript:openbrowser('simpleeditdefault','importmap','sequence,page','')"
-	value="$lt{'selm'}" /> <input type="submit" name="loadmap" value="$lt{'load'}" />
-	$help{'Load_Map'}</span>
-	</form>
-SEDFFORM
+        { '<img class="LC_noBorder LC_middle" src="/res/adm/pages/sequence.png" alt="'.$lt{impm}.'" onclick="javascript:toggleMap();" />' => $importpubform }
+        );
+        $importpubform = &create_form_ul(&create_list_elements(@importpubforma));
 
       my $extresourcesform=(<<ERFORM);
       <a class="LC_menubuttons_link" href="javascript:toggleUpload('ext');">$lt{'extr'}</a>$help{'Adding_External_Resource'}
@@ -3664,7 +3733,7 @@ SEDFFORM
       <input type="button" name="view" value="$lt{'prev'}" onclick="javascript:extUrlPreview('exturl');" /><br />
       $lt{'title'}:<br />
       <input type="text" size="60" name="exttitle" value="$lt{'extr'}" />
-      $uploadtag
+      $pathitem
       <br />
       <input type="hidden" name="importdetail" value="" />
       <input type="button" value="$lt{'lnk'}" onclick="javascript:setExternal(this.form,0)" />
@@ -3689,8 +3758,8 @@ ERFORM
  </form>
 
 HIDDENFORM
-        $r->print(&makesimpleeditform($uploadtag)."\n".
-                  &makedocslogform($uploadtag."\n".
+        $r->print(&makesimpleeditform($pathitem)."\n".
+                  &makedocslogform($pathitem."\n".
                                    '<input type="hidden" name="folder" value="'.
                                    $env{'form.folder'}.'" />'."\n"));
     }
@@ -3713,7 +3782,7 @@ HIDDENFORM
            $folder='default';
 	   $savefolderpath = $env{'form.folderpath'};
 	   $env{'form.folderpath'}='default&'.&escape(&mt('Content'));
-           $uploadtag = '<input type="hidden" name="folderpath" value="'.
+           $pathitem = '<input type="hidden" name="folderpath" value="'.
 	       &HTML::Entities::encode($env{'form.folderpath'},'<>&"').'" />';
        }
        my $postexec='';
@@ -3727,9 +3796,9 @@ HIDDENFORM
        } else {
            #$postexec='self.close();';
        }
-       my $folderseq='/uploaded/'.$coursedom.'/'.$coursenum.'/default_'.time.
+       my $folderseq='/uploaded/'.$coursedom.'/'.$coursenum.'/default_new.sequence';
                      '.sequence';
-       my $pageseq = '/uploaded/'.$coursedom.'/'.$coursenum.'/default_'.time.
+       my $pageseq = '/uploaded/'.$coursedom.'/'.$coursenum.'/default_new.page';
                      '.page';
 	my $container='sequence';
 	if ($env{'form.pagepath'}) {
@@ -3740,7 +3809,7 @@ HIDDENFORM
 	my $newnavform=(<<NNFORM);
 	<form action="/adm/coursedocs" method="post" name="newnav">
 	<input type="hidden" name="active" value="cc" />
-	$uploadtag
+	$pathitem
 	<input type="hidden" name="importdetail" 
 	value="$lt{'navc'}=/adm/navmaps" />
 	<a class="LC_menubuttons_link" href="javascript:document.newnav.submit()">$lt{'navc'}</a>
@@ -3750,7 +3819,7 @@ NNFORM
 	my $newsmppageform=(<<NSPFORM);
 	<form action="/adm/coursedocs" method="post" name="newsmppg">
 	<input type="hidden" name="active" value="cc" />
-	$uploadtag
+	$pathitem
 	<input type="hidden" name="importdetail" value="" />
 	<a class="LC_menubuttons_link" href="javascript:makesmppage();"> $lt{'sipa'}</a>
 	$help{'Simple Page'}
@@ -3760,7 +3829,7 @@ NSPFORM
 	my $newsmpproblemform=(<<NSPROBFORM);
 	<form action="/adm/coursedocs" method="post" name="newsmpproblem">
 	<input type="hidden" name="active" value="cc" />
-	$uploadtag
+	$pathitem
 	<input type="hidden" name="importdetail" value="" />
 	<a class="LC_menubuttons_link" href="javascript:makesmpproblem();">$lt{'sipr'}</a>
 	$help{'Simple Problem'}
@@ -3771,7 +3840,7 @@ NSPROBFORM
 	my $newdropboxform=(<<NDBFORM);
 	<form action="/adm/coursedocs" method="post" name="newdropbox">
 	<input type="hidden" name="active" value="cc" />
-	$uploadtag
+	$pathitem
 	<input type="hidden" name="importdetail" value="" />
 	<a class="LC_menubuttons_link" href="javascript:makedropbox();">$lt{'drbx'}</a>
 	</form>
@@ -3780,7 +3849,7 @@ NDBFORM
 	my $newexuploadform=(<<NEXUFORM);
 	<form action="/adm/coursedocs" method="post" name="newexamupload">
 	<input type="hidden" name="active" value="cc" />
-	$uploadtag
+	$pathitem
 	<input type="hidden" name="importdetail" value="" />
 	<a class="LC_menubuttons_link" href="javascript:makeexamupload();">$lt{'scuf'}</a>
 	$help{'Score_Upload_Form'}
@@ -3790,7 +3859,7 @@ NEXUFORM
 	my $newbulform=(<<NBFORM);
 	<form action="/adm/coursedocs" method="post" name="newbul">
 	<input type="hidden" name="active" value="cc" />
-	$uploadtag
+	$pathitem
 	<input type="hidden" name="importdetail" value="" />
 	<a class="LC_menubuttons_link" href="javascript:makebulboard();" >$lt{'bull'}</a>
 	$help{'Bulletin Board'}
@@ -3800,7 +3869,7 @@ NBFORM
 	my $newaboutmeform=(<<NAMFORM);
 	<form action="/adm/coursedocs" method="post" name="newaboutme">
 	<input type="hidden" name="active" value="cc" />
-	$uploadtag
+	$pathitem
 	<input type="hidden" name="importdetail" 
 	value="$plainname=/adm/$udom/$uname/aboutme" />
 	<a class="LC_menubuttons_link" href="javascript:document.newaboutme.submit()">$lt{'mypi'}</a>
@@ -3811,7 +3880,7 @@ NAMFORM
 	my $newaboutsomeoneform=(<<NASOFORM);
 	<form action="/adm/coursedocs" method="post" name="newaboutsomeone">
 	<input type="hidden" name="active" value="cc" />
-	$uploadtag
+	$pathitem
 	<input type="hidden" name="importdetail" value="" />
 	<a class="LC_menubuttons_link" href="javascript:makeabout();">$lt{'abou'}</a>
 	</form>
@@ -3821,7 +3890,7 @@ NASOFORM
 	my $newrosterform=(<<NROSTFORM);
 	<form action="/adm/coursedocs" method="post" name="newroster">
 	<input type="hidden" name="active" value="cc" />
-	$uploadtag
+	$pathitem
 	<input type="hidden" name="importdetail" 
 	value="$lt{'rost'}=/adm/viewclasslist" />
 	<a class="LC_menubuttons_link" href="javascript:document.newroster.submit()">$lt{'rost'}</a>
@@ -3863,7 +3932,7 @@ NFFORM
 	my $newsylform=(<<NSYLFORM);
 	<form action="/adm/coursedocs" method="post" name="newsyl">
 	<input type="hidden" name="active" value="cc" />
-	$uploadtag
+	$pathitem
 	<input type="hidden" name="importdetail" 
 	value="$lt{'syll'}=/public/$coursedom/$coursenum/syllabus" />
 	<a class="LC_menubuttons_link" href="javascript:document.newsyl.submit()">$lt{'syll'}</a>
@@ -3875,7 +3944,7 @@ NSYLFORM
 	my $newgroupfileform=(<<NGFFORM);
 	<form action="/adm/coursedocs" method="post" name="newgroupfiles">
 	<input type="hidden" name="active" value="cc" />
-	$uploadtag
+	$pathitem
 	<input type="hidden" name="importdetail"
 	value="$lt{'grpo'}=/adm/$coursedom/$coursenum/aboutme" />
 	<a class="LC_menubuttons_link" href="javascript:document.newgroupfiles.submit()">$lt{'grpo'}</a>
@@ -3918,7 +3987,7 @@ NGFFORM
 
 my %orderhash = (
                 'aa' => ['Import Content',$fileuploadform],
-                'bb' => ['Published Content',$simpleeditdefaultform],
+                'bb' => ['Published Content',$importpubform],
                 'cc' => ['Grading Resources',$gradingform],
                 );
 unless ($env{'form.pagepath'}) {
@@ -3930,7 +3999,7 @@ unless ($env{'form.pagepath'}) {
  $hadchanges=0;
        unless (($supplementalflag || $toolsflag)) {
           my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$crstype,
-                              $supplementalflag,\%orderhash,$iconpath,$uploadtag);
+                              $supplementalflag,\%orderhash,$iconpath,$pathitem);
           if ($error) {
              $r->print('<p><span class="LC_error">'.$error.'</span></p>');
           }
@@ -3955,12 +4024,11 @@ unless ($env{'form.pagepath'}) {
 	  $env{'form.folderpath'} = $savefolderpath;
        }
        $env{'form.pagepath'} = '';
+       $pathitem = '<input type="hidden" name="folderpath" value="'.
+                    &HTML::Entities::encode($env{'form.folderpath'},'<>&"').'" />';
        if ($allowed) {
 	   my $folderseq=
-	       '/uploaded/'.$coursedom.'/'.$coursenum.'/supplemental_'.time.
-	       '.sequence';
-
-	   my $path = &HTML::Entities::encode($env{'form.folderpath'},'<>&"');
+	       '/uploaded/'.$coursedom.'/'.$coursenum.'/supplemental_new.sequence';
 
 	my $supupdocform=(<<SUPDOCFORM);
         <a class="LC_menubuttons_link" href="javascript:toggleUpload('suppdoc');">
@@ -3979,7 +4047,7 @@ unless ($env{'form.pagepath'}) {
 	$lt{'comment'}:<br />
 	<textarea cols="50" rows="4" name="comment"></textarea>
 	<br />
-	<input type="hidden" name="folderpath" value="$path" />
+        $pathitem
 	<input type="hidden" name="cmd" value="upload_supplemental" />
         <input type='submit' value="$lt{'upld'}" />
         </form>
@@ -3987,7 +4055,7 @@ unless ($env{'form.pagepath'}) {
 	my $supnewfolderform=(<<SNFFORM);
 	<form action="/adm/coursedocs" method="post" name="supnewfolder">
 	<input type="hidden" name="active" value="ee" />
-	<input type="hidden" name="folderpath" value="$path" />
+        $pathitem
 	<input type="hidden" name="importdetail" value="" />
 	<a class="LC_menubuttons_link" href="javascript:makenewfolder(document.supnewfolder,'$folderseq');">$lt{'newf'}</a> 
 	$help{'Adding_Folders'}
@@ -4005,7 +4073,7 @@ SNFFORM
         <input type="button" name="view" value="$lt{'prev'}" onclick="javascript:extUrlPreview('exturl');" /><br />
         $lt{'title'}:<br />
         <input type="text" size="60" name="exttitle" value="$lt{'extr'}" />
-        $uploadtag
+        $pathitem
         <br />
         <input type="hidden" name="importdetail" value="" />
         <input type="button" value="$lt{'lnk'}" onclick="javascript:setExternal(this.form,0)" />
@@ -4056,14 +4124,14 @@ my %suporderhash = (
                 );
         if ($supplementalflag) {
            my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$crstype,
-                               $supplementalflag,\%suporderhash,$iconpath,$uploadtag);
+                               $supplementalflag,\%suporderhash,$iconpath,$pathitem);
            if ($error) {
               $r->print('<p><span class="LC_error">'.$error.'</span></p>');
            }
         }
     } elsif ($supplementalflag) {
         my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$crstype,
-                            $supplementalflag,'',$iconpath,$uploadtag);
+                            $supplementalflag,'',$iconpath,$pathitem);
         if ($error) {
             $r->print('<p><span class="LC_error">'.$error.'</span></p>');
         }
@@ -4546,6 +4614,34 @@ function makeabout() {
 }
 }
 
+function toggleUpload(caller) {
+    var blocks = Array($fieldsets);
+    for (var i=0; i<blocks.length; i++) {
+        var disp = 'none';
+        if (caller == blocks[i]) {
+            var curr = document.getElementById('upload'+caller+'form').style.display;
+            if (curr == 'none') {
+                disp='block';
+            }
+        }
+        document.getElementById('upload'+blocks[i]+'form').style.display=disp;
+    }
+    resize_scrollbox('contentscroll','1','1');
+    return;
+}
+
+function toggleMap() {
+    var disp = 'none';
+    var curr = document.getElementById('importmapform').style.display;
+    if (curr == 'none') {
+        disp='block';
+    }
+    document.getElementById('importmapform').style.display=disp;
+    resize_scrollbox('contentscroll','1','1');
+    return;
+}
+
+
 function extUrlPreview(caller) {
     if (document.getElementById(caller)) {
         var url = document.getElementById(caller).value;
@@ -4748,6 +4844,7 @@ function showPage(current, pageId, nav,
 	currentData.style.display = 'block';
         activeTab = pageId;
         toggleUpload();
+        toggleMap();
         if (nav == 'mainnav') {
             var storedpath = "$docs_folderpath";
             if (storedpath == '') {