--- loncom/interface/lonhtmlcommon.pm	2006/07/07 19:17:19	1.143
+++ loncom/interface/lonhtmlcommon.pm	2006/07/18 21:55:24	1.144
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common html routines
 #
-# $Id: lonhtmlcommon.pm,v 1.143 2006/07/07 19:17:19 albertel Exp $
+# $Id: lonhtmlcommon.pm,v 1.144 2006/07/18 21:55:24 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1264,26 +1264,27 @@ returns: nothing
         $bug = $last->{'bug'} if (exists($last->{'bug'}));
         $help = $last->{'help'} if (exists($last->{'help'}));
         $component_help=($component_help?$component_help:$help);
-#        if ($faq ne '') {
-#            $icons .= &Apache::loncommon::help_open_faq($faq);
-#        }
+        if ($faq ne '') {
+            $icons .= &Apache::loncommon::help_open_faq($faq);
+        }
 #        if ($bug ne '') {
 #            $icons .= &Apache::loncommon::help_open_bug($bug);
 #        }
-	if ($helplink ne 'nohelp') {
+	if ($faq ne '' || $component_help ne '' || $bug ne '') {
 	    $icons .= &Apache::loncommon::help_open_menu($component,
 							 $component_help,
 							 $faq,$bug);
 	}
-        if ($icons ne '') {
-            $Str .= $icons.' ';
-        }
         #
         $Str .= $links.'</td>';
         #
         if (defined($component)) {
             $Str .= '<td class="'.$css_class.'_component">'.
-                &mt($component).'</td>';
+                &mt($component);
+	    if ($icons ne '') {
+		$Str .= '&nbsp;'.$icons;
+	    }
+	    $Str .= '</td>';
         }
         $Str .= '</tr></table>'."\n";
         #