--- loncom/interface/londocs.pm	2009/02/03 18:31:59	1.335
+++ loncom/interface/londocs.pm	2009/02/10 14:23:18	1.339
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.335 2009/02/03 18:31:59 ehlerst Exp $
+# $Id: londocs.pm,v 1.339 2009/02/10 14:23:18 ehlerst Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2764,7 +2764,7 @@ sub handler {
                 'sipr' => 'Simple Problem',
                 'drbx' => 'Drop Box',
                 'scuf' => 'Score Upload Form',
-                'bull' => 'Bulletin Board',
+                'bull' => 'Discussion Board',
                 'mypi' => 'My Personal Info',
                 'grpo' => 'Group Files',
                 'rost' => 'Course Roster',
@@ -2872,12 +2872,23 @@ ERFORM
            $containertag = '<input type="hidden" name="folderpath" value="" />';
            $uploadtag = '<input type="hidden" name="folderpath" value="'.&HTML::Entities::encode($folderpath,'<>&"').'" />';
        }
-
-       $r->print(&generate_admin_options($containertag,$uploadtag,\%lt,\%help,\%env));
+	$r->print(<<HIDDENFORM);
+	<form name="renameform" method="post" action="/adm/coursedocs">
+   <input type="hidden" name="title" />
+   <input type="hidden" name="cmd" />
+   <input type="hidden" name="markcopy" />
+   <input type="hidden" name="copyfolder" />
+   $containertag
+ </form>
+ <form name="simpleedit" method="post" action="/adm/coursedocs">
+   <input type="hidden" name="importdetail" value="" />
+   $uploadtag
+ </form>
+HIDDENFORM
     }
 # --------------------------------------------------------- Main tab structure
     my $activeClass = 1;
-    $r->print('<div class="LC_ContentBoxSpecial"><ul class="LC_TabContent" id="mainnav">');
+    $r->print('<ul class="LC_TabContentBigger" id="mainnav">');
     if (($standard) && ($allowed) && (!$forcesupplement)) {
 	my $active = '';
         if($activeClass == 1){
@@ -2893,7 +2904,8 @@ ERFORM
         }
 	$r->print('<li '.$active.'onclick="javascript:showPage(this,\'Supplemental Course Documents\',\'mainnav\',\'maincoursedoc\');">'.&mt('Supplemental Course Documents').'</li>');
     }
-    $r->print('</ul><div id="maincoursedoc" style="margin:0 0;padding:0 0;">');
+    $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)) {
        my $active = 'style="display: none;"';
@@ -3154,6 +3166,7 @@ $r->print('</div>');
           $active = 'style="display: block;"';
        }
        $r->print('<div class="LC_ContentBox" id="Supplemental Course Documents" '.$active.'>');
+	&changewarning($r);
        my $folder=$env{'form.folder'};
        unless ($folder=~/^supplemental/) {
 	   $folder='supplemental';
@@ -3264,9 +3277,12 @@ my $error = &editor($r,$coursenum,$cours
        if ($error) {
            $r->print('<p><span class="LC_error">'.$error.'</span></p>');
        }
-$r->print('</div)');
+$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('
@@ -3292,24 +3308,18 @@ $r->print('</div>');
 } 
 
 sub generate_admin_options {
-  my ($containertag,$uploadtag,$lt_ref,$help_ref,$env_ref) = @_;
-  my %lt = %{$lt_ref};
+  my ($containertag,$uploadtag,$help_ref,$env_ref) = @_;
+ my %lt=&Apache::lonlocal::texthash(
+                                         'vc' => 'Verify Content',
+                                         'cv' => 'Check/Set Resource Versions',
+                                         'ls' => 'List Symbs',
+                                         'sl' => 'Show Log'
+                                          );
   my %help = %{$help_ref};
   my %env = %{$env_ref};
   my $dumpbut=&dumpbutton();
   my $exportbut=&exportbutton();
   return (<<ENDOPTIONFORM);
- <form name="renameform" method="post" action="/adm/coursedocs">
-   <input type="hidden" name="title" />
-   <input type="hidden" name="cmd" />
-   <input type="hidden" name="markcopy" />
-   <input type="hidden" name="copyfolder" />
-   $containertag
- </form>
- <form name="simpleedit" method="post" action="/adm/coursedocs">
-   <input type="hidden" name="importdetail" value="" />
-   $uploadtag
- </form>
  <form action="/adm/coursedocs" method="post" name="courseverify">
    <ul style="list-style-type:none">
        <li>
@@ -3333,7 +3343,7 @@ sub generate_admin_options {
         </li>
    </ul>
  </form>
- <div style="clear: both; height: 0px;">&nbsp;</div>
+<!-- <div style="clear: both; height: 0px;">&nbsp;</div>-->
 ENDOPTIONFORM
 
 }
@@ -3356,6 +3366,7 @@ sub generate_edit_table {
             $form .= '<li onclick="javascript:showPage(this, \''.$tid.$orderhash{$name}.'\', \''.$navigation.$tid.'\',\''.$content.$tid.'\');">'.&mt($orderhash{$name}).'</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>';
@@ -3377,7 +3388,7 @@ sub editing_js {
                                           p_msp => 'Title for the Page',
                                           p_msb => 'Title for the Problem',
                                           p_mdb => 'Title for the Drop Box',
-                                          p_mbb => 'Title for the Bulletin Board',
+                                          p_mbb => 'Title for the Discussion Board',
                                           p_mab => "Enter user:domain for User's 'About Me' Page",
                                           p_mab2 => "About [_99]",
                                           p_mab_alrt1 => 'Not a valid user:domain',