--- loncom/interface/londocs.pm	2009/03/03 17:45:15	1.351
+++ loncom/interface/londocs.pm	2009/04/07 20:12:55	1.362
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.351 2009/03/03 17:45:15 ehlerst Exp $
+# $Id: londocs.pm,v 1.362 2009/04/07 20:12:55 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
@@ -2540,7 +2540,7 @@ sub handler {
 		    'Docs_About_Bulletin_Board,Docs_Editing_Templated_Pages');
     $help{'My Personal Information Page'} = &Apache::loncommon::help_open_topic(
 		  'Docs_About_My_Personal_Info,Docs_Editing_Templated_Pages');
-    $help{'Group Files'} = &Apache::loncommon::help_open_topic('Docs_About_Group_Files');
+    $help{'Group Portfolio'} = &Apache::loncommon::help_open_topic('Docs_About_Group_Files');
     $help{'Caching'} = &Apache::loncommon::help_open_topic('Caching');
 
 # does this user have privileges to modify docs
@@ -2767,7 +2767,7 @@ sub handler {
                 'scuf' => 'Score Upload Form',
                 'bull' => 'Discussion Board',
                 'mypi' => 'My Personal Information Page',
-                'grpo' => 'Group Files',
+                'grpo' => 'Group Portfolio',
                 'rost' => 'Course Roster',
 				'abou' => 'Personal Information Page for a User',
                 'imsf' => 'Import IMS package',
@@ -2889,36 +2889,36 @@ HIDDENFORM
     }
 # --------------------------------------------------------- Main tab structure
     my $activeClass = 1;
+    my $active = '';
     $r->print('<ul class="LC_TabContentBigger" id="mainnav">');
-    if (($standard) && ($allowed) && (!$forcesupplement)) {
-	my $active = '';
+    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>');
     }
-    if (!$forcestandard) {
-	my $active = '';
+    $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('<li onclick="javascript:showPage(this,\'Special Admin Options\',\'mainnav\',\'maincoursedoc\');">'.&mt('Special Admin Options').'</li>');
+    $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'},'<>&"').'" />';
@@ -3108,7 +3108,7 @@ NSYLFORM
 	value="$lt{'grpo'}=/adm/$coursedom/$coursenum/aboutme" />
 	<span class="LC_nobreak">
 	<input name="newgroupfiles" type="submit" value="$lt{'grpo'}" />
-	$help{'Group Files'}
+	$help{'Group Portfolio'}
 	</span>
 	</form>
 NGFFORM
@@ -3128,20 +3128,18 @@ my %orderhash = (
                 'aa' => 'New Document',
                 'bb' => 'Published Documents',
                 'cc' => 'Special Documents',
-		'dd' => 'More Options',
+		'dd' => 'Tools',
                 'zz' => 'Hide all Options',
                 );
 my %namehash = (
                 'New Document' => $fileuploadform.'<br />'.$newfolderform,
                 'Published Documents' => $simpleeditdefaultform,
                 'Special Documents' => $specialdocumentsform,
-		'More Options' => $extresourcesform.'<br />'.$imspform.'<br />'.$recoverform,
+		'Tools' => $extresourcesform.'<br />'.$imspform.'<br />'.$recoverform.'<br />'.&generate_admin_options($containertag,$uploadtag,\%help,\%env),
                 );
 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,\%namehash,\%orderhash));
  $hadchanges=0;
         my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$type);
        if ($error) {
@@ -3155,9 +3153,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;"';
@@ -3171,7 +3167,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.
@@ -3189,7 +3188,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" />
@@ -3259,26 +3258,20 @@ my %suporderhash = (
                 );
 
 my %supnamehash = (
-                'New Document' => $supupdocform,
-                'Special Documents' => $supnewfolderform.'<br />'.$supnewextform.'<br />'.$supnewsylform.'<br />'.$supnewaboutmeform,
+                'New Document' => $supupdocform.'<br />'.$supnewfolderform,
+                'Special Documents' => $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));
+$r->print(&generate_edit_table($tid,$varscd,\%supnamehash,\%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 class="LC_ContentBox" id="Special Admin Options" style="display: none;">');
-$r->print(&generate_admin_options($containertag,$uploadtag,\%help,\%env));
-$r->print('</div>');
 $r->print('</div>');
     if ($allowed) {
 	$r->print('
@@ -3317,53 +3310,38 @@ sub generate_admin_options {
   my $exportbut=&exportbutton();
   return (<<ENDOPTIONFORM);
  <form action="/adm/coursedocs" method="post" name="courseverify">
-   <ul style="list-style-type:none">
-       <li>
-           <input type="submit" name="verify" value="$lt{'vc'}" />$help{'Verify_Content'}
-       </li>
-       <li>
-           <input type="submit" name="versions" value="$lt{'cv'}" />$help{'Check_Resource_Versions'}
-       </li>
-       <li>
+           <input type="submit" name="verify" value="$lt{'vc'}" />$help{'Verify_Content'}<br />
+           <input type="submit" name="versions" value="$lt{'cv'}" />$help{'Check_Resource_Versions'}<br />
            $dumpbut
-       </li>
-       <li>
            $exportbut
-       </li>
-       <li>
           <input type="submit" name="listsymbs" value="$lt{'ls'}" />
-        </li>
-        <li>
-          <input type="hidden" name="folder" value="$env{'form.folder'}" />
+          <input type="hidden" name="folder" value="$env{'form.folder'}" /><br />
           <input type="submit" name="docslog" value="$lt{'sl'}" />
-        </li>
-   </ul>
  </form>
-<!-- <div style="clear: both; height: 0px;">&nbsp;</div>-->
 ENDOPTIONFORM
 
 }
 
 
 sub generate_edit_table {
-    my ($tid,$content,$navigation,$varcd,$namehash_ref,$orderhash_ref) = @_;
+    my ($tid,$varcd,$namehash_ref,$orderhash_ref) = @_;
     my %namehash = %{$namehash_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}).'</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,3).$tid.'\', \'navigation'.$tid.'\',\'content'.$tid.'\');">'.&mt($orderhash{$name}).'</li>';
         }
     }
     $form .= '</ul>';
-    $form .= '<div id="'.$content.$tid.'" 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="'.$tid.$field.'" class="LC_ContentBox" style="display: none;">'.$namehash{$field}.'</div>';
+        $form .= '<div id="'.substr($field,0,3).$tid.'" class="LC_ContentBox" style="display: none;">'.$namehash{$field}.'</div>';
       }
     $form .= '</div></div>';
     
@@ -3384,7 +3362,7 @@ sub editing_js {
                                           p_mdb => 'Title for the Drop Box',
                                           p_mbb => 'Title for the Discussion Board',
                                           p_mab => "Enter user:domain for User's Personal Information Page",
-                                          p_mab2 => "Personal Information Page [_99]",
+                                          p_mab2 => 'Personal Information Page of ',
                                           p_mab_alrt1 => 'Not a valid user:domain',
                                           p_mab_alrt2 => 'Please enter both user and domain in the format user:domain',
                                           p_chn => 'New Title',