--- loncom/interface/lonhelpmenu.pm 2004/07/03 19:33:30 1.3
+++ loncom/interface/lonhelpmenu.pm 2004/07/03 20:25:51 1.6
@@ -69,7 +69,7 @@ sub handler {
sub display_help_banner {
my ($r,$color,$function,$faq,$bug,$topic,$component_url,$origurl,$bugurl,$faqbaseurl,$requestmail) = @_;
my $bodytag = &Apache::loncommon::bodytag('',$function,'rightmargin="0" leftmargin="0" marginwidth="0" topmargin="1" marginheight="1"',1);
- $bodytag=~/[\n\r]/ /g;
+ $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');
@@ -120,11 +120,12 @@ END
if ($component_url) {
$r->print("
| ");
- } elsif ($ENV{'user.adv'}) {
+ $r->print('
+ Topic help | ');
+ } elsif (0 && $ENV{'user.adv'}) {
+ #FIXME doing this in JS is problematic since JS can't control frames that go to outside sites
$r->print(' ');
}
- $r->print('
- Topic help | ');
}
if ($requestmail) {
$r->print('
@@ -167,14 +168,14 @@ END
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=~/[\n\r]/ /g;
+ $bodytag=~s/[\n\r]/ /g;
$r->print(<
Help Content