--- loncom/interface/londocs.pm	2009/02/12 11:35:07	1.340
+++ loncom/interface/londocs.pm	2009/02/16 10:33:32	1.343
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.340 2009/02/12 11:35:07 raeburn Exp $
+# $Id: londocs.pm,v 1.343 2009/02/16 10:33:32 biermanm Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2761,7 +2761,7 @@ sub handler {
                 'extr' => 'External Resource',
                 'syll' => 'Syllabus',
                 'navc' => 'Navigate Contents',
-                'sipa' => 'Simple Page',
+                'sipa' => 'Simple Course Page',
                 'sipr' => 'Simple Problem',
                 'drbx' => 'Drop Box',
                 'scuf' => 'Score Upload Form',
@@ -2929,11 +2929,6 @@ HIDDENFORM
        } else {
            #$postexec='self.close();';
        }
-       $hadchanges=0;
-       if ($hadchanges) {
-	   &mark_hash_old();
-       }
-       &changewarning($r,$postexec);
        my $folderseq='/uploaded/'.$coursedom.'/'.$coursenum.'/default_'.time.
                      '.sequence';
        my $pageseq = '/uploaded/'.$coursedom.'/'.$coursenum.'/default_'.time.
@@ -3064,6 +3059,8 @@ NASOFORM
 	</form>
 NROSTFORM
 
+my $specialdocumentsform;
+
        unless ($env{'form.pagepath'}) {
 	   my $path = &HTML::Entities::encode($env{'form.folderpath'},'<>&"');
 
@@ -3115,23 +3112,16 @@ NSYLFORM
 	</form>
 NGFFORM
 
-
-        my $specialdocumentsform=(<<SPDOFORM);
-	<br />$newfolderform
-	<br />$newpageform
-	<br />$newsylform
-	<br />$newnavform
-	<br />$newsmppageform
-	<br />$newsmpproblemform
-	<br />$newdropboxform
-	<br />$newexuploadform
-	<br />$newbulform
-	<br />$newaboutmeform
-	<br />$newaboutsomeoneform
-	<br />$newgroupfileform
-	<br />$newrosterform
-SPDOFORM
-
+	$specialdocumentsform="<br />$newfolderform<br />$newpageform<br />$newsylform<br />$newgroupfileform";
+      }
+	$specialdocumentsform.="<br />$newnavform<br />$newsmppageform
+				<br />$newsmpproblemform<br />$newdropboxform
+       				<br />$newexuploadform<br />$newbulform
+       				<br />$newaboutmeform<br />$newaboutsomeoneform
+       				<br />$newrosterform";
+if($env{'form.pagepath'}) {
+	$specialdocumentsform="<br />$newsmpproblemform<br />$newexuploadform";
+}
 
 my %orderhash = (
                 'aa' => 'New Document',
@@ -3150,13 +3140,18 @@ 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)); 
-my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$type);
+$r->print(&generate_edit_table($tid,$content,$navigation,$varcd,\%namehash,\%orderhash));
+ $hadchanges=0;
+        my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$type);
        if ($error) {
            $r->print('<p><span class="LC_error">'.$error.'</span></p>');
        }
+       if ($hadchanges) {
+           &mark_hash_old();
+       }
+
+       &changewarning($r,'');
 $r->print('</div>');
-      }
        if ($env{'form.pagepath'}) {
        }
     }
@@ -3167,7 +3162,6 @@ $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';
@@ -3352,11 +3346,9 @@ ENDOPTIONFORM
 
 sub generate_edit_table {
     my ($tid,$content,$navigation,$varcd,$namehash_ref,$orderhash_ref) = @_;
-    my %namehash = %{$namehash_ref};             #name verlinkt mit id
-    my %orderhash = %{$orderhash_ref};           #name mit kürzel verlinkt mit name
-    my $form;
-
-    
+    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">';