--- loncom/interface/lonhelpmenu.pm 2006/07/20 22:44:04 1.32 +++ loncom/interface/lonhelpmenu.pm 2013/08/08 14:31:54 1.42 @@ -1,6 +1,8 @@ # The LearningOnline Network with CAPA # generate frame-based help system # +# $Id: lonhelpmenu.pm,v 1.42 2013/08/08 14:31:54 raeburn Exp $ +# # Copyright Michigan State University Board of Trustees # # This file is part of the LearningOnline Network with CAPA (LON-CAPA). @@ -55,9 +57,9 @@ sub handler { $component_url = '/adm/help/'.$component_url.'.hlp'; } my $bugurl = $Apache::lonnet::perlvar{'BugzillaHost'}; - $bugurl .= 'enter_bug.cgi?product=LON-CAPA&bug_file_loc='.$origurl; + $bugurl .= 'enter_bug.cgi?product=LON-CAPA&bug_file_loc='.$origurl; if ($bug) { - $bugurl .= '&component='.$bug; + $bugurl .= '&component='.$bug; } my $faqbaseurl = $Apache::lonnet::perlvar{'FAQHost'}; my $requestmail = $Apache::lonnet::perlvar{'lonSupportEMail'}; @@ -72,11 +74,14 @@ sub handler { sub display_help_banner { my ($r,$faq,$bug,$topic,$component_url,$origurl,$bugurl,$faqbaseurl,$requestmail,$stayOnPage) = @_; my $location=&Apache::loncommon::lonhttpdurl("/adm"); + my $dom = $env{'request.role.domain'}; + my %helpconfig = &Apache::lonnet::get_dom('configuration',['helpsettings'],$dom); my $scripttag = ''; if ($requestmail =~ m/^[^\@]+\@[^\@]+$/) { my $displayurl = &escape($origurl); $scripttag = (<<"SCRIPT_ONE"); SCRIPT_TWO } @@ -136,63 +142,58 @@ SCRIPT_TWO 'topmargin' => "1", 'marginheight' => "1"); my $start_page = - &Apache::loncommon::start_page('',$scripttag, - {'add_entries' => \%body_layout, - 'only_body' => 1,}); + &Apache::loncommon::start_page('Help',$scripttag, + {'only_body' => 1,}); $r->print($start_page); my $width = ($stayOnPage) ? '95%' : '600'; - $r->print(''); my $general_help = &Apache::loncommon::general_help(); - $r->print(< - + $r->print(' + + - + - +
 
  -
  LON-CAPA help/support +
('.&mt('LON-CAPA help/support').')  '.&mt('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 + $r->print(' + '); } if ($env{'user.adv'}) { - $r->print(< (Report a bug) Report a bug  -END + if ($helpconfig{'helpsettings'}{'submitbugs'} eq '1' || + $helpconfig{'helpsettings'}{'submitbugs'} eq '' ) { + $r->print(' + '); + } } if ($stayOnPage) { - $r->print(< (Return to last location) Return to last location  -END + $r->print(' + '); } else { - $r->print(< (Close window) Close  -END + $r->print(' + '); } $r->print(<
  
 
@@ -210,10 +211,8 @@ sub display_help_mainpage { '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' => 'Topical help system for', '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', @@ -255,7 +254,11 @@ sub display_help_mainpage {

$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('
'. + &mt('[_1]Note[_2]: questions about course content should not be directed to the support team, but instead should be sent to the course instructor.'). + ' '. + &mt('This can be done by clicking the [_1]Communicate[_2] link or the "Send Feedback" link when viewing a content page.', + '','')); } $r->print("

"); }