--- loncom/interface/lonhelpmenu.pm 2013/08/08 14:31:54 1.42 +++ loncom/interface/lonhelpmenu.pm 2013/12/30 00:34:49 1.43 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # generate frame-based help system # -# $Id: lonhelpmenu.pm,v 1.42 2013/08/08 14:31:54 raeburn Exp $ +# $Id: lonhelpmenu.pm,v 1.43 2013/12/30 00:34:49 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -62,11 +62,21 @@ sub handler { $bugurl .= '&component='.$bug; } my $faqbaseurl = $Apache::lonnet::perlvar{'FAQHost'}; - my $requestmail = $Apache::lonnet::perlvar{'lonSupportEMail'}; + my $origmail = $Apache::lonnet::perlvar{'lonSupportEMail'}; + my $defdom; + if ($env{'request.course.id'}) { + $defdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; + } elsif ($env{'request.role.domain'}) { + $defdom = $env{'request.role.domain'}; + } else { + $defdom = &Apache::lonnet::default_login_domain(); + } + my $requestmail = &Apache::loncommon::build_recipient_list(undef,'helpdeskmail', + $defdom,$origmail); if ($env{'form.page'} eq 'banner') { &display_help_banner($r,$faq,$bug,$topic,$component_url,$origurl,$bugurl,$faqbaseurl,$requestmail,$stayOnPage); } elsif ($env{'form.page'} eq 'body') { - &display_help_mainpage($r,$faq,$bug,$topic,$component_url,$origurl,$bugurl,$faqbaseurl,$requestmail); + &display_help_mainpage($r,$faq,$bug,$topic,$component_url,$origurl,$bugurl,$faqbaseurl,$requestmail,$stayOnPage); } return OK; } @@ -75,12 +85,11 @@ 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/^[^\@]+\@[^\@]+$/) { + if ($requestmail) { my $displayurl = &escape($origurl); $scripttag = (<<"SCRIPT_ONE"); - SCRIPT_TWO } - my %body_layout = - ('rightmargin' => "0", - 'leftmargin' => "0", - 'marginwidth' => "0", - 'topmargin' => "1", - 'marginheight' => "1"); - my $start_page = - &Apache::loncommon::start_page('Help',$scripttag, - {'only_body' => 1,}); - $r->print($start_page); - - my $width = ($stayOnPage) ? '95%' : '600'; - $r->print(''); + if ($stayOnPage) { + $r->print(&Apache::loncommon::start_page('Help',$scripttag, + {'no_secondary_menu' => 1,})); + } else { + $r->print(&Apache::loncommon::start_page('Help',$scripttag, + {'only_body' => 1,})); + } + my $menu = &helpmenu_items($dom,$faq,$bug,$topic,$component_url,$origurl,$bugurl,$faqbaseurl,$requestmail,$stayOnPage); + if ($menu) { + $r->print(""); + } + if ($stayOnPage && $env{'user.adv'}) { + $r->print('
'); + } + $r->print(&Apache::loncommon::end_page()); +} +sub helpmenu_items { + my ($dom,$faq,$bug,$topic,$component_url,$origurl,$bugurl,$faqbaseurl,$requestmail,$stayOnPage) = @_; + my $location=&Apache::loncommon::lonhttpdurl("/adm"); my $general_help = &Apache::loncommon::general_help(); - $r->print(' - - - - - - - - -
  -
