--- loncom/interface/lonhelpmenu.pm 2007/09/05 05:03:41 1.33 +++ 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,52 +142,49 @@ 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('
+ $r->print(' + | |
- |