--- loncom/interface/londocs.pm	2009/03/03 16:57:24	1.350
+++ loncom/interface/londocs.pm	2009/03/10 22:15:43	1.355
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.350 2009/03/03 16:57:24 tempelho Exp $
+# $Id: londocs.pm,v 1.355 2009/03/10 22:15:43 ehlerst Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -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,23 +2889,22 @@ 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.suppactive'})) {
         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,\'Main Course Documents\',\'mainnav\',\'maincoursedoc\');">'.&mt('Main Course Documents').'</li>');
+    $active = '';
+    if (!$forcestandard || $env{'form.suppactive'} ) {
         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)) {
@@ -3060,6 +3059,7 @@ NASOFORM
 NROSTFORM
 
 my $specialdocumentsform;
+my $newfolderform;
 
        unless ($env{'form.pagepath'}) {
 	   my $path = &HTML::Entities::encode($env{'form.folderpath'},'<>&"');
@@ -3076,7 +3076,7 @@ my $specialdocumentsform;
 	</form>
 NPFORM
 
-	my $newfolderform=(<<NFFORM);
+	$newfolderform=(<<NFFORM);
 	<form action="/adm/coursedocs" method="post" name="newfolder">
 	<input type="hidden" name="folderpath" value="$path" />
 	<input type="hidden" name="importdetail" value="" />
@@ -3107,12 +3107,12 @@ 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
 
-	$specialdocumentsform="<br />$newfolderform<br />$newpageform<br />$newsylform<br />$newgroupfileform";
+	$specialdocumentsform="<br />$newpageform<br />$newsylform<br />$newgroupfileform";
       }
 	$specialdocumentsform.="<br />$newnavform<br />$newsmppageform
 				<br />$newsmpproblemform<br />$newdropboxform
@@ -3127,14 +3127,14 @@ my %orderhash = (
                 'aa' => 'New Document',
                 'bb' => 'Published Documents',
                 'cc' => 'Special Documents',
-		'dd' => 'More Options',
+		'dd' => 'More Tools',
                 'zz' => 'Hide all Options',
                 );
 my %namehash = (
-                'New Document' => $fileuploadform,
+                'New Document' => $fileuploadform.'<br />'.$newfolderform,
                 'Published Documents' => $simpleeditdefaultform,
                 'Special Documents' => $specialdocumentsform,
-		'More Options' => $extresourcesform.'<br />'.$imspform.'<br />'.$recoverform,
+		'More Tools' => $extresourcesform.'<br />'.$imspform.'<br />'.$recoverform.'<br />'.&generate_admin_options($containertag,$uploadtag,\%help,\%env),
                 );
 my $tid='1';
 my $content='content';
@@ -3192,6 +3192,7 @@ $r->print('</div>');
 	</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'}" />
@@ -3204,6 +3205,7 @@ 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');"
@@ -3217,6 +3219,7 @@ 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');"
@@ -3230,6 +3233,7 @@ 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'}
@@ -3242,6 +3246,7 @@ 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'}
@@ -3258,8 +3263,8 @@ 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';
@@ -3275,9 +3280,6 @@ my $error = &editor($r,$coursenum,$cours
 $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('
@@ -3316,29 +3318,14 @@ 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="verify" value="$lt{'vc'}" />$help{'Verify_Content'}<br />
            <input type="submit" name="versions" value="$lt{'cv'}" />$help{'Check_Resource_Versions'}
-       </li>
-       <li>
-           $dumpbut
-       </li>
-       <li>
-           $exportbut
-       </li>
-       <li>
+           $dumpbut<br />
+           $exportbut<br />
           <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
 
 }
@@ -3383,7 +3370,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',