--- loncom/interface/lonhelpmenu.pm 2004/12/20 21:11:41 1.18 +++ loncom/interface/lonhelpmenu.pm 2006/06/26 21:54:34 1.26 @@ -31,6 +31,9 @@ use lib qw(/home/httpd/lib/perl); 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) = @_; @@ -41,14 +44,14 @@ sub handler { 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'}; - my $function = $ENV{'form.function'}; - my $component_help = $ENV{'form.component_help'}; - my $origurl = $ENV{'form.origurl'}; - my $stayOnPage = $ENV{'form.stayonpage'}; + my $color = $env{'form.color'}; + my $faq = $env{'form.faq'}; + my $bug = $env{'form.bug'}; + my $topic = $env{'form.topic'}; + my $function = $env{'form.function'}; + my $component_help = $env{'form.component_help'}; + my $origurl = $env{'form.origurl'}; + my $stayOnPage = $env{'form.stayonpage'}; my $component_url = $component_help; if ($component_url) { $component_url = '/adm/help/'.$component_url.'.hlp'; @@ -60,9 +63,9 @@ sub handler { } my $faqbaseurl = $Apache::lonnet::perlvar{'FAQHost'}; my $requestmail = $Apache::lonnet::perlvar{'lonSupportEMail'}; - if ($ENV{'form.page'} eq 'banner') { + if ($env{'form.page'} eq 'banner') { &display_help_banner($r,$color,$function,$faq,$bug,$topic,$component_url,$origurl,$bugurl,$faqbaseurl,$requestmail,$stayOnPage); - } elsif ($ENV{'form.page'} eq 'body') { + } elsif ($env{'form.page'} eq 'body') { &display_help_mainpage($r,$color,$function,$faq,$bug,$topic,$component_url,$origurl,$bugurl,$faqbaseurl,$requestmail); } return OK; @@ -70,8 +73,6 @@ sub handler { 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'); @@ -83,7 +84,7 @@ sub display_help_banner { } my $scripttag = ''; if ($requestmail =~ m/^[^\@]+\@[^\@]+$/) { - my $displayurl = &Apache::lonnet::escape($origurl); + my $displayurl = &escape($origurl); $scripttag = (<<"SCRIPT_ONE"); SCRIPT_TWO } - $r->print(< - -Help Banner - -$scripttag - -$bodytag -END + + 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); + if ($stayOnPage) { $r->print(''); } else { @@ -163,40 +162,25 @@ END
 
  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(' '); } - if ($faq && $ENV{'user.adv'}) { + if ($faq && $env{'user.adv'}) { $r->print(<  (FAQ) FAQ  END } - if ($ENV{'user.adv'}) { + if ($env{'user.adv'}) { $r->print(< (Report a bug) Report a bug  END @@ -211,15 +195,6 @@ END END } $r->print(< - -
-
-
@@ -230,24 +205,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 %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.', @@ -259,13 +232,15 @@ sub display_help_mainpage { 'suim' => ' Suggested improvements may include additional functionality, improved usability, or changes to wording used in LON-CAPA pages, including the embedded help system.' ); - $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'}); @@ -273,7 +248,7 @@ END $r->print("."); } if ($topic) { - if ( ($component_url) || ($ENV{'user.adv'}) ) { + if ( ($component_url) || ($env{'user.adv'}) ) { if ($component_url) { $r->print("

$lt{'disp'}

"); - } elsif ($ENV{'user.adv'}) { + } elsif ($env{'user.adv'}) { $r->print(" +
  •  $lt{'noto'} $topic

    • $lt{'coth'}

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

    $lt{'suhr'}"); - unless ($ENV{'user.adv'}) { + unless ($env{'user.adv'}) { $r->print('
    '.&mt('Note').': '.$lt{'stuq'}.'. '.&mt('This can be done using the').' '.&mt('COM').' '.&mt('button, or the FDBK button when viewing a content page.')); } $r->print("

    "); } - if ($faqbaseurl && $ENV{'user.adv'}) { + if ($faqbaseurl && $env{'user.adv'}) { if (!defined($faq) ||$faq eq '') { $faq = '1'; } @@ -311,7 +286,7 @@ END

    $lt{'tfaq'}

    "); } - if ($bugurl && $ENV{'user.adv'}) { + if ($bugurl && $env{'user.adv'}) { $bugurl .= '?'.$bug; $r->print("