--- loncom/interface/londocs.pm	2009/03/10 22:15:43	1.355
+++ loncom/interface/londocs.pm	2009/04/07 20:48:40	1.363
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.355 2009/03/10 22:15:43 ehlerst Exp $
+# $Id: londocs.pm,v 1.363 2009/04/07 20:48:40 ehlerst Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -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.
@@ -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 />';
 }
 
 
@@ -474,7 +474,7 @@ function containerCheck(item) {
 						 $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">'.
+                  '<p><input type="hidden" name="finishexport" value="1" />'.
                   '<input type="submit" name="exportcourse" value="'.
                   &mt('Export '.$type.' DOCS').'" /></p></form>');
     }
@@ -1012,7 +1012,7 @@ sub breadcrumbs {
     }
     $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 {
@@ -1775,7 +1775,7 @@ sub entryline {
 		'<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>';
 		}
@@ -2000,9 +2000,9 @@ 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
@@ -2891,15 +2891,15 @@ HIDDENFORM
     my $activeClass = 1;
     my $active = '';
     $r->print('<ul class="LC_TabContentBigger" id="mainnav">');
-    if (($standard) && ($allowed) && (!$forcesupplement) && (!$env{'form.suppactive'})) {
+    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.suppactive'} ) {
+    if (!$forcestandard || ($env{'form.folderpath'}=~/^supplemental/)) {
         if($activeClass == 1){
            $active = 'class="active"';
         }
@@ -2907,17 +2907,18 @@ HIDDENFORM
     $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;">');
 # --------------------------------------------------------- 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="Main Course Documents" '.$active.'>');
+       $r->print('<div class="LC_ContentBox" id="mainCourseDocuments" '.$active.'>');
         $r->print(&Apache::loncommon::help_open_topic('Docs_Adding_Course_Doc',
                      &mt('Editing the Table of Contents for your '.$type)));
        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'},'<>&"').'" />';
@@ -3124,23 +3125,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' => ['New 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) {
@@ -3154,9 +3147,7 @@ $r->print(&generate_edit_table($tid,$con
 $r->print('</div>');
        if ($env{'form.pagepath'}) {
        }
-    }
 # ----------------------------------------------------- Supplemental documents
-    if (!$forcestandard) {
        my $active = 'style="display: none;"';
        if($activeClass == 1){
           $active = 'style="display: block;"';
@@ -3170,7 +3161,10 @@ $r->print('</div>');
 	   (($env{'form.folderpath'} =~ /^default\&/) || ($env{'form.folderpath'} eq ''))) {
           $env{'form.folderpath'} = 'supplemental&'.
                                     &escape(&mt('Supplemental '.$type.' Documents'));
+       }else{
+	  $env{'form.folderpath'} = $savefolderpath;
        }
+       $env{'form.pagepath'} = '';
        if ($allowed) {
 	   my $folderseq=
 	       '/uploaded/'.$coursedom.'/'.$coursenum.'/supplemental_'.time.
@@ -3188,11 +3182,10 @@ $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" />
-	<input type="hidden" name="suppactive" value="true" />
 	<input type="hidden" name="cmd" value="upload_supplemental" />
 	<span class="LC_nobreak">
 	<input type="submit" value="$lt{'upld'}" />
@@ -3205,7 +3198,6 @@ SUPDOCFORM
 	<form action="/adm/coursedocs" method="post" name="supnewfolder">
 	<input type="hidden" name="folderpath" value="$path" />
 	<input type="hidden" name="importdetail" value="" />
-	<input type="hidden" name="suppactive" value="true" />
 	<span class="LC_nobreak">
 	<input name="newfolder" type="button"
 	onClick="javascript:makenewfolder(this.form,'$folderseq');"
@@ -3219,7 +3211,6 @@ SNFFORM
 	<form action="/adm/coursedocs" method="post" name="supnewext">
 	<input type="hidden" name="folderpath" value="$path" />
 	<input type="hidden" name="importdetail" value="" />
-	<input type="hidden" name="suppactive" value="true" />
 	<span class="LC_nobreak">
 	<input name="newext" type="button" 
 	onClick="javascript:makenewext('supnewext');"
@@ -3233,7 +3224,6 @@ SNEFORM
 	<input type="hidden" name="folderpath" value="$path" />
 	<input type="hidden" name="importdetail" 
 	value="Syllabus=/public/$coursedom/$coursenum/syllabus" />
-	<input type="hidden" name="suppactive" value="true" />
 	<span class="LC_nobreak">
 	<input name="newsyl" type="submit" value="$lt{'syll'}" />
 	$help{'Syllabus'}
@@ -3246,7 +3236,6 @@ SNSFORM
 	<input type="hidden" name="folderpath" value="$path" />
 	<input type="hidden" name="importdetail" 
 	value="$plainname=/adm/$udom/$uname/aboutme" />
-	<input type="hidden" name="suppactive" value="true" />
 	<span class="LC_nobreak">
 	<input name="newaboutme" type="submit" value="$lt{'mypi'}" />
 	$help{'My Personal Information Page'}
@@ -3257,29 +3246,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' => ['New 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));
+$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('
@@ -3319,9 +3300,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'}" />
@@ -3332,25 +3313,26 @@ 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">';
+    $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>';
+            $form .= '<span class="LC_Right"><li onclick="javascript:hideAll(this, \'navigation'.$tid.'\' ,\'content'.$tid.'\');" class="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>';
+            $form .= '<li 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'){
+           $form .= '<div id="'.substr(${$orderhash{$field}}[0],0,3).$tid.'" class="LC_ContentBox" style="display: none;">'.${$orderhash{$field}}[1].'</div>';
+        }
+    }
     $form .= '</div></div>';
     
     return $form;