';
+ return $menu;
}
sub display_help_mainpage {
- my ($r,$color,$function,$faq,$bug,$topic,$component_url,$origurl,$bugurl,$faqbaseurl,$requestmail) = @_;
+ my ($r,$faq,$bug,$topic,$component_url,$origurl,$bugurl,$faqbaseurl,$requestmail,$stayOnPage) = @_;
my %lt =&Apache::lonlocal::texthash(
'topp' => 'Topic Page',
@@ -219,12 +398,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',
- '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',
'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',
@@ -232,21 +407,28 @@ sub display_help_mainpage {
'suim' => ' Suggested improvements may include additional functionality, improved usability, or changes to wording used in LON-CAPA pages, including the embedded help system.'
);
- my %body_layout =
- ('topmargin' => "0",
- 'marginheight' => "0");
- my $start_page =
- &Apache::loncommon::start_page('Help Content',undef,
- {'function' => $function,
- 'add_entries' => \%body_layout,
- 'only_body' => 1,});
- $r->print($start_page);
- $r->print($lt{'chen'});
- if ($requestmail =~ m/^[^\@]+\@[^\@]+$/) {
+ if ($stayOnPage) {
+ $r->print(&Apache::loncommon::start_page('Help Content',undef,
+ {'no_secondary_menu' => 1,}));
+ } else {
+ $r->print(&Apache::loncommon::start_page('Help Content',undef,
+ {'only_body' => 1,}));
+ }
+ my $target = '_top';
+ if ((($env{'request.lti.login'}) && ($env{'request.lti.target'} eq 'iframe')) ||
+ (($env{'request.deeplink.login'}) && ($env{'request.deeplink.target'} eq '_self'))) {
+ $target = '_parent';
+ }
+ if ($stayOnPage) {
+ $r->print('
');
+ }
+ $r->print(''.$lt{'chen'});
+ if ($requestmail) {
$r->print(', '.$lt{'orto'});
} else {
$r->print(".");
}
+ $r->print('');
if ($topic) {
if ( ($component_url) || ($env{'user.adv'}) ) {
if ($component_url) {
@@ -256,22 +438,21 @@ 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("
");
}
@@ -295,6 +476,9 @@ sub display_help_mainpage {