--- loncom/interface/londocs.pm	2009/02/02 11:23:56	1.333
+++ loncom/interface/londocs.pm	2009/02/03 14:16:39	1.334
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.333 2009/02/02 11:23:56 muellerd Exp $
+# $Id: londocs.pm,v 1.334 2009/02/03 14:16:39 muellerd Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -3106,18 +3106,19 @@ my %orderhash = (
                 'bb' => 'Published Documents',
                 'cc' => 'Special Documents',
 		'dd' => 'More Options',
-                'zz' => 'Hide all Option',
+                'zz' => 'Hide all Options',
                 );
 my %namehash = (
                 'New Document' => $fileuploadform,
                 'Published Documents' => $simpleeditdefaultform,
                 'Special Documents' => $specialdocumentsform,
 		'More Options' => $extresourcesform.'<br />'.$imspform.'<br />'.$recoverform,
-                'drei' => 'dr',
                 );
-my $tid = '1';
-my $varcd = 'Course Documents';
-$r->print(&generate_edit_table($varcd,\%namehash,\%orderhash)); 
+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)); 
       }
        if ($env{'form.pagepath'}) {
        }
@@ -3227,17 +3228,13 @@ my %supnamehash = (
                 'New Document' => $supupdocform,
                 'Special Documents' => $supnewfolderform.'<br />'.$supnewextform.'<br />'.$supnewsylform.'<br />'.$supnewaboutmeform,
                 );
-my $tid='2';
-my $varscd = 'Supplemented Course Documents';
 
-$r->print(<<FORM);
-<ul class="LC_TabContent">
-	<li>New Document</li>
-	<li>Special Documents</li>
-</ul>
-FORM
+my $tid='2';
+my $content='content';
+my $navigation='navigation';
+my $varscd = 'Supplemental Course Documents';
 
-#$r->print(&generate_edit_table($varscd,\%supnamehash,\%suporderhash));
+$r->print(&generate_edit_table($tid,$content,$navigation,$varscd,\%supnamehash,\%suporderhash));
 
 	} 
    }
@@ -3313,28 +3310,28 @@ ENDOPTIONFORM
 
 
 sub generate_edit_table {
-    my ($varcd,$namehash_ref,$orderhash_ref) = @_;
+    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 $form;
 
-    {
+    
 
-    $form = '<div class="LC_ContentBoxSpecial"><h4 class="LC_hcell">'.&mt('Upload '.$varcd).'</h4>';
-    $form .= '<ul id="navigation" class="LC_TabContent">';
+    $form = '<div class="LC_ContentBoxSpecial"><h4 class="LC_hcell">'.&mt($varcd).'</h4>';
+    $form .= '<ul id="'.$navigation.$tid.'" class="LC_TabContent">';
     foreach my $name (sort(keys(%orderhash))){
         if($name eq 'zz'){
-            $form .= '<li onclick="javascript:hideAll(this);" class="active">'.&mt($orderhash{$name}).'</li>';
+            $form .= '<li onclick="javascript:hideAll(this, \''.$navigation.$tid.'\' ,\''.$content.$tid.'\');" class="active">'.&mt($orderhash{$name}).'</li>';
         }else{
-            $form .= '<li onclick="javascript:showPage(this, \''.$orderhash{$name}.'\');">'.&mt($orderhash{$name}).'</li>';
+            $form .= '<li onclick="javascript:showPage(this, \''.$tid.$orderhash{$name}.'\', \''.$navigation.$tid.'\',\''.$content.$tid.'\');">'.&mt($orderhash{$name}).'</li>';
         }
     }
-    $form .= '<div id="content" style="padding: 0 0; margin: 0 0;">';
+    $form .= '<div id="'.$content.$tid.'" style="padding: 0 0; margin: 0 0;">';
     foreach my $field (keys(%namehash)){
-        $form .= '<div id="'.$field.'" class="LC_ContentBox" style="display: none;">'.$namehash{$field}.'</div>';
+        $form .= '<div id="'.$tid.$field.'" class="LC_ContentBox" style="display: none;">'.$namehash{$field}.'</div>';
       }
     $form .= '</div></div>';
-    }
+    
     return $form;
 }
 
@@ -3539,28 +3536,27 @@ function markcopy(folderpath,index,oldti
     this.document.forms.renameform.submit();
 }
 
-function unselectInactive() {
-	currentTable = document.getElementById('tableId');
-	currentNav = document.getElementById('navigation');
+function unselectInactive(nav) {
+	currentNav = document.getElementById(nav);
 	currentLis = currentNav.getElementsByTagName('LI');
 	for (i = 0; i < currentLis.length; i++) {
 		currentLis[i].className = 'i';
 	}
 }
 
-function hideAll(current) {
-	unselectInactive();
+function hideAll(current, nav, data) {
+	unselectInactive(nav);
 	current.className = 'active';
-	currentData = document.getElementById('content');
+	currentData = document.getElementById(data);
 	currentDivs = currentData.getElementsByTagName('DIV');
 	for (i = 0; i < currentDivs.length; i++) {
 		currentDivs[i].style.display = 'none';
 	}
 }
 
-function showPage(current, pageId) {
-	hideAll(current);
-	unselectInactive();
+function showPage(current, pageId, nav, data) {
+	hideAll(current, nav, data);
+	unselectInactive(nav);
 	current.className = 'active';
 	currentData = document.getElementById(pageId);
 	currentData.style.display = 'block';