--- loncom/interface/londocs.pm	2012/12/13 02:45:27	1.484.2.15
+++ loncom/interface/londocs.pm	2012/11/01 01:01:13	1.502
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.484.2.15 2012/12/13 02:45:27 raeburn Exp $
+# $Id: londocs.pm,v 1.502 2012/11/01 01:01:13 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -537,7 +537,7 @@ sub docs_change_log {
                                   ':'.$docslog{$id}{'exe_udom'}.'</tt>'.
                   $send_msg_link.'</td><td>'.
                   $docslog{$id}{'logentry'}{'folder'}.'</td><td>');
-        my $is_supp = 0;
+        my $is_supp = 0; 
         if ($docslog{$id}{'logentry'}{'currentfolder'} =~ /^supplemental/) {
             $is_supp = 1;
         }
@@ -560,7 +560,7 @@ sub docs_change_log {
                 if ($is_supp) {
                     $shown = &Apache::loncommon::parse_supplemental_title($shown);
                 }
-                $r->print('<li>'.$shown.'</li>');
+		$r->print('<li>'.$shown.'</li>');
 	    }
 	}
 	$r->print('</ul>');
@@ -711,7 +711,7 @@ sub print_paste_buffer {
         $canpaste = &supp_pasteable($env{'docs.markedcopy_url'});
         unless ($canpaste) {
             $nopaste = &mt('Paste into Supplemental Content unavailable for this type of content.');
-        }
+        } 
     } else {
         $canpaste = 1;
     }
