--- loncom/interface/lonhelpmenu.pm 2005/04/07 06:56:23 1.20 +++ loncom/interface/lonhelpmenu.pm 2006/06/26 22:06:19 1.27 @@ -32,17 +32,18 @@ use Apache::Constants qw(:common); use Apache::loncommon(); use Apache::lonlocal; use Apache::lonnet; +use lib '/home/httpd/lib/perl/'; +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'}; @@ -62,29 +63,19 @@ 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 $bodytag = &Apache::loncommon::bodytag('',$function,'rightmargin="0" leftmargin="0" marginwidth="0" topmargin="1" marginheight="1"',1); - $bodytag=~s/[\n\r]/ /g; - 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 = &Apache::lonnet::escape($origurl); + my $displayurl = &escape($origurl); $scripttag = (<<"SCRIPT_ONE"); SCRIPT_TWO } - my $html=&Apache::lonxml::xmlbegin(); - $r->print(< -Help Banner - -$scripttag - -$bodytag -END - if ($stayOnPage) { - $r->print(''); - } else { - $r->print('
'); - } + + my %body_layout = + ('rightmargin' => "0", + 'leftmargin' => "0", + 'marginwidth' => "0", + 'topmargin' => "1", + 'marginheight' => "1"); + my $start_page = + &Apache::loncommon::start_page('',$scripttag, + {'function' => $function, + 'add_entries' => \%body_layout, + 'only_body' => 1,}); + $r->print($start_page); + + my $width = ($stayOnPage) ? '700' : '600'; + + $r->print('
'); + $r->print(<
  -
  LON-CAPA help/support - - -
- - - - -
- - - - -
- - +
  LON-CAPA help/support +
+ END - if (($component_url) || ($env{'user.adv'})) { - if ($component_url) { - $r->print(" - '); + if ($component_url) { + $r->print("'); } if ($requestmail =~ m/^[^\@]+\@[^\@]+$/) { $r->print(' @@ -213,15 +185,6 @@ END END } $r->print(< - -
-
-
@@ -232,24 +195,22 @@ END 		 
- - END + $r->print(&Apache::loncommon::end_page()); } sub display_help_mainpage { - my ($r,$color,$function,$faq,$bug,$topic,$component_url,$origurl,$bugurl,$faqbaseurl,$requestmail) = @_; - my $bodytag = &Apache::loncommon::bodytag('',$function,'topmargin="0" marginheight="0"',1); - $bodytag=~s/[\n\r]/ /g; + my ($r,$function,$faq,$bug,$topic,$component_url,$origurl,$bugurl,$faqbaseurl,$requestmail) = @_; + my %lt =&Apache::lonlocal::texthash( - 'heco' => 'Help Content', 'topp' => 'Topic Page', 'chen' => 'Choose an entry below to go directly to a relevant help page', 'orto' => 'or to submit a help request to the LON-CAPA support staff at your institution.', 'vthp' => 'Visit the help page for ', 'disp' => 'Display the page in the inline help system that covers this topic.', 'crac' => 'Create an account for yourself in the LON-CAPA Bugzilla tracking system, if you wish to report bugs you have encountered in the LON-CAPA software, or if you have suggestions for improvements in LON-CAPA.', - 'inhs' => 'Inline help system for', + 'inhs' => 'Topical help system for', + 'noto' => 'There is no specific topical help item for', 'coth' => 'Consult the inline help system for this topic.', 'cont' => 'Contact the LON-CAPA support team', 'suhr' => 'Submit a help request to the team responsible for LON-CAPA support at this institution.', @@ -260,14 +221,16 @@ sub display_help_mainpage { 'crea' => 'Create an account for yourself in the LON-CAPA Bugzilla tracking system, if you wish to report bugs you have encountered in the LON-CAPA software,or if you have suggestions for improvements in LON-CAPA.', 'suim' => ' Suggested improvements may include additional functionality, improved usability, or changes to wording used in LON-CAPA pages, including the embedded help system.' ); - my $html=&Apache::lonxml::xmlbegin(); - $r->print(< - $lt{'heco'} - -$bodytag -END + + my %body_layout = + ('topmargin' => "0", + 'marginheight' => "0"); + my $start_page = + &Apache::loncommon::start_page('Help Content',undef, + {'function' => $function, + 'add_entries' => \%body_layout, + 'only_body' => 1,}); + $r->print($start_page); $r->print($lt{'chen'}); if ($requestmail =~ m/^[^\@]+\@[^\@]+$/) { $r->print(', '.$lt{'orto'}); @@ -286,7 +249,7 @@ END } elsif ($env{'user.adv'}) { $r->print(" +
  •  $lt{'noto'} $topic

    • $lt{'coth'}

    "); } } @@ -294,7 +257,7 @@ END if ($requestmail =~ m/^[^\@]+\@[^\@]+$/) { $r->print("

    $lt{'suhr'}"); unless ($env{'user.adv'}) { @@ -322,10 +285,7 @@ END

    $lt{'crea'} $lt{'suim'}

    "); } - $r->print(< - -END + $r->print(&Apache::loncommon::end_page()); } 1; 500 Internal Server Error

    Internal Server Error

    The server encountered an internal error or misconfiguration and was unable to complete your request.

    Please contact the server administrator at root@localhost to inform them of the time this error occurred, and the actions you performed just before this error.

    More information about this error may be available in the server error log.