--- loncom/interface/londocs.pm	2009/02/04 13:03:44	1.336
+++ 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.336 2009/02/04 13:03:44 schafran Exp $
+# $Id: londocs.pm,v 1.343 2009/02/16 10:33:32 biermanm Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1899,6 +1899,7 @@ END
     }
     
     my $orig_url = $url;
+    $orig_url=~s{http(:|:)//https(:|:)//}{https$2//};
     my $external = ($url=~s{^http(|s)(:|:)//}{/adm/wrapper/ext/});
     if ((!$isfolder) && ($residx) && ($folder!~/supplemental/) && (!$ispage)) {
 	my $symb=&Apache::lonnet::symbclean(
@@ -2760,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',
@@ -2872,12 +2873,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 +2905,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;"';
@@ -2916,11 +2929,6 @@ ERFORM
        } 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.
@@ -3051,6 +3059,8 @@ NASOFORM
 	</form>
 NROSTFORM
 
+my $specialdocumentsform;
+
        unless ($env{'form.pagepath'}) {
 	   my $path = &HTML::Entities::encode($env{'form.folderpath'},'<>&"');
 
@@ -3102,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',
@@ -3137,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'}) {
        }
     }
@@ -3264,9 +3272,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 +3303,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 +3338,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
 
 }
@@ -3341,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">';
@@ -3356,6 +3359,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>';