--- loncom/interface/londocs.pm	2009/03/05 10:56:59	1.352
+++ loncom/interface/londocs.pm	2009/03/10 18:49:22	1.354
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.352 2009/03/05 10:56:59 bisitz Exp $
+# $Id: londocs.pm,v 1.354 2009/03/10 18:49:22 tempelho 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',
@@ -2905,7 +2905,6 @@ HIDDENFORM
         }
 	$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('</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)) {
@@ -3108,7 +3107,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,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.'<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';
@@ -3259,8 +3258,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';
@@ -3276,9 +3275,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('
@@ -3317,29 +3313,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
 
 }