--- loncom/interface/lonhelpmenu.pm 2005/06/03 15:47:29 1.21 +++ loncom/interface/lonhelpmenu.pm 2006/07/20 22:44:04 1.32 @@ -32,21 +32,21 @@ use Apache::Constants qw(:common); use Apache::loncommon(); use Apache::lonlocal; use Apache::lonnet; +use lib '/home/httpd/lib/perl/'; +use LONCAPA; sub handler { my ($r) = @_; - &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['page','color','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; if ($r->header_only) { return OK; } - my $color = $env{'form.color'}; 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'}; @@ -62,29 +62,19 @@ sub handler { my $faqbaseurl = $Apache::lonnet::perlvar{'FAQHost'}; my $requestmail = $Apache::lonnet::perlvar{'lonSupportEMail'}; if ($env{'form.page'} eq 'banner') { - &display_help_banner($r,$color,$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,$color,$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,$color,$function,$faq,$bug,$topic,$component_url,$origurl,$bugurl,$faqbaseurl,$requestmail,$stayOnPage) = @_; - my $bodytag = &Apache::loncommon::bodytag('',$function,'rightmargin="0" leftmargin="0" marginwidth="0" topmargin="1" marginheight="1"',1); - $bodytag=~s/[\n\r]/ /g; - my $fontcolor = &Apache::loncommon::designparm($function.'.font'); - my $alinkcolor = &Apache::loncommon::designparm($function.'.alink'); - my $vlinkcolor = &Apache::loncommon::designparm($function.'.vlink'); - my $pagecolor = &Apache::loncommon::designparm($function.'.pgbg'); - my $tablecolor = &Apache::loncommon::designparm($function.'.tabbg'); + my ($r,$faq,$bug,$topic,$component_url,$origurl,$bugurl,$faqbaseurl,$requestmail,$stayOnPage) = @_; my $location=&Apache::loncommon::lonhttpdurl("/adm"); - if (($tablecolor eq '') || ($tablecolor eq '#FFFFFF')) { - $tablecolor = '#EEEE99'; - } my $scripttag = ''; if ($requestmail =~ m/^[^\@]+\@[^\@]+$/) { - my $displayurl = &Apache::lonnet::escape($origurl); + my $displayurl = &escape($origurl); $scripttag = (<<"SCRIPT_ONE"); SCRIPT_TWO } - my $html=&Apache::lonxml::xmlbegin(); - $r->print(< -Help Banner - -$scripttag - -$bodytag -END - if ($stayOnPage) { - $r->print(''); - } else { - $r->print('
'); - } + + my %body_layout = + ('rightmargin' => "0", + 'leftmargin' => "0", + 'marginwidth' => "0", + 'topmargin' => "1", + 'marginheight' => "1"); + my $start_page = + &Apache::loncommon::start_page('',$scripttag, + {'add_entries' => \%body_layout, + 'only_body' => 1,}); + $r->print($start_page); + + my $width = ($stayOnPage) ? '95%' : '600'; + + $r->print('
'); + + my $general_help = &Apache::loncommon::general_help(); $r->print(<
  -
  LON-CAPA help/support - - -
- - - - -
- - - - -
- - +
  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(< - -
-
-
@@ -226,17 +196,14 @@ END 		 
- - END + $r->print(&Apache::loncommon::end_page()); } sub display_help_mainpage { - my ($r,$color,$function,$faq,$bug,$topic,$component_url,$origurl,$bugurl,$faqbaseurl,$requestmail) = @_; - my $bodytag = &Apache::loncommon::bodytag('',$function,'topmargin="0" marginheight="0"',1); - $bodytag=~s/[\n\r]/ /g; + my ($r,$faq,$bug,$topic,$component_url,$origurl,$bugurl,$faqbaseurl,$requestmail) = @_; + my %lt =&Apache::lonlocal::texthash( - 'heco' => 'Help Content', 'topp' => 'Topic Page', 'chen' => 'Choose an entry below to go directly to a relevant help page', 'orto' => 'or to submit a help request to the LON-CAPA support staff at your institution.', @@ -244,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', @@ -255,20 +220,22 @@ sub display_help_mainpage { 'crea' => '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.', 'suim' => ' Suggested improvements may include additional functionality, improved usability, or changes to wording used in LON-CAPA pages, including the embedded help system.' ); - my $html=&Apache::lonxml::xmlbegin(); - $r->print(< - $lt{'heco'} - -$bodytag -END - $r->print($lt{'chen'}); + + my %body_layout = + ('topmargin' => "0", + 'marginheight' => "0"); + my $start_page = + &Apache::loncommon::start_page('Help Content',undef, + {'add_entries' => \%body_layout, + 'only_body' => 1,}); + $r->print($start_page); + $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) { @@ -278,18 +245,13 @@ END

$lt{'disp'}

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

$lt{'coth'}

"); } } } if ($requestmail =~ m/^[^\@]+\@[^\@]+$/) { $r->print("

$lt{'suhr'}"); unless ($env{'user.adv'}) { @@ -317,10 +279,7 @@ END

$lt{'crea'} $lt{'suim'}

"); } - $r->print(< - -END + $r->print(&Apache::loncommon::end_page()); } 1;