--- loncom/interface/lonhelpmenu.pm 2004/12/04 21:15:33 1.16 +++ loncom/interface/lonhelpmenu.pm 2005/04/07 06:56:23 1.20 @@ -30,6 +30,8 @@ use strict; use lib qw(/home/httpd/lib/perl); use Apache::Constants qw(:common); use Apache::loncommon(); +use Apache::lonlocal; +use Apache::lonnet; sub handler { my ($r) = @_; @@ -40,14 +42,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'; @@ -59,9 +61,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; @@ -78,11 +80,67 @@ sub display_help_banner { 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 + } + my $html=&Apache::lonxml::xmlbegin(); $r->print(< +$html Help Banner +$scripttag $bodytag END @@ -118,11 +177,11 @@ END END - if (($component_url) || ($ENV{'user.adv'})) { + if (($component_url) || ($env{'user.adv'})) { if ($component_url) { $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 @@ -194,15 +253,16 @@ sub display_help_mainpage { '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.', + 'stuq' => 'Questions about course content should not be directed to the support team, but instead should be sent to the course instructor', 'faqo' => 'FAQ-O-Matic Help system', 'tfaq' => 'The FAQ-O-Matic is a compendium of answers provided to common questions asked by users of LON-CAPA over the past couple of years.', 'lbug' => 'LON-CAPA Bugzilla bug/feature request tracking system', '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(< +$html $lt{'heco'} @@ -215,7 +275,7 @@ END $r->print("."); } if ($topic) { - if ( ($component_url) || ($ENV{'user.adv'}) ) { + if ( ($component_url) || ($env{'user.adv'}) ) { if ($component_url) { $r->print("
    @@ -223,7 +283,7 @@ END

$lt{'disp'}

"); - } elsif ($ENV{'user.adv'}) { + } elsif ($env{'user.adv'}) { $r->print("
 "); - } elsif ($ENV{'user.adv'}) { + "); + } elsif ($env{'user.adv'}) { $r->print(' '); } $r->print(' @@ -130,16 +189,16 @@ END } if ($requestmail =~ m/^[^\@]+\@[^\@]+$/) { $r->print(' -  (Ask helpdesk) Ask helpdesk  (Ask helpdesk) Ask helpdesk  $lt{'inhs'} $topic @@ -236,10 +296,13 @@ END -

$lt{'suhr'}

- "); +

$lt{'suhr'}"); + 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'; } @@ -250,7 +313,7 @@ END

$lt{'tfaq'}

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