--- loncom/interface/lonhelpmenu.pm 2005/06/03 15:47:29 1.21
+++ 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 {
@@ -226,17 +223,14 @@ END
|
-