--- loncom/interface/lonhelpmenu.pm 2004/07/03 19:05:12 1.2 +++ loncom/interface/lonhelpmenu.pm 2004/09/13 13:31:52 1.11 @@ -33,20 +33,21 @@ use Apache::loncommon(); sub handler { my ($r) = @_; - &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['page','color','function','faq','bug','topic','component_help','origurl']); + &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['page','color','function','faq','bug','topic','component_help','origurl','stayonpage']); &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; if ($r->header_only) { return OK; } - my $color = &Apache::lonnet::unescape($ENV{'form.color'}); - my $faq = &Apache::lonnet::unescape($ENV{'form.faq'}); - my $bug = &Apache::lonnet::unescape($ENV{'form.bug'}); - my $topic = &Apache::lonnet::unescape($ENV{'form.topic'}); - my $function = &Apache::lonnet::unescape($ENV{'form.function'}); - my $component_help = &Apache::lonnet::unescape($ENV{'form.component_help'}); + 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,22 +60,27 @@ sub handler { my $faqbaseurl = $Apache::lonnet::perlvar{'FAQHost'}; my $requestmail = $Apache::lonnet::perlvar{'lonSupportEMail'}; if ($ENV{'form.page'} eq 'banner') { - &display_help_banner ($r,$color,$function,$faq,$bug,$topic,$component_url,$origurl,$bugurl,$faqbaseurl,$requestmail); + &display_help_banner($r,$color,$function,$faq,$bug,$topic,$component_url,$origurl,$bugurl,$faqbaseurl,$requestmail,$stayOnPage); } elsif ($ENV{'form.page'} eq 'body') { - &display_help_mainpage ($r,$color,$function,$faq,$bug,$topic,$component_url,$origurl,$bugurl,$faqbaseurl,$requestmail); + &display_help_mainpage($r,$color,$function,$faq,$bug,$topic,$component_url,$origurl,$bugurl,$faqbaseurl,$requestmail); } return OK; } sub display_help_banner { - my ($r,$color,$function,$faq,$bug,$topic,$component_url,$origurl,$bugurl,$faqbaseurl,$requestmail) = @_; + 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'); my $pagecolor = &Apache::loncommon::designparm($function.'.pgbg'); my $tablecolor = &Apache::loncommon::designparm($function.'.tabbg'); + if (($tablecolor eq '') || ($tablecolor eq '#FFFFFF')) { + $tablecolor = '#CCCCFF'; + } + $r->print(< @@ -87,18 +93,15 @@ sub display_help_banner { a:hover {text-decoration: underline; color: $vlinkcolor; } --> - $bodytag - +END + if ($stayOnPage) { + $r->print('
'); + } else { + $r->print('
'); + } + $r->print(< '); +  Topic help '); } - if ($requestmail) { + if ($requestmail =~ m/^[^\@]+\@[^\@]+$/) { $r->print(' - '); + '); } - if ($ENV{'user.adv'}) { + if ($faq && $ENV{'user.adv'}) { $r->print(<   FAQ  +END + } + if ($ENV{'user.adv'}) { + $r->print(<  Report a bug  END } + if ($stayOnPage) { + $r->print(<  Return to last location  +END + } else { + $r->print(<  Close  +END + } $r->print(< Close 
  @@ -120,25 +123,37 @@ END $r->print("  "); } elsif ($ENV{'user.adv'}) { - $r->print(' '); + $r->print(' '); } $r->print(' - (Topic help) Topic help  (Ask helpdesk) Ask helpdesk  (Ask helpdesk) Ask helpdesk 
@@ -166,24 +181,36 @@ 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=~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', + '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.', + '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.' + ); + $r->print(< - Help Content - + $lt{'heco'} $bodytag -Choose an entry below to go directly to a relevant help page END - if ($requestmail) { - $r->print(", or to submit a help request to the LON-CAPA support staff at you institution."); + $r->print($lt{'chen'}); + if ($requestmail =~ m/^[^\@]+\@[^\@]+$/) { + $r->print(', '.$lt{'orto'}); } else { $r->print("."); } @@ -192,25 +219,24 @@ END if ($component_url) { $r->print(" -

Display the page in the inline help system that covers this topic.

+

$lt{'disp'}

"); } elsif ($ENV{'user.adv'}) { $r->print(" -

Consult the inline help system for this topic.

"); +
  •  $lt{'inhs'} $topic
    • +

    $lt{'coth'}

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

    Submit a help request to the team responsible for LON-CAPA support at this institution.

    -