--- loncom/interface/londocs.pm	2010/02/02 01:30:46	1.325.2.7
+++ loncom/interface/londocs.pm	2009/07/13 17:34:28	1.379
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.325.2.7 2010/02/02 01:30:46 raeburn Exp $
+# $Id: londocs.pm,v 1.379 2009/07/13 17:34:28 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);
 }
@@ -117,17 +116,15 @@ sub authorhosts {
 
 sub dumpbutton {
     my ($home,$other,%outhash)=&authorhosts();
-    my $crstype = &Apache::loncommon::course_type();
+    my $type = &Apache::loncommon::course_type();
     if ($home+$other==0) { return ''; }
     if ($home) {
-	return '<div>'.
-	    '<input type="submit" name="dumpcourse" value="'.
-	    &mt('Dump '.$crstype.' DOCS to Construction Space').'" />'.
-	    &Apache::loncommon::help_open_topic('Docs_Dump_Course_Docs').
-	    '</div>';
+	return '<input type="submit" name="dumpcourse" value="'.
+	    &mt('Dump '.$type.' DOCS to Construction Space').'" />'.
+	    &Apache::loncommon::help_open_topic('Docs_Dump_Course_Docs').'<br />';
     } else {
 	return '<div>'.
-     &mt('Dump '.$crstype.
+     &mt('Dump '.$type.
 	 ' DOCS to Construction Space: available on other servers').
 	 '</div>';
     }
@@ -136,17 +133,17 @@ sub dumpbutton {
 sub clean {
     my ($title)=@_;
     $title=~s/[^\w\/\!\$\%\^\*\-\_\=\+\;\:\,\\\|\`\~]+/\_/gs;
-    return $title;	
+    return $title;
 }
 
 
 
 sub dumpcourse {
     my ($r) = @_;
-    my $crstype = &Apache::loncommon::course_type();
-    $r->print(&Apache::loncommon::start_page('Dump '.$crstype.' DOCS to Construction Space').
+    my $type = &Apache::loncommon::course_type();
+    $r->print(&Apache::loncommon::start_page('Dump '.$type.' DOCS to Construction Space').
 	      '<form name="dumpdoc" action="" method="post">');
-    $r->print(&Apache::lonhtmlcommon::breadcrumbs('Dump '.$crstype.' DOCS to Construction Space'));
+    $r->print(&Apache::lonhtmlcommon::breadcrumbs('Dump '.$type.' DOCS to Construction Space'));
     my ($home,$other,%outhash)=&authorhosts();
     unless ($home) { return ''; }
     my $origcrsid=$env{'request.course.id'};
@@ -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>: ');
@@ -257,17 +254,17 @@ sub dumpcourse {
 	$r->print(&Apache::loncommon::end_data_table());
 	&untiehash();
 	$r->print(
-  '<p><input type="submit" name="dumpcourse" value="'.&mt("Dump $crstype DOCS").'" /></p></form>');
+  '<p><input type="submit" name="dumpcourse" value="'.&mt("Dump $type DOCS").'" /></p></form>');
     }
 }
 
 
 
 sub exportbutton {
-    my $crstype = &Apache::loncommon::course_type();
+    my $type = &Apache::loncommon::course_type();
     return '<input type="submit" name="exportcourse"'
           .' value="'.&mt('IMS Export').'"'
-          .' title="'.&mt('Export '.$crstype.' to IMS Package').'" />'.
+          .' title="'.&mt('Export '.$type.' to IMS Package').'" />'.
     &Apache::loncommon::help_open_topic('Docs_Export_Course_Docs').'<br />';
 }
 
@@ -275,28 +272,18 @@ sub exportbutton {
 
 sub exportcourse {
     my $r=shift;
-    my $crstype = &Apache::loncommon::course_type();
+    my $type = &Apache::loncommon::course_type();
     my %discussiontime = &Apache::lonnet::dump('discussiontimes',
                                                $env{'course.'.$env{'request.course.id'}.'.domain'}, $env{'course.'.$env{'request.course.id'}.'.num'});
     my $numdisc = keys(%discussiontime);
     my $navmap = Apache::lonnavmaps::navmap->new();
     if (!defined($navmap)) {
-        $r->print(&Apache::loncommon::start_page('Export '.$crstype.' to IMS Package').
+        $r->print(&Apache::loncommon::start_page('Export '.$type.' to IMS Package').
                   '<h2>'.&mt('IMS Export Failed').'</h2>'.
-                  '<div class="LC_error">');
-        if ($crstype eq 'Community') {
-            $r->print(&mt('Unable to retrieve information about community contents'));
-        } else {
-            $r->print(&mt('Unable to retrieve information about course contents'));
-        }
-        $r->print('</div><a href="/adm/coursedocs">');
-        if ($crstype eq 'Community') {
-            $r->print(&mt('Return to Community Editor'));
-        } else {
-            $r->print(&mt('Return to Course Editor'));
-        }
-        $r->print('</a>');
-        &Apache::lonnet::logthis('IMS export failed - could not create navmap object in '.lc($crstype).':'.$env{'request.course.id'});
+                  '<div class="LC_error">'.
+                  &mt('Unable to retrieve information about course contents').
+                  '</div><a href="/adm/coursedocs">'.&mt('Return to Course Editor').'</a>');
+        &Apache::lonnet::logthis('IMS export failed - could not create navmap object in '.lc($type).':'.$env{'request.course.id'});
         return;
     }
     my $it=$navmap->getIterator(undef,undef,undef,1,undef,undef);
@@ -345,16 +332,16 @@ sub exportcourse {
                 open(OUTPUT, "zip -r $imszip *  2> /dev/null |");
                 close(OUTPUT);
                 chdir $cwd;
-                $outcome .= '<p>'
-                           .&mt('[_1]Your IMS package[_2] is ready for download.'
-                               ,'<a href="'.$imszipfile.'">','</a>')
-                           .'</p>';
                 if ($copyresult) {
                     $outcome .= '<p class="LC_error">'
                                .&mt('The following errors occurred during export - [_1]'
                                    ,$copyresult)
                                .'</p>';
                 }
+                $outcome .= '<p>'
+                           .&mt('[_1]Your IMS package[_2] is ready for download.'
+                               ,'<a href="'.$imszipfile.'">','</a>')
+                           .'</p>';
             } else {
                 $outcome = '<p class="LC_error">'
                           .&mt('Unfortunately you will not be able to retrieve'
@@ -367,31 +354,29 @@ sub exportcourse {
                           .'</a></p>';
             }
         }
-        $r->print(&Apache::loncommon::start_page('Export '.$crstype.' to IMS Package'));
-        $r->print(&Apache::lonhtmlcommon::breadcrumbs('IMS Export'));
+        $r->print(&Apache::loncommon::start_page('Export '.$type.' to IMS Package'));
+	$r->print(&Apache::lonhtmlcommon::breadcrumbs('IMS Export'));
         $r->print($outcome);
         $r->print(&Apache::loncommon::end_page());
     } else {
-        my $display='<form name="exportdoc" action="" method="post">'."\n".
-                    '<p>'.
-                    &mt('Choose which items you wish to export from your '.$crstype.'.').
-                    '</p>'.
-                    '<div class="LC_columnSection"><fieldset>'.
+        my $display;
+        $display = '<form name="exportdoc" action="" method="post">'."\n";
+        $display .= '<p>'
+                   .&mt('Choose which items you wish to export from your '.$type.'.')
+                   .'</p>';
+        $display .= '<div class="LC_columnSection"><fieldset>'.
                     '<legend>'.&mt('Content items').'</legend>'.
                     '<input type="button" value="'.&mt('check all').'" '.
                     'onclick="javascript:checkAll(document.exportdoc.archive)" />'.
                     '&nbsp;&nbsp;<input type="button" value="'.&mt('uncheck all').'"'.
-                    ' onclick="javascript:uncheckAll(document.exportdoc.archive)" /></fieldset>';
-        if ($numdisc > 0) {
-            $display .= '<fieldset>'.
-                        '<legend>'.&mt('Discussion posts').'</legend>'.
-                        '<input type="button" value="'.&mt('check all').'"'.
-                        ' onclick="javascript:checkAll(document.exportdoc.discussion)" />'.
-                        '&nbsp;&nbsp;<input type="button" value="'.&mt('uncheck all').'"'.
-                        ' onclick="javascript:uncheckAll(document.exportdoc.discussion)" />'.
-                        '</fieldset>';
-        }
-        $display .= '</div>';
+                    ' onclick="javascript:uncheckAll(document.exportdoc.archive)" /></fieldset>'.
+                    '<fieldset>'.
+                    '<legend>'.&mt('Discussion posts').'</legend>'.
+                    '<input type="button" value="'.&mt('check all').'"'.
+                    ' onclick="javascript:checkAll(document.exportdoc.discussion)" />'.
+                    '&nbsp;&nbsp;<input type="button" value="'.&mt('uncheck all').'"'.
+                    ' onclick="javascript:uncheckAll(document.exportdoc.discussion)" />'.
+                    '</fieldset></div>';
         my $curRes;
         my $depth = 0;
         my $count = 0;
@@ -402,11 +387,15 @@ sub exportcourse {
         my $lastcontainer = $startcount;
         $display .= &Apache::loncommon::start_data_table()
                    .&Apache::loncommon::start_data_table_header_row()
-                   .'<th>'.&mt('Export content item?').'</th>';
+                   .'<th>'.&mt('Export content item?').'</th>'
+                   .'<th>';
         if ($numdisc > 0) {
-            $display .= '<th>'.&mt('Export discussion posts?').'</th>';
+            $display .= &mt('Export discussion posts?');
+        } else {
+             $display .= '&nbsp;';
         }
-        $display .= &Apache::loncommon::end_data_table_header_row();
+        $display .= '</th>'
+                   .&Apache::loncommon::end_data_table_header_row();
         while ($curRes = $it->next()) {
             if (ref($curRes)) {
                 $count ++;
@@ -427,30 +416,33 @@ sub exportcourse {
                         $ressymb = 'bulletin___'.$3.'___adm/wrapper/adm/'.$1.'/'.$2.'/'.$3.'/bulletinboard';
                     }
                 }
-                my $currelem = $count+$boards+$startcount;
                 $display .= &Apache::loncommon::start_data_table_row()
                            .'<td>'."\n"
                            .'<input type="checkbox" name="archive" value="'.$count.'" ';
                 if (($curRes->is_sequence()) || ($curRes->is_page())) {
-                    $lastcontainer = $currelem;
-                    $display .= 'onclick="javascript:propagateCheck('."'$currelem'".')"';
+                    my $checkitem = $count + $boards + $startcount;
+                    $display .= 'onclick="javascript:propagateCheck('."'$checkitem'".')"';
                 }
                 $display .= ' />'."\n";
                 for (my $i=0; $i<$depth; $i++) {
-                    $display .= ('<img src="/adm/lonIcons/whitespace1.gif" class="LC_docs_spacer" />' x2)."\n";
+                    $display .= '<img src="/adm/lonIcons/whitespace1.gif" class="LC_docs_spacer" alt="" />'
+                               .'<img src="/adm/lonIcons/whitespace1.gif" class="LC_docs_spacer" alt="" />'."\n";
                 }
                 if ($curRes->is_sequence()) {
                     $display .= '<img src="/adm/lonIcons/navmap.folder.open.gif" alt="" />&nbsp;'."\n";
+                    $lastcontainer = $count + $startcount + $boards;
                 } elsif ($curRes->is_page()) {
                     $display .= '<img src="/adm/lonIcons/navmap.page.open.gif" alt="" />&nbsp;'."\n";
+                    $lastcontainer = $count + $startcount + $boards;
                 }
+                my $currelem = $count+$boards+$startcount;
                 $children{$parent{$depth}} .= $currelem.':';
                 $display .= '&nbsp;'.$curRes->title().'</td>'."\n";
 
                 # Existing discussion posts?
-
                 if ($discussiontime{$ressymb} > 0) {
                     $boards ++;
+                    $currelem = $count+$boards+$startcount;
                     $display .= '<td align="right">'
                                .'<input type="checkbox" name="discussion" value="'.$count.'" />'
                                .'</td>'."\n";
@@ -464,7 +456,6 @@ sub exportcourse {
         my $scripttag = qq|
 <script type="text/javascript">
 // <![CDATA[
-
 function checkAll(field) {
     if (field.length > 0) {
         for (i = 0; i < field.length; i++) {
@@ -474,7 +465,7 @@ function checkAll(field) {
         field.checked = true
     }
 }
-                                                                                
+
 function uncheckAll(field) {
     if (field.length > 0) {
         for (i = 0; i < field.length; i++) {
@@ -489,7 +480,7 @@ function propagateCheck(item) {
     if (document.exportdoc.elements[item].checked == true) {
         containerCheck(item)
     }
-} 
+}
 
 function containerCheck(item) {
     document.exportdoc.elements[item].checked = true
@@ -512,15 +503,14 @@ function containerCheck(item) {
         for (var j=0; j<parents[item].length; j++) {
             containerCheck(parents[item][j])
         }
-     }   
+     }
 }
-
 // ]]>
 </script>
         |;
-        $r->print(&Apache::loncommon::start_page('Export '.$crstype.' to IMS Package',
- 						 $scripttag));
-	$r->print(&Apache::lonhtmlcommon::breadcrumbs('Export '.lc($crstype).' to IMS content package'));
+	$r->print(&Apache::loncommon::start_page('Export '.$type.' to IMS Package',
+						 $scripttag));
+	$r->print(&Apache::lonhtmlcommon::breadcrumbs('IMS Export'));
 	$r->print($display.
                   '<p><input type="hidden" name="finishexport" value="1" />'.
                   '<input type="submit" name="exportcourse" value="'.
@@ -551,7 +541,7 @@ sub create_ims_store {
     my $manifestfilename = $$tempexport.$manifest;
     if ($ims_manifest = Apache::File->new('>'.$manifestfilename)) {
         $$manifestok=1;
-        print $ims_manifest 
+        print $ims_manifest
 '<?xml version="1.0" encoding="UTF-8"?>'."\n".
 '<manifest xmlns="http://www.imsglobal.org/xsd/imscp_v1p1"'.
 ' xmlns:imsmd="http://www.imsglobal.org/xsd/imsmd_v1p2"'.
@@ -807,7 +797,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;
@@ -847,9 +837,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;
@@ -900,14 +890,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') {
@@ -969,10 +959,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".
@@ -992,7 +982,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);
@@ -1001,7 +991,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'));
 	}
     }
@@ -1009,7 +999,7 @@ sub group_import {
 }
 
 sub breadcrumbs {
-    my ($allowed,$crstype)=@_;
+    my ($where,$allowed,$type)=@_;
     &Apache::lonhtmlcommon::clear_breadcrumbs();
     my (@folders);
     if ($env{'form.pagepath'}) {
@@ -1032,9 +1022,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;
@@ -1044,23 +1034,22 @@ sub breadcrumbs {
 	    if ($4 ne '') { $is_random_order = 1; }
             if ($folder eq 'supplemental') {
                 if ($allowed) {
-                    $name = &mt('Supplemental '.$crstype.' Documents');
+                    $name = &mt('Supplemental '.$type.' Documents');
                 } else {
-                    $name = &mt($crstype.' Documents');
+                    $name = &mt($type.' Documents');
                 }
             }
 	    &Apache::lonhtmlcommon::add_breadcrumb(
 		      {'href'=>$url.$cpinfo,
 		       'title'=>$name,
-		       'text'=>'<font size="+1">'.
-			   $name.'</font>',
+		       'text'=>$name,
 		       'no_mt'=>1,
 		       });
 	$plain.=$name.' &gt; ';
     }
     $plain=~s/\&gt\;\s*$//;
     return (&Apache::lonhtmlcommon::breadcrumbs(undef,undef,0,'nohelp',
-					       'LC_docs_path'),$randompick,$ishidden,$isencrypted,$plain,$is_random_order);
+					       undef, undef, 1 ),$randompick,$ishidden,$isencrypted,$plain,$is_random_order);
 }
 
 sub log_docs {
@@ -1173,7 +1162,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 =
@@ -1224,7 +1213,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}) {
@@ -1262,7 +1251,7 @@ sub update_paste_buffer {
 
     my ($errtext,$fatal) = &mapread($coursenum,$coursedom,
 				    $env{'form.copyfolder'});
-    
+
     return if ($fatal);
 
 # Mark for copying
@@ -1386,7 +1375,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;
 	}
     }
@@ -1400,7 +1389,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 {
@@ -1424,7 +1413,7 @@ sub uniqueness_check {
         $url=&LONCAPA::map::qtescape($url);
         if ($newurl eq $url) {
             $unique = 0;
-            last;    
+            last;
         }
     }
     return $unique;
@@ -1450,7 +1439,7 @@ sub update_parameter {
 	&remember_parms($idx,$which,'set',$value);
     } else {
 	&LONCAPA::map::delparameter($idx,'parameter_'.$which);
-	
+
 	&remember_parms($idx,$which,'del');
     }
     return 1;
@@ -1478,7 +1467,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];
 
@@ -1503,7 +1492,7 @@ sub handle_edit_cmd {
 }
 
 sub editor {
-    my ($r,$coursenum,$coursedom,$folder,$allowed,$upload_output,$crstype)=@_;
+    my ($r,$coursenum,$coursedom,$folder,$allowed,$upload_output,$type)=@_;
 
     my $container= ($env{'form.pagepath'}) ? 'page'
 		                           : 'sequence';
@@ -1518,11 +1507,11 @@ sub editor {
        	$LONCAPA::map::order[0]=$idx;
         $LONCAPA::map::resources[$idx]='';
     }
-    
+
     my ($breadcrumbtrail,$randompick,$ishidden,$isencrypted,$plain,$is_random_order)=
-	&breadcrumbs($allowed,$crstype);
+	&breadcrumbs($folder,$allowed,$type);
     $r->print($breadcrumbtrail);
-    
+
 # ------------------------------------------------------------ Process commands
 
 # ---------------- if they are for this folder and user allowed to make changes
@@ -1543,9 +1532,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);
@@ -1589,7 +1578,7 @@ sub editor {
 		return $errtext if ($fatal);
 	    } else {
 		$r->print('<p><span class="LC_error">'.&mt('No map selected.').'</span></p>');
-		
+
 	    }
 	}
 	&log_differences($plain);
@@ -1604,14 +1593,14 @@ 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>');
     }
     if ($is_random_order) {
 	$r->print('<p>'.&mt('Caution: this folder is set to randomly order its contents. Adding or removing resources from this folder will change the order of resources shown.').'</p>');
     }
-    $r->print('<table class="LC_docs_editor">');
+    $r->print(&Apache::loncommon::start_data_table());
     foreach my $res (@LONCAPA::map::order) {
 	my ($name,$url)=split(/\:/,$LONCAPA::map::resources[$res]);
 	$name=&LONCAPA::map::qtescape($name);
@@ -1619,14 +1608,16 @@ sub editor {
 	unless ($name) {  $name=(split(/\//,$url))[-1]; }
 	unless ($name) { $idx++; next; }
 	$r->print(&entryline($idx,$name,$url,$folder,$allowed,$res,
-			     $coursenum,$crstype));
+			     $coursenum));
 	$idx++;
 	$shown++;
     }
     unless ($shown) {
-	$r->print('<tr><td>'.&mt('Currently no documents.').'</td></tr>');
+	$r->print('<tr><td><p class="LC_info">'
+             .&mt('Currently no documents.')
+             .'</p></td></tr>');
     }
-    $r->print("\n</table>\n");
+    $r->print(&Apache::loncommon::end_data_table());
     if ($allowed) {
         &print_paste_buffer($r,$container);
     }
@@ -1697,7 +1688,7 @@ sub process_file_upload {
             return 'failed';
         } else {
             if ($parseaction eq 'parse') {
-                my $total_embedded = scalar(keys(%{$allfiles}));
+                my $total_embedded = keys(%{$allfiles});
                 if ($total_embedded > 0) {
                     my $num = 0;
 		    my $state = '
@@ -1708,7 +1699,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);
@@ -1758,20 +1749,19 @@ sub parse_supplemental_title {
 	$foldertitle=&Apache::lontexconvert::msgtexconverted($4);
 	my $name =  &Apache::loncommon::plainname($uname,$udom);
 	$name = &HTML::Entities::encode($name,'"<>&\'');
-        $renametitle = &HTML::Entities::encode($renametitle,'"<>&\'');
 	$title='<i>'.&Apache::lonlocal::locallocaltime($time).'</i> '.
 	    $name.': <br />'.$foldertitle;
     }
     if (wantarray) {
 	return ($title,$foldertitle,$renametitle);
-    } 
+    }
     return $title;
 }
 
 # --------------------------------------------------------------- An entry line
 
 sub entryline {
-    my ($index,$title,$url,$folder,$allowed,$residx,$coursenum,$crstype)=@_;
+    my ($index,$title,$url,$folder,$allowed,$residx,$coursenum)=@_;
 
     my ($foldertitle,$pagetitle,$renametitle);
     if (&is_supplemental_title($title)) {
@@ -1785,12 +1775,12 @@ sub entryline {
     }
 
     my $orderidx=$LONCAPA::map::order[$index];
-    
+
 
     $renametitle=~s/\\/\\\\/g;
     $renametitle=~s/\&quot\;/\\\"/g;
     $renametitle=~s/ /%20/g;
-    my $line='<tr>';
+    my $line=&Apache::loncommon::start_data_table_row();
     my ($form_start,$form_end);
 # Edit commands
     my ($container, $type, $esc_path, $path, $symb);
@@ -1812,16 +1802,16 @@ 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.'" />'.
-		'<select name="newpos" onChange="this.form.submit()">';
+		'<select name="newpos" onchange="this.form.submit()">';
 	    for (my $i=1;$i<=$#LONCAPA::map::order+1;$i++) {
 		if ($i==$incindex) {
 		    $selectbox.='<option value="" selected="selected">('.$i.')</option>';
@@ -1854,13 +1844,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$
@@ -1893,18 +1883,16 @@ END
         $form_end = '</form>';
 	$line.=(<<END);
 <td>
-   <table class="LC_docs_entry_move">
-      <tr>
-         <td>
-            <a href='/adm/coursedocs?cmd=up_$index&amp;${type}path=$esc_path&amp;${type}symb=$symb$cpinfo'><img src="${iconpath}move_up.gif" alt='$lt{'up'}' class="LC_icon" /></a>
-         </td>
-      </tr>
-      <tr>
-        <td>
-           <a href='/adm/coursedocs?cmd=down_$index&amp;${type}path=$esc_path&amp;${type}symb=$symb$cpinfo'><img src="${iconpath}move_down.gif" alt='$lt{'dw'}' class="LC_icon" /></a>
-        </td>
-      </tr>
-    </table>
+<div class="LC_docs_entry_move">
+  <a href='/adm/coursedocs?cmd=up_$index&amp;${type}path=$esc_path&amp;${type}symb=$symb$cpinfo'>
+    <img src="${iconpath}move_up.gif" alt='$lt{'up'}' class="LC_icon" />
+  </a>
+</div>
+<div class="LC_docs_entry_move">
+  <a href='/adm/coursedocs?cmd=down_$index&amp;${type}path=$esc_path&amp;${type}symb=$symb$cpinfo'>
+    <img src="${iconpath}move_down.gif" alt='$lt{'dw'}' class="LC_icon" />
+  </a>
+</div>
 </td>
 <td>
    $form_start
@@ -1946,7 +1934,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/});
@@ -1970,7 +1958,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;
 	}
@@ -1981,7 +1969,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);
 	}
@@ -1991,7 +1979,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]
@@ -2003,7 +1991,7 @@ END
                                               'parameter_randomorder'))[0]=~/^yes$/i);
 	$url.='folderpath='.&escape($folderpath).$cpinfo;
 	$parameterset='<label>'.&mt('Randomly Pick: ').
-	    '<input type="text" size="4" onChange="this.form.changeparms.value='."'randompick'".';this.form.submit()" name="randompick_'.$orderidx.'" value="'.
+	    '<input type="text" size="4" onchange="this.form.changeparms.value='."'randompick'".';this.form.submit()" name="randompick_'.$orderidx.'" value="'.
 	    (&LONCAPA::map::getparameter($orderidx,
                                               'parameter_randompick'))[0].
                                               '" />'.
@@ -2011,7 +1999,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);
@@ -2037,18 +2025,12 @@ END
     } else {
 	undef($external);
     }
-    my $reinit;
-    if ($crstype eq 'Community') {
-        $reinit = &mt('(re-initialize community to access)');
-    } else {
-        $reinit = &mt('(re-initialize course to access)');
-    }  
     $line.='
-  <td class="LC_docs_entry_icon">
+  <td>
     '.($url?'<a href="'.$url.'">':'').'<img src="'.$icon.'" alt="" class="LC_icon" />'.($url?'</a>':'').'
   </td>
-  <td class="LC_docs_entry_title">
-    '.($url?"<a href=\"$url\">":'').$title.($url?'</a>':' <span class="LC_docs_reinit_warn">'.$reinit.'</span>').$external."
+  <td>
+    '.($url?"<a href=\"$url\">":'').$title.($url?'</a>':' <span class="LC_docs_reinit_warn">'.&mt('(re-initialize course to access)').'</span>').$external."
   </td>";
     if (($allowed) && ($folder!~/^supplemental/)) {
  	my %lt=&Apache::lonlocal::texthash(
@@ -2073,7 +2055,7 @@ END
   <td class="LC_docs_entry_parameter">$form_start $parameterset $form_end</td>
 ENDPARMS
     }
-    $line.="</tr>";
+    $line.=&Apache::loncommon::end_data_table_row();
     return $line;
 }
 
@@ -2100,7 +2082,7 @@ sub tiehash {
                 $hashtied=1;
 	    }
 	}
-    }    
+    }
 }
 
 sub untiehash {
@@ -2196,7 +2178,7 @@ List Symbs
 sub list_symbs {
     my ($r) = @_;
 
-    my $crstype = &Apache::loncommon::course_type();
+    my $type = &Apache::loncommon::course_type();
     $r->print(&Apache::loncommon::start_page('Symb List'));
     $r->print(&Apache::lonhtmlcommon::breadcrumbs('Symb List'));
     my $navmap = Apache::lonnavmaps::navmap->new();
@@ -2205,7 +2187,7 @@ sub list_symbs {
                   '<div class="LC_error">'.
                   &mt('Unable to retrieve information about course contents').
                   '</div>');
-        &Apache::lonnet::logthis('Symb list failed - could not create navmap object in '.lc($crstype).':'.$env{'request.course.id'});
+        &Apache::lonnet::logthis('Symb list failed - could not create navmap object in '.lc($type).':'.$env{'request.course.id'});
     } else {
         $r->print("<pre>\n");
         foreach my $res ($navmap->retrieveResources()) {
@@ -2219,11 +2201,11 @@ sub list_symbs {
 
 sub verifycontent {
     my ($r) = @_;
-    my $crstype = &Apache::loncommon::course_type();
+    my $type = &Apache::loncommon::course_type();
    my $loaderror=&Apache::lonnet::overloaderror($r);
    if ($loaderror) { return $loaderror; }
-   $r->print(&Apache::loncommon::start_page('Verify '.$crstype.' Documents'));
-   $r->print(&Apache::lonhtmlcommon::breadcrumbs('Verify '.$crstype.' Documents'));
+   $r->print(&Apache::loncommon::start_page('Verify '.$type.' Documents'));
+   $r->print(&Apache::lonhtmlcommon::breadcrumbs('Verify '.$type.' Documents'));
    $hashtied=0;
    undef %alreadyseen;
    %alreadyseen=();
@@ -2232,7 +2214,7 @@ sub verifycontent {
        if ($hash{$key}=~/\.(page|sequence)$/) {
 	   if (($key=~/^src_/) && ($alreadyseen{&unescape($hash{$key})})) {
 	       $r->print('<hr /><span class="LC_error">'.
-                         &mt('The following sequence or page is included more than once in your '.$crstype.': ').
+			 &mt('The following sequence or page is included more than once in your '.$type.': ').
 			 &unescape($hash{$key}).'</span><br />'.
 			 &mt('Note that grading records for problems included in this sequence or folder will overlap.<hr />'));
 	   }
@@ -2255,9 +2237,9 @@ sub devalidateversioncache {
 
 sub checkversions {
     my ($r) = @_;
-    my $crstype = &Apache::loncommon::course_type();
-    $r->print(&Apache::loncommon::start_page("Check $crstype Document Versions"));
-    $r->print(&Apache::lonhtmlcommon::breadcrumbs("Check $crstype Document Versions"));
+    my $type = &Apache::loncommon::course_type();
+    $r->print(&Apache::loncommon::start_page("Check $type Document Versions"));
+    $r->print(&Apache::lonhtmlcommon::breadcrumbs("Check $type Document Versions"));
     my $header='';
     my $startsel='';
     my $monthsel='';
@@ -2308,7 +2290,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>');
@@ -2318,7 +2300,7 @@ sub checkversions {
     &changewarning($r,'');
     if ($env{'form.timerange'} eq 'all') {
 # show all documents
-        $header=&mt('All Documents in '.$crstype);
+	$header=&mt('All Documents in '.$type);
 	$allsel=1;
 	foreach my $key (keys(%hash)) {
 	    if ($key=~/^ids\_(\/res\/.+)$/) {
@@ -2363,7 +2345,7 @@ sub checkversions {
 			  $env{'course.'.$env{'request.course.id'}.'.domain'},
 			  $env{'course.'.$env{'request.course.id'}.'.num'});
     my %lt=&Apache::lonlocal::texthash
-              ('st' => 'Version changes since start of '.$crstype,
+	      ('st' => 'Version changes since start of '.$type,
 	       'lm' => 'Version changes since last Month',
 	       'lw' => 'Version changes since last Week',
 	       'sy' => 'Version changes since Yesterday',
@@ -2372,9 +2354,9 @@ sub checkversions {
 	       'fi' => 'File',
 	       'md' => 'Modification Date',
                'mr' => 'Most recently published Version',
-	       've' => 'Version used in '.$crstype,
-               'vu' => 'Set Version to be used in '.$crstype,
-'sv' => 'Set Versions to be used in '.$crstype.' according to Selections below',
+	       've' => 'Version used in '.$type,
+               'vu' => 'Set Version to be used in '.$type,
+'sv' => 'Set Versions to be used in '.$type.' according to Selections below',
 'sm' => 'Keep all Resources up-to-date with most recent Versions (default)',
 'sc' => 'Set all Resource Versions to current Version (Fix Versions)',
 	       'di' => 'Differences');
@@ -2421,7 +2403,7 @@ ENDHEADERS
                       '<td title="'.$lt{'mr'}.'"><span class="LC_nobreak">Most Recent: '.
                       '<font size="+1">'.$currentversion.'</font>'.
                       '</span></td>'.
-                      '<td title="'.$lt{'ve'}.'"><span class="LC_nobreak">In '.$crstype.': '.
+                      '<td title="'.$lt{'ve'}.'"><span class="LC_nobreak">In '.$type.': '.
                       '<font size="+1">');
 # Used in course
 	    my $usedversion=$hash{'version_'.$linkurl};
@@ -2438,7 +2420,7 @@ ENDHEADERS
 						      ('select_form_order' =>
 						       ['',1..$currentversion,'mostrecent'],
 						       '' => '',
-						       'mostrecent' => &mt('most recent'),
+						       'mostrecent' => 'most recent',
 						       map {$_,$_} (1..$currentversion))));
 	    $r->print('</span></td></tr><tr><td></td>');
 	    my $lastold=1;
@@ -2449,7 +2431,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;
@@ -2460,7 +2442,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;
@@ -2551,7 +2533,6 @@ sub changewarning {
     $env{'request.role'}.'" value="1" /><input type="button" value="'.
     &mt('re-initializing '.$course_type).'" onclick="reinit(this.form)" />').
 $help{'Caching'}.'</p></form>'."\n\n");
-
 }
 
 
@@ -2559,7 +2540,7 @@ sub init_breadcrumbs {
     my ($form,$text)=@_;
     &Apache::lonhtmlcommon::clear_breadcrumbs();
     &Apache::lonhtmlcommon::add_breadcrumb({href=>"/adm/coursedocs",
-					    text=>&Apache::loncommon::course_type().' Editor',
+					    text=>"Edit ".&Apache::loncommon::course_type(),
 					    faq=>273,
 					    bug=>'Instructor Interface',
                                             help => 'Docs_Adding_Course_Doc'});
@@ -2577,7 +2558,8 @@ sub handler {
     &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;
     return OK if $r->header_only;
-    my $crstype = &Apache::loncommon::course_type();
+    my $type = &Apache::loncommon::course_type();
+
 
 # --------------------------------------------- Initialize help topics for this
     foreach my $topic ('Adding_Course_Doc','Main_Course_Documents',
@@ -2597,9 +2579,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
@@ -2632,6 +2614,8 @@ sub handler {
     my $showdoc=0;
     my $containertag;
     my $uploadtag;
+
+
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
 					    ['folderpath','pagepath',
 					     'pagesymb']);
@@ -2649,7 +2633,7 @@ sub handler {
     }
     if ($env{'form.folderpath'} =~ /^supplemental_\d+/) {
         $env{'form.folderpath'} = 'supplemental&'.
-                                  &escape(&mt('Supplemental '.$crstype.' Documents')).'&'.
+                                  &escape(&mt('Supplemental '.$type.' Documents')).'&'.
                                   $env{'form.folderpath'};
     }
     &Apache::loncommon::store_course_settings('docs_folderpath',
@@ -2673,15 +2657,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;
@@ -2691,7 +2675,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));
@@ -2709,19 +2693,19 @@ sub handler {
               .$script."\n"
               .'// ]]>'."\n"
               .'</script>'."\n";
-    my $brcrum = [{href=>"/adm/createuser",text=>"$crstype Documents"}];
-    $r->print(&Apache::loncommon::start_page("$crstype Documents", $script,
+    my $brcrum = [{href=>"/adm/createuser",text=>"$type Documents"}];
+    $r->print(&Apache::loncommon::start_page("$type Documents", $script,
 				    {'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,
@@ -2746,8 +2730,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} =~ /:/) {
@@ -2783,8 +2767,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
@@ -2796,7 +2780,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);
               }
           }
       }
@@ -2805,12 +2789,10 @@ sub handler {
   unless ($showdoc ||  $upload_result eq 'phasetwo') {
 # -----------------------------------------------------------------------------
        my %lt=&Apache::lonlocal::texthash(
-                'uplm' => 'Upload a new main '.lc($crstype).' document',
-                'upls' => 'Upload a new supplemental '.lc($crstype).' document',
+                'uplm' => 'Upload a new main '.lc($type).' document',
+                'upls' => 'Upload a new supplemental '.lc($type).' document',
                 'impp' => 'Import a document',
-                'pubd' => 'Published documents',
 		'copm' => 'All documents out of a published map into this folder',
-                'spec' => 'Special documents',
                 'upld' => 'Upload Document',
                 'srch' => 'Search',
                 'impo' => 'Import',
@@ -2829,31 +2811,94 @@ 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' => 'IMS Import',
                 'imsl' => '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' => 'Upload Document',
+		'pm' => 'Published Map',
+		'sd' => 'Special Document',
+		'mo' => 'More Options',
 					  );
 # -----------------------------------------------------------------------------
-    my %tabtitles = (
-                       main => {
-                                 Course => &mt('Main Course Documents'),
-                                 Community => &mt('Main Community Documents'),
-                               },
-                       supplemental => {
-                                 Course => &mt('Supplemental Course Documents'),        
-                                 Community => &mt('Supplemental Community Documents'),
-                               },
-                    );
+	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">
+	<input type="hidden" name="active" value="aa" />
+	$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">
+	<input type="hidden" name="active" value="bb" />
+	$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',
@@ -2865,62 +2910,61 @@ sub handler {
        if (!$folderpath) {
 	   if ($env{'form.folder'} eq '' ||
 	       $env{'form.folder'} eq 'supplemental') {
-	       $folderpath='default&'.&escape($tabtitles{'main'}{$crstype});
+	       $folderpath='default&'.
+		   &escape(&mt('Main '.$type.' Documents'));
 	   }
        }
        unless ($env{'form.pagepath'}) {
            $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 '.$crstype)));
-    }
+	$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.folderpath'}eq"" || ($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,\'supplCourseDocuments\',\'mainnav\',\'maincoursedoc\');">'.&mt('Supplemental Course Documents').'</li>');
+    $r->print('</ul>'
+             .'<div class="LC_Box" style="clear:both;margin: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.'>');
        my $folder=$env{'form.folder'};
-       if ($folder eq '' || $folder eq 'supplemental') {
+       if ($folder eq '' || $folder=~/^supplemental/) {
            $folder='default';
-	   $env{'form.folderpath'}='default&'.&escape(&mt('Main '.$crstype.' Documents'));
+	   $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'},'<>&"').'" />';
        }
@@ -2935,16 +2979,6 @@ ENDCOURSEVERIFY
        } else {
            #$postexec='self.close();';
        }
-       $hadchanges=0;
-       my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,
-			   $upload_output,$crstype);
-       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.
@@ -2954,230 +2988,236 @@ 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'}" title="$lt{imsl}" 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'}" title="$lt{imsl}"  onclick="javascript:makeims();" />
+	</form>
+IMSPFORM
+
+	my $newnavform=(<<NNFORM);
+	<form action="/adm/coursedocs" method="post" name="newnav">
+	<input type="hidden" name="active" value="cc" />
+	$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">
+	<input type="hidden" name="active" value="cc" />
+	$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">
+	<input type="hidden" name="active" value="cc" />
+	$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">
+	<input type="hidden" name="active" value="cc" />
+	$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">
+	<input type="hidden" name="active" value="cc" />
+	$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">
+	<input type="hidden" name="active" value="cc" />
+	$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">
+	<input type="hidden" name="active" value="cc" />
+	$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">
+	<input type="hidden" name="active" value="cc" />
+	$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">
+	<input type="hidden" name="active" value="cc" />
+	$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="" />
+	<input type="hidden" name="active" value="cc" />
+	<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="" />
+	<input type="hidden" name="active" value="aa" />
+	<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">
+	<input type="hidden" name="active" value="cc" />
+	$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">
+	<input type="hidden" name="active" value="cc" />
+	$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' => ['Upload Document',$fileuploadform.'<br />'.$newfolderform],
+                'bb' => ['Published Resources',$simpleeditdefaultform],
+                'cc' => ['Special Documents',$specialdocumentsform],
+		'dd' => ['Tools',$extresourcesform.'<br />'.$imspform.'<br />'.$recoverform.'<br />'.&generate_admin_options($containertag,$uploadtag,\%help,\%env)],
+                'zz' => ['Hide'],
+                );
+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(&Apache::loncommon::help_open_topic('Docs_Adding_Course_Doc',
+                     &mt('Editing the Table of Contents for your '.$type)));
+$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="supplCourseDocuments" '.$active.'>');
        my $folder=$env{'form.folder'};
        unless ($folder=~/^supplemental/) {
 	   $folder='supplemental';
@@ -3185,89 +3225,113 @@ ENDBLOCK
        if ($folder =~ /^supplemental$/ &&
 	   (($env{'form.folderpath'} =~ /^default\&/) || ($env{'form.folderpath'} eq ''))) {
           $env{'form.folderpath'} = 'supplemental&'.
-                                    &escape($tabtitles{'supplemental'}{$crstype});
-       }
-       my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$crstype);
-       if ($error) {
-	   $r->print('<p><span class="LC_error">'.$error.'</span></p>');
+                                    &escape(&mt('Supplemental '.$type.' Documents'));
+       }else{
+	  $env{'form.folderpath'} = $savefolderpath;
        }
+       $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">
+	<input type="hidden" name="active" value="ee" />	
+	$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="active" value="ee" />
+	<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="active" value="ff" />
+	<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="active" value="ff" />
+	<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="active" value="ff" />
+	<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' => ['Upload Document',$supupdocform.'<br />'.$supnewfolderform],
+                'ff' => ['Special Documents',$supnewextform.'<br />'.$supnewsylform.'<br />'.$supnewaboutmeform],
+                'zz' => ['Hide'],
+                );
+
+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">
@@ -3289,8 +3353,81 @@ 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;
+    my $activetab;
+    my $active;
+    if($env{'form.active'} ne ''){
+        $activetab = $env{'form.active'};
+    }
+    $form = '<div class="LC_Box"><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'){
+            if($activetab ne ''){
+               $active = 'class="right"';
+            }else{
+               $active = 'class="right active"';
+            }
+            $form .= '<li onclick="javascript:hideAll(this, \'navigation'.$tid.'\' ,\'content'.$tid.'\');" '.$active.'>'.&mt(${$orderhash{$name}}[0]).'</li>';
+        }else{
+            if($activetab eq '' || $activetab ne $name){
+               $active = '';
+            }elsif($activetab eq $name){
+               $active = 'class="active"';
+            }
+            $form .= '<li '.$active.' onclick="javascript:showPage(this, \''.$name.$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'){
+        if($activetab eq '' || $activetab ne $field){
+                $active = 'style="display: none;"';
+        }elsif($activetab eq $field){
+                $active = 'style="display:block;"';
+        }
+           $form .= '<div id="'.$field.$tid.'"'
+                   .' class="LC_ContentBox" '.$active.'>'.${$orderhash{$field}}[1]
+                   .'</div>';
+        }
+    }
+    $form .= '</div></div>';
 
+    return $form;
+}
 
 sub editing_js {
     my ($udom,$uname) = @_;
@@ -3301,12 +3438,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',
@@ -3354,7 +3491,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();
@@ -3363,7 +3500,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();
@@ -3372,7 +3509,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();
@@ -3381,7 +3518,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();
@@ -3406,91 +3543,145 @@ 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++) {
+	if(currentLis[i].className == 'right active' || currentLis[i].className == 'right'){
+		currentLis[i].className = 'right';
+	}else{
+		currentLis[i].className = 'i';
+	}
+}
+}
+
+function hideAll(current, nav, data) {
+unselectInactive(nav);
+if(current.className == 'right'){
+	current.className = 'right active'
+	}else{
+	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 openTabs(pageId) {
+	tabnav = document.getElementById(pageId).getElementsByTagName('UL');	
+	if(tabnav.length > 0 ){
+		currentNav = document.getElementById(tabnav[0].id);
+		currentLis = currentNav.getElementsByTagName('LI');
+		for(i = 0; i< currentLis.length; i++){
+			if(currentLis[i].className == 'active') {
+				funcString = currentLis[i].onclick.toString();
+				tab = funcString.split('"');
+				currentData = document.getElementById(tab[1]);
+        			currentData.style.display = 'block';
+			}	
+		}
+	}
+}
+
+function showPage(current, pageId, nav, data) {
+	hideAll(current, nav, data);
+	openTabs(pageId);
+	unselectInactive(nav);
+	current.className = 'active';
+	currentData = document.getElementById(pageId);
+	currentData.style.display = 'block';
+	return false;
 }
 
 ENDNEWSCRIPT
@@ -3518,7 +3709,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