--- loncom/interface/lonhelpmenu.pm 2005/04/07 06:56:23 1.20 +++ loncom/interface/lonhelpmenu.pm 2006/05/30 12:46:09 1.25 @@ -32,6 +32,8 @@ 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) = @_; @@ -71,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'); @@ -84,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 } - my $html=&Apache::lonxml::xmlbegin(); - $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 { @@ -177,15 +174,9 @@ END
END - if (($component_url) || ($env{'user.adv'})) { - if ($component_url) { - $r->print(" - '); + if ($component_url) { + $r->print("'); } if ($requestmail =~ m/^[^\@]+\@[^\@]+$/) { $r->print(' @@ -232,24 +223,22 @@ END
"); - } elsif ($env{'user.adv'}) { - $r->print(' '); - } - $r->print(' - (Topic help) Topic help ". + '(Topic help) Topic help  
- - 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.', @@ -260,14 +249,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 +277,7 @@ END } elsif ($env{'user.adv'}) { $r->print(" +
  •  $lt{'noto'} $topic

    • $lt{'coth'}

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

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

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

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