--- loncom/interface/londocs.pm	2009/02/03 14:16:39	1.334
+++ loncom/interface/londocs.pm	2009/06/17 17:36:25	1.373
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.334 2009/02/03 14:16:39 muellerd Exp $
+# $Id: londocs.pm,v 1.373 2009/06/17 17:36:25 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -72,7 +72,7 @@ sub storemap {
       &LONCAPA::map::storemap('/uploaded/'.$coursedom.'/'.$coursenum.'/'.
 			      $map,1);
     if ($errtext) { return ($errtext,2); }
-    
+
     $hadchanges=1;
     return ($errtext,0);
 }
@@ -121,7 +121,7 @@ sub dumpbutton {
     if ($home) {
 	return '<input type="submit" name="dumpcourse" value="'.
 	    &mt('Dump '.$type.' DOCS to Construction Space').'" />'.
-	    &Apache::loncommon::help_open_topic('Docs_Dump_Course_Docs');
+	    &Apache::loncommon::help_open_topic('Docs_Dump_Course_Docs').'<br />';
     } else {
 	return '<div>'.
      &mt('Dump '.$type.
@@ -133,7 +133,7 @@ sub dumpbutton {
 sub clean {
     my ($title)=@_;
     $title=~s/[^\w\/\!\$\%\^\*\-\_\=\+\;\:\,\\\|\`\~]+/\_/gs;
-    return $title;	
+    return $title;
 }
 
 
@@ -142,7 +142,7 @@ sub dumpcourse {
     my ($r) = @_;
     my $type = &Apache::loncommon::course_type();
     $r->print(&Apache::loncommon::start_page('Dump '.$type.' DOCS to Construction Space').
-	      '<form name="dumpdoc" method="post">');
+	      '<form name="dumpdoc" action="" method="post">');
     $r->print(&Apache::lonhtmlcommon::breadcrumbs('Dump '.$type.' DOCS to Construction Space'));
     my ($home,$other,%outhash)=&authorhosts();
     unless ($home) { return ''; }
@@ -175,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>: ');
@@ -264,7 +264,7 @@ sub exportbutton {
     my $type = &Apache::loncommon::course_type();
     return '<input type="submit" name="exportcourse" value="'.
             &mt('Export '.$type.' to IMS').'" />'.
-    &Apache::loncommon::help_open_topic('Docs_Export_Course_Docs');
+    &Apache::loncommon::help_open_topic('Docs_Export_Course_Docs').'<br />';
 }
 
 
@@ -321,9 +321,15 @@ sub exportcourse {
                 open(OUTPUT, "zip -r $imszip *  2> /dev/null |");
                 close(OUTPUT);
                 chdir $cwd;
-                $outcome .= &mt('Download the zip file from <a href="[_1]">IMS '.lc($type).' archive</a><br />',$imszipfile,);
+                $outcome .= '<p>'
+                           .&mt('Download the zip file from [_1]IMS '.lc($type).' archive[_2]'
+                               ,'<a href="'.$imszipfile.'">','</a>')
+                           .'</p>';
                 if ($copyresult) {
-                    $outcome .= &mt('The following errors occurred during export - [_1]',$copyresult);
+                    $outcome .= '<p class="LC_error">'
+                               .&mt('The following errors occurred during export - [_1]'
+                                   ,$copyresult)
+                               .'</p>';
                 }
             } else {
                 $outcome = '<br />'.&mt('Unfortunately you will not be able to retrieve an IMS archive of this posts at this time, because there was a problem creating a manifest file.').'<br />';
@@ -335,21 +341,23 @@ sub exportcourse {
         $r->print(&Apache::loncommon::end_page());
     } else {
         my $display;
-        $display = '<form name="exportdoc" method="post">'."\n";
-        $display .= &mt('Choose which items you wish to export from your '.$type.'.<br /><br />');
-        $display .= '<table border="0" cellspacing="0" cellpadding="3">'.
-                    '<tr><td><fieldset><legend>&nbsp;<b>Content items</b></legend>'.
-                    '<input type="button" value="check all" '.
+        $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="uncheck all"'.
-                    ' onclick="javascript:uncheckAll(document.exportdoc.archive)" /></fieldset></td>'.
-                    '<td>&nbsp;</td><td>&nbsp;</td>'.
-                    '<td align="right"><fieldset><legend>&nbsp;<b>Discussion posts'.
-                    '</b></legend><input type="button" value="check all"'.
+                    '&nbsp;&nbsp;<input type="button" value="'.&mt('uncheck all').'"'.
+                    ' 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="uncheck all"'.
-                    ' onclick="javascript:uncheckAll(document.exportdoc.discussion)" /></fieldset></td>'.
-                    '</tr></table>';
+                    '&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;
@@ -358,13 +366,17 @@ sub exportcourse {
         my %parent = ();
         my %children = ();
         my $lastcontainer = $startcount;
-        my @bgcolors = ('#F6F6F6','#FFFFFF');
-        $display .= '<table cellspacing="0"><tr>'.
-            '<td><b>Export content item?<br /></b></td><td>&nbsp;</td><td align="right">'."\n";
+        $display .= &Apache::loncommon::start_data_table()
+                   .&Apache::loncommon::start_data_table_header_row()
+                   .'<th>'.&mt('Export content item?').'</th>'
+                   .'<th>';
         if ($numdisc > 0) {
-            $display.='<b>Export&nbsp;discussion posts?</b>'."\n";
+            $display .= &mt('Export discussion posts?');
+        } else {
+             $display .= '&nbsp;';
         }
-        $display.='&nbsp;</td></tr>';
+        $display .= '</th>'
+                   .&Apache::loncommon::end_data_table_header_row();
         while ($curRes = $it->next()) {
             if (ref($curRes)) {
                 $count ++;
@@ -385,39 +397,46 @@ sub exportcourse {
                         $ressymb = 'bulletin___'.$3.'___adm/wrapper/adm/'.$1.'/'.$2.'/'.$3.'/bulletinboard';
                     }
                 }
-                my $color = $count%2;
-                $display .='<tr bgcolor='.$bgcolors[$color].'><td>'."\n".
-                    '<input type="checkbox" name="archive" value="'.$count.'" ';
+                $display .= &Apache::loncommon::start_data_table_row()
+                           .'<td>'."\n"
+                           .'<input type="checkbox" name="archive" value="'.$count.'" ';
                 if (($curRes->is_sequence()) || ($curRes->is_page())) {
                     my $checkitem = $count + $boards + $startcount;
-                    $display .= 'onClick="javascript:propagateCheck('."'$checkitem'".')"';
+                    $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" /><img src="/adm/lonIcons/whitespace1.gif" class="LC_docs_spacer" />'."\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">&nbsp;'."\n";
+                    $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">&nbsp;'."\n";
+                    $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>';
+                $display .= '&nbsp;'.$curRes->title().'</td>'."\n";
+
+                # Existing discussion posts?
                 if ($discussiontime{$ressymb} > 0) {
                     $boards ++;
                     $currelem = $count+$boards+$startcount;
-                    $display .= '<td>&nbsp;</td><td align="right"><input type="checkbox" name="discussion" value="'.$count.'" />&nbsp;</td>'."\n";
+                    $display .= '<td align="right">'
+                               .'<input type="checkbox" name="discussion" value="'.$count.'" />'
+                               .'</td>'."\n";
                 } else {
-                    $display .= '<td colspan="2">&nbsp;</td>'."\n";
+                    $display .= '<td>&nbsp;</td>'."\n";
                 }
+                $display .= &Apache::loncommon::end_data_table_row();
             }
         }
+        $display .= &Apache::loncommon::end_data_table();
         my $scripttag = qq|
-<script>
-
+<script type="text/javascript">
+// <![CDATA[
 function checkAll(field) {
     if (field.length > 0) {
         for (i = 0; i < field.length; i++) {
@@ -427,7 +446,7 @@ function checkAll(field) {
         field.checked = true
     }
 }
-                                                                                
+
 function uncheckAll(field) {
     if (field.length > 0) {
         for (i = 0; i < field.length; i++) {
@@ -442,7 +461,7 @@ function propagateCheck(item) {
     if (document.exportdoc.elements[item].checked == true) {
         containerCheck(item)
     }
-} 
+}
 
 function containerCheck(item) {
     document.exportdoc.elements[item].checked = true
@@ -465,16 +484,16 @@ function containerCheck(item) {
         for (var j=0; j<parents[item].length; j++) {
             containerCheck(parents[item][j])
         }
-     }   
+     }
 }
-
+// ]]>
 </script>
         |;
 	$r->print(&Apache::loncommon::start_page('Export '.lc($type).' to IMS content package',
 						 $scripttag));
 	$r->print(&Apache::lonhtmlcommon::breadcrumbs('Export '.lc($type).' to IMS content package'));
-	$r->print($display.'</table>'.
-                  '<p><input type="hidden" name="finishexport" value="1">'.
+	$r->print($display.
+                  '<p><input type="hidden" name="finishexport" value="1" />'.
                   '<input type="submit" name="exportcourse" value="'.
                   &mt('Export '.$type.' DOCS').'" /></p></form>');
     }
@@ -759,7 +778,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;
@@ -799,9 +818,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;
@@ -852,14 +871,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') {
@@ -921,10 +940,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".
@@ -944,7 +963,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);
@@ -953,7 +972,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'));
 	}
     }
@@ -984,9 +1003,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;
@@ -1004,15 +1023,14 @@ sub breadcrumbs {
 	    &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);
+					       'LC_docs_path', undef, 1 ),$randompick,$ishidden,$isencrypted,$plain,$is_random_order);
 }
 
 sub log_docs {
@@ -1125,7 +1143,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 =
@@ -1176,7 +1194,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}) {
@@ -1214,7 +1232,7 @@ sub update_paste_buffer {
 
     my ($errtext,$fatal) = &mapread($coursenum,$coursedom,
 				    $env{'form.copyfolder'});
-    
+
     return if ($fatal);
 
 # Mark for copying
@@ -1223,7 +1241,7 @@ sub update_paste_buffer {
         &Apache::lonnet::appenv({'docs.markedcopy_supplemental' => $title});
 	($title) = &parse_supplemental_title($title);
     } elsif ($env{'docs.markedcopy_supplemental'}) {
-        &Apache::lonnet::delenv('docs\\.markedcopy_supplemental');
+        &Apache::lonnet::delenv('docs.markedcopy_supplemental');
     }
     $url=~s{http(&colon;|:)//https(&colon;|:)//}{https$2//};
 
@@ -1327,7 +1345,7 @@ sub do_paste_from_buffer {
     }
 # published maps can only exists once, so remove it from paste buffer when done
     if (($url=~/\.(page|sequence)$/) && ($url=~m {^/res/})) {
-	&Apache::lonnet::delenv('docs\\.markedcopy');
+	&Apache::lonnet::delenv('docs.markedcopy');
     }
     if ($url=~ m{/smppg$}) {
 	my $db_name = &Apache::lonsimplepage::get_db_name($url);
@@ -1338,7 +1356,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;
 	}
     }
@@ -1352,7 +1370,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 {
@@ -1376,7 +1394,7 @@ sub uniqueness_check {
         $url=&LONCAPA::map::qtescape($url);
         if ($newurl eq $url) {
             $unique = 0;
-            last;    
+            last;
         }
     }
     return $unique;
@@ -1402,7 +1420,7 @@ sub update_parameter {
 	&remember_parms($idx,$which,'set',$value);
     } else {
 	&LONCAPA::map::delparameter($idx,'parameter_'.$which);
-	
+
 	&remember_parms($idx,$which,'del');
     }
     return 1;
@@ -1430,7 +1448,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];
 
@@ -1470,11 +1488,11 @@ sub editor {
        	$LONCAPA::map::order[0]=$idx;
         $LONCAPA::map::resources[$idx]='';
     }
-    
+
     my ($breadcrumbtrail,$randompick,$ishidden,$isencrypted,$plain,$is_random_order)=
 	&breadcrumbs($folder,$allowed,$type);
     $r->print($breadcrumbtrail);
-    
+
 # ------------------------------------------------------------ Process commands
 
 # ---------------- if they are for this folder and user allowed to make changes
@@ -1495,9 +1513,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);
@@ -1541,7 +1559,7 @@ sub editor {
 		return $errtext if ($fatal);
 	    } else {
 		$r->print('<p><span class="LC_error">'.&mt('No map selected.').'</span></p>');
-		
+
 	    }
 	}
 	&log_differences($plain);
@@ -1556,7 +1574,7 @@ sub editor {
 		  ($ishidden?'<li>'.&mt('contents hidden').'</li>':'').
 		  ($isencrypted?'<li>'.&mt('URLs hidden').'</li>':'').
 		  '</ul></p>');
-    }                                                                                                     
+    }
     if ($randompick>=0) {
 	$r->print('<p>'.&mt('Caution: this folder is set to randomly pick a subset of resources. Adding or removing resources from this folder will change the set of resources that the students see, resulting in spurious or missing credit for completed problems, not limited to ones you modify. Do not modify the contents of this folder if it is in active student use.').'</p>');
     }
@@ -1660,7 +1678,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);
@@ -1715,7 +1733,7 @@ sub parse_supplemental_title {
     }
     if (wantarray) {
 	return ($title,$foldertitle,$renametitle);
-    } 
+    }
     return $title;
 }
 
@@ -1736,7 +1754,7 @@ sub entryline {
     }
 
     my $orderidx=$LONCAPA::map::order[$index];
-    
+
 
     $renametitle=~s/\\/\\\\/g;
     $renametitle=~s/\&quot\;/\\\"/g;
@@ -1763,19 +1781,19 @@ 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="1">('.$i.')</option>';
+		    $selectbox.='<option value="" selected="selected">('.$i.')</option>';
 		} else {
 		    $selectbox.='<option value="'.$i.'">'.$i.'</option>';
 		}
@@ -1805,13 +1823,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$
@@ -1897,8 +1915,9 @@ 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/});
     if ((!$isfolder) && ($residx) && ($folder!~/supplemental/) && (!$ispage)) {
 	my $symb=&Apache::lonnet::symbclean(
@@ -1920,7 +1939,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;
 	}
@@ -1931,7 +1950,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);
 	}
@@ -1941,7 +1960,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]
@@ -1953,7 +1972,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].
                                               '" />'.
@@ -1961,7 +1980,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);
@@ -1999,18 +2018,18 @@ END
  			      'hd' => 'Hidden',
  			      'ec' => 'URL hidden');
 	my $enctext=
-	    ((&LONCAPA::map::getparameter($orderidx,'parameter_encrypturl'))[0]=~/^yes$/i?' checked="1"':'');
+	    ((&LONCAPA::map::getparameter($orderidx,'parameter_encrypturl'))[0]=~/^yes$/i?' checked="checked"':'');
 	my $hidtext=
-	    ((&LONCAPA::map::getparameter($orderidx,'parameter_hiddenresource'))[0]=~/^yes$/i?' checked="1"':'');
+	    ((&LONCAPA::map::getparameter($orderidx,'parameter_hiddenresource'))[0]=~/^yes$/i?' checked="checked"':'');
 	$line.=(<<ENDPARMS);
   <td class="LC_docs_entry_parameter">
     $form_start
-    <label><input type="checkbox" name="hiddenresource_$orderidx" onClick="this.form.changeparms.value='hiddenresource';this.form.submit()" $hidtext /> $lt{'hd'}</label>
+    <label><input type="checkbox" name="hiddenresource_$orderidx" onclick="this.form.changeparms.value='hiddenresource';this.form.submit()" $hidtext /> $lt{'hd'}</label>
     $form_end
   </td>
   <td class="LC_docs_entry_parameter">
     $form_start
-    <label><input type="checkbox" name="encrypturl_$orderidx" onClick="this.form.changeparms.value='encrypturl';this.form.submit()" $enctext /> $lt{'ec'}</label>
+    <label><input type="checkbox" name="encrypturl_$orderidx" onclick="this.form.changeparms.value='encrypturl';this.form.submit()" $enctext /> $lt{'ec'}</label>
     $form_end
   </td>
   <td class="LC_docs_entry_parameter">$form_start $rand_order_text $form_end</td>
@@ -2044,7 +2063,7 @@ sub tiehash {
                 $hashtied=1;
 	    }
 	}
-    }    
+    }
 }
 
 sub untiehash {
@@ -2093,7 +2112,7 @@ sub checkonthis {
                  if (($errorcount) ||
                      ($warningcount)) {
 		     if ($errorcount) {
-                        $r->print('<img src="/adm/lonMisc/bomb.gif" /><span class="LC_error">'.
+                        $r->print('<img src="/adm/lonMisc/bomb.gif" alt="'.&mt('bomb').'" /><span class="LC_error">'.
                           &mt('[quant,_1,error]',$errorcount).'</span>');
                      }
 		     if ($warningcount) {
@@ -2118,7 +2137,7 @@ sub checkonthis {
 	      unless ($url=~/\$/) {
 		  $r->print('<span class="LC_error">'.&mt('not found').'</b></span>');
 	      } else {
-		  $r->print('<span class="LC_unknown">'.&mt('unable to verify variable URL').'</span>');
+		  $r->print('<span class="LC_error">'.&mt('unable to verify variable URL').'</span>');
 	      }
           } else {
              $r->print('<span class="LC_error">'.&mt('access denied').'</span>');
@@ -2252,7 +2271,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>');
@@ -2393,7 +2412,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;
@@ -2404,7 +2423,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;
@@ -2483,14 +2502,18 @@ sub changewarning {
 	$message='Changes will become active for your current session after [_1], or the next time you log in.';
     }
     $r->print("\n\n".
-'<script type="text/javascript">function reinit(tf) { tf.submit();'.$postexec.' }</script>'."\n". 
-'<form name="reinitform" method="post" action="/adm/roles" target="loncapaclient">'.
+'<script type="text/javascript">'."\n".
+'// <![CDATA['."\n".
+'function reinit(tf) { tf.submit();'.$postexec.' }'."\n".
+'// ]]>'."\n".
+'</script>'."\n".
+'<form name="reinitform" method="post" action="/adm/coursedocs" target="loncapaclient">'.
 '<input type="hidden" name="orgurl" value="'.$url.
-'" /><input type="hidden" name="selectrole" value="1" /><h3><span class="LC_warning">'.
+'" /><input type="hidden" name="selectrole" value="1" /><p class="LC_warning">'.
 &mt($message,' <input type="hidden" name="'.
     $env{'request.role'}.'" value="1" /><input type="button" value="'.
-    &mt('re-initializing '.$course_type).'" onClick="reinit(this.form)" />').
-$help{'Caching'}.'</span></h3></form>'."\n\n");
+    &mt('re-initializing '.$course_type).'" onclick="reinit(this.form)" />').
+$help{'Caching'}.'</p></form>'."\n\n");
 }
 
 
@@ -2537,9 +2560,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
@@ -2615,15 +2638,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;
@@ -2633,7 +2656,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));
@@ -2646,20 +2669,24 @@ sub handler {
 	$script .= &editing_js($udom,$uname);
     }
 # -------------------------------------------------------------------- Body tag
-    $script = '<script type="text/javascript">'."\n".$script."\n".'</script>';
+    $script = '<script type="text/javascript">'."\n"
+              .'// <![CDATA['."\n"
+              .$script."\n"
+              .'// ]]>'."\n"
+              .'</script>'."\n";
     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,
@@ -2684,8 +2711,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} =~ /:/) {
@@ -2721,8 +2748,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
@@ -2734,7 +2761,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);
               }
           }
       }
@@ -2760,21 +2787,21 @@ sub handler {
                 'extr' => 'External Resource',
                 'syll' => 'Syllabus',
                 'navc' => 'Navigate Contents',
-                'sipa' => 'Simple Page',
+                'sipa' => 'Simple Course Page',
                 'sipr' => 'Simple Problem',
                 'drbx' => 'Drop Box',
                 'scuf' => 'Score Upload Form',
-                'bull' => 'Bulletin Board',
-                'mypi' => 'My Personal Info',
-                'grpo' => 'Group Files',
+                'bull' => 'Discussion Board',
+                'mypi' => 'My Personal Information Page',
+                'grpo' => 'Group Portfolio',
                 'rost' => 'Course Roster',
-		'abou' => 'About User',
+				'abou' => 'Personal Information Page for a User',
                 'imsf' => 'Import IMS package',
                 'file' =>  'File',
                 'title' => 'Title',
                 'comment' => 'Comment',
                 'parse' => 'Upload embedded images/multimedia files if HTML file!',
-		'nd' => 'New Document',
+		'nd' => 'Upload Document',
 		'pm' => 'Published Map',
 		'sd' => 'Special Document',
 		'mo' => 'More Options',
@@ -2797,6 +2824,7 @@ 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 />
@@ -2818,22 +2846,23 @@ FUFORM
 
 	my $simpleeditdefaultform=(<<SEDFFORM);
 	<form action="/adm/coursedocs" method="post" name="simpleeditdefault">
+	<input type="hidden" name="active" value="bb" />
 	$lt{'pubd'}<br />
 	$uploadtag
-	<input type="button" onClick="javascript:groupsearch()" value="$lt{'srch'}" />
+	<input type="button" onclick="javascript:groupsearch()" value="$lt{'srch'}" />
 	<br />
 	<span class="LC_nobreak">
-	<input type="button" onClick="javascript:groupimport();" value="$lt{'impo'}" />
+	<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'}" />
+	<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','')"
+	<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>
@@ -2845,7 +2874,7 @@ SEDFFORM
 	$uploadtag
 	<input type="hidden" name="importdetail" value="" />
 	<span class="LC_nobreak">
-	<input name="newext" type="button" onClick="javascript:makenewext('newext');"
+	<input name="newext" type="button" onclick="javascript:makenewext('newext');"
 	value="$lt{'extr'}" /> $help{'Adding_External_Resource'}
 	</span>
 	</form>
@@ -2872,36 +2901,65 @@ ERFORM
            $containertag = '<input type="hidden" name="folderpath" value="" />';
            $uploadtag = '<input type="hidden" name="folderpath" value="'.&HTML::Entities::encode($folderpath,'<>&"').'" />';
        }
-
-       $r->print(&generate_admin_options($containertag,$uploadtag,\%lt,\%help,\%env));
-       $r->print(&Apache::loncommon::help_open_topic('Docs_Adding_Course_Doc',
-		     &mt('Editing the Table of Contents for your '.$type)));
+	$r->print(<<HIDDENFORM);
+	<form name="renameform" method="post" action="/adm/coursedocs">
+   <input type="hidden" name="title" />
+   <input type="hidden" name="cmd" />
+   <input type="hidden" name="markcopy" />
+   <input type="hidden" name="copyfolder" />
+   $containertag
+ </form>
+ <form name="simpleedit" method="post" action="/adm/coursedocs">
+   <input type="hidden" name="importdetail" value="" />
+   $uploadtag
+ </form>
+HIDDENFORM
+    }
+# --------------------------------------------------------- Main tab structure
+    my $activeClass = 1;
+    my $active = '';
+    $r->print('<ul class="LC_TabContentBigger" id="mainnav">');
+    if (($standard) && ($allowed) && (!$forcesupplement) && (($env{'form.folderpath'}=~/^default/) || ($env{'form.pagepath'}))) {
+        if($activeClass == 1){
+           $active = 'class="active"';
+	   $activeClass = 0;
+	}
+    }
+    $r->print('<li '.$active.' onclick="javascript:showPage(this,\'mainCourseDocuments\',\'mainnav\',\'maincoursedoc\');">'.&mt('Main Course Documents').'</li>');
+    $active = '';
+    if (!$forcestandard || ($env{'form.folderpath'}=~/^supplemental/)) {
+        if($activeClass == 1){
+           $active = 'class="active"';
+        }
     }
+    $r->print('<li '.$active.' onclick="javascript:showPage(this,\'supplCourseDocuments\',\'mainnav\',\'maincoursedoc\');">'.&mt('Supplemental Course Documents').'</li>');
+    $r->print('</ul><div class="LC_Box" style="margin:0 0;padding:0 0;"><div id="maincoursedoc" style="margin:0 0;padding:0 0;">');
 # --------------------------------------------------------- Standard documents
-    if (($standard) && ($allowed) && (!$forcesupplement)) {
+       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';
+	   $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'},'<>&"').'" />';
        }
        my $postexec='';
        if ($folder eq 'default') {
-	   $r->print('<script type="text/javascript">this.window.name="loncapaclient";</script>');
+           $r->print('<script type="text/javascript">'."\n"
+                    .'// <![CDATA['."\n"
+                    .'this.window.name="loncapaclient";'."\n"
+                    .'// ]]>'."\n"
+                    .'</script>'."\n"
+       );
        } else {
            #$postexec='self.close();';
        }
-       $hadchanges=0;
-       my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,
-			   $upload_output,$type);
-       if ($error) {
-	   $r->print('<p><span class="LC_error">'.$error.'</span></p>');
-       }
-       if ($hadchanges) {
-	   &mark_hash_old();
-       }
-       &changewarning($r,$postexec);
        my $folderseq='/uploaded/'.$coursedom.'/'.$coursenum.'/default_'.time.
                      '.sequence';
        my $pageseq = '/uploaded/'.$coursedom.'/'.$coursenum.'/default_'.time.
@@ -2916,19 +2974,20 @@ ERFORM
 
 	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'}" />
+	<input type="button" name="recovermap" onclick="javascript:groupopen('$readfile',1,0)" value="$lt{'reco'}" />
 	</form>
 RFORM
 
 	my $imspform=(<<IMSPFORM);
 	<form action="/adm/imsimportdocs" method="post" name="ims">
 	<input type="hidden" name="folder" value="$folder" />
-	<input name="imsimport" type="button" value="$lt{'imsf'}" onClick="javascript:makeims();" />
+	<input name="imsimport" type="button" value="$lt{'imsf'}" 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" />
@@ -2940,22 +2999,24 @@ IMSPFORM
 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'}
+	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'}
+	onclick="javascript:makesmpproblem();" />$help{'Simple Problem'}
 	</span>
 	</form>
 
@@ -2963,22 +3024,24 @@ NSPROBFORM
 
 	my $newdropboxform=(<<NDBFORM);
 	<form action="/adm/coursedocs" method="post" name="newdropbox">
-	$uploadtag      
+	<input type="hidden" name="active" value="cc" />
+	$uploadtag
 	<input type="hidden" name="importdetail" value="" />
-	<span class="LC_nobreak">          
+	<span class="LC_nobreak">
 	<input name="newdropbox" type="button" value="$lt{'drbx'}"
-	onClick="javascript:makedropbox();" />
-	</span>         
-	</form> 
+	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();" />
+	onclick="javascript:makeexamupload();" />
 	$help{'Score_Upload_Form'}
 	</span>
 	</form>
@@ -2986,11 +3049,12 @@ 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();" />
+	onclick="javascript:makebulboard();" />
 	$help{'Bulletin Board'}
 	</span>
 	</form>
@@ -2998,23 +3062,25 @@ 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 Info'}
+	$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();" />
+	onclick="javascript:makeabout();" />
 	</span>
 	</form>
 NASOFORM
@@ -3022,6 +3088,7 @@ 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" />
@@ -3032,6 +3099,9 @@ NASOFORM
 	</form>
 NROSTFORM
 
+my $specialdocumentsform;
+my $newfolderform;
+
        unless ($env{'form.pagepath'}) {
 	   my $path = &HTML::Entities::encode($env{'form.folderpath'},'<>&"');
 
@@ -3039,21 +3109,23 @@ NROSTFORM
 	<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');"
+	onclick="javascript:makenewpage(this.form,'$pageseq');"
 	value="$lt{'newp'}" />$help{'Adding_Pages'}
 	</span>
 	</form>
 NPFORM
 
-	my $newfolderform=(<<NFFORM);
+	$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');"
+	onclick="javascript:makenewfolder(this.form,'$folderseq');"
 	value="$lt{'newf'}" />$help{'Adding_Folders'}
 	</span>
 	</form>
@@ -3061,6 +3133,7 @@ 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" />
@@ -3070,61 +3143,62 @@ NFFORM
 	</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 Files'}
+	$help{'Group Portfolio'}
 	</span>
 	</form>
 NGFFORM
 
-
-        my $specialdocumentsform=(<<SPDOFORM);
-	<br />$newfolderform
-	<br />$newpageform
-	<br />$newsylform
-	<br />$newnavform
-	<br />$newsmppageform
-	<br />$newsmpproblemform
-	<br />$newdropboxform
-	<br />$newexuploadform
-	<br />$newbulform
-	<br />$newaboutmeform
-	<br />$newaboutsomeoneform
-	<br />$newgroupfileform
-	<br />$newrosterform
-SPDOFORM
-
+	$specialdocumentsform="<br />$newpageform<br />$newsylform<br />$newgroupfileform";
+      }
+	$specialdocumentsform.="<br />$newnavform<br />$newsmppageform
+				<br />$newsmpproblemform<br />$newdropboxform
+       				<br />$newexuploadform<br />$newbulform
+       				<br />$newaboutmeform<br />$newaboutsomeoneform
+       				<br />$newrosterform";
+if($env{'form.pagepath'}) {
+	$specialdocumentsform="<br />$newsmpproblemform<br />$newexuploadform";
+}
 
 my %orderhash = (
-                'aa' => 'New Document',
-                'bb' => 'Published Documents',
-                'cc' => 'Special Documents',
-		'dd' => 'More Options',
-                'zz' => 'Hide all Options',
-                );
-my %namehash = (
-                'New Document' => $fileuploadform,
-                'Published Documents' => $simpleeditdefaultform,
-                'Special Documents' => $specialdocumentsform,
-		'More Options' => $extresourcesform.'<br />'.$imspform.'<br />'.$recoverform,
+                'aa' => ['Upload Document',$fileuploadform.'<br />'.$newfolderform],
+                'bb' => ['Published Documents',$simpleeditdefaultform],
+                'cc' => ['Special Documents',$specialdocumentsform],
+		'dd' => ['Tools',$extresourcesform.'<br />'.$imspform.'<br />'.$recoverform.'<br />'.&generate_admin_options($containertag,$uploadtag,\%help,\%env)],
+                'zz' => ['Hide all Options'],
                 );
 my $tid='1';
-my $content='content';
-my $navigation='navigation';
 my $varcd = 'Main Course Documents';
-$r->print(&generate_edit_table($tid,$content,$navigation,$varcd,\%namehash,\%orderhash)); 
-      }
+$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'}) {
        }
-    }
 # ----------------------------------------------------- Supplemental documents
-    if (!$forcestandard) {
+       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';
@@ -3133,11 +3207,10 @@ $r->print(&generate_edit_table($tid,$con
 	   (($env{'form.folderpath'} =~ /^default\&/) || ($env{'form.folderpath'} eq ''))) {
           $env{'form.folderpath'} = 'supplemental&'.
                                     &escape(&mt('Supplemental '.$type.' Documents'));
+       }else{
+	  $env{'form.folderpath'} = $savefolderpath;
        }
-       my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$type);
-       if ($error) {
-	   $r->print('<p><span class="LC_error">'.$error.'</span></p>');
-       }
+       $env{'form.pagepath'} = '';
        if ($allowed) {
 	   my $folderseq=
 	       '/uploaded/'.$coursedom.'/'.$coursenum.'/supplemental_'.time.
@@ -3147,6 +3220,7 @@ $r->print(&generate_edit_table($tid,$con
 
 	my $supupdocform=(<<SUPDOCFORM);
 	<form action="/adm/coursedocs" method="post" enctype="multipart/form-data">
+	<input type="hidden" name="active" value="ee" />	
 	$fileupload
 	<br />
 	<br />
@@ -3155,7 +3229,7 @@ $r->print(&generate_edit_table($tid,$con
 	</span>
 	<br /><br />
 	$lt{'comment'}:<br />
-	<textarea cols=50 rows=4 name='comment'>
+	<textarea cols="50" rows="4" name="comment">
 	</textarea>
 	<br />
 	<input type="hidden" name="folderpath" value="$path" />
@@ -3169,11 +3243,12 @@ 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');"
+	onclick="javascript:makenewfolder(this.form,'$folderseq');"
 	value="$lt{'newf'}" /> $help{'Adding_Folders'}
 	</span>
 	</form>
@@ -3182,11 +3257,12 @@ 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');"
+	onclick="javascript:makenewext('supnewext');"
 	value="$lt{'extr'}" /> $help{'Adding_External_Resource'}
 	</span>
 	</form>
@@ -3194,6 +3270,7 @@ 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" />
@@ -3206,12 +3283,13 @@ 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 Info'}
+	$help{'My Personal Information Page'}
 	</span>
 	</form>
 SNAMFORM
@@ -3219,25 +3297,22 @@ SNAMFORM
 
 
 my %suporderhash = (
-                'ee' => 'New Document',
-                'ff' => 'Special Documents',
-                'zz' => 'Hide all Options',
-                );
-
-my %supnamehash = (
-                'New Document' => $supupdocform,
-                'Special Documents' => $supnewfolderform.'<br />'.$supnewextform.'<br />'.$supnewsylform.'<br />'.$supnewaboutmeform,
+                'ee' => ['Upload Document',$supupdocform.'<br />'.$supnewfolderform],
+                'ff' => ['Special Documents',$supnewextform.'<br />'.$supnewsylform.'<br />'.$supnewaboutmeform],
+                'zz' => ['Hide all Options'],
                 );
 
 my $tid='2';
-my $content='content';
-my $navigation='navigation';
-my $varscd = 'Supplemental Course Documents';
-
-$r->print(&generate_edit_table($tid,$content,$navigation,$varscd,\%supnamehash,\%suporderhash));
+my $varscd = 'supplCourseDocuments';
 
-	} 
-   }
+$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('</div>');
+	}
+$r->print('</div>');
     if ($allowed) {
 	$r->print('
 <form method="post" name="extimport" action="/adm/coursedocs">
@@ -3259,79 +3334,79 @@ $r->print(&generate_edit_table($tid,$con
  }
  $r->print(&Apache::loncommon::end_page());
  return OK;
-} 
+}
 
 sub generate_admin_options {
-  my ($containertag,$uploadtag,$lt_ref,$help_ref,$env_ref) = @_;
-  my %lt = %{$lt_ref};
+  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 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">
-   <ul style="list-style-type:none">
-       <li>
-           <input type="submit" name="verify" value="$lt{'vc'}" />$help{'Verify_Content'}
-       </li>
-       <li>
-           <input type="submit" name="versions" value="$lt{'cv'}" />$help{'Check_Resource_Versions'}
-       </li>
-       <li>
+           <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
-       </li>
-       <li>
            $exportbut
-       </li>
-       <li>
           <input type="submit" name="listsymbs" value="$lt{'ls'}" />
-        </li>
-        <li>
-          <input type="hidden" name="folder" value="$env{'form.folder'}" />
+          <input type="hidden" name="folder" value="$env{'form.folder'}" /><br />
           <input type="submit" name="docslog" value="$lt{'sl'}" />
-        </li>
-   </ul>
  </form>
- <div style="clear: both; height: 0px;">&nbsp;</div>
 ENDOPTIONFORM
 
 }
 
 
 sub generate_edit_table {
-    my ($tid,$content,$navigation,$varcd,$namehash_ref,$orderhash_ref) = @_;
-    my %namehash = %{$namehash_ref};             #name verlinkt mit id
-    my %orderhash = %{$orderhash_ref};           #name mit kürzel verlinkt mit name
+    my ($tid,$varcd,$orderhash_ref) = @_;
+    my %orderhash = %{$orderhash_ref};
     my $form;
-
-    
-
-    $form = '<div class="LC_ContentBoxSpecial"><h4 class="LC_hcell">'.&mt($varcd).'</h4>';
-    $form .= '<ul id="'.$navigation.$tid.'" class="LC_TabContent">';
+    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'){
-            $form .= '<li onclick="javascript:hideAll(this, \''.$navigation.$tid.'\' ,\''.$content.$tid.'\');" class="active">'.&mt($orderhash{$name}).'</li>';
+            if($activetab ne ''){
+               $active = '';
+            }else{
+               $active = 'class="active"';
+            }
+            $form .= '<span class="LC_Right"><li onclick="javascript:hideAll(this, \'navigation'.$tid.'\' ,\'content'.$tid.'\');" '.$active.'>'.&mt(${$orderhash{$name}}[0]).'</li></span>';
         }else{
-            $form .= '<li onclick="javascript:showPage(this, \''.$tid.$orderhash{$name}.'\', \''.$navigation.$tid.'\',\''.$content.$tid.'\');">'.&mt($orderhash{$name}).'</li>';
+            if($activetab eq '' || $activetab ne $name){
+               $active = '';
+            }elsif($activetab eq $name){
+               $active = 'class="active"';
+            }
+            $form .= '<li '.$active.' onclick="javascript:showPage(this, \''.substr(${$orderhash{$name}}[0],0,3).$tid.'\', \'navigation'.$tid.'\',\'content'.$tid.'\');">'.&mt(${$orderhash{$name}}[0]).'</li>';
+        }
+    }
+    $form .= '</ul>';
+    $form .= '<div id="content'.$tid.'" style="padding: 0 0; margin: 0 0;">';
+    foreach my $field (keys(%orderhash)){
+	if($field ne 'zz'){
+        if($activetab eq '' || $activetab ne $field){
+                $active = 'style="display: none;"';
+        }elsif($activetab eq $field){
+                $active = 'style="display:block;"';
+        }
+           $form .= '<div id="'.substr(${$orderhash{$field}}[0],0,3).$tid.'"'
+                   .' class="LC_ContentBox" '.$active.'>'.${$orderhash{$field}}[1]
+                   .'</div>';
         }
     }
-    $form .= '<div id="'.$content.$tid.'" style="padding: 0 0; margin: 0 0;">';
-    foreach my $field (keys(%namehash)){
-        $form .= '<div id="'.$tid.$field.'" class="LC_ContentBox" style="display: none;">'.$namehash{$field}.'</div>';
-      }
     $form .= '</div></div>';
-    
+
     return $form;
 }
 
@@ -3344,12 +3419,12 @@ sub editing_js {
                                           p_mnp => 'Name of New Page',
                                           t_mnp => 'New Page',
                                           p_mxu => 'Title for the Uploaded Score',
-                                          p_msp => 'Title for the 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 Bulletin Board',
-                                          p_mab => "Enter user:domain for User's 'About Me' Page",
-                                          p_mab2 => "About [_99]",
+                                          p_mbb => 'Title for the Discussion Board',
+                                          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',
@@ -3397,7 +3472,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();
@@ -3406,7 +3481,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();
@@ -3415,7 +3490,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();
@@ -3424,7 +3499,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();
@@ -3449,110 +3524,112 @@ function makeabout() {
 	   if ((comp[0]) && (comp[1])) {
 	       this.document.forms.newaboutsomeone.importdetail.value=
 		   '$lt{"p_mab2"}'+escape(user)+'=/adm/'+comp[1]+'/'+comp[0]+'/aboutme';
-	       this.document.forms.newaboutsomeone.submit();
-	   } else {
-               alert("$lt{'p_mab_alrt1'}");
-           }
-       } else {
-           alert("$lt{'p_mab_alrt2'}");
-       }
+       this.document.forms.newaboutsomeone.submit();
+   } else {
+       alert("$lt{'p_mab_alrt1'}");
    }
+} else {
+   alert("$lt{'p_mab_alrt2'}");
+}
+}
 }
 
 function makeims() {
-    var caller = document.forms.ims.folder.value;
-    var newlocation = "/adm/imsimportdocs?folder="+caller+"&phase=one";
-    newWindow = window.open("","IMSimport","HEIGHT=700,WIDTH=750,scrollbars=yes");
-    newWindow.location.href = newlocation;
+var caller = document.forms.ims.folder.value;
+var newlocation = "/adm/imsimportdocs?folder="+caller+"&phase=one";
+newWindow = window.open("","IMSimport","HEIGHT=700,WIDTH=750,scrollbars=yes");
+newWindow.location.href = newlocation;
 }
 
 
 function finishpick() {
-    var title=this.document.forms.extimport.title.value;
-    var url=this.document.forms.extimport.url.value;
-    var form=this.document.forms.extimport.useform.value;
-    var residx=this.document.forms.extimport.residx.value;
-    eval('this.document.forms.'+form+'.importdetail.value="'+title+'='+url+'='+residx+'";this.document.forms.'+form+'.submit();');
+var title=this.document.forms.extimport.title.value;
+var url=this.document.forms.extimport.url.value;
+var form=this.document.forms.extimport.useform.value;
+var residx=this.document.forms.extimport.residx.value;
+eval('this.document.forms.'+form+'.importdetail.value="'+title+'='+url+'='+residx+'";this.document.forms.'+form+'.submit();');
 }
 
 function changename(folderpath,index,oldtitle,container,pagesymb) {
-    var title=prompt('$lt{"p_chn"}',oldtitle);
-    if (title) {
-	this.document.forms.renameform.markcopy.value=-1;
-	this.document.forms.renameform.title.value=title;
-	this.document.forms.renameform.cmd.value='rename_'+index;
-        if (container == 'sequence') {
-	    this.document.forms.renameform.folderpath.value=folderpath;
-        }
-        if (container == 'page') {
-            this.document.forms.renameform.pagepath.value=folderpath;
-            this.document.forms.renameform.pagesymb.value=pagesymb;
-        }
-        this.document.forms.renameform.submit();
-    }
+var title=prompt('$lt{"p_chn"}',oldtitle);
+if (title) {
+this.document.forms.renameform.markcopy.value=-1;
+this.document.forms.renameform.title.value=title;
+this.document.forms.renameform.cmd.value='rename_'+index;
+if (container == 'sequence') {
+    this.document.forms.renameform.folderpath.value=folderpath;
+}
+if (container == 'page') {
+    this.document.forms.renameform.pagepath.value=folderpath;
+    this.document.forms.renameform.pagesymb.value=pagesymb;
+}
+this.document.forms.renameform.submit();
+}
 }
 
 function removeres(folderpath,index,oldtitle,container,pagesymb,skip_confirm) {
-    if (skip_confirm || confirm('$lt{"p_rmr1"}\\n\\n$lt{"p_rmr2a"} "'+oldtitle+'" $lt{"p_rmr2b"}')) {
-	this.document.forms.renameform.markcopy.value=-1;
-	this.document.forms.renameform.cmd.value='del_'+index;
-        if (container == 'sequence') {
-            this.document.forms.renameform.folderpath.value=folderpath;
-        }
-        if (container == 'page') {
-            this.document.forms.renameform.pagepath.value=folderpath;
-            this.document.forms.renameform.pagesymb.value=pagesymb;
-        }
-        this.document.forms.renameform.submit();
-    }
+if (skip_confirm || confirm('$lt{"p_rmr1"}\\n\\n$lt{"p_rmr2a"} "'+oldtitle+'" $lt{"p_rmr2b"}')) {
+this.document.forms.renameform.markcopy.value=-1;
+this.document.forms.renameform.cmd.value='del_'+index;
+if (container == 'sequence') {
+    this.document.forms.renameform.folderpath.value=folderpath;
+}
+if (container == 'page') {
+    this.document.forms.renameform.pagepath.value=folderpath;
+    this.document.forms.renameform.pagesymb.value=pagesymb;
+}
+this.document.forms.renameform.submit();
+}
 }
 
 function cutres(folderpath,index,oldtitle,container,pagesymb,folder,skip_confirm) {
-    if (skip_confirm || confirm('$lt{"p_ctr1a"}\\n$lt{"p_ctr1b"}\\n\\n$lt{"p_ctr2a"} "'+oldtitle+'" $lt{"p_ctr2b"}')) {
-	this.document.forms.renameform.cmd.value='cut_'+index;
-	this.document.forms.renameform.markcopy.value=index;
-	this.document.forms.renameform.copyfolder.value=folder+'.'+container;
-        if (container == 'sequence') {
-            this.document.forms.renameform.folderpath.value=folderpath;
-        }
-        if (container == 'page') {
-            this.document.forms.renameform.pagepath.value=folderpath;
-            this.document.forms.renameform.pagesymb.value=pagesymb;
-        }
-        this.document.forms.renameform.submit();
-    }
+if (skip_confirm || confirm('$lt{"p_ctr1a"}\\n$lt{"p_ctr1b"}\\n\\n$lt{"p_ctr2a"} "'+oldtitle+'" $lt{"p_ctr2b"}')) {
+this.document.forms.renameform.cmd.value='cut_'+index;
+this.document.forms.renameform.markcopy.value=index;
+this.document.forms.renameform.copyfolder.value=folder+'.'+container;
+if (container == 'sequence') {
+    this.document.forms.renameform.folderpath.value=folderpath;
+}
+if (container == 'page') {
+    this.document.forms.renameform.pagepath.value=folderpath;
+    this.document.forms.renameform.pagesymb.value=pagesymb;
+}
+this.document.forms.renameform.submit();
+}
 }
 
 function markcopy(folderpath,index,oldtitle,container,pagesymb,folder) {
-    this.document.forms.renameform.markcopy.value=index;
-    this.document.forms.renameform.copyfolder.value=folder+'.'+container;
-    if (container == 'sequence') {
-	this.document.forms.renameform.folderpath.value=folderpath;
-    }
-    if (container == 'page') {
-	this.document.forms.renameform.pagepath.value=folderpath;
-	this.document.forms.renameform.pagesymb.value=pagesymb;
-    }
-    this.document.forms.renameform.submit();
+this.document.forms.renameform.markcopy.value=index;
+this.document.forms.renameform.copyfolder.value=folder+'.'+container;
+if (container == 'sequence') {
+this.document.forms.renameform.folderpath.value=folderpath;
+}
+if (container == 'page') {
+this.document.forms.renameform.pagepath.value=folderpath;
+this.document.forms.renameform.pagesymb.value=pagesymb;
+}
+this.document.forms.renameform.submit();
 }
 
 function unselectInactive(nav) {
-	currentNav = document.getElementById(nav);
-	currentLis = currentNav.getElementsByTagName('LI');
-	for (i = 0; i < currentLis.length; i++) {
-		currentLis[i].className = 'i';
-	}
+currentNav = document.getElementById(nav);
+currentLis = currentNav.getElementsByTagName('LI');
+for (i = 0; i < currentLis.length; i++) {
+	currentLis[i].className = 'i';
+}
 }
 
 function hideAll(current, nav, data) {
-	unselectInactive(nav);
-	current.className = 'active';
-	currentData = document.getElementById(data);
-	currentDivs = currentData.getElementsByTagName('DIV');
-	for (i = 0; i < currentDivs.length; i++) {
+unselectInactive(nav);
+current.className = 'active';
+currentData = document.getElementById(data);
+currentDivs = currentData.getElementsByTagName('DIV');
+for (i = 0; i < currentDivs.length; i++) {
+	if(currentDivs[i].className == 'LC_ContentBox'){
 		currentDivs[i].style.display = 'none';
 	}
 }
+}
 
 function showPage(current, pageId, nav, data) {
 	hideAll(current, nav, data);
@@ -3588,7 +3665,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