--- loncom/interface/lonhelpmenu.pm 2006/06/26 22:06:19 1.27 +++ loncom/interface/lonhelpmenu.pm 2009/02/13 17:20:29 1.37 @@ -1,6 +1,8 @@ # The LearningOnline Network with CAPA # generate frame-based help system # +# $Id: lonhelpmenu.pm,v 1.37 2009/02/13 17:20:29 bisitz Exp $ +# # Copyright Michigan State University Board of Trustees # # This file is part of the LearningOnline Network with CAPA (LON-CAPA). @@ -37,7 +39,7 @@ use LONCAPA; sub handler { my ($r) = @_; - &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['page','function','faq','bug','topic','component_help','origurl','stayonpage']); + &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['page','faq','bug','topic','component_help','origurl','stayonpage']); &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; @@ -47,7 +49,6 @@ sub handler { 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'}; @@ -63,15 +64,15 @@ sub handler { my $faqbaseurl = $Apache::lonnet::perlvar{'FAQHost'}; my $requestmail = $Apache::lonnet::perlvar{'lonSupportEMail'}; if ($env{'form.page'} eq 'banner') { - &display_help_banner($r,$function,$faq,$bug,$topic,$component_url,$origurl,$bugurl,$faqbaseurl,$requestmail,$stayOnPage); + &display_help_banner($r,$faq,$bug,$topic,$component_url,$origurl,$bugurl,$faqbaseurl,$requestmail,$stayOnPage); } elsif ($env{'form.page'} eq 'body') { - &display_help_mainpage($r,$function,$faq,$bug,$topic,$component_url,$origurl,$bugurl,$faqbaseurl,$requestmail); + &display_help_mainpage($r,$faq,$bug,$topic,$component_url,$origurl,$bugurl,$faqbaseurl,$requestmail); } return OK; } sub display_help_banner { - my ($r,$function,$faq,$bug,$topic,$component_url,$origurl,$bugurl,$faqbaseurl,$requestmail,$stayOnPage) = @_; + my ($r,$faq,$bug,$topic,$component_url,$origurl,$bugurl,$faqbaseurl,$requestmail,$stayOnPage) = @_; my $location=&Apache::loncommon::lonhttpdurl("/adm"); my $scripttag = ''; if ($requestmail =~ m/^[^\@]+\@[^\@]+$/) { @@ -84,7 +85,7 @@ function gohelpdesk() { actiontype = parent.bodyframe.document.logproblem.action.value; } catch(error) { - parent.bodyframe.location = "/adm/support?origurl=$displayurl&function=$function"; + parent.bodyframe.location = "/adm/support?origurl=$displayurl"; return; } if (actiontype) { @@ -99,7 +100,7 @@ function gohelpdesk() { return; } } - parent.bodyframe.location = "/adm/support?origurl=$displayurl&function=$function"; + parent.bodyframe.location = "/adm/support?origurl=$displayurl"; return; } } @@ -138,15 +139,14 @@ SCRIPT_TWO 'marginheight' => "1"); my $start_page = &Apache::loncommon::start_page('',$scripttag, - {'function' => $function, - 'add_entries' => \%body_layout, + {'add_entries' => \%body_layout, 'only_body' => 1,}); $r->print($start_page); - my $width = ($stayOnPage) ? '700' : '600'; - + my $width = ($stayOnPage) ? '95%' : '600'; $r->print(''); + my $general_help = &Apache::loncommon::general_help(); $r->print(< @@ -154,34 +154,35 @@ SCRIPT_TWO
  LON-CAPA help/support
 
+ END if ($component_url) { - $r->print("'); + $r->print("'); } if ($requestmail =~ m/^[^\@]+\@[^\@]+$/) { $r->print(' - '); + '); } if ($faq && $env{'user.adv'}) { $r->print(< -  (FAQ) FAQ  + END } if ($env{'user.adv'}) { $r->print(< (Report a bug) Report a bug  + END } if ($stayOnPage) { $r->print(< (Return to last location) Return to last location  + END } else { $r->print(< (Close window) Close  + END } $r->print(< - + @@ -200,7 +201,7 @@ END } sub display_help_mainpage { - my ($r,$function,$faq,$bug,$topic,$component_url,$origurl,$bugurl,$faqbaseurl,$requestmail) = @_; + my ($r,$faq,$bug,$topic,$component_url,$origurl,$bugurl,$faqbaseurl,$requestmail) = @_; my %lt =&Apache::lonlocal::texthash( 'topp' => 'Topic Page', @@ -210,8 +211,6 @@ sub display_help_mainpage { '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' => 'Topical help system for', - 'noto' => 'There is no specific topical help item 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.', 'stuq' => 'Questions about course content should not be directed to the support team, but instead should be sent to the course instructor', @@ -227,16 +226,16 @@ sub display_help_mainpage { 'marginheight' => "0"); my $start_page = &Apache::loncommon::start_page('Help Content',undef, - {'function' => $function, - 'add_entries' => \%body_layout, + {'add_entries' => \%body_layout, 'only_body' => 1,}); $r->print($start_page); - $r->print($lt{'chen'}); + $r->print(''.$lt{'chen'}); if ($requestmail =~ m/^[^\@]+\@[^\@]+$/) { $r->print(', '.$lt{'orto'}); } else { $r->print("."); } + $r->print(''); if ($topic) { if ( ($component_url) || ($env{'user.adv'}) ) { if ($component_url) { @@ -246,18 +245,13 @@ sub display_help_mainpage {

$lt{'disp'}

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