--- loncom/interface/londocs.pm	2009/05/21 02:47:48	1.325.2.1
+++ loncom/interface/londocs.pm	2009/04/15 12:44:24	1.364
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.325.2.1 2009/05/21 02:47:48 raeburn Exp $
+# $Id: londocs.pm,v 1.364 2009/04/15 12:44:24 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -59,7 +59,6 @@ my $hadchanges;
 my %help=();
 
 
-
 sub mapread {
     my ($coursenum,$coursedom,$map)=@_;
     return
@@ -73,7 +72,7 @@ sub storemap {
       &LONCAPA::map::storemap('/uploaded/'.$coursedom.'/'.$coursenum.'/'.
 			      $map,1);
     if ($errtext) { return ($errtext,2); }
-    
+
     $hadchanges=1;
     return ($errtext,0);
 }
@@ -120,11 +119,9 @@ sub dumpbutton {
     my $type = &Apache::loncommon::course_type();
     if ($home+$other==0) { return ''; }
     if ($home) {
-	return '<div>'.
-	    '<input type="submit" name="dumpcourse" value="'.
+	return '<input type="submit" name="dumpcourse" value="'.
 	    &mt('Dump '.$type.' DOCS to Construction Space').'" />'.
-	    &Apache::loncommon::help_open_topic('Docs_Dump_Course_Docs').
-	    '</div>';
+	    &Apache::loncommon::help_open_topic('Docs_Dump_Course_Docs').'<br />';
     } else {
 	return '<div>'.
      &mt('Dump '.$type.
@@ -136,7 +133,7 @@ sub dumpbutton {
 sub clean {
     my ($title)=@_;
     $title=~s/[^\w\/\!\$\%\^\*\-\_\=\+\;\:\,\\\|\`\~]+/\_/gs;
-    return $title;	
+    return $title;
 }
 
 
@@ -178,8 +175,8 @@ sub dumpcourse {
 	    my $fail=0;
 	    for (my $i=0;$i<$#dirs;$i++) {
 		$makepath.='/'.$dirs[$i];
-		unless (-e $makepath) { 
-		    unless(mkdir($makepath,0777)) { $fail=1; } 
+		unless (-e $makepath) {
+		    unless(mkdir($makepath,0777)) { $fail=1; }
 		}
 	    }
 	    $r->print('<br /><tt>'.$item.'</tt> => <tt>'.$newfilename.'</tt>: ');
@@ -265,10 +262,9 @@ sub dumpcourse {
 
 sub exportbutton {
     my $type = &Apache::loncommon::course_type();
-    return '<div>'.
-            '<input type="submit" name="exportcourse" value="'.
+    return '<input type="submit" name="exportcourse" value="'.
             &mt('Export '.$type.' to IMS').'" />'.
-    &Apache::loncommon::help_open_topic('Docs_Export_Course_Docs').'</div>';
+    &Apache::loncommon::help_open_topic('Docs_Export_Course_Docs').'<br />';
 }
 
 
@@ -401,10 +397,10 @@ sub exportcourse {
                     $display .= '<img src="/adm/lonIcons/whitespace1.gif" class="LC_docs_spacer" /><img src="/adm/lonIcons/whitespace1.gif" class="LC_docs_spacer" />'."\n";
                 }
                 if ($curRes->is_sequence()) {
-                    $display .= '<img src="/adm/lonIcons/navmap.folder.open.gif" alt="" />&nbsp;'."\n";
+                    $display .= '<img src="/adm/lonIcons/navmap.folder.open.gif">&nbsp;'."\n";
                     $lastcontainer = $count + $startcount + $boards;
                 } elsif ($curRes->is_page()) {
-                    $display .= '<img src="/adm/lonIcons/navmap.page.open.gif" alt="" />&nbsp;'."\n";
+                    $display .= '<img src="/adm/lonIcons/navmap.page.open.gif">&nbsp;'."\n";
                     $lastcontainer = $count + $startcount + $boards;
                 }
                 my $currelem = $count+$boards+$startcount;
@@ -431,7 +427,7 @@ function checkAll(field) {
         field.checked = true
     }
 }
-                                                                                
+
 function uncheckAll(field) {
     if (field.length > 0) {
         for (i = 0; i < field.length; i++) {
@@ -446,7 +442,7 @@ function propagateCheck(item) {
     if (document.exportdoc.elements[item].checked == true) {
         containerCheck(item)
     }
-} 
+}
 
 function containerCheck(item) {
     document.exportdoc.elements[item].checked = true
@@ -469,7 +465,7 @@ function containerCheck(item) {
         for (var j=0; j<parents[item].length; j++) {
             containerCheck(parents[item][j])
         }
-     }   
+     }
 }
 
 </script>
@@ -763,7 +759,7 @@ sub replicate_content {
     if ($caller eq 'templateupload') {
         $url = $symb;
         $url =~ s#//#/#g;
-    } else { 
+    } else {
         ($map,$ind,$url)=&Apache::lonnet::decode_symb($symb);
     }
     my $content;
@@ -803,9 +799,9 @@ sub replicate_content {
                     $$message = 'Could not render '.$url.' server message - '.$rtncode."<br />\n";
                 }
             } elsif ($caller eq 'noedit') {
-# Need to render the resource without the LON-CAPA Internal header and the Post discussion footer, and then set $content equal to this. 
+# Need to render the resource without the LON-CAPA Internal header and the Post discussion footer, and then set $content equal to this.
                 $repstatus = 'ok';
-                $content = 'Not the owner of this resource'; 
+                $content = 'Not the owner of this resource';
             }
             if ($repstatus eq 'ok') {
                 print $copiedfile $content;
@@ -856,14 +852,14 @@ sub extract_media {
             }
         }
         if ($caller eq 'resource') {
-            my $respath =  $Apache::lonnet::perlvar{'lonDocRoot'}.'/res';  
-            my $embed_path = &Apache::lonnet::filelocation($respath,$embed_url); 
+            my $respath =  $Apache::lonnet::perlvar{'lonDocRoot'}.'/res';
+            my $embed_path = &Apache::lonnet::filelocation($respath,$embed_url);
             $embed_content = &Apache::lonnet::getfile($embed_path);
             unless ($embed_content eq -1) {
                 $repstatus = 'ok';
             }
         } elsif ($caller eq 'uploaded') {
-            
+
             $repstatus = &Apache::lonnet::getuploaded('GET',$embed_url,$cdom,$cnum,\$embed_content,$rtncode);
         }
         if ($repstatus eq 'ok') {
@@ -925,10 +921,10 @@ sub group_import {
 
     while (@files) {
 	my ($name, $url, $residx) = @{ shift(@files) };
-        if (($url =~ m{^/uploaded/\Q$coursedom\E/\Q$coursenum\E/(default_\d+\.)(page|sequence)$}) 
+        if (($url =~ m{^/uploaded/\Q$coursedom\E/\Q$coursenum\E/(default_\d+\.)(page|sequence)$})
 	     && ($caller eq 'londocs')
 	     && (!&Apache::lonnet::stat_file($url))) {
-	    
+
             my $errtext = '';
             my $fatal = 0;
             my $newmapstr = '<map>'."\n".
@@ -948,7 +944,7 @@ sub group_import {
             }
         }
 	if ($url) {
-	    if (!$residx 
+	    if (!$residx
 		|| defined($LONCAPA::map::zombies[$residx])) {
 		$residx = &LONCAPA::map::getresidx($url,$residx);
 		push(@LONCAPA::map::order, $residx);
@@ -957,7 +953,7 @@ sub group_import {
 	    if ($url=~m{^http://} || $url=~m{^https://}) { $ext = 'true'; }
 	    $url  = &LONCAPA::map::qtunescape($url);
 	    $name = &LONCAPA::map::qtunescape($name);
-	    $LONCAPA::map::resources[$residx] = 
+	    $LONCAPA::map::resources[$residx] =
 		join(':', ($name, $url, $ext, 'normal', 'res'));
 	}
     }
@@ -988,9 +984,9 @@ sub breadcrumbs {
 	my $url='/adm/coursedocs?folderpath='.
 	    &escape($folderpath);
 	    my $name=&unescape($foldername);
-# randompick number, hidden, encrypted, random order, is appended with ":"s to the foldername	
+# randompick number, hidden, encrypted, random order, is appended with ":"s to the foldername
  	    $name=~s/\:(\d*)\:(\w*)\:(\w*):(\d*)$//;
-	    if ($1 ne '') { 
+	    if ($1 ne '') {
                $randompick=$1;
             } else {
                $randompick=-1;
@@ -1016,7 +1012,7 @@ sub breadcrumbs {
     }
     $plain=~s/\&gt\;\s*$//;
     return (&Apache::lonhtmlcommon::breadcrumbs(undef,undef,0,'nohelp',
-					       'LC_docs_path'),$randompick,$ishidden,$isencrypted,$plain,$is_random_order);
+					       'LC_docs_path', undef, 1 ),$randompick,$ishidden,$isencrypted,$plain,$is_random_order);
 }
 
 sub log_docs {
@@ -1129,7 +1125,7 @@ sub docs_change_log {
 	    foreach my $key (@changes) {
 		$wholeentry.=':'.$docslog{$id}{'logentry'}{$key};
 	    }
-	    if ($wholeentry!~/\Q$env{'form.containingphrase'}\E/i) { next; }         
+	    if ($wholeentry!~/\Q$env{'form.containingphrase'}\E/i) { next; }
 	}
         my $count = 0;
         my $time =
@@ -1180,7 +1176,7 @@ sub docs_change_log {
 	    if ($oldname ne '' && $oldname ne $newname) {
 		$r->print(&LONCAPA::map::qtescape($newname));
 	    }
-	}        
+	}
 	$r->print('<ul>');
 	for (my $idx=0;$idx<=$docslog{$id}{'logentry'}{'maxidx'};$idx++) {
             if ($docslog{$id}{'logentry'}{'after_order_res_'.$idx}) {
@@ -1218,7 +1214,7 @@ sub update_paste_buffer {
 
     my ($errtext,$fatal) = &mapread($coursenum,$coursedom,
 				    $env{'form.copyfolder'});
-    
+
     return if ($fatal);
 
 # Mark for copying
@@ -1342,7 +1338,7 @@ sub do_paste_from_buffer {
 	    $db_name =~ s{_\d*$ }{_$now}x;
 	    my $result=&Apache::lonnet::put($db_name,\%contents,
 					    $coursedom,$coursenum);
-	    $url =~ s{/(\d*)/smppg$ }{/$now/smppg}x; 
+	    $url =~ s{/(\d*)/smppg$ }{/$now/smppg}x;
 	    $title=&mt('Copy of').' '.$title;
 	}
     }
@@ -1356,7 +1352,7 @@ sub do_paste_from_buffer {
         if ($folder =~ /^supplemental/) {
             $title = $env{'docs.markedcopy_supplemental'};
         } else {
-            (undef,undef,$title) = 
+            (undef,undef,$title) =
                 &parse_supplemental_title($env{'docs.markedcopy_supplemental'});
         }
     } else {
@@ -1380,7 +1376,7 @@ sub uniqueness_check {
         $url=&LONCAPA::map::qtescape($url);
         if ($newurl eq $url) {
             $unique = 0;
-            last;    
+            last;
         }
     }
     return $unique;
@@ -1406,7 +1402,7 @@ sub update_parameter {
 	&remember_parms($idx,$which,'set',$value);
     } else {
 	&LONCAPA::map::delparameter($idx,'parameter_'.$which);
-	
+
 	&remember_parms($idx,$which,'del');
     }
     return 1;
@@ -1434,7 +1430,7 @@ sub handle_edit_cmd {
 	&LONCAPA::map::makezombie($LONCAPA::map::order[$idx]);
 	splice(@LONCAPA::map::order, $idx, 1);
 
-    } elsif ($cmd eq 'up' 
+    } elsif ($cmd eq 'up'
 	     && ($idx) && (defined($LONCAPA::map::order[$idx-1]))) {
 	@LONCAPA::map::order[$idx-1,$idx] = @LONCAPA::map::order[$idx,$idx-1];
 
@@ -1474,11 +1470,11 @@ sub editor {
        	$LONCAPA::map::order[0]=$idx;
         $LONCAPA::map::resources[$idx]='';
     }
-    
+
     my ($breadcrumbtrail,$randompick,$ishidden,$isencrypted,$plain,$is_random_order)=
 	&breadcrumbs($folder,$allowed,$type);
     $r->print($breadcrumbtrail);
-    
+
 # ------------------------------------------------------------ Process commands
 
 # ---------------- if they are for this folder and user allowed to make changes
@@ -1499,9 +1495,9 @@ sub editor {
 	    ($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container);
 	    return $errtext if ($fatal);
 	}
-	    
+
 	if ($env{'form.pastemarked'}) {
-            my $paste_res = 
+            my $paste_res =
                 &do_paste_from_buffer($coursenum,$coursedom,$folder);
             if ($paste_res eq 'ok') {
                 ($errtext,$fatal) = &storemap($coursenum,$coursedom,$folder.'.'.$container);
@@ -1545,7 +1541,7 @@ sub editor {
 		return $errtext if ($fatal);
 	    } else {
 		$r->print('<p><span class="LC_error">'.&mt('No map selected.').'</span></p>');
-		
+
 	    }
 	}
 	&log_differences($plain);
@@ -1560,7 +1556,7 @@ sub editor {
 		  ($ishidden?'<li>'.&mt('contents hidden').'</li>':'').
 		  ($isencrypted?'<li>'.&mt('URLs hidden').'</li>':'').
 		  '</ul></p>');
-    }                                                                                                     
+    }
     if ($randompick>=0) {
 	$r->print('<p>'.&mt('Caution: this folder is set to randomly pick a subset of resources. Adding or removing resources from this folder will change the set of resources that the students see, resulting in spurious or missing credit for completed problems, not limited to ones you modify. Do not modify the contents of this folder if it is in active student use.').'</p>');
     }
@@ -1664,7 +1660,7 @@ sub process_file_upload {
    <input type="hidden" name="phasetwo" value="'.$total_embedded.'" />';
 		    $phase_status = 'phasetwo';
 
-                    $$upload_output .= 
+                    $$upload_output .=
 			'This file contains embedded multimedia objects, which need to be uploaded to LON-CAPA.<br />'.
 			&Apache::loncommon::ask_for_embedded_content(
                             '/adm/coursedocs',$state,$allfiles,$codebase);
@@ -1719,7 +1715,7 @@ sub parse_supplemental_title {
     }
     if (wantarray) {
 	return ($title,$foldertitle,$renametitle);
-    } 
+    }
     return $title;
 }
 
@@ -1740,7 +1736,7 @@ sub entryline {
     }
 
     my $orderidx=$LONCAPA::map::order[$index];
-    
+
 
     $renametitle=~s/\\/\\\\/g;
     $renametitle=~s/\&quot\;/\\\"/g;
@@ -1767,12 +1763,12 @@ sub entryline {
 	my $incindex=$index+1;
 	my $selectbox='';
 	if (($folder!~/^supplemental/) &&
-	    ($#LONCAPA::map::order>0) && 
+	    ($#LONCAPA::map::order>0) &&
 	    ((split(/\:/,
-	     $LONCAPA::map::resources[$LONCAPA::map::order[0]]))[1] 
-	     ne '') && 
+	     $LONCAPA::map::resources[$LONCAPA::map::order[0]]))[1]
+	     ne '') &&
 	    ((split(/\:/,
-	     $LONCAPA::map::resources[$LONCAPA::map::order[1]]))[1] 
+	     $LONCAPA::map::resources[$LONCAPA::map::order[1]]))[1]
 	     ne '')) {
 	    $selectbox=
 		'<input type="hidden" name="currentpos" value="'.$incindex.'" />'.
@@ -1809,13 +1805,13 @@ sub entryline {
 		}
 	    }
 	}
-        if ($url=~/^\/res\/lib\/templates\//) { 
-           $nocopy=1; 
+        if ($url=~/^\/res\/lib\/templates\//) {
+           $nocopy=1;
            $nocut=1;
         }
         my $copylink='&nbsp;';
         my $cutlink='&nbsp;';
-	
+
 	my $skip_confirm = 0;
 	if ( $folder =~ /^supplemental/
 	     || ($url =~ m{( /smppg$
@@ -1901,7 +1897,7 @@ END
 	    &Apache::lonnet::allowuploaded('/adm/coursedoc',$url);
 	}
     }
-    
+
     my $orig_url = $url;
     $orig_url=~s{http(&colon;|:)//https(&colon;|:)//}{https$2//};
     my $external = ($url=~s{^http(|s)(&colon;|:)//}{/adm/wrapper/ext/});
@@ -1925,7 +1921,7 @@ END
 	    } elsif ($url!~/\.(sequence|page)$/) {
 		$url='/adm/coursedocs/showdoc'.$url;
 	    }
-	} elsif ($url=~m|^/ext/|) { 
+	} elsif ($url=~m|^/ext/|) {
 	    $url='/adm/wrapper'.$url;
 	    $external = 1;
 	}
@@ -1936,7 +1932,7 @@ END
         }
 	if ($container eq 'page') {
 	    my $symb=$env{'form.pagesymb'};
-	    	    
+
 	    $url=&Apache::lonnet::clutter((&Apache::lonnet::decode_symb($symb))[2]);
 	    $url.=(($url=~/\?/)?'&':'?').'symb='.&escape($symb);
 	}
@@ -1946,7 +1942,7 @@ END
 	my $foldername=&escape($foldertitle);
 	my $folderpath=$env{'form.folderpath'};
 	if ($folderpath) { $folderpath.='&' };
-# Append randompick number, hidden, and encrypted with ":" to foldername, 
+# Append randompick number, hidden, and encrypted with ":" to foldername,
 # so it gets transferred between levels
 	$folderpath.=$folderarg.'&'.$foldername.':'.(&LONCAPA::map::getparameter($orderidx,
                                               'parameter_randompick'))[0]
@@ -1966,7 +1962,7 @@ END
     	my $ro_set=
 	    ((&LONCAPA::map::getparameter($orderidx,'parameter_randomorder'))[0]=~/^yes$/i?' checked="checked"':'');
 	$rand_order_text ='
-<span class="LC_nobreak"><label><input type="checkbox" name="randomorder_'.$orderidx.'" onClick="this.form.changeparms.value=\'randomorder\';this.form.submit()" '.$ro_set.' /> '.&mt('Random Order').' </label></span>';   
+<span class="LC_nobreak"><label><input type="checkbox" name="randomorder_'.$orderidx.'" onClick="this.form.changeparms.value=\'randomorder\';this.form.submit()" '.$ro_set.' /> '.&mt('Random Order').' </label></span>';
     }
     if ($ispage) {
         my $pagename=&escape($pagetitle);
@@ -2049,7 +2045,7 @@ sub tiehash {
                 $hashtied=1;
 	    }
 	}
-    }    
+    }
 }
 
 sub untiehash {
@@ -2098,7 +2094,7 @@ sub checkonthis {
                  if (($errorcount) ||
                      ($warningcount)) {
 		     if ($errorcount) {
-                        $r->print('<img src="/adm/lonMisc/bomb.gif" alt="" /><span class="LC_error">'.
+                        $r->print('<img src="/adm/lonMisc/bomb.gif" /><span class="LC_error">'.
                           &mt('[quant,_1,error]',$errorcount).'</span>');
                      }
 		     if ($warningcount) {
@@ -2123,7 +2119,7 @@ sub checkonthis {
 	      unless ($url=~/\$/) {
 		  $r->print('<span class="LC_error">'.&mt('not found').'</b></span>');
 	      } else {
-		  $r->print('<span class="LC_error">'.&mt('unable to verify variable URL').'</span>');
+		  $r->print('<span class="LC_unknown">'.&mt('unable to verify variable URL').'</span>');
 	      }
           } else {
              $r->print('<span class="LC_error">'.&mt('access denied').'</span>');
@@ -2257,7 +2253,7 @@ sub checkversions {
     if ($haschanged) {
         if (&Apache::lonnet::put('resourceversions',\%newsetversions,
 			  $env{'course.'.$env{'request.course.id'}.'.domain'},
-			  $env{'course.'.$env{'request.course.id'}.'.num'}) eq 'ok') {		
+			  $env{'course.'.$env{'request.course.id'}.'.num'}) eq 'ok') {
 	    $r->print('<h1>'.&mt('Your Version Settings have been Saved').'</h1>');
 	} else {
 	    $r->print('<h1><span class="LC_error">'.&mt('An Error Occured while Attempting to Save your Version Settings').'</span></h1>');
@@ -2398,7 +2394,7 @@ ENDHEADERS
 		    $lastold=$prevvers;
 		}
 	    }
-            # 
+            #
             # Code to figure out how many version entries should go in
             # each of the four columns
             my $entries_per_col = 0;
@@ -2409,7 +2405,7 @@ ENDHEADERS
                 $entries_per_col = $num_entries/4 + 1;
             }
             my $entries_count = 0;
-            $r->print('<td valign="top"><font size="-2">'); 
+            $r->print('<td valign="top"><font size="-2">');
             my $cols_output = 1;
             for (my $prevvers=$lastold;$prevvers<$currentversion;$prevvers++) {
 		my $url=$root.'.'.$prevvers.'.'.$extension;
@@ -2488,7 +2484,7 @@ sub changewarning {
 	$message='Changes will become active for your current session after [_1], or the next time you log in.';
     }
     $r->print("\n\n".
-'<script type="text/javascript">function reinit(tf) { tf.submit();'.$postexec.' }</script>'."\n". 
+'<script type="text/javascript">function reinit(tf) { tf.submit();'.$postexec.' }</script>'."\n".
 '<form name="reinitform" method="post" action="/adm/roles" target="loncapaclient">'.
 '<input type="hidden" name="orgurl" value="'.$url.
 '" /><input type="hidden" name="selectrole" value="1" /><h3><span class="LC_warning">'.
@@ -2523,6 +2519,7 @@ sub handler {
     return OK if $r->header_only;
     my $type = &Apache::loncommon::course_type();
 
+
 # --------------------------------------------- Initialize help topics for this
     foreach my $topic ('Adding_Course_Doc','Main_Course_Documents',
 	               'Adding_External_Resource','Navigate_Content',
@@ -2541,9 +2538,9 @@ sub handler {
 		    'Option_Response_Simple');
     $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(
+    $help{'My Personal Information Page'} = &Apache::loncommon::help_open_topic(
 		  'Docs_About_My_Personal_Info,Docs_Editing_Templated_Pages');
-    $help{'Group Files'} = &Apache::loncommon::help_open_topic('Docs_About_Group_Files');
+    $help{'Group Portfolio'} = &Apache::loncommon::help_open_topic('Docs_About_Group_Files');
     $help{'Caching'} = &Apache::loncommon::help_open_topic('Caching');
 
 # does this user have privileges to modify docs
@@ -2576,6 +2573,8 @@ sub handler {
     my $showdoc=0;
     my $containertag;
     my $uploadtag;
+
+
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
 					    ['folderpath','pagepath',
 					     'pagesymb']);
@@ -2617,15 +2616,15 @@ sub handler {
        $showdoc='/'.$1;
     }
     unless ($showdoc) { # got called from remote
-       if (($env{'form.folder'}=~/^(?:group|default)_/) || 
+       if (($env{'form.folder'}=~/^(?:group|default)_/) ||
           ($env{'form.folder'} =~ m:^\d+/(pages|sequences)/:)) {
            $forcestandard = 1;
-       } 
+       }
        $forcesupplement=($env{'form.folder'}=~/^supplemental_/);
 
-       if ($allowed) { 
+       if ($allowed) {
          &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['cmd']);
-         $script=&Apache::lonratedt::editscript('simple'); 
+         $script=&Apache::lonratedt::editscript('simple');
        }
     } else { # got called in sequence from course
        $allowed=0;
@@ -2635,7 +2634,7 @@ sub handler {
     my $coursenum=$env{'course.'.$env{'request.course.id'}.'.num'};
     my $coursedom=$env{'course.'.$env{'request.course.id'}.'.domain'};
 
-# get personal data 
+# get personal data
     my $uname=$env{'user.name'};
     my $udom=$env{'user.domain'};
     my $plainname=&escape(&Apache::loncommon::plainname($uname,$udom));
@@ -2654,14 +2653,14 @@ sub handler {
 				    {'force_register' => $showdoc,
                                      'bread_crumbs' => $brcrum}).
 	      &Apache::loncommon::help_open_menu('','',273,'RAT'));
-  
+
   my %allfiles = ();
   my %codebase = ();
   my ($upload_result,$upload_output);
   if ($allowed) {
       if (($env{'form.uploaddoc.filename'}) &&
 	  ($env{'form.cmd'}=~/^upload_(\w+)/)) {
-# Process file upload - phase one - upload and parse primary file.  
+# Process file upload - phase one - upload and parse primary file.
 	  undef($hadchanges);
           $upload_result = &process_file_upload(\$upload_output,$coursenum,
 						$coursedom,\%allfiles,
@@ -2686,8 +2685,8 @@ sub handler {
                   $newname{$i} = &process_secondary_uploads(\$upload_output,$coursedom,$coursenum,'embedded_item_',$i,$residx);
                   $origname{$i} = &unescape($env{'form.embedded_orig_'.$i});
                   if (exists($env{'form.embedded_codebase_'.$i})) {
-                      $javacodebase =  &unescape($env{'form.embedded_codebase_'.$i});  
-                      $origname{$i} =~ s#^\Q$javacodebase\E/##; 
+                      $javacodebase =  &unescape($env{'form.embedded_codebase_'.$i});
+                      $origname{$i} =~ s#^\Q$javacodebase\E/##;
                   }
                   my @attributes = ();
                   if ($env{'form.embedded_attrib_'.$i} =~ /:/) {
@@ -2723,8 +2722,8 @@ sub handler {
                               $attrib_regexp = $attribs{$item}[0];
                           }
                           if ($content =~ m#($attrib_regexp\s*=\s*['"]?)\Q$origname{$item}\E(['"]?)#) {
-                          } 
-                          $content =~ s#($attrib_regexp\s*=\s*['"]?)\Q$origname{$item}\E(['"]?)#$1$newname{$item}$2#gi; 
+                          }
+                          $content =~ s#($attrib_regexp\s*=\s*['"]?)\Q$origname{$item}\E(['"]?)#$1$newname{$item}$2#gi;
                       }
                       if (exists($codebase{$item})) {
                           $content =~ s/(codebase\s*=\s*["']?)\Q$codebase{$item}\E(["']?)/$1.$2/i; #' stupid emacs
@@ -2736,7 +2735,7 @@ sub handler {
                   my $docudom=$env{'course.'.$env{'request.course.id'}.'.domain'};
                   my $url = &Apache::lonnet::store_edited_file($primary_url,$content,$docudom,$docuname,\$saveresult);
               } else {
-                  &Apache::lonnet::logthis('retrieval of uploaded file - '.$primary_url.' - for editing, failed: '.$getstatus); 
+                  &Apache::lonnet::logthis('retrieval of uploaded file - '.$primary_url.' - for editing, failed: '.$getstatus);
               }
           }
       }
@@ -2748,9 +2747,8 @@ sub handler {
                 'uplm' => 'Upload a new main '.lc($type).' document',
                 'upls' => 'Upload a new supplemental '.lc($type).' document',
                 'impp' => 'Import a document',
-                'pubd' => 'Published documents',
+                'pubd' => 'Published Documents',
 		'copm' => 'All documents out of a published map into this folder',
-                'spec' => 'Special documents',
                 'upld' => 'Upload Document',
                 'srch' => 'Search',
                 'impo' => 'Import',
@@ -2769,20 +2767,93 @@ sub handler {
                 'scuf' => 'Score Upload Form',
                 'bull' => 'Discussion Board',
                 'mypi' => 'My Personal Information Page',
-                'grpo' => 'Group Portfolios',
+                'grpo' => 'Group Portfolio',
                 'rost' => 'Course Roster',
-		'abou' => 'About User',
+				'abou' => 'Personal Information Page for a User',
                 'imsf' => 'Import IMS package',
                 'file' =>  'File',
                 'title' => 'Title',
                 'comment' => 'Comment',
-                'parse' => 'If HTML file, upload embedded images/multimedia files'
+                'parse' => 'Upload embedded images/multimedia files if HTML file!',
+		'nd' => 'New Document',
+		'pm' => 'Published Map',
+		'sd' => 'Special Document',
+		'mo' => 'More Options',
+		'hao' => 'Hide all Options'
 					  );
 # -----------------------------------------------------------------------------
+	my $fileupload=(<<FIUP);
+	$lt{'file'}:<br />
+	<input type="file" name="uploaddoc" size="40" />
+FIUP
+
+	my $checkbox=(<<CHBO);
+	<!-- <label>$lt{'parse'}?
+	<input type="checkbox" name="parserflag" />
+	</label> -->
+	<label>
+	<input type="checkbox" name="parserflag" checked="checked" /> $lt{'parse'}
+	</label>
+CHBO
+
+	my $fileuploadform=(<<FUFORM);
+	<form name="uploaddocument" action="/adm/coursedocs" method="post" enctype="multipart/form-data">
+	$fileupload
+	<br />
+	$lt{'title'}:<br />
+	<input type="text" size="50" name="comment" />
+	$uploadtag
+	<input type="hidden" name="cmd" value="upload_default" />
+	<br />
+	<span class="LC_nobreak">
+	$checkbox
+	</span>
+	<br />
+	<br />
+	<span class="LC_nobreak">
+	<input type="submit" value="$lt{'upld'}" />
+	 $help{'Uploading_From_Harddrive'}
+	</span>
+	</form>
+FUFORM
+
+	my $simpleeditdefaultform=(<<SEDFFORM);
+	<form action="/adm/coursedocs" method="post" name="simpleeditdefault">
+	$lt{'pubd'}<br />
+	$uploadtag
+	<input type="button" onClick="javascript:groupsearch()" value="$lt{'srch'}" />
+	<br />
+	<span class="LC_nobreak">
+	<input type="button" onClick="javascript:groupimport();" value="$lt{'impo'}" />
+	$help{'Importing_LON-CAPA_Resource'}
+	</span>
+	<br />
+	<input type="button" onClick="javascript:groupopen(0,1,1);" value="$lt{'book'}" />
+	<hr />
+	<p>
+	$lt{'copm'}<br />
+	<input type="text" size="40" name="importmap" /><br />
+	<span class="LC_nobreak"><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>
+	</p>
+	</form>
+SEDFFORM
+
+	my $extresourcesform=(<<ERFORM);
+	<form action="/adm/coursedocs" method="post" name="newext">
+	$uploadtag
+	<input type="hidden" name="importdetail" value="" />
+	<span class="LC_nobreak">
+	<input name="newext" type="button" onClick="javascript:makenewext('newext');"
+	value="$lt{'extr'}" /> $help{'Adding_External_Resource'}
+	</span>
+	</form>
+ERFORM
+
     if ($allowed) {
 	&update_paste_buffer($coursenum,$coursedom);
-       my $dumpbut=&dumpbutton();
-       my $exportbut=&exportbutton();
        my %lt=&Apache::lonlocal::texthash(
 					 'vc' => 'Verify Content',
 					 'cv' => 'Check/Set Resource Versions',
@@ -2802,54 +2873,52 @@ sub handler {
            $containertag = '<input type="hidden" name="folderpath" value="" />';
            $uploadtag = '<input type="hidden" name="folderpath" value="'.&HTML::Entities::encode($folderpath,'<>&"').'" />';
        }
-
-       $r->print(<<ENDCOURSEVERIFY);
-<form name="renameform" method="post" action="/adm/coursedocs">
-  <input type="hidden" name="title" />
-  <input type="hidden" name="cmd" />
-  <input type="hidden" name="markcopy" />
-  <input type="hidden" name="copyfolder" />
-  $containertag
-</form>
-<form name="simpleedit" method="post" action="/adm/coursedocs">
-  <input type="hidden" name="importdetail" value="" />
-  $uploadtag
-</form>
-<form action="/adm/coursedocs" method="post" name="courseverify">
-  <div class="LC_docs_course_commands">
-
-      <div>
-        <input type="submit" name="verify" value="$lt{'vc'}" />$help{'Verify_Content'}
-      </div>
-      <div>
-        <input type="submit" name="versions" value="$lt{'cv'}" />$help{'Check_Resource_Versions'}
-      </div>
-        $dumpbut
-        $exportbut
-      <div>
-        <input type="submit" name="listsymbs" value="$lt{'ls'}" />
-      </div>
-      <div>
-        <input type="hidden" name="folder" value="$env{'form.folder'}" />
-        <input type="submit" name="docslog" value="$lt{'sl'}" />
-      </div>
-  </div>
-</form>
-<div style="clear: both; height: 0px;">&nbsp;</div>
-ENDCOURSEVERIFY
-       $r->print(&Apache::loncommon::help_open_topic('Docs_Adding_Course_Doc',
-		     &mt('Editing the Table of Contents for your '.$type)));
+	$r->print(<<HIDDENFORM);
+	<form name="renameform" method="post" action="/adm/coursedocs">
+   <input type="hidden" name="title" />
+   <input type="hidden" name="cmd" />
+   <input type="hidden" name="markcopy" />
+   <input type="hidden" name="copyfolder" />
+   $containertag
+ </form>
+ <form name="simpleedit" method="post" action="/adm/coursedocs">
+   <input type="hidden" name="importdetail" value="" />
+   $uploadtag
+ </form>
+HIDDENFORM
+    }
+# --------------------------------------------------------- Main tab structure
+    my $activeClass = 1;
+    my $active = '';
+    $r->print('<ul class="LC_TabContentBigger" id="mainnav">');
+    if (($standard) && ($allowed) && (!$forcesupplement) && (($env{'form.folderpath'}=~/^default/) || ($env{'form.pagepath'}))) {
+        if($activeClass == 1){
+           $active = 'class="active"';
+	   $activeClass = 0;
+	}
+    }
+    $r->print('<li '.$active.'onclick="javascript:showPage(this,\'mainCourseDocuments\',\'mainnav\',\'maincoursedoc\');">'.&mt('Main Course Documents').'</li>');
+    $active = '';
+    if (!$forcestandard || ($env{'form.folderpath'}=~/^supplemental/)) {
+        if($activeClass == 1){
+           $active = 'class="active"';
+        }
     }
+    $r->print('<li '.$active.'onclick="javascript:showPage(this,\'Supplemental Course Documents\',\'mainnav\',\'maincoursedoc\');">'.&mt('Supplemental Course Documents').'</li>');
+    $r->print('</ul><div class="LC_ContentBoxSpecial" style="margin:0 0;padding:0 0;"><div id="maincoursedoc" style="margin:0 0;padding:0 0;">');
 # --------------------------------------------------------- Standard documents
-    $r->print('<table class="LC_docs_documents">');
-
-    if (($standard) && ($allowed) && (!$forcesupplement)) {
-	$r->print('<tr><td class="LC_docs_document">');
-#  '<h2>'.&mt('Main Course Documents').
-#  ($allowed?' '.$help{'Main_Course_Documents'}:'').'</h2>');
+       my $savefolderpath;
+       my $active = 'style="display: none;"';
+       if($activeClass == 0){
+          $active = 'style="display: block;"';
+       }
+       $r->print('<div class="LC_ContentBox" id="mainCourseDocuments" '.$active.'>');
+        $r->print(&Apache::loncommon::help_open_topic('Docs_Adding_Course_Doc',
+                     &mt('Editing the Table of Contents for your '.$type)));
        my $folder=$env{'form.folder'};
-       if ($folder eq '' || $folder eq 'supplemental') {
+       if ($folder eq '' || $folder=~/^supplemental/) {
            $folder='default';
+	   $savefolderpath = $env{'form.folderpath'};
 	   $env{'form.folderpath'}='default&'.&escape(&mt('Main '.$type.' Documents'));
            $uploadtag = '<input type="hidden" name="folderpath" value="'.
 	       &HTML::Entities::encode($env{'form.folderpath'},'<>&"').'" />';
@@ -2860,16 +2929,6 @@ ENDCOURSEVERIFY
        } else {
            #$postexec='self.close();';
        }
-       $hadchanges=0;
-       my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,
-			   $upload_output,$type);
-       if ($error) {
-	   $r->print('<p><span class="LC_error">'.$error.'</span></p>');
-       }
-       if ($hadchanges) {
-	   &mark_hash_old();
-       }
-       &changewarning($r,$postexec);
        my $folderseq='/uploaded/'.$coursedom.'/'.$coursenum.'/default_'.time.
                      '.sequence';
        my $pageseq = '/uploaded/'.$coursedom.'/'.$coursenum.'/default_'.time.
@@ -2879,230 +2938,221 @@ ENDCOURSEVERIFY
 	    $container='page';
 	}
 	my $readfile='/uploaded/'.$coursedom.'/'.$coursenum.'/'.$folder.'.'.$container;
-       $r->print(<<ENDFORM);
-<table class="LC_docs_adddocs">
-<tr>
-<th>$lt{'uplm'}</th>
-<th>$lt{'impp'}</th>
-<th>$lt{'spec'}</th>
-</tr>
-<tr>
-<td>
-$lt{'file'}:<br />
-<form name="uploaddocument" action="/adm/coursedocs" method="post" enctype="multipart/form-data">
-<input type="file" name="uploaddoc" size="40" />
-<br />
-$lt{'title'}:<br />
-<input type="text" size="50" name="comment" />
-$uploadtag
-<input type="hidden" name="cmd" value="upload_default" />
-<br />
-<span class="LC_nobreak">
-<label>$lt{'parse'}?
-<input type="checkbox" name="parserflag" checked="checked" />
-</label>
-</span>
-<br />
-<br />
-<span class="LC_nobreak">
-<input type="submit" value="$lt{'upld'}" />
- $help{'Uploading_From_Harddrive'}
-</span>
-</form>
-</td>
-<td>
-<form action="/adm/coursedocs" method="post" name="simpleeditdefault">
-$lt{'pubd'}<br />
-$uploadtag
-<input type="button" onClick="javascript:groupsearch()" value="$lt{'srch'}" />
-<br />
-<span class="LC_nobreak">
-<input type="button" onClick="javascript:groupimport();" value="$lt{'impo'}" />
-$help{'Importing_LON-CAPA_Resource'}
-</span>
-<br />
-<input type="button" onClick="javascript:groupopen(0,1,1);" value="$lt{'book'}" />
-<hr />
-<p>
-$lt{'copm'}<br />
-<input type="text" size="40" name="importmap" /><br />
-<span class="LC_nobreak"><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>
-</p>
-</form>
-<hr />
-<form action="/adm/groupsort" method="post" name="recover">
-<input type="button" name="recovermap" onClick="javascript:groupopen('$readfile',1,0)" value="$lt{'reco'}" />
-</form>
-ENDFORM
-       unless ($env{'form.pagepath'}) {
-	   $r->print(<<ENDFORM);
-<hr />
-<form action="/adm/coursedocs" method="post" name="newext">
-$uploadtag
-<input type="hidden" name="importdetail" value="" />
-<span class="LC_nobreak">
-<input name="newext" type="button" onClick="javascript:makenewext('newext');"
-value="$lt{'extr'}" /> $help{'Adding_External_Resource'}
-</span>
-</form>
-<br /><form action="/adm/imsimportdocs" method="post" name="ims">
-<input type="hidden" name="folder" value="$folder" />
-<input name="imsimport" type="button" value="$lt{'imsf'}" onClick="javascript:makeims();" />
-</form>
-ENDFORM
-       }
-       $r->print('</td><td>');
+
+
+
+	my $recoverform=(<<RFORM);
+	<form action="/adm/groupsort" method="post" name="recover">
+	<input type="button" name="recovermap" onClick="javascript:groupopen('$readfile',1,0)" value="$lt{'reco'}" />
+	</form>
+RFORM
+
+	my $imspform=(<<IMSPFORM);
+	<form action="/adm/imsimportdocs" method="post" name="ims">
+	<input type="hidden" name="folder" value="$folder" />
+	<input name="imsimport" type="button" value="$lt{'imsf'}" onClick="javascript:makeims();" />
+	</form>
+IMSPFORM
+
+	my $newnavform=(<<NNFORM);
+	<form action="/adm/coursedocs" method="post" name="newnav">
+	$uploadtag
+	<input type="hidden" name="importdetail" 
+	value="$lt{'navc'}=/adm/navmaps" />
+	<span class="LC_nobreak">
+	<input name="newnav" type="submit" value="$lt{'navc'}" />
+	$help{'Navigate_Content'}
+	</span>
+	</form>
+NNFORM
+	my $newsmppageform=(<<NSPFORM);
+	<form action="/adm/coursedocs" method="post" name="newsmppg">
+	$uploadtag
+	<input type="hidden" name="importdetail" value="" />
+	<span class="LC_nobreak">
+	<input name="newsmppg" type="button" value="$lt{'sipa'}"
+	onClick="javascript:makesmppage();" /> $help{'Simple Page'}
+	</span>
+	</form>
+NSPFORM
+
+	my $newsmpproblemform=(<<NSPROBFORM);
+	<form action="/adm/coursedocs" method="post" name="newsmpproblem">
+	$uploadtag
+	<input type="hidden" name="importdetail" value="" />
+	<span class="LC_nobreak">
+	<input name="newsmpproblem" type="button" value="$lt{'sipr'}"
+	onClick="javascript:makesmpproblem();" />$help{'Simple Problem'}
+	</span>
+	</form>
+
+NSPROBFORM
+
+	my $newdropboxform=(<<NDBFORM);
+	<form action="/adm/coursedocs" method="post" name="newdropbox">
+	$uploadtag
+	<input type="hidden" name="importdetail" value="" />
+	<span class="LC_nobreak">
+	<input name="newdropbox" type="button" value="$lt{'drbx'}"
+	onClick="javascript:makedropbox();" />
+	</span>
+	</form>
+NDBFORM
+
+	my $newexuploadform=(<<NEXUFORM);
+	<form action="/adm/coursedocs" method="post" name="newexamupload">
+	$uploadtag
+	<input type="hidden" name="importdetail" value="" />
+	<span class="LC_nobreak">
+	<input name="newexamupload" type="button" value="$lt{'scuf'}"
+	onClick="javascript:makeexamupload();" />
+	$help{'Score_Upload_Form'}
+	</span>
+	</form>
+NEXUFORM
+
+	my $newbulform=(<<NBFORM);
+	<form action="/adm/coursedocs" method="post" name="newbul">
+	$uploadtag
+	<input type="hidden" name="importdetail" value="" />
+	<span class="LC_nobreak">
+	<input name="newbulletin" type="button" value="$lt{'bull'}"
+	onClick="javascript:makebulboard();" />
+	$help{'Bulletin Board'}
+	</span>
+	</form>
+NBFORM
+
+	my $newaboutmeform=(<<NAMFORM);
+	<form action="/adm/coursedocs" method="post" name="newaboutme">
+	$uploadtag
+	<input type="hidden" name="importdetail" 
+	value="$plainname=/adm/$udom/$uname/aboutme" />
+	<span class="LC_nobreak">
+	<input name="newaboutme" type="submit" value="$lt{'mypi'}" />
+	$help{'My Personal Information Page'}
+	</span>
+	</form>
+NAMFORM
+
+	my $newaboutsomeoneform=(<<NASOFORM);
+	<form action="/adm/coursedocs" method="post" name="newaboutsomeone">
+	$uploadtag
+	<input type="hidden" name="importdetail" value="" />
+	<span class="LC_nobreak">
+	<input name="newaboutsomeone" type="button" value="$lt{'abou'}" 
+	onClick="javascript:makeabout();" />
+	</span>
+	</form>
+NASOFORM
+
+
+	my $newrosterform=(<<NROSTFORM);
+	<form action="/adm/coursedocs" method="post" name="newroster">
+	$uploadtag
+	<input type="hidden" name="importdetail" 
+	value="$lt{'rost'}=/adm/viewclasslist" />
+	<span class="LC_nobreak">
+	<input name="newroster" type="submit" value="$lt{'rost'}" />
+	$help{'Course Roster'}
+	</span>
+	</form>
+NROSTFORM
+
+my $specialdocumentsform;
+my $newfolderform;
+
        unless ($env{'form.pagepath'}) {
 	   my $path = &HTML::Entities::encode($env{'form.folderpath'},'<>&"');
-           $r->print(<<ENDFORM);
-<br /><form action="/adm/coursedocs" method="post" name="newfolder">
-<input type="hidden" name="folderpath" value="$path" />
-<input type="hidden" name="importdetail" value="" />
-<span class="LC_nobreak">
-<input name="newfolder" type="button"
-onClick="javascript:makenewfolder(this.form,'$folderseq');"
-value="$lt{'newf'}" />$help{'Adding_Folders'}
-</span>
-</form>
-<br /><form action="/adm/coursedocs" method="post" name="newpage">
-<input type="hidden" name="folderpath" value="$path" />
-<input type="hidden" name="importdetail" value="" />
-<span class="LC_nobreak">
-<input name="newpage" type="button"
-onClick="javascript:makenewpage(this.form,'$pageseq');"
-value="$lt{'newp'}" />$help{'Adding_Pages'}
-</span>
-</form>
-<br /><form action="/adm/coursedocs" method="post" name="newsyl">
-$uploadtag
-<input type="hidden" name="importdetail" 
-value="$lt{'syll'}=/public/$coursedom/$coursenum/syllabus" />
-<span class="LC_nobreak">
-<input name="newsyl" type="submit" value="$lt{'syll'}" /> 
- $help{'Syllabus'}
-</span>
-</form>
-<br /><form action="/adm/coursedocs" method="post" name="newnav">
-$uploadtag
-<input type="hidden" name="importdetail" 
-value="$lt{'navc'}=/adm/navmaps" />
-<span class="LC_nobreak">
-<input name="newnav" type="submit" value="$lt{'navc'}" />
-$help{'Navigate_Content'}
-</span>
-</form>
-<br /><form action="/adm/coursedocs" method="post" name="newsmppg">
-$uploadtag
-<input type="hidden" name="importdetail" value="" />
-<span class="LC_nobreak">
-<input name="newsmppg" type="button" value="$lt{'sipa'}"
-onClick="javascript:makesmppage();" /> $help{'Simple Page'}
-</span>
-</form>
-<br /><form action="/adm/coursedocs" method="post" name="newsmpproblem">
-$uploadtag
-<input type="hidden" name="importdetail" value="" />
-<span class="LC_nobreak">
-<input name="newsmpproblem" type="button" value="$lt{'sipr'}"
-onClick="javascript:makesmpproblem();" />$help{'Simple Problem'}
-</span>
-</form>
-<br /><form action="/adm/coursedocs" method="post" name="newdropbox">
-$uploadtag      
-<input type="hidden" name="importdetail" value="" />
-<span class="LC_nobreak">          
-<input name="newdropbox" type="button" value="$lt{'drbx'}"
-onClick="javascript:makedropbox();" />
-</span>         
-</form> 
-<br /><form action="/adm/coursedocs" method="post" name="newexamupload">
-$uploadtag
-<input type="hidden" name="importdetail" value="" />
-<span class="LC_nobreak">
-<input name="newexamupload" type="button" value="$lt{'scuf'}"
-onClick="javascript:makeexamupload();" />
-$help{'Score_Upload_Form'}
-</span>
-</form>
-<br /><form action="/adm/coursedocs" method="post" name="newbul">
-$uploadtag
-<input type="hidden" name="importdetail" value="" />
-<span class="LC_nobreak">
-<input name="newbulletin" type="button" value="$lt{'bull'}"
-onClick="javascript:makebulboard();" />
-$help{'Bulletin Board'}
-</span>
-</form>
-<br /><form action="/adm/coursedocs" method="post" name="newaboutme">
-$uploadtag
-<input type="hidden" name="importdetail" 
-value="$plainname=/adm/$udom/$uname/aboutme" />
-<span class="LC_nobreak">
-<input name="newaboutme" type="submit" value="$lt{'mypi'}" />
-$help{'My Personal Info'}
-</span>
-</form>
-<br /><form action="/adm/coursedocs" method="post" name="newaboutsomeone">
-$uploadtag
-<input type="hidden" name="importdetail" value="" />
-<span class="LC_nobreak">
-<input name="newaboutsomeone" type="button" value="$lt{'abou'}" 
-onClick="javascript:makeabout();" />
-</span>
-</form>
-<br /><form action="/adm/coursedocs" method="post" name="newgroupfiles">
-$uploadtag
-<input type="hidden" name="importdetail"
-value="$lt{'grpo'}=/adm/$coursedom/$coursenum/aboutme" />
-<span class="LC_nobreak">
-<input name="newgroupfiles" type="submit" value="$lt{'grpo'}" />
-$help{'Group Files'}
-</span>
-</form>
-<br /><form action="/adm/coursedocs" method="post" name="newroster">
-$uploadtag
-<input type="hidden" name="importdetail" 
-value="$lt{'rost'}=/adm/viewclasslist" />
-<span class="LC_nobreak">
-<input name="newroster" type="submit" value="$lt{'rost'}" />
-$help{'Course Roster'}
-</span>
-</form>
-ENDFORM
+
+	my $newpageform=(<<NPFORM);
+	<form action="/adm/coursedocs" method="post" name="newpage">
+	<input type="hidden" name="folderpath" value="$path" />
+	<input type="hidden" name="importdetail" value="" />
+	<span class="LC_nobreak">
+	<input name="newpage" type="button"
+	onClick="javascript:makenewpage(this.form,'$pageseq');"
+	value="$lt{'newp'}" />$help{'Adding_Pages'}
+	</span>
+	</form>
+NPFORM
+
+	$newfolderform=(<<NFFORM);
+	<form action="/adm/coursedocs" method="post" name="newfolder">
+	<input type="hidden" name="folderpath" value="$path" />
+	<input type="hidden" name="importdetail" value="" />
+	<span class="LC_nobreak">
+	<input name="newfolder" type="button"
+	onClick="javascript:makenewfolder(this.form,'$folderseq');"
+	value="$lt{'newf'}" />$help{'Adding_Folders'}
+	</span>
+	</form>
+NFFORM
+
+	my $newsylform=(<<NSYLFORM);
+	<form action="/adm/coursedocs" method="post" name="newsyl">
+	$uploadtag
+	<input type="hidden" name="importdetail" 
+	value="$lt{'syll'}=/public/$coursedom/$coursenum/syllabus" />
+	<span class="LC_nobreak">
+	<input name="newsyl" type="submit" value="$lt{'syll'}" /> 
+	$help{'Syllabus'}
+	</span>
+	</form>
+NSYLFORM
+
+	my $newgroupfileform=(<<NGFFORM);
+	<form action="/adm/coursedocs" method="post" name="newgroupfiles">
+	$uploadtag
+	<input type="hidden" name="importdetail"
+	value="$lt{'grpo'}=/adm/$coursedom/$coursenum/aboutme" />
+	<span class="LC_nobreak">
+	<input name="newgroupfiles" type="submit" value="$lt{'grpo'}" />
+	$help{'Group Portfolio'}
+	</span>
+	</form>
+NGFFORM
+
+	$specialdocumentsform="<br />$newpageform<br />$newsylform<br />$newgroupfileform";
+      }
+	$specialdocumentsform.="<br />$newnavform<br />$newsmppageform
+				<br />$newsmpproblemform<br />$newdropboxform
+       				<br />$newexuploadform<br />$newbulform
+       				<br />$newaboutmeform<br />$newaboutsomeoneform
+       				<br />$newrosterform";
+if($env{'form.pagepath'}) {
+	$specialdocumentsform="<br />$newsmpproblemform<br />$newexuploadform";
+}
+
+my %orderhash = (
+                'aa' => ['New Document',$fileuploadform.'<br />'.$newfolderform],
+                'bb' => ['Published Documents',$simpleeditdefaultform],
+                'cc' => ['Special Documents',$specialdocumentsform],
+		'dd' => ['Tools',$extresourcesform.'<br />'.$imspform.'<br />'.$recoverform.'<br />'.&generate_admin_options($containertag,$uploadtag,\%help,\%env)],
+                'zz' => ['Hide all Options'],
+                );
+my $tid='1';
+my $varcd = 'Main Course Documents';
+$r->print(&generate_edit_table($tid,$varcd,\%orderhash));
+ $hadchanges=0;
+        my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$type);
+       if ($error) {
+           $r->print('<p><span class="LC_error">'.$error.'</span></p>');
+       }
+       if ($hadchanges) {
+           &mark_hash_old();
        }
+
+       &changewarning($r,'');
+$r->print('</div>');
        if ($env{'form.pagepath'}) {
-           $r->print(<<ENDBLOCK);
-<form action="/adm/coursedocs" method="post" name="newsmpproblem">
-$uploadtag
-<input type="hidden" name="importdetail" value="" />
-<span class="LC_nobreak">
-<input name="newsmpproblem" type="button" value="$lt{'sipr'}"
-onClick="javascript:makesmpproblem();" />$help{'Simple Problem'}
-</span>
-</form>
-<br /><form action="/adm/coursedocs" method="post" name="newexamupload">
-$uploadtag
-<input type="hidden" name="importdetail" value="" />
-<span class="LC_nobreak">
-<input name="newexamupload" type="button" value="$lt{'scuf'}"
-onClick="javascript:makeexamupload();" />
-$help{'Score_Upload_Form'}
-</span>
-</form>
-ENDBLOCK
        }
-       $r->print('</td></tr>'."\n".
-'</table>');
-       $r->print('</td></tr>');
-    }
 # ----------------------------------------------------- Supplemental documents
-    if (!$forcestandard) {
-       $r->print('<tr><td class="LC_docs_document">');
-# '<h2>'.&mt('Supplemental Course Documents').
-#  ($allowed?' '.$help{'Supplemental'}:'').'</h2>');
+       my $active = 'style="display: none;"';
+       if($activeClass == 1){
+          $active = 'style="display: block;"';
+       }
+       $r->print('<div class="LC_ContentBox" id="Supplemental Course Documents" '.$active.'>');
        my $folder=$env{'form.folder'};
        unless ($folder=~/^supplemental/) {
 	   $folder='supplemental';
@@ -3111,88 +3161,107 @@ ENDBLOCK
 	   (($env{'form.folderpath'} =~ /^default\&/) || ($env{'form.folderpath'} eq ''))) {
           $env{'form.folderpath'} = 'supplemental&'.
                                     &escape(&mt('Supplemental '.$type.' Documents'));
+       }else{
+	  $env{'form.folderpath'} = $savefolderpath;
        }
-       my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$type);
-       if ($error) {
-	   $r->print('<p><span class="LC_error">'.$error.'</span></p>');
-       }
+       $env{'form.pagepath'} = '';
        if ($allowed) {
 	   my $folderseq=
 	       '/uploaded/'.$coursedom.'/'.$coursenum.'/supplemental_'.time.
 	       '.sequence';
 
 	   my $path = &HTML::Entities::encode($env{'form.folderpath'},'<>&"');
-	   $r->print(<<ENDSUPFORM);
-<table class="LC_docs_adddocs"><tr>
-<th>$lt{'upls'}</th>
-<th>$lt{'spec'}</th>
-</tr>
-<tr><td>
-<form action="/adm/coursedocs" method="post" enctype="multipart/form-data">
-<input type="file" name="uploaddoc" size="40" />
-<br />
-<br />
-<span class="LC_nobreak">
-<label>$lt{'parse'}?
-<input type="checkbox" name="parserflag" />
-</label>
-</span>
-<br /><br />
-$lt{'comment'}:<br />
-<textarea cols="50" rows="4" name="comment">
-</textarea>
-<br />
-<input type="hidden" name="folderpath" value="$path" />
-<input type="hidden" name="cmd" value="upload_supplemental" />
-<span class="LC_nobreak">
-<input type="submit" value="$lt{'upld'}" />
- $help{'Uploading_From_Harddrive'}
-</span>
-</form>
-</td>
-<td>
-<form action="/adm/coursedocs" method="post" name="supnewfolder">
-<input type="hidden" name="folderpath" value="$path" />
-<input type="hidden" name="importdetail" value="" />
-<span class="LC_nobreak">
-<input name="newfolder" type="button"
-onClick="javascript:makenewfolder(this.form,'$folderseq');"
-value="$lt{'newf'}" /> $help{'Adding_Folders'}
-</span>
-</form>
-<br /><form action="/adm/coursedocs" method="post" name="supnewext">
-<input type="hidden" name="folderpath" value="$path" />
-<input type="hidden" name="importdetail" value="" />
-<span class="LC_nobreak">
-<input name="newext" type="button" 
-onClick="javascript:makenewext('supnewext');"
-value="$lt{'extr'}" /> $help{'Adding_External_Resource'}
-</span>
-</form>
-<br /><form action="/adm/coursedocs" method="post" name="supnewsyl">
-<input type="hidden" name="folderpath" value="$path" />
-<input type="hidden" name="importdetail" 
-value="Syllabus=/public/$coursedom/$coursenum/syllabus" />
-<span class="LC_nobreak">
-<input name="newsyl" type="submit" value="$lt{'syll'}" />
-$help{'Syllabus'}
-</span>
-</form>
-<br /><form action="/adm/coursedocs" method="post" name="subnewaboutme">
-<input type="hidden" name="folderpath" value="$path" />
-<input type="hidden" name="importdetail" 
-value="$plainname=/adm/$udom/$uname/aboutme" />
-<span class="LC_nobreak">
-<input name="newaboutme" type="submit" value="$lt{'mypi'}" />
-$help{'My Personal Info'}
-</span>
-</form>
-</td></tr>
-</table></td></tr>
-ENDSUPFORM
+
+	my $supupdocform=(<<SUPDOCFORM);
+	<form action="/adm/coursedocs" method="post" enctype="multipart/form-data">
+	$fileupload
+	<br />
+	<br />
+	<span class="LC_nobreak">
+	$checkbox
+	</span>
+	<br /><br />
+	$lt{'comment'}:<br />
+	<textarea cols="50" rows="4" name="comment">
+	</textarea>
+	<br />
+	<input type="hidden" name="folderpath" value="$path" />
+	<input type="hidden" name="cmd" value="upload_supplemental" />
+	<span class="LC_nobreak">
+	<input type="submit" value="$lt{'upld'}" />
+	 $help{'Uploading_From_Harddrive'}
+	</span>
+	</form>
+SUPDOCFORM
+
+	my $supnewfolderform=(<<SNFFORM);
+	<form action="/adm/coursedocs" method="post" name="supnewfolder">
+	<input type="hidden" name="folderpath" value="$path" />
+	<input type="hidden" name="importdetail" value="" />
+	<span class="LC_nobreak">
+	<input name="newfolder" type="button"
+	onClick="javascript:makenewfolder(this.form,'$folderseq');"
+	value="$lt{'newf'}" /> $help{'Adding_Folders'}
+	</span>
+	</form>
+SNFFORM
+
+
+	my $supnewextform=(<<SNEFORM);
+	<form action="/adm/coursedocs" method="post" name="supnewext">
+	<input type="hidden" name="folderpath" value="$path" />
+	<input type="hidden" name="importdetail" value="" />
+	<span class="LC_nobreak">
+	<input name="newext" type="button" 
+	onClick="javascript:makenewext('supnewext');"
+	value="$lt{'extr'}" /> $help{'Adding_External_Resource'}
+	</span>
+	</form>
+SNEFORM
+
+	my $supnewsylform=(<<SNSFORM);
+	<form action="/adm/coursedocs" method="post" name="supnewsyl">
+	<input type="hidden" name="folderpath" value="$path" />
+	<input type="hidden" name="importdetail" 
+	value="Syllabus=/public/$coursedom/$coursenum/syllabus" />
+	<span class="LC_nobreak">
+	<input name="newsyl" type="submit" value="$lt{'syll'}" />
+	$help{'Syllabus'}
+	</span>
+	</form>
+SNSFORM
+
+	my $supnewaboutmeform=(<<SNAMFORM);
+	<form action="/adm/coursedocs" method="post" name="subnewaboutme">
+	<input type="hidden" name="folderpath" value="$path" />
+	<input type="hidden" name="importdetail" 
+	value="$plainname=/adm/$udom/$uname/aboutme" />
+	<span class="LC_nobreak">
+	<input name="newaboutme" type="submit" value="$lt{'mypi'}" />
+	$help{'My Personal Information Page'}
+	</span>
+	</form>
+SNAMFORM
+
+
+
+my %suporderhash = (
+                'ee' => ['New Document',$supupdocform.'<br />'.$supnewfolderform],
+                'ff' => ['Special Documents',$supnewextform.'<br />'.$supnewsylform.'<br />'.$supnewaboutmeform],
+                'zz' => ['Hide all Options'],
+                );
+
+my $tid='2';
+my $varscd = 'Supplemental Course Documents';
+
+$r->print(&generate_edit_table($tid,$varscd,\%suporderhash));
+my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$type);
+       if ($error) {
+           $r->print('<p><span class="LC_error">'.$error.'</span></p>');
        }
-    }
-    $r->print('</table>');
+$r->print('</div>');
+	}
+$r->print('</div>');
     if ($allowed) {
 	$r->print('
 <form method="post" name="extimport" action="/adm/coursedocs">
@@ -3214,8 +3283,60 @@ ENDSUPFORM
  }
  $r->print(&Apache::loncommon::end_page());
  return OK;
-} 
+}
 
+sub generate_admin_options {
+  my ($containertag,$uploadtag,$help_ref,$env_ref) = @_;
+ my %lt=&Apache::lonlocal::texthash(
+                                         'vc' => 'Verify Content',
+                                         'cv' => 'Check/Set Resource Versions',
+                                         'ls' => 'List Symbs',
+                                         'sl' => 'Show Log'
+                                          );
+  my %help = %{$help_ref};
+  my %env = %{$env_ref};
+  my $dumpbut=&dumpbutton();
+  my $exportbut=&exportbutton();
+  return (<<ENDOPTIONFORM);
+ <form action="/adm/coursedocs" method="post" name="courseverify">
+           <input type="submit" name="verify" value="$lt{'vc'}" />$help{'Verify_Content'}<br />
+           <input type="submit" name="versions" value="$lt{'cv'}" />$help{'Check_Resource_Versions'}<br />
+           $dumpbut
+           $exportbut
+          <input type="submit" name="listsymbs" value="$lt{'ls'}" />
+          <input type="hidden" name="folder" value="$env{'form.folder'}" /><br />
+          <input type="submit" name="docslog" value="$lt{'sl'}" />
+ </form>
+ENDOPTIONFORM
+
+}
+
+
+sub generate_edit_table {
+    my ($tid,$varcd,$orderhash_ref) = @_;
+    my %orderhash = %{$orderhash_ref};
+    my $form;
+
+    $form = '<div class="LC_ContentBoxSpecial"><h4 class="LC_hcell">'.&mt($varcd).'</h4>';
+    $form .= '<ul id="navigation'.$tid.'" class="LC_TabContent">';
+    foreach my $name (sort(keys(%orderhash))){
+        if($name eq 'zz'){
+            $form .= '<span class="LC_Right"><li onclick="javascript:hideAll(this, \'navigation'.$tid.'\' ,\'content'.$tid.'\');" class="active">'.&mt(${$orderhash{$name}}[0]).'</li></span>';
+        }else{
+            $form .= '<li onclick="javascript:showPage(this, \''.substr(${$orderhash{$name}}[0],0,3).$tid.'\', \'navigation'.$tid.'\',\'content'.$tid.'\');">'.&mt(${$orderhash{$name}}[0]).'</li>';
+        }
+    }
+    $form .= '</ul>';
+    $form .= '<div id="content'.$tid.'" style="padding: 0 0; margin: 0 0;">';
+    foreach my $field (keys(%orderhash)){
+	if($field ne 'zz'){
+           $form .= '<div id="'.substr(${$orderhash{$field}}[0],0,3).$tid.'" class="LC_ContentBox" style="display: none;">'.${$orderhash{$field}}[1].'</div>';
+        }
+    }
+    $form .= '</div></div>';
+
+    return $form;
+}
 
 sub editing_js {
     my ($udom,$uname) = @_;
@@ -3226,12 +3347,12 @@ sub editing_js {
                                           p_mnp => 'Name of New Page',
                                           t_mnp => 'New Page',
                                           p_mxu => 'Title for the Uploaded Score',
-                                          p_msp => 'Name of the Simple Course Page',
+                                          p_msp => 'Name of Simple Course Page',
                                           p_msb => 'Title for the Problem',
                                           p_mdb => 'Title for the Drop Box',
                                           p_mbb => 'Title for the Discussion Board',
-                                          p_mab => "Enter user:domain for User's 'About Me' Page",
-                                          p_mab2 => "About [_99]",
+                                          p_mab => "Enter user:domain for User's Personal Information Page",
+                                          p_mab2 => 'Personal Information Page of ',
                                           p_mab_alrt1 => 'Not a valid user:domain',
                                           p_mab_alrt2 => 'Please enter both user and domain in the format user:domain',
                                           p_chn => 'New Title',
@@ -3279,7 +3400,7 @@ function edittext(targetname,residx,titl
 
 function makeexamupload() {
    var title=prompt('$lt{"p_mxu"}');
-   if (title) { 
+   if (title) {
     this.document.forms.newexamupload.importdetail.value=
 	escape(title)+'=/res/lib/templates/examupload.problem';
     this.document.forms.newexamupload.submit();
@@ -3288,7 +3409,7 @@ function makeexamupload() {
 
 function makesmppage() {
    var title=prompt('$lt{"p_msp"}');
-   if (title) { 
+   if (title) {
     this.document.forms.newsmppg.importdetail.value=
 	escape(title)+'=/adm/$udom/$uname/$now/smppg';
     this.document.forms.newsmppg.submit();
@@ -3297,7 +3418,7 @@ function makesmppage() {
 
 function makesmpproblem() {
    var title=prompt('$lt{"p_msb"}');
-   if (title) { 
+   if (title) {
     this.document.forms.newsmpproblem.importdetail.value=
 	escape(title)+'=/res/lib/templates/simpleproblem.problem';
     this.document.forms.newsmpproblem.submit();
@@ -3306,7 +3427,7 @@ function makesmpproblem() {
 
 function makedropbox() {
    var title=prompt('$lt{"p_mdb"}');
-   if (title) { 
+   if (title) {
     this.document.forms.newdropbox.importdetail.value=
         escape(title)+'=/res/lib/templates/DropBox.problem';
     this.document.forms.newdropbox.submit();
@@ -3331,91 +3452,120 @@ function makeabout() {
 	   if ((comp[0]) && (comp[1])) {
 	       this.document.forms.newaboutsomeone.importdetail.value=
 		   '$lt{"p_mab2"}'+escape(user)+'=/adm/'+comp[1]+'/'+comp[0]+'/aboutme';
-	       this.document.forms.newaboutsomeone.submit();
-	   } else {
-               alert("$lt{'p_mab_alrt1'}");
-           }
-       } else {
-           alert("$lt{'p_mab_alrt2'}");
-       }
+       this.document.forms.newaboutsomeone.submit();
+   } else {
+       alert("$lt{'p_mab_alrt1'}");
    }
+} else {
+   alert("$lt{'p_mab_alrt2'}");
+}
+}
 }
 
 function makeims() {
-    var caller = document.forms.ims.folder.value;
-    var newlocation = "/adm/imsimportdocs?folder="+caller+"&phase=one";
-    newWindow = window.open("","IMSimport","HEIGHT=700,WIDTH=750,scrollbars=yes");
-    newWindow.location.href = newlocation;
+var caller = document.forms.ims.folder.value;
+var newlocation = "/adm/imsimportdocs?folder="+caller+"&phase=one";
+newWindow = window.open("","IMSimport","HEIGHT=700,WIDTH=750,scrollbars=yes");
+newWindow.location.href = newlocation;
 }
 
 
 function finishpick() {
-    var title=this.document.forms.extimport.title.value;
-    var url=this.document.forms.extimport.url.value;
-    var form=this.document.forms.extimport.useform.value;
-    var residx=this.document.forms.extimport.residx.value;
-    eval('this.document.forms.'+form+'.importdetail.value="'+title+'='+url+'='+residx+'";this.document.forms.'+form+'.submit();');
+var title=this.document.forms.extimport.title.value;
+var url=this.document.forms.extimport.url.value;
+var form=this.document.forms.extimport.useform.value;
+var residx=this.document.forms.extimport.residx.value;
+eval('this.document.forms.'+form+'.importdetail.value="'+title+'='+url+'='+residx+'";this.document.forms.'+form+'.submit();');
 }
 
 function changename(folderpath,index,oldtitle,container,pagesymb) {
-    var title=prompt('$lt{"p_chn"}',oldtitle);
-    if (title) {
-	this.document.forms.renameform.markcopy.value=-1;
-	this.document.forms.renameform.title.value=title;
-	this.document.forms.renameform.cmd.value='rename_'+index;
-        if (container == 'sequence') {
-	    this.document.forms.renameform.folderpath.value=folderpath;
-        }
-        if (container == 'page') {
-            this.document.forms.renameform.pagepath.value=folderpath;
-            this.document.forms.renameform.pagesymb.value=pagesymb;
-        }
-        this.document.forms.renameform.submit();
-    }
+var title=prompt('$lt{"p_chn"}',oldtitle);
+if (title) {
+this.document.forms.renameform.markcopy.value=-1;
+this.document.forms.renameform.title.value=title;
+this.document.forms.renameform.cmd.value='rename_'+index;
+if (container == 'sequence') {
+    this.document.forms.renameform.folderpath.value=folderpath;
+}
+if (container == 'page') {
+    this.document.forms.renameform.pagepath.value=folderpath;
+    this.document.forms.renameform.pagesymb.value=pagesymb;
+}
+this.document.forms.renameform.submit();
+}
 }
 
 function removeres(folderpath,index,oldtitle,container,pagesymb,skip_confirm) {
-    if (skip_confirm || confirm('$lt{"p_rmr1"}\\n\\n$lt{"p_rmr2a"} "'+oldtitle+'" $lt{"p_rmr2b"}')) {
-	this.document.forms.renameform.markcopy.value=-1;
-	this.document.forms.renameform.cmd.value='del_'+index;
-        if (container == 'sequence') {
-            this.document.forms.renameform.folderpath.value=folderpath;
-        }
-        if (container == 'page') {
-            this.document.forms.renameform.pagepath.value=folderpath;
-            this.document.forms.renameform.pagesymb.value=pagesymb;
-        }
-        this.document.forms.renameform.submit();
-    }
+if (skip_confirm || confirm('$lt{"p_rmr1"}\\n\\n$lt{"p_rmr2a"} "'+oldtitle+'" $lt{"p_rmr2b"}')) {
+this.document.forms.renameform.markcopy.value=-1;
+this.document.forms.renameform.cmd.value='del_'+index;
+if (container == 'sequence') {
+    this.document.forms.renameform.folderpath.value=folderpath;
+}
+if (container == 'page') {
+    this.document.forms.renameform.pagepath.value=folderpath;
+    this.document.forms.renameform.pagesymb.value=pagesymb;
+}
+this.document.forms.renameform.submit();
+}
 }
 
 function cutres(folderpath,index,oldtitle,container,pagesymb,folder,skip_confirm) {
-    if (skip_confirm || confirm('$lt{"p_ctr1a"}\\n$lt{"p_ctr1b"}\\n\\n$lt{"p_ctr2a"} "'+oldtitle+'" $lt{"p_ctr2b"}')) {
-	this.document.forms.renameform.cmd.value='cut_'+index;
-	this.document.forms.renameform.markcopy.value=index;
-	this.document.forms.renameform.copyfolder.value=folder+'.'+container;
-        if (container == 'sequence') {
-            this.document.forms.renameform.folderpath.value=folderpath;
-        }
-        if (container == 'page') {
-            this.document.forms.renameform.pagepath.value=folderpath;
-            this.document.forms.renameform.pagesymb.value=pagesymb;
-        }
-        this.document.forms.renameform.submit();
-    }
+if (skip_confirm || confirm('$lt{"p_ctr1a"}\\n$lt{"p_ctr1b"}\\n\\n$lt{"p_ctr2a"} "'+oldtitle+'" $lt{"p_ctr2b"}')) {
+this.document.forms.renameform.cmd.value='cut_'+index;
+this.document.forms.renameform.markcopy.value=index;
+this.document.forms.renameform.copyfolder.value=folder+'.'+container;
+if (container == 'sequence') {
+    this.document.forms.renameform.folderpath.value=folderpath;
+}
+if (container == 'page') {
+    this.document.forms.renameform.pagepath.value=folderpath;
+    this.document.forms.renameform.pagesymb.value=pagesymb;
+}
+this.document.forms.renameform.submit();
+}
 }
 
 function markcopy(folderpath,index,oldtitle,container,pagesymb,folder) {
-    this.document.forms.renameform.markcopy.value=index;
-    this.document.forms.renameform.copyfolder.value=folder+'.'+container;
-    if (container == 'sequence') {
-	this.document.forms.renameform.folderpath.value=folderpath;
-    }
-    if (container == 'page') {
-	this.document.forms.renameform.pagepath.value=folderpath;
-	this.document.forms.renameform.pagesymb.value=pagesymb;
-    }
-    this.document.forms.renameform.submit();
+this.document.forms.renameform.markcopy.value=index;
+this.document.forms.renameform.copyfolder.value=folder+'.'+container;
+if (container == 'sequence') {
+this.document.forms.renameform.folderpath.value=folderpath;
+}
+if (container == 'page') {
+this.document.forms.renameform.pagepath.value=folderpath;
+this.document.forms.renameform.pagesymb.value=pagesymb;
+}
+this.document.forms.renameform.submit();
+}
+
+function unselectInactive(nav) {
+currentNav = document.getElementById(nav);
+currentLis = currentNav.getElementsByTagName('LI');
+for (i = 0; i < currentLis.length; i++) {
+	currentLis[i].className = 'i';
+}
+}
+
+function hideAll(current, nav, data) {
+unselectInactive(nav);
+current.className = 'active';
+currentData = document.getElementById(data);
+currentDivs = currentData.getElementsByTagName('DIV');
+for (i = 0; i < currentDivs.length; i++) {
+	if(currentDivs[i].className == 'LC_ContentBox'){
+		currentDivs[i].style.display = 'none';
+	}
+}
+}
+
+function showPage(current, pageId, nav, data) {
+	hideAll(current, nav, data);
+	unselectInactive(nav);
+	current.className = 'active';
+	currentData = document.getElementById(pageId);
+	currentData.style.display = 'block';
+	return false;
 }
 
 ENDNEWSCRIPT
@@ -3443,7 +3593,7 @@ Available help topics
 
 =item mapread()
 
-Mapread read maps into LONCAPA::map:: global arrays 
+Mapread read maps into LONCAPA::map:: global arrays
 @order and @resources, determines status
 sets @order - pointer to resources in right order
 sets @resources - array with the resources with correct idx