--- loncom/interface/lonhelpmenu.pm 2013/07/19 17:11:09 1.41 +++ loncom/interface/lonhelpmenu.pm 2013/08/08 14:31:54 1.42 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # generate frame-based help system # -# $Id: lonhelpmenu.pm,v 1.41 2013/07/19 17:11:09 bisitz Exp $ +# $Id: lonhelpmenu.pm,v 1.42 2013/08/08 14:31:54 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -57,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'}; @@ -81,6 +81,7 @@ sub display_help_banner { my $displayurl = &escape($origurl); $scripttag = (<<"SCRIPT_ONE"); SCRIPT_TWO } @@ -140,9 +142,8 @@ 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'; @@ -150,40 +151,40 @@ SCRIPT_TWO my $general_help = &Apache::loncommon::general_help(); $r->print(' - -   + +   -
('.&mt('LON-CAPA help/support').')  '.&mt('LON-CAPA help/support').' +
('.&mt('LON-CAPA help/support').')  '.&mt('LON-CAPA help/support').' '); + ('.&mt('General help').') '.&mt('General Help').' '); if ($component_url) { $r->print("'); + '('.&mt('Topic help').') '.$topic.' '); } if ($requestmail =~ m/^[^\@]+\@[^\@]+$/) { $r->print(' - '); + '); } if ($faq && $env{'user.adv'}) { $r->print(' - '); } if ($env{'user.adv'}) { if ($helpconfig{'helpsettings'}{'submitbugs'} eq '1' || $helpconfig{'helpsettings'}{'submitbugs'} eq '' ) { $r->print(' - '); + '); } } if ($stayOnPage) { $r->print(' - '); + '); } else { $r->print(' - '); + '); } $r->print(< @@ -192,7 +193,7 @@ SCRIPT_TWO - +