--- loncom/interface/londocs.pm	2009/03/16 21:44:38	1.356
+++ 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.356 2009/03/16 21:44:38 tempelho 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.
@@ -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 ''; }
@@ -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>');
     }
@@ -859,7 +878,7 @@ sub extract_media {
                 $repstatus = 'ok';
             }
         } elsif ($caller eq 'uploaded') {
-            
+
             $repstatus = &Apache::lonnet::getuploaded('GET',$embed_url,$cdom,$cnum,\$embed_content,$rtncode);
         }
         if ($repstatus eq 'ok') {
@@ -924,7 +943,7 @@ sub group_import {
         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".
@@ -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 {
@@ -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
@@ -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;
@@ -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,7 +1513,7 @@ sub editor {
 	    ($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container);
 	    return $errtext if ($fatal);
 	}
-	    
+
 	if ($env{'form.pastemarked'}) {
             my $paste_res =
                 &do_paste_from_buffer($coursenum,$coursedom,$folder);
@@ -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>');
     }
@@ -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;
@@ -1772,10 +1790,10 @@ sub entryline {
 	     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>';
 		}
@@ -1811,7 +1829,7 @@ sub entryline {
         }
         my $copylink='&nbsp;';
         my $cutlink='&nbsp;';
-	
+
 	my $skip_confirm = 0;
 	if ( $folder =~ /^supplemental/
 	     || ($url =~ m{( /smppg$
@@ -1897,7 +1915,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/});
@@ -1932,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);
 	}
@@ -1954,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].
                                               '" />'.
@@ -1962,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);
@@ -2000,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>
@@ -2045,7 +2063,7 @@ sub tiehash {
                 $hashtied=1;
 	    }
 	}
-    }    
+    }
 }
 
 sub untiehash {
@@ -2094,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) {
@@ -2119,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>');
@@ -2394,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;
@@ -2484,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");
 }
 
 
@@ -2619,7 +2641,7 @@ sub handler {
        if (($env{'form.folder'}=~/^(?:group|default)_/) ||
           ($env{'form.folder'} =~ m:^\d+/(pages|sequences)/:)) {
            $forcestandard = 1;
-       } 
+       }
        $forcesupplement=($env{'form.folder'}=~/^supplemental_/);
 
        if ($allowed) {
@@ -2647,13 +2669,17 @@ 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);
@@ -2722,7 +2748,7 @@ 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;
                       }
                       if (exists($codebase{$item})) {
@@ -2775,7 +2801,7 @@ sub handler {
                 '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',
@@ -2798,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 />
@@ -2819,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','')"
+	onclick="javascript:openbrowser('simpleeditdefault','importmap','sequence,page','')"
 	value="$lt{'selm'}" /> <input type="submit" name="loadmap" value="$lt{'load'}" />
 	$help{'Load_Map'}</span>
 	</p>
@@ -2846,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>
@@ -2891,30 +2919,28 @@ HIDDENFORM
     my $activeClass = 1;
     my $active = '';
     $r->print('<ul class="LC_TabContentBigger" id="mainnav">');
-    if (($standard) && ($allowed) && (!$forcesupplement) && ($env{'form.folderpath'}=~/^default/)) {
+    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,\'Main Course Documents\',\'mainnav\',\'maincoursedoc\');">'.&mt('Main Course Documents').'</li>');
+    $r->print('<li '.$active.' onclick="javascript:showPage(this,\'mainCourseDocuments\',\'mainnav\',\'maincoursedoc\');">'.&mt('Main Course Documents').'</li>');
     $active = '';
     if (!$forcestandard || ($env{'form.folderpath'}=~/^supplemental/)) {
         if($activeClass == 1){
            $active = 'class="active"';
         }
     }
-    $r->print('<li '.$active.'onclick="javascript:showPage(this,\'Supplemental Course Documents\',\'mainnav\',\'maincoursedoc\');">'.&mt('Supplemental Course Documents').'</li>');
-    $r->print('</ul><div class="LC_ContentBoxSpecial" style="margin:0 0;padding:0 0;"><div id="maincoursedoc" style="margin:0 0;padding:0 0;">');
+    $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
        my $savefolderpath;
        my $active = 'style="display: none;"';
        if($activeClass == 0){
           $active = 'style="display: block;"';
        }
-       $r->print('<div class="LC_ContentBox" id="Main Course Documents" '.$active.'>');
-        $r->print(&Apache::loncommon::help_open_topic('Docs_Adding_Course_Doc',
-                     &mt('Editing the Table of Contents for your '.$type)));
+       $r->print('<div class="LC_ContentBox" id="mainCourseDocuments" '.$active.'>');
        my $folder=$env{'form.folder'};
        if ($folder eq '' || $folder=~/^supplemental/) {
            $folder='default';
@@ -2925,7 +2951,12 @@ HIDDENFORM
        }
        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();';
        }
@@ -2943,19 +2974,20 @@ HIDDENFORM
 
 	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" />
@@ -2967,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>
 
@@ -2990,22 +3024,24 @@ 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();" />
+	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>
@@ -3013,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>
@@ -3025,6 +3062,7 @@ 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" />
@@ -3037,11 +3075,12 @@ 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
@@ -3049,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" />
@@ -3069,9 +3109,10 @@ my $newfolderform;
 	<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>
@@ -3081,9 +3122,10 @@ NPFORM
 	<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>
@@ -3091,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" />
@@ -3100,9 +3143,10 @@ 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" />
@@ -3125,23 +3169,15 @@ if($env{'form.pagepath'}) {
 }
 
 my %orderhash = (
-                'aa' => 'New Document',
-                'bb' => 'Published Documents',
-                'cc' => 'Special Documents',
-		'dd' => 'More Tools',
-                'zz' => 'Hide all Options',
-                );
-my %namehash = (
-                'New Document' => $fileuploadform.'<br />'.$newfolderform,
-                'Published Documents' => $simpleeditdefaultform,
-                'Special Documents' => $specialdocumentsform,
-		'More Tools' => $extresourcesform.'<br />'.$imspform.'<br />'.$recoverform.'<br />'.&generate_admin_options($containertag,$uploadtag,\%help,\%env),
+                '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) {
@@ -3152,6 +3188,8 @@ $r->print(&generate_edit_table($tid,$con
        }
 
        &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'}) {
        }
@@ -3160,7 +3198,7 @@ $r->print('</div>');
        if($activeClass == 1){
           $active = 'style="display: block;"';
        }
-       $r->print('<div class="LC_ContentBox" id="Supplemental Course Documents" '.$active.'>');
+       $r->print('<div class="LC_ContentBox" id="supplCourseDocuments" '.$active.'>');
        my $folder=$env{'form.folder'};
        unless ($folder=~/^supplemental/) {
 	   $folder='supplemental';
@@ -3172,6 +3210,7 @@ $r->print('</div>');
        }else{
 	  $env{'form.folderpath'} = $savefolderpath;
        }
+       $env{'form.pagepath'} = '';
        if ($allowed) {
 	   my $folderseq=
 	       '/uploaded/'.$coursedom.'/'.$coursenum.'/supplemental_'.time.
@@ -3181,6 +3220,7 @@ $r->print('</div>');
 
 	my $supupdocform=(<<SUPDOCFORM);
 	<form action="/adm/coursedocs" method="post" enctype="multipart/form-data">
+	<input type="hidden" name="active" value="ee" />	
 	$fileupload
 	<br />
 	<br />
@@ -3189,7 +3229,7 @@ $r->print('</div>');
 	</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" />
@@ -3203,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>
@@ -3216,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>
@@ -3228,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" />
@@ -3240,6 +3283,7 @@ 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" />
@@ -3253,28 +3297,21 @@ SNAMFORM
 
 
 my %suporderhash = (
-                'ee' => 'New Document',
-                'ff' => 'Special Documents',
-                'zz' => 'Hide all Options',
-                );
-
-my %supnamehash = (
-                'New Document' => $supupdocform.'<br />'.$supnewfolderform,
-                'Special Documents' => $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';
+my $varscd = 'supplCourseDocuments';
 
-$r->print(&generate_edit_table($tid,$content,$navigation,$varscd,\%supnamehash,\%suporderhash));
+$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('
@@ -3297,7 +3334,7 @@ $r->print('</div>');
  }
  $r->print(&Apache::loncommon::end_page());
  return OK;
-} 
+}
 
 sub generate_admin_options {
   my ($containertag,$uploadtag,$help_ref,$env_ref) = @_;
@@ -3314,9 +3351,9 @@ sub generate_admin_options {
   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'}
-           $dumpbut<br />
-           $exportbut<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'}" />
@@ -3327,27 +3364,49 @@ ENDOPTIONFORM
 
 
 sub generate_edit_table {
-    my ($tid,$content,$navigation,$varcd,$namehash_ref,$orderhash_ref) = @_;
-    my %namehash = %{$namehash_ref};
+    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 .= '<span class="LC_Right"><li onclick="javascript:hideAll(this, \''.$navigation.$tid.'\' ,\''.$content.$tid.'\');" class="active">'.&mt($orderhash{$name}).'</li></span>';
+            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(%namehash)){
-        $form .= '<div id="'.$tid.$field.'" class="LC_ContentBox" style="display: none;">'.$namehash{$field}.'</div>';
-      }
+    $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></div>';
-    
+
     return $form;
 }