--- loncom/interface/lonhelpmenu.pm	2007/09/05 05:03:41	1.33
+++ loncom/interface/lonhelpmenu.pm	2009/11/10 19:13:00	1.39
@@ -1,6 +1,8 @@
 # The LearningOnline Network with CAPA
 # generate frame-based help system
 #
+# $Id: lonhelpmenu.pm,v 1.39 2009/11/10 19:13:00 jms Exp $
+#
 # Copyright Michigan State University Board of Trustees
 #
 # This file is part of the LearningOnline Network with CAPA (LON-CAPA).
@@ -72,6 +74,8 @@ 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);
@@ -153,11 +157,11 @@ SCRIPT_TWO
  <table id="LC_helpmenu_links">
    <tr>
 	<td><span class="LC_nobreak"><a href="/adm/help/$general_help.hlp" target="bodyframe">
-		  <img src="$location/help/gif/smallHelp.gif" border="0" alt="(General help)" valign="middle" />&nbsp;General Help</a>&nbsp;</span></td>
+		  <img src="$location/help/help.png" border="0" alt="(General help)" valign="middle" />&nbsp;General Help</a>&nbsp;</span></td>
 END
     if ($component_url) {
 	$r->print("<td><span class=\"LC_nobreak\"><a href=\"$component_url\" target=\"bodyframe\">".
-		  '<img src="'.$location.'/help/gif/smallHelp.gif" border="0" alt="(Topic help)" valign="middle" />&nbsp;'.$topic.'</a>&nbsp;</span></td>');
+		  '<img src="'.$location.'/help/help.png" border="0" alt="(Topic help)" valign="middle" />&nbsp;'.$topic.'</a>&nbsp;</span></td>');
     }
     if ($requestmail =~ m/^[^\@]+\@[^\@]+$/) {
         $r->print('
@@ -170,9 +174,12 @@ END
 END
     }
     if ($env{'user.adv'}) {
-        $r->print(<<END);
-            <td><span class="LC_nobreak"&nbsp;<b><a href="$bugurl" target="bodyframe"><img src="$location/lonMisc/smallBug.gif" border="0" alt="(Report a bug)" valign="middle" />&nbsp;Report a bug</a>&nbsp;</b></span></td>
+    	if ($helpconfig{'helpsettings'}{'submitbugs'} eq '1' ||
+    		$helpconfig{'helpsettings'}{'submitbugs'} eq '' ) {
+        	$r->print(<<END);
+            	<td><span class="LC_nobreak"&nbsp;<b><a href="$bugurl" target="bodyframe"><img src="$location/lonMisc/smallBug.gif" border="0" alt="(Report a bug)" valign="middle" />&nbsp;Report a bug</a>&nbsp;</b></span></td>
 END
+		}
     }
     if ($stayOnPage) {
         $r->print(<<END);