@@ -725,11 +725,11 @@ sub print_paste_buffer {
                 $othercourse = 1;
                 if ($env{"user.priv.cm./$srcdom/$srcnum"} =~ /\Q:mdc&F\E/) {
                     if ($canpaste) {
-                        $othercrs = '<br />'.&mt('(from another course).');
+                        $othercrs = '<br />'.&mt('(from another course).');  
                     }
                 } else {
                     $canpaste = 0;
-                    $nopaste = &mt('Paste from another course unavailable.')
+                    $nopaste = &mt('Paste from another course unavailable.') 
                 }
             }
             if ($rem =~ m{^(default|supplemental)_?(\d*)\.(?:page|sequence)$}) {
@@ -747,18 +747,18 @@ sub print_paste_buffer {
              .'<legend>'.&mt('Clipboard').'</legend>');
     my ($type,$buffer);
     if ($is_external) {
-	$type = &mt('External Resource');
-	$buffer = $type.': '.
-		  &LONCAPA::map::qtescape($env{'docs.markedcopy_title'}).' ('.
+        $type = &mt('External Resource');
+        $buffer = $type.': '.
+                  &LONCAPA::map::qtescape($env{'docs.markedcopy_title'}).' ('.
                   &LONCAPA::map::qtescape($env{'docs.markedcopy_url'}).')';
     }  else {
-	my $icon = &Apache::loncommon::icon($extension);
-	if ($extension eq 'sequence' &&
-	    $env{'docs.markedcopy_url'} =~ m{/default_\d+\.sequence$ }x) {
-	    $icon = &Apache::loncommon::lonhttpdurl($r->dir_config('lonIconsURL'));
-	    $icon .= '/navmap.folder.closed.gif';
-	}
-	$icon = '<img src="'.$icon.'" alt="" class="LC_icon" />';
+        my $icon = &Apache::loncommon::icon($extension);
+        if ($extension eq 'sequence' &&
+            $env{'docs.markedcopy_url'} =~ m{/default_\d+\.sequence$ }x) {
+            $icon = &Apache::loncommon::lonhttpdurl($r->dir_config('lonIconsURL'));
+            $icon .= '/navmap.folder.closed.gif';
+        }
+        $icon = '<img src="'.$icon.'" alt="" class="LC_icon" />';
         $buffer = $icon.$type.': '.  &Apache::loncommon::parse_supplemental_title(&LONCAPA::map::qtescape($env{'docs.markedcopy_title'}));
     }
     if ($canpaste) {
@@ -772,7 +772,7 @@ sub print_paste_buffer {
                           '<label>'.
                           '<input type="radio" name="docs.markedcopy_options" value="new" checked="checked" />'.
                           &mt('Copy to new folder').'</label>'.('&nbsp;' x2).
-                          '<label>'.
+                          '<label>'.   
                           '<input type="radio" name="docs.markedcopy_options" value="move" />'.
                           &mt('Move old folder').'</label><br />');
                 if ($env{'docs.markedcopy_nested'}) {
@@ -784,7 +784,7 @@ sub print_paste_buffer {
                     my %depths = (
                                    $lastdir => 0,
                                  );
-                    my (%display,%deps);
+                    my (%display,%deps); 
                     for (my $i=0; $i<@pastemaps; $i++) {
                         ($lastdir,my $subfolderstr) = split(/\:/,$pastemaps[$i]);
                         my ($namedir,$esctitlestr) = split(/\:/,$titles[$i]);
@@ -796,7 +796,7 @@ sub print_paste_buffer {
                         my $indent = ('&nbsp;' x $offset);
                         for (my $j=0; $j<@subfolders; $j++) {
                             $depths{$subfolders[$j]} = $depth;
-                            $display{$subfolders[$j]} =
+                            $display{$subfolders[$j]} = 
                                   '<tr><td>'.$indent.$subfoldertitles[$j].'&nbsp;</td>'.
                                   '<td><label>'.
                                   '<input type="radio" name="docs.markedcopy_'.$subfolders[$j].'" value="new" checked="checked" />'.&mt('Copy to new').'</label>'.('&nbsp;' x2).
@@ -814,12 +814,12 @@ sub print_paste_buffer {
         }
         $r->print('<br /><input type="submit" name="pastemarked" value="'.&mt('Paste').'" />'.$othercrs);
         if ($container eq 'page') {
-	    $r->print('
-	<input type="hidden" name="pagepath" value="'.&HTML::Entities::encode($env{'form.pagepath'},'<>&"').'" />
-	<input type="hidden" name="pagesymb" value="'.&HTML::Entities::encode($env{'form.pagesymb'},'<>&"').'" />
+            $r->print('
+        <input type="hidden" name="pagepath" value="'.&HTML::Entities::encode($env{'form.pagepath'},'<>&"').'" />
+        <input type="hidden" name="pagesymb" value="'.&HTML::Entities::encode($env{'form.pagesymb'},'<>&"').'" />
 ');
         } else {
-	    $r->print('
+            $r->print('
         <input type="hidden" name="folderpath" value="'.&HTML::Entities::encode($env{'form.folderpath'},'<>&"').'" />
 ');
         }
@@ -901,22 +901,22 @@ sub do_paste_from_buffer {
 
     my ($is_map,$srcdom,$srcnum,$prefixchg,%before,%after,%mapchanges,%tomove);
     if ($url=~/\.(page|sequence)$/) {
-        $is_map = 1;
+        $is_map = 1; 
     }
     if ($url =~ m{^/uploaded/($match_domain)/($match_courseid)/([^/]+)}) {
         $srcdom = $1;
         $srcnum = $2;
         my $oldprefix = $3;
 # When paste buffer was populated using an active role in a different course
-# check for mdc privilege in the course from which the resource was pasted
+# check for mdc privilege in the course from which the resource was pasted 
         if (($srcdom ne $coursedom) || ($srcnum ne $coursenum)) {
             unless ($env{"user.priv.cm./$srcdom/$srcnum"} =~ /\Q:mdc&F\E/) {
                 return (&mt('Paste failed: Item is from a different course which you do not have rights to edit.'));
             }
         }
-# When pasting content from Main Content to Supplemental Content and vice versa
+# When pasting content from Main Content to Supplemental Content and vice versa 
 # URLs will contain different paths (which depend on whether pasted item is
-# a folder/page or a document.
+# a folder/page or a document.   
         if (($folder =~ /^supplemental/) && (($oldprefix =~ /^default/) || ($oldprefix eq 'docs'))) {
             $prefixchg = 1;
             %before = ( map => 'default',
@@ -960,7 +960,7 @@ sub do_paste_from_buffer {
         if ($folder =~ /^default/) {
             my $lastchange = &Apache::lonnet::get_coursechange($coursedom,$coursenum);
             if ($lastchange > $env{'request.course.tied'}) {
-                &reinit_role($coursedom,$coursenum,$env{"course.$env{'request.course.id'}.home"});
+                &reinit_role($coursedom,$coursenum,$env{"course.$env{'request.course.id'}.home"}); 
             }
         }
 # If pasting a map, check if map contains other maps
@@ -978,7 +978,7 @@ sub do_paste_from_buffer {
         if ($url=~ m{^/uploaded/}) {
             my $newurl;
             unless ($env{'form.docs.markedcopy_options'} eq 'move') {
-                ($newurl,my $error) =
+                ($newurl,my $error) = 
                     &get_newmap_url($url,$folder,$prefixchg,$coursedom,$coursenum,
                                     $srcdom,$srcnum,\$title,\%allmaps,\%newurls);
                 if ($error) {
@@ -1005,7 +1005,7 @@ sub do_paste_from_buffer {
             } elsif ($env{'docs.markedcopy_nested'}) {
                 &url_paste_fixups($url,$folder,$prefixchg,$coursedom,$coursenum,\%allmaps,\%rewrites,
                                   \%retitles,\%copies,\%dbcopies,\%zombies,\%params,\%mapmoves,
-                                  \%mapchanges,\%tomove,\%newsubdir,\%newurls);
+                                  \%mapchanges,\%tomove,\%newsubdir,\%newurls); 
             }
         } elsif ($url=~m {^/res/}) {
 # published maps can only exists once, so remove it from paste buffer when done
@@ -1019,21 +1019,21 @@ sub do_paste_from_buffer {
         }
     }
     if ($url=~ m{/smppg$}) {
-        my $db_name = &Apache::lonsimplepage::get_db_name($url);
-        if ($db_name =~ /^smppage_/) {
-            #simple pages, need to copy the db contents to a new one.
-            my %contents=&Apache::lonnet::dump($db_name,$coursedom,$coursenum);
-            my $now = time();
-            $db_name =~ s{_\d*$ }{_$now}x;
-            my $dbresult=&Apache::lonnet::put($db_name,\%contents,
-                                            $coursedom,$coursenum);
+	my $db_name = &Apache::lonsimplepage::get_db_name($url);
+	if ($db_name =~ /^smppage_/) {
+	    #simple pages, need to copy the db contents to a new one.
+	    my %contents=&Apache::lonnet::dump($db_name,$coursedom,$coursenum);
+	    my $now = time();
+	    $db_name =~ s{_\d*$ }{_$now}x;
+	    my $dbresult=&Apache::lonnet::put($db_name,\%contents,
+					    $coursedom,$coursenum);
             if ($dbresult eq 'ok') {
                 $url =~ s{/(\d*)/smppg$ }{/$now/smppg}x;
                 $title=&mt('Copy of').' '.$title;
             } else {
                 return (&mt('Paste failed: An error occurred when copying the simple page.'));
             }
-        }
+	}
     }
     $title = &LONCAPA::map::qtunescape($title);
     my $ext='false';
@@ -1076,7 +1076,7 @@ sub do_paste_from_buffer {
             }
         }
     }
-# Apply any changes to maps, or copy dependencies for uploaded HTML pages
+# Apply any changes to maps, or copy dependencies for uploaded HTML pages 
     my ($result,$save_err);
     $result =
         &apply_fixups($folder,$is_map,$prefixchg,$coursedom,$coursenum,$oldurl,
@@ -1084,7 +1084,7 @@ sub do_paste_from_buffer {
                       \%copies,\%dbcopies,\%zombies,\%params,\%docmoves,
                       \%mapmoves,\%newsubdir,$errors,\%before,\%after);
     if ($result eq 'ok') {
-        if ($is_map) {
+        if ($is_map) { 
             my ($errtext,$fatal) = &mapread($coursenum,$coursedom,
                                             $folder.'.'.$container);
             return $errtext if ($fatal);
@@ -1108,17 +1108,17 @@ sub do_paste_from_buffer {
                        $env{'user.domain'}.'___&&&___'.$title;
             }
         }
-        $LONCAPA::map::resources[$newidx]=      $title.':'.$url.':'.$ext.':normal:res';
+        $LONCAPA::map::resources[$newidx]= 	$title.':'.$url.':'.$ext.':normal:res';
         push(@LONCAPA::map::order, $newidx);
 
 # Store the result
-        my ($errtext,$fatal) =
+        my ($errtext,$fatal) = 
             &storemap($coursenum,$coursedom,$folder.'.'.$container,1);
         if ($fatal) {
             $save_err = $errtext;
         }
     }
-
+   
     if ($env{'form.docs.markedcopy_options'} eq 'move') {
         &Apache::lonnet::delenv('docs.markedcopy');
         &Apache::lonnet::delenv('docs.markedcopy_nested');
@@ -1242,7 +1242,7 @@ sub contained_map_check {
                         $titles->{$url}{$token->[2]->{'id'}} = $token->[2]->{'title'};
                     } else {
                         if ($allmaps->{$ressrc}) {
-                            $removefrommap->{$url}{$token->[2]->{'id'}} = $ressrc;
+                            $removefrommap->{$url}{$token->[2]->{'id'}} = $ressrc; 
                         } elsif (ref($addedmaps->{$ressrc}) eq 'ARRAY') {
                             $removefrommap->{$url}{$token->[2]->{'id'}} = $ressrc;
                         } else {
@@ -1257,7 +1257,7 @@ sub contained_map_check {
                     if (ref($removeparam->{$url}{$token->[2]->{'to'}}) eq 'ARRAY') {
                         push(@{$removeparam->{$url}{$token->[2]->{'to'}}},$token->[2]->{'name'});
                     } else {
-                        $removeparam->{$url}{$token->[2]->{'to'}} = [$token->[2]->{'name'}];
+                        $removeparam->{$url}{$token->[2]->{'to'}} = [$token->[2]->{'name'}]; 
                     }
                 }
             }
@@ -1309,7 +1309,7 @@ sub url_paste_fixups {
             }
             next if ($token->[2]->{'type'} eq 'external');
             if ($token->[2]->{'type'} eq 'zombie') {
-                next if ($skip);
+                next if ($skip);  
                 $zombies->{$oldurl}{$ressrc} = $id;
                 $changed = 1;
             } elsif ($ressrc =~ m{^/uploaded/($match_domain)/($match_courseid)/(.+)$}) {
@@ -1341,7 +1341,7 @@ sub url_paste_fixups {
                 }
                 if (($srcdom ne $cdom) || ($srcnum ne $cnum) || ($prefixchg) ||
                     ($mapchanges->{$oldurl}) || (($newurl ne '') && ($newurl ne $oldurl))) {
-
+                   
                     if ($rem =~ /^(default|supplemental)(_?\d*).(sequence|page)$/) {
                         $rewrites->{$oldurl}{$ressrc} = $id;
                         $mapchanges->{$ressrc} = 1;
@@ -1359,7 +1359,7 @@ sub url_paste_fixups {
                     }
                 }
             } elsif ($ressrc =~ m{^/adm/($match_domain)/($match_courseid)/(.+)$}) {
-                next if ($skip);
+                next if ($skip);  
                 my $srcdom = $1;
                 my $srcnum = $2;
                 if (($srcdom ne $cdom) || ($srcnum ne $cnum)) {
@@ -1379,7 +1379,7 @@ sub url_paste_fixups {
             }
         } elsif ($token->[1] eq 'param') {
             next if ($skip);
-            my $to = $token->[2]->{'to'};
+            my $to = $token->[2]->{'to'}; 
             if ($to ne '') {
                 if (ref($params->{$oldurl}{$to}) eq 'ARRAY') {
                     push(@{$params->{$oldurl}{$to}},$token->[2]->{'name'});
@@ -1417,7 +1417,7 @@ sub apply_fixups {
         }
         if (@allcopies > 0) {
             foreach my $item (@allcopies) {
-                my ($relpath,$oldsubdir,$fname) =
+                my ($relpath,$oldsubdir,$fname) = 
                     ($item =~ m{^(/uploaded/$match_domain/$match_courseid/(?:docs|supplemental)/(default|\d+)/.*/)([^/]+)$});
                 if ($fname ne '') {
                     my $content = &Apache::lonnet::getfile($item);
@@ -1436,7 +1436,7 @@ sub apply_fixups {
                             }
                         }
                         &copy_dependencies($item,$storefn,$relpath,$errors,\$content);
-                        my $copyurl =
+                        my $copyurl = 
                             &Apache::lonclonecourse::writefile($env{'request.course.id'},
                                                                $storefn.$fname,$content);
                         if ($copyurl eq '/adm/notfound.html') {
@@ -1582,7 +1582,7 @@ sub apply_fixups {
             }
             foreach my $idx (keys(%remparam)) {
                 if (ref($remparam{$idx}) eq 'ARRAY') {
-                    foreach my $name (@{$remparam{$idx}}) {
+                    foreach my $name (@{$remparam{$idx}}) {   
                         &LONCAPA::map::delparameter($idx,'parameter_'.$name);
                     }
                 }
@@ -1795,7 +1795,7 @@ sub editor {
                 &do_paste_from_buffer($coursenum,$coursedom,$folder,$container,
                                       \%paste_errors);
                 if ($save_error ne '') {
-                    return $save_error;
+                    return $save_error; 
                 }
             if ($paste_res ne 'ok') {
                 $r->print('<p><span class="LC_error">'.$paste_res.'</span></p>');
@@ -1828,18 +1828,6 @@ 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]);
 		}
 	    }
@@ -2214,9 +2202,9 @@ sub entryline {
         my $nocut=0;
         my $noremove=0;
         if ($url=~ m{^/res/.+\.(page|sequence)$}) {
-            # no copy for published maps
-            $nocopy=1;
-        }
+	    # no copy for published maps
+	    $nocopy=1;
+	}
         if ($url=~/^\/res\/lib\/templates\//) {
            $nocopy=1;
            $nocut=1;
@@ -2396,13 +2384,13 @@ END
 	    } elsif ($url=~m|^/ext/|) {
 	        $url='/adm/wrapper'.$url;
 	        $external = 1;
- 	    }
+	    }
             if (&Apache::lonnet::symbverify($symb,$url)) {
-                $url.=(($url=~/\?/)?'&':'?').'symb='.&escape($symb);
+	        $url.=(($url=~/\?/)?'&':'?').'symb='.&escape($symb);
             } else {
                 $url='';
             }
-        }
+	}
     }
     my ($rand_pick_text,$rand_order_text);
     if ($isfolder || $extension eq 'sequence') {
@@ -2452,11 +2440,11 @@ $form_common.'
 	    '&amp;pagesymb='.&escape($symb);
     }
     if ($allowed) {
-        my $fileloc =
+        my $fileloc = 
             &Apache::lonnet::declutter(&Apache::lonnet::filelocation('',$orig_url));
 
         if ($external) {
-            $editlink = <<"EXTLNK";
+	    $editlink = <<"EXTLNK";
             &nbsp;
             <a class="LC_docs_ext_edit" href="javascript:editext('$residx');">
             $lt{'ed'}</a>
@@ -2478,15 +2466,14 @@ $form_common.'
             </fieldset>
             </form>
 EXTLNK
-        } else {
-            my ($cfile,$home,$switchserver,$forceedit,$forceview) =
-                &Apache::lonnet::can_edit_resource($fileloc,$coursenum,$coursedom,$orig_url);
+        } else { 
+            my ($cfile,$home,$switchserver,$uploaded) = 
+                &Apache::lonnet::can_edit_resource($fileloc,$coursenum,$coursedom);
             if (($cfile ne '') && ($symb ne '')) {
-                my $jscall =
+                my $jscall = 
                     &Apache::lonhtmlcommon::jump_to_editres($cfile,$home,
                                                             $switchserver,
-                                                            $forceedit,
-                                                            undef,$symb);
+                                                            $uploaded,$symb);
                 if ($jscall) {
                     $editlink = '&nbsp;<a class="LC_docs_ext_edit" href="javascript:'.
                                 $jscall.'" >'.&mt('Edit').'</a>';
@@ -2549,30 +2536,6 @@ 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()
@@ -2939,7 +2902,7 @@ ENDHEADERS
     '</b>');
     foreach my $key (sort(keys(%changes))) {
         #excludes not versionable problems from resource version history:
-        next unless ($changes{$key}>$starttime && $key !~ /^\/res\/lib\/templates/);
+        if ($changes{$key}>$starttime && $key !~ /^\/res\/lib\/templates/) {
 	    my ($root,$extension)=($key=~/^(.*)\.(\w+)$/);
 	    my $currentversion=&Apache::lonnet::getversion($key);
 	    if ($currentversion<0) {
@@ -3130,6 +3093,7 @@ sub startContentScreen {
     if (($mode eq 'navmaps') || ($mode eq 'supplemental')) {
         $output .= '<li'.(($mode eq 'navmaps')?' class="active"':'').'><a href="/adm/navmaps"><b>&nbsp;&nbsp;&nbsp;&nbsp;'.&mt('Content Overview').'&nbsp;&nbsp;&nbsp;&nbsp;</b></a></li>'."\n";
         $output .= '<li'.(($mode eq 'coursesearch')?' class="active"':'').'><a href="/adm/searchcourse"><b>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'.&mt('Content Search').'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b></a></li>'."\n";
+        $output .= '<li'.(($mode eq 'courseindex')?' class="active"':'').'><a href="/adm/indexcourse"><b>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'.&mt('Content Index').'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b></a></li>'."\n";
         $output .= '<li '.(($mode eq 'suppdocs')?' class="active"':'').'><a href="/adm/supplemental"><b>'.&mt('Supplemental Content').'</b></a></li>';
     } else {
         $output .= '<li '.(($mode eq 'docs')?' class="active"':'').' id="tabbededitor"><a href="/adm/coursedocs?forcestandard=1"><b>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'.&mt('Content Editor').'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b></a></li>'."\n";
@@ -3176,7 +3140,7 @@ sub handler {
 	               'Adding_External_Resource','Navigate_Content',
 	               'Adding_Folders','Docs_Overview', 'Load_Map',
 	               'Supplemental','Score_Upload_Form','Adding_Pages',
-                       'Importing_LON-CAPA_Resource','Importing_IMS_Course',
+	               'Importing_LON-CAPA_Resource','Importing_IMS_Course',
                        'Uploading_From_Harddrive',
 	               'Check_Resource_Versions','Verify_Content') {
 	$help{$topic}=&Apache::loncommon::help_open_topic('Docs_'.$topic);
@@ -3469,10 +3433,12 @@ sub handler {
                           };
         }
         if ($env{'docs.markedcopy_url'}) {
-            $script .= &paste_popup_js();
+            $script .= &paste_popup_js(); 
         }
         my $confirm_switch = &mt("Editing requires switching to the resource's home server.").'\n'.
                              &mt('Switch server?');
+        
+
     }
 # -------------------------------------------------------------------- Body tag
     $script = '<script type="text/javascript">'."\n"
@@ -3569,7 +3535,7 @@ sub handler {
                 'upld' => 'Import Content',
                 'srch' => 'Search',
                 'impo' => 'Import',
-                'lnks' => 'Import from Stored Links',
+		'lnks' => 'Import from Stored Links',
                 'impm' => 'Import from Assembled Map',
                 'selm' => 'Select Map',
                 'load' => 'Load Map',
@@ -3591,13 +3557,13 @@ sub handler {
                 'imsf' => 'IMS Import',
                 'imsl' => 'Import IMS package',
                 'cms'  => 'Origin of IMS package',
-                'file' =>  'File',
                 'se'   => 'Select',
+                'file' =>  'File',
                 'title' => 'Title',
                 'comment' => 'Comment',
                 'url'  => 'URL',
                 'prev' => 'Preview',
-                'lnk'  => 'Add Link',
+                'lnk'  => 'Add Link', 
                 'parse' => 'Upload embedded images/multimedia files if HTML file',
 		'nd' => 'Upload Document',
 		'pm' => 'Published Map',
@@ -3620,7 +3586,7 @@ FIUP
 CHBO
         my $imsfolder = $env{'form.folder'};
         if ($imsfolder eq '') {
-            $imsfolder = 'default';
+            $imsfolder = 'default';  
         }
         my $imspform=(<<IMSFORM);
         <a class="LC_menubuttons_link" href="javascript:toggleUpload('ims');">
@@ -3631,7 +3597,7 @@ CHBO
         $fileupload
         <br />
         <p>
-        $lt{'cms'}:&nbsp;
+        $lt{'cms'}:&nbsp; 
         <select name="source">
         <option value="-1" selected="selected">$lt{'se'}</option>
         <option value="bb5">Blackboard 5</option>
@@ -3647,7 +3613,7 @@ CHBO
         </form>
 IMSFORM
 
-        my $fileuploadform=(<<FUFORM);
+	my $fileuploadform=(<<FUFORM);
         <a class="LC_menubuttons_link" href="javascript:toggleUpload('doc');">
         $lt{'upfi'}</a> $help{'Uploading_From_Harddrive'}
         <form name="uploaddocument" action="/adm/coursedocs" method="post" enctype="multipart/form-data">
@@ -3670,16 +3636,16 @@ IMSFORM
         </form>
 FUFORM
 
-        my $importpubform=(<<SEDFFORM);
+	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">
+	<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" />
+	<input type="hidden" name="active" value="bb" />
         $lt{'copm'}<br />
         <span class="LC_nobreak">
-        <input type="text" name="importmap" size="40" value=""
+        <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'}" />
@@ -3687,14 +3653,13 @@ FUFORM
         </form>
 
 SEDFFORM
-
-	my @simpleeditdefaultforma = ( 
+	my @importpubforma = (
 	{ '<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/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>" },
+	{ '<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>" },
         { '<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));
+	);
+	$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'}
@@ -3770,9 +3735,9 @@ HIDDENFORM
        } else {
            #$postexec='self.close();';
        }
-       my $folderseq='/uploaded/'.$coursedom.'/'.$coursenum.'/default_new.sequence';
+       my $folderseq='/uploaded/'.$coursedom.'/'.$coursenum.'/default_'.time.
                      '.sequence';
-       my $pageseq = '/uploaded/'.$coursedom.'/'.$coursenum.'/default_new.page';
+       my $pageseq = '/uploaded/'.$coursedom.'/'.$coursenum.'/default_'.time.
                      '.page';
 	my $container='sequence';
 	if ($env{'form.pagepath'}) {
@@ -3934,7 +3899,6 @@ NGFFORM
         $specialdocumentsform = &create_form_ul(&create_list_elements(@specialdocumentsforma));
 
 
-
         my @importdoc = (
         {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/extres.png" alt="'.$lt{extr}.'" onclick="toggleUpload(\'ext\');" />'=>$extresourcesform},
         {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/ims.png" alt="'.$lt{imsf}.'" onclick="javascript:toggleUpload(\'ims\');" />'=>$imspform},
@@ -4000,7 +3964,8 @@ unless ($env{'form.pagepath'}) {
        $env{'form.pagepath'} = '';
        if ($allowed) {
 	   my $folderseq=
-	       '/uploaded/'.$coursedom.'/'.$coursenum.'/supplemental_new.sequence';
+	       '/uploaded/'.$coursedom.'/'.$coursenum.'/supplemental_'.time.
+	       '.sequence';
 
 	   my $path = &HTML::Entities::encode($env{'form.folderpath'},'<>&"');
 
@@ -4025,6 +3990,7 @@ unless ($env{'form.pagepath'}) {
 	<input type="hidden" name="cmd" value="upload_supplemental" />
         <input type='submit' value="$lt{'upld'}" />
         </form>
+SUPDOCFORM
 
 	my $supnewfolderform=(<<SNFFORM);
 	<form action="/adm/coursedocs" method="post" name="supnewfolder">
@@ -4085,11 +4051,12 @@ my @specialdocs = (
             =>$supnewaboutmeform},
 		);
 my @supimportdoc = (
-		{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/extres.png" alt="'.$lt{extr}.'" onclick="javascript:makenewext(\'supext\');" />'
+		{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/extres.png" alt="'.$lt{extr}.'" onclick="toggleUpload(\'suppext\')" />'
             =>$supextform},
                 {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/pdfupload.png" alt="'.$lt{upl}.'" onclick="javascript:toggleUpload(\'suppdoc\');" />'
             =>$supupdocform},
-        );
+                   );
+
 $supupdocform =  &create_form_ul(&create_list_elements(@supimportdoc));
 my %suporderhash = (
 		'00' => ['Supnewfolder', $supnewfolderform],
@@ -4378,14 +4345,14 @@ sub generate_edit_table {
     my $backicon = $iconpath.'clickhere.gif';
     my $backtext = &mt('To Overview');
     $form = '<div class="LC_Box" style="margin:0;">'.
-             '<ul id="navigation'.$tid.'" class="LC_TabContent">'."\n".
-             '<li class="goback">'.
-             '<a href="javascript:toContents('."'$jumpto'".');">'.
-             '<img src="'.$backicon.'" class="LC_icon" style="border: none; vertical-align: top;"'.
-             '  alt="'.$backtext.'" />'.$backtext.'</a></li>'."\n".
-             '<li>'.
-             '<a href="javascript:groupopen('."'$readfile'".',1);">'.
-             &mt('Undo Delete').'</a></li>'."\n";
+            '<ul id="navigation'.$tid.'" class="LC_TabContent">'."\n".
+            '<li class="goback">'.
+            '<a href="javascript:toContents('."'$jumpto'".');">'.
+            '<img src="'.$backicon.'" class="LC_icon" style="border: none; vertical-align: top;"'.
+            '  alt="'.$backtext.'" />'.$backtext.'</a></li>'."\n".
+            '<li>'.
+            '<a href="javascript:groupopen('."'$readfile'".',1);">'.
+            &mt('Undo Delete').'</a></li>'."\n";
     if ($env{'form.docslog'}) {
         $form .= '<li class="active">';
     } else {
@@ -4818,7 +4785,6 @@ function showPage(current, pageId, nav,
 	currentData.style.display = 'block';
         activeTab = pageId;
         toggleUpload();
-        toggleMap();
         if (nav == 'mainnav') {
             var storedpath = "$docs_folderpath";
             if (storedpath == '') {