--- loncom/interface/londocs.pm	2009/01/30 11:39:38	1.332
+++ 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.332 2009/01/30 11:39:38 tempelho Exp $
+# $Id: londocs.pm,v 1.334 2009/02/03 14:16:39 muellerd Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2878,12 +2878,7 @@ ERFORM
 		     &mt('Editing the Table of Contents for your '.$type)));
     }
 # --------------------------------------------------------- Standard documents
-    $r->print('<table class="LC_docs_documents">');
-
     if (($standard) && ($allowed) && (!$forcesupplement)) {
-	$r->print('<tr><td class="LC_docs_document">');
-#  '<h2>'.&mt('Main Course Documents').
-#  ($allowed?' '.$help{'Main_Course_Documents'}:'').'</h2>');
        my $folder=$env{'form.folder'};
        if ($folder eq '' || $folder eq 'supplemental') {
            $folder='default';
@@ -3037,38 +3032,9 @@ NASOFORM
 	</form>
 NROSTFORM
 
-       $r->print(<<ENDFORM);
-
-
-<table class="LC_docs_adddocs">
-<!-- <tr>
-<th>$lt{'uplm'}</th>
-<th>$lt{'impp'}</th>
-<th>$lt{'spec'}</th>
-</tr> -->
-<tr>
-<td>
-$fileuploadform
-</td>
-<td>
-$simpleeditdefaultform
-<hr />
-$recoverform
-ENDFORM
-       unless ($env{'form.pagepath'}) {
-	   $r->print(<<ENDFORM);
-<hr />
-$extresourcesform
-	<br />
-$imspform
-ENDFORM
-       }
-       $r->print('</td><td>');
        unless ($env{'form.pagepath'}) {
 	   my $path = &HTML::Entities::encode($env{'form.folderpath'},'<>&"');
 
-
-
 	my $newpageform=(<<NPFORM);
 	<form action="/adm/coursedocs" method="post" name="newpage">
 	<input type="hidden" name="folderpath" value="$path" />
@@ -3118,72 +3084,47 @@ NSYLFORM
 NGFFORM
 
 
-           my $specialdocumentsform=(<<ENDFORM);
-<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
-ENDFORM
+        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
 
-$r->print($specialdocumentsform);
 
 my %orderhash = (
                 'aa' => 'New Document',
                 '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 $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'}) {
-           $r->print(<<ENDBLOCK);
-$newsmpproblemform
-<br />
-$newexuploadform
-ENDBLOCK
        }
-       $r->print('</td></tr>'."\n".
-'</table>');
-#$r->print(&generate_edit_table(\%namehash,\%orderhash));
-       $r->print('</td></tr>');
     }
 # ----------------------------------------------------- Supplemental documents
     if (!$forcestandard) {
-       $r->print('<tr><td class="LC_docs_document">');
-# '<h2>'.&mt('Supplemental Course Documents').
-#  ($allowed?' '.$help{'Supplemental'}:'').'</h2>');
        my $folder=$env{'form.folder'};
        unless ($folder=~/^supplemental/) {
 	   $folder='supplemental';
@@ -3275,30 +3216,28 @@ SNSFORM
 	</form>
 SNAMFORM
 
-	   $r->print(<<ENDSUPFORM);
-<ul class="LC_TabContent">
-<li>$lt{'nd'}</li>
-<li>$lt{'sd'}</li>
-<li>$lt{'hao'}</li>
-</ul>
-<table class="LC_docs_adddocs">
-<tr><td>
-$supupdocform
-</td>
-<td>
-$supnewfolderform
-<br />
-$supnewextform
-<br />
-$supnewsylform
-<br />
-$supnewaboutmeform
-</td></tr>
-</table></td></tr>
-ENDSUPFORM
-       }
-    }
-    $r->print('</table>');
+
+
+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,
+                );
+
+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));
+
+	} 
+   }
     if ($allowed) {
 	$r->print('
 <form method="post" name="extimport" action="/adm/coursedocs">
@@ -3308,7 +3247,6 @@ ENDSUPFORM
   <input type="hidden" name="residx" />
 </form>');
     }
-
   } else {
       unless ($upload_result eq 'phasetwo') {
 # -------------------------------------------------------- This is showdoc mode
@@ -3372,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;
 
-    #foreach my $id (keys(%tablehash)){
-    $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;
 }
 
@@ -3598,27 +3536,27 @@ function markcopy(folderpath,index,oldti
     this.document.forms.renameform.submit();
 }
 
-function unselectInactive() {
-currentNav = document.getElementById('navigation');
-currentLis = currentNav.getElementsByTagName('LI');
-for (i = 0; i < currentLis.length; i++) {
-currentLis[i].className = 'i';
-}
+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';
+		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';