--- loncom/interface/lonhelpmenu.pm 2004/07/13 17:35:58 1.9 +++ loncom/interface/lonhelpmenu.pm 2004/12/20 19:58:41 1.17 @@ -76,11 +76,66 @@ sub display_help_banner { my $vlinkcolor = &Apache::loncommon::designparm($function.'.vlink'); my $pagecolor = &Apache::loncommon::designparm($function.'.pgbg'); my $tablecolor = &Apache::loncommon::designparm($function.'.tabbg'); - + my $location=&Apache::loncommon::lonhttpdurl("/adm"); if (($tablecolor eq '') || ($tablecolor eq '#FFFFFF')) { - $tablecolor = '#CCCCFF'; + $tablecolor = '#EEEE99'; + } + my $scripttag = ''; + if ($requestmail =~ m/^[^\@]+\@[^\@]+$/) { + my $displayurl = &Apache::lonnet::escape($origurl); + $scripttag = (<<"SCRIPT_ONE"); + +SCRIPT_TWO + } $r->print(< @@ -93,6 +148,7 @@ sub display_help_banner { a:hover {text-decoration: underline; color: $vlinkcolor; } --> +$scripttag $bodytag END @@ -105,7 +161,7 @@ END   -
  LON-CAPA help/support +
  LON-CAPA help/support '); + (Topic help) Topic help '); } - if ($requestmail) { + if ($requestmail =~ m/^[^\@]+\@[^\@]+$/) { $r->print(' - '); + '); } if ($faq && $ENV{'user.adv'}) { - $r->print(<print(< -   FAQ  +  (FAQ) FAQ  END } if ($ENV{'user.adv'}) { - $r->print(<  Report a bug  + $r->print(< (Report a bug) Report a bug  END } if ($stayOnPage) { $r->print(<  Return to last location  + END } else { $r->print(<  Close  + END } $r->print(<print($lt{'chen'}); - if ($requestmail) { + if ($requestmail =~ m/^[^\@]+\@[^\@]+$/) { $r->print(', '.$lt{'orto'}); } else { $r->print("."); @@ -231,13 +287,12 @@ END } } } - if ($requestmail) { + if ($requestmail =~ m/^[^\@]+\@[^\@]+$/) { $r->print("

$lt{'suhr'}

-
    "); } if ($faqbaseurl && $ENV{'user.adv'}) { @@ -245,6 +300,7 @@ END $faq = '1'; } $r->print(" +

    $lt{'tfaq'}

@@ -126,31 +182,31 @@ END $r->print(' '); } $r->print(' - (Topic help) Topic help  (Ask helpdesk) Ask helpdesk  (Ask helpdesk) Ask helpdesk  (Return to last location) Return to last location  (Close window) Close