('.&mt('LON-CAPA help/support').')  '.&mt('LON-CAPA help/support').' - - - '); + my %helpconfig = &Apache::lonnet::get_dom('configuration',['helpsettings'],$dom); + my %lt = &Apache::lonlocal::texthash( + general => 'General help', + component => 'Topic help', + faq => 'FAQ', + helpdesk => 'Ask helpdesk', + bugs => 'Report a bug', + manuals_web => 'Online manuals', + manuals_pdf => 'Printable manuals', + lastloc => 'Go back', + close => 'Close', + ); + my %items = ( + general => { + href => '/adm/help/'.$general_help.'.hlp', + img => $location.'/help/help.png', + alt => $lt{'general'}, + text => $lt{'general'}, + }, + component => { + href => $component_url, + img => $location.'/help/help.png', + alt => $lt{'component'}, + text => $topic, + }, + faq => { + href => $faqbaseurl.'fom/cache/'.$faq.'.html', + img => $location.'/lonMisc/smallFAQ.gif', + alt => $lt{'faq'}, + text => $lt{'faq'}, + }, + helpdesk => { + href => '#', + onclick => 'gohelpdesk()', + img => $location.'/lonIcons/helpdesk.gif', + alt => $lt{'helpdesk'}, + text => $lt{'helpdesk'}, + }, + bugs => { + href => $bugurl, + img => $location.'/lonMisc/smallBug.gif', + alt => $lt{'bugs'}, + text => $lt{'bugs'}, + }, + manuals_web => { + href => '', + img => $location.'/lonIcons/html.gif', + alt => $lt{'manuals_web'}, + text => $lt{'manuals_web'}, + }, + manuals_pdf => { + href => '', + img => $location.'/lonIcons/pdf.gif', + alt => $lt{'manuals_pdf'}, + text => $lt{'manuals_pdf'}, + }, + lastloc => { + href => $origurl, + img => '/res/adm/pages/tolastloc.png', + alt => $lt{'lastloc'}, + text => $lt{'lastloc'}, + target => '_top', + }, + close => { + href => 'javascript:window.close()', + img => $location.'/lonIcons/close.gif', + alt => $lt{'close'}, + text => $lt{'close'}, + target => '_top', + }, + ); + my %help_submenu = ( + manuals_web => [ + ['/adm/help/course.manual.access.hlp','Course Coordination','course'], + ['/adm/help/course.manual.access.hlp','Authoring','author'], + ], + manuals_pdf => [ + ['/adm/help/course.manual.pdf','Course Coordination','course'], + ['/adm/help/course.manual.pdf','Authoring','author'], + ], + ); + my @order = ('general'); if ($component_url) { - $r->print("'); + push(@order,'component'); + } + if ($requestmail) { + push(@order,'helpdesk'); + } + if ($env{'user.adv'} && $faq) { + push(@order,'faq'); } - 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 (($env{'user.adv'}) && (($helpconfig{'helpsettings'}{'submitbugs'} eq '1') || ($helpconfig{'helpsettings'}{'submitbugs'} eq ''))) { + push(@order,'bugs'); } if ($stayOnPage) { - $r->print(' - '); + push(@order,('manuals_web','manuals_pdf','lastloc')); } else { - $r->print(' - '); + push(@order,'close'); } - $r->print(< - -
- 		 
 
-END - $r->print(&Apache::loncommon::end_page()); + my $menu; + foreach my $title (@order) { + my $menuitem = $items{$title}; + next unless (ref($menuitem) eq 'HASH'); + if (defined($help_submenu{$title})) { + my ($link,$target); + if ($menuitem->{href} ne '') { + $link = $menuitem->{href}; + $target = 'bodyframe'; + } else { + $link = '#'; + } + my @helpsub; + if (ref($help_submenu{$title}) eq 'ARRAY') { + foreach my $item (@{$help_submenu{$title}}) { + if (ref($item) eq 'ARRAY') { + if (($item->[2] eq 'course') || ($item->[2] eq 'author')) { + next unless($env{'user.adv'}); + } + push(@helpsub,$item); + } + } + if (@helpsub > 0) { + my $img; + if ($menuitem->{img}) { + $img = ''.$menuitem->{alt}.''; + } + $menu .= &create_submenu($link,$img,$target,$menuitem->{text},\@helpsub,1); + } elsif ($link ne '#') { + $menu .= '
  • '.$menuitem->{text}.'
    • '; + } + } + } else { + $menu .= &build_menuitem($menuitem); + } + } + return $menu; +} + +sub build_menuitem { + my ($menuitem) = @_; + return '' unless(ref($menuitem) eq 'HASH'); + my $link; + if ($menuitem->{img}) { + $link = ''.$menuitem->{alt}.' '; + } + if ($menuitem->{text}) { + $link .= $menuitem->{text}; + } + my $target; + if ($menuitem->{target}) { + $target = $menuitem->{target}; + } else { + $target = 'bodyframe'; + } + my $onclick; + if ($menuitem->{onclick}) { + $onclick = ' onclick="'.$menuitem->{onclick}.';return false"'; + } + return '
  • '.$link.'
    • ', +} + +sub create_submenu { + my ($link,$img,$target,$title,$submenu,$translate) = @_; + return unless (ref($submenu) eq 'ARRAY'); + my $disptarget; + if ($target ne '') { + $disptarget = ' target="'.$target.'"'; + } + my $menu = '
  • '.$img. + ''. + ''.$title. + ''. + ' ▼'. + '
    • '; + return $menu; } sub display_help_mainpage { - my ($r,$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', @@ -220,16 +384,18 @@ 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, - {'add_entries' => \%body_layout, - 'only_body' => 1,}); - $r->print($start_page); + 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,})); + } + if ($stayOnPage) { + $r->print('
    '); + } $r->print(''.$lt{'chen'}); - if ($requestmail =~ m/^[^\@]+\@[^\@]+$/) { + if ($requestmail) { $r->print(', '.$lt{'orto'}); } else { $r->print("."); @@ -247,7 +413,7 @@ sub display_help_mainpage { } } } - if ($requestmail =~ m/^[^\@]+\@[^\@]+$/) { + if ($requestmail) { $r->print("
    '); + } $r->print(&Apache::loncommon::end_page()); }