--- loncom/interface/lonhelpmenu.pm	2006/06/26 22:13:13	1.29
+++ loncom/interface/lonhelpmenu.pm	2006/07/20 22:44:04	1.32
@@ -141,10 +141,11 @@ SCRIPT_TWO
 					'only_body'   => 1,});
     $r->print($start_page);
 
-    my $width = ($stayOnPage) ? '700' : '600';
+    my $width = ($stayOnPage) ? '95%' : '600';
 
     $r->print('<table id="LC_helpmenu" width="'.$width.'">');
 
+    my $general_help = &Apache::loncommon::general_help();
     $r->print(<<END);
   <tr height="50">
    <td width='5'>&nbsp;</td>
@@ -152,10 +153,12 @@ SCRIPT_TWO
     <fieldset><legend><img src="$location/lonIcons/minilogo.gif" height='20' width='29' valign='bottom' />&nbsp;&nbsp;LON-CAPA help/support</legend>
  <table id="LC_helpmenu_links">
    <tr>
+	<td><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;</td>
 END
     if ($component_url) {
 	$r->print("<td><a href=\"$component_url\" target=\"bodyframe\">".
-		  '<img src="'.$location.'/help/gif/smallHelp.gif" border="0" alt="(Topic help)" valign="middle" />&nbsp;Topic help</a>&nbsp;</td>');
+		  '<img src="'.$location.'/help/gif/smallHelp.gif" border="0" alt="(Topic help)" valign="middle" />&nbsp;'.$topic.'</a>&nbsp;</td>');
     }
     if ($requestmail =~ m/^[^\@]+\@[^\@]+$/) {
         $r->print('
@@ -208,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',
@@ -228,12 +229,13 @@ sub display_help_mainpage {
 				       {'add_entries' => \%body_layout,
 					'only_body'   => 1,});
     $r->print($start_page);
-    $r->print($lt{'chen'});
+    $r->print('<b>'.$lt{'chen'});
     if ($requestmail =~ m/^[^\@]+\@[^\@]+$/) {
         $r->print(', '.$lt{'orto'});
     } else {
         $r->print(".");
     }
+    $r->print('</b>');
     if ($topic) {
         if ( ($component_url) || ($env{'user.adv'}) ) {
             if ($component_url) {
@@ -243,11 +245,6 @@ sub display_help_mainpage {
           </ul>
           <p>$lt{'disp'}</p>
                 ");
-            } elsif ($env{'user.adv'}) {
-                $r->print("
-              <ul>
-               <li><td align=\"center\">&nbsp;<a href=\"/adm/help/nohelptopic.html\">$lt{'noto'} $topic</a></li></ul>
-               <p>$lt{'coth'}</p>");
             }
         }
     }