--- loncom/interface/londocs.pm	2009/10/04 09:41:12	1.387
+++ loncom/interface/londocs.pm	2009/10/04 13:58:02	1.389
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.387 2009/10/04 09:41:12 tempelho Exp $
+# $Id: londocs.pm,v 1.389 2009/10/04 13:58:02 tempelho Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -3253,7 +3253,6 @@ my %orderhash = (
                 );
 my $tid='1';
 my $varcd = 'Main Course Documents';
-$r->print(&generate_edit_table($tid,$varcd,\%orderhash));
  $hadchanges=0;
         my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$type);
        if ($error) {
@@ -3264,6 +3263,8 @@ $r->print(&generate_edit_table($tid,$var
        }
 
        &changewarning($r,'');
+$r->print(&generate_edit_table($tid,$varcd,\%orderhash));
+
 $r->print('</div>');
 	}
        if ($env{'form.pagepath'}) {
@@ -3294,7 +3295,7 @@ $r->print('</div>');
 	   my $path = &HTML::Entities::encode($env{'form.folderpath'},'<>&"');
 
 	my @supupdocform = (
-		{'<img class="LC_noBorder LC_middle" align="left" src="/res/adm/pages/docspacer.gif" alt="pic27" />'=>"<a onclick='document.supuploaddocument.submit()'>$lt{'upld'}</a>$help{'Uploading_From_Harddrive'}"},
+		{'<img class="LC_noBorder LC_middle" align="left" src="/res/adm/pages/docspacer.gif" alt="pic27" />'=>"<input type='submit' value='".$lt{'upld'}."' />$help{'Uploading_From_Harddrive'}"},
 		);
 	my $supupdocform=(<<SUPDOCFORM);
 	<form action="/adm/coursedocs" method="post" name="supuploaddocument" enctype="multipart/form-data">
@@ -3373,14 +3374,14 @@ my %suporderhash = (
 
 my $tid='2';
 my $varscd = 'Supplemental Course Documents';
-
-$r->print(&generate_edit_table($tid,$varscd,\%suporderhash));
-}
-
 my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$type);
        if ($error) {
            $r->print('<p><span class="LC_error">'.$error.'</span></p>');
         }
+$r->print(&generate_edit_table($tid,$varscd,\%suporderhash));
+}
+
+
 $r->print('</div>');
 $r->print('</div></div>');
 
@@ -3448,14 +3449,7 @@ sub generate_edit_table {
     $form = '<div class="LC_Box">';
     $form .= '<ul id="navigation'.$tid.'" class="LC_TabContent">';
     foreach my $name (sort(keys(%orderhash))){
-        if($name eq 'zz'){
-            if($activetab ne ''){
-               $active = 'class="right"';
-            }else{
-               $active = 'class="right active"';
-            }
-            $form .= '<li onclick="javascript:hideAll(this, \'navigation'.$tid.'\' ,\'content'.$tid.'\');" '.$active.'>'.&mt(${$orderhash{$name}}[0]).'</li>';
-        }else{
+        if($name ne 'zz'){
             if($activetab eq '' || $activetab ne $name){
                $active = '';
             }elsif($activetab eq $name){
@@ -3715,7 +3709,7 @@ for (i = 0; i < currentDivs.length; i++)
 function openTabs(pageId) {
 	tabnav = document.getElementById(pageId).getElementsByTagName('UL');	
 	if(tabnav.length > 2 ){
-		currentNav = document.getElementById(tabnav[0].id);
+		currentNav = document.getElementById(tabnav[1].id);
 		currentLis = currentNav.getElementsByTagName('LI');
 		for(i = 0; i< currentLis.length; i++){
 			if(currentLis[i].className == 'active') {