--- loncom/interface/lonhelpmenu.pm 2006/06/26 21:54:34 1.26 +++ loncom/interface/lonhelpmenu.pm 2006/06/26 22:06:19 1.27 @@ -37,14 +37,13 @@ use LONCAPA; sub handler { my ($r) = @_; - &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['page','color','function','faq','bug','topic','component_help','origurl','stayonpage']); + &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['page','function','faq','bug','topic','component_help','origurl','stayonpage']); &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; if ($r->header_only) { return OK; } - my $color = $env{'form.color'}; my $faq = $env{'form.faq'}; my $bug = $env{'form.bug'}; my $topic = $env{'form.topic'}; @@ -64,24 +63,16 @@ sub handler { my $faqbaseurl = $Apache::lonnet::perlvar{'FAQHost'}; my $requestmail = $Apache::lonnet::perlvar{'lonSupportEMail'}; if ($env{'form.page'} eq 'banner') { - &display_help_banner($r,$color,$function,$faq,$bug,$topic,$component_url,$origurl,$bugurl,$faqbaseurl,$requestmail,$stayOnPage); + &display_help_banner($r,$function,$faq,$bug,$topic,$component_url,$origurl,$bugurl,$faqbaseurl,$requestmail,$stayOnPage); } elsif ($env{'form.page'} eq 'body') { - &display_help_mainpage($r,$color,$function,$faq,$bug,$topic,$component_url,$origurl,$bugurl,$faqbaseurl,$requestmail); + &display_help_mainpage($r,$function,$faq,$bug,$topic,$component_url,$origurl,$bugurl,$faqbaseurl,$requestmail); } return OK; } sub display_help_banner { - my ($r,$color,$function,$faq,$bug,$topic,$component_url,$origurl,$bugurl,$faqbaseurl,$requestmail,$stayOnPage) = @_; - my $fontcolor = &Apache::loncommon::designparm($function.'.font'); - my $alinkcolor = &Apache::loncommon::designparm($function.'.alink'); - my $vlinkcolor = &Apache::loncommon::designparm($function.'.vlink'); - my $pagecolor = &Apache::loncommon::designparm($function.'.pgbg'); - my $tablecolor = &Apache::loncommon::designparm($function.'.tabbg'); + my ($r,$function,$faq,$bug,$topic,$component_url,$origurl,$bugurl,$faqbaseurl,$requestmail,$stayOnPage) = @_; my $location=&Apache::loncommon::lonhttpdurl("/adm"); - if (($tablecolor eq '') || ($tablecolor eq '#FFFFFF')) { - $tablecolor = '#EEEE99'; - } my $scripttag = ''; if ($requestmail =~ m/^[^\@]+\@[^\@]+$/) { my $displayurl = &escape($origurl); @@ -152,16 +143,15 @@ SCRIPT_TWO 'only_body' => 1,}); $r->print($start_page); - if ($stayOnPage) { - $r->print(''); - } else { - $r->print('
'); - } + my $width = ($stayOnPage) ? '700' : '600'; + + $r->print('
'); + $r->print(<
  -
  LON-CAPA help/support +
  LON-CAPA help/support END @@ -210,7 +200,7 @@ END } sub display_help_mainpage { - my ($r,$color,$function,$faq,$bug,$topic,$component_url,$origurl,$bugurl,$faqbaseurl,$requestmail) = @_; + my ($r,$function,$faq,$bug,$topic,$component_url,$origurl,$bugurl,$faqbaseurl,$requestmail) = @_; my %lt =&Apache::lonlocal::texthash( 'topp' => 'Topic Page',