--- loncom/interface/loncommon.pm	2004/07/19 21:00:53	1.201
+++ loncom/interface/loncommon.pm	2004/09/24 22:08:02	1.205.2.2
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.201 2004/07/19 21:00:53 raeburn Exp $
+# $Id: loncommon.pm,v 1.205.2.2 2004/09/24 22:08:02 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -688,8 +688,21 @@ function helpMenu(caller) {
     }
 }
  </script>
- <a href="$link" title="$title"><image src="/adm/lonMisc/smallFAQ.gif" border="0" alt="(Help Menu)" /></a>
+ <a href="$link" title="$title"><image src="/adm/lonIcons/helpgateway.gif" border="0" alt="(Help Menu)" /></a>
 ENDTEMPLATE
+    if ($component_help) {
+	if (!$text) {
+	    $template=&help_open_topic($component_help,undef,$stayOnPage,
+				       $width,$height).' '.$template;
+	} else {
+	    my $help_text;
+	    $help_text=&Apache::lonnet::unescape($topic);
+	    $template='<table><tr><td>'.
+		&help_open_topic($component_help,$help_text,$stayOnPage,
+				 $width,$height).'</td><td>'.$template.
+				 '</td></tr></table>';
+	}
+    }
     if ($text ne '') { $template.='</td></tr></table>' };
     return $template;
 }
@@ -1804,7 +1817,7 @@ sub noteswrapper {
 
 sub aboutmewrapper {
     my ($link,$username,$domain,$target)=@_;
-    return '<a href="/adm/$domain/$username/aboutme"'.
+    return '<a href="/adm/'.$domain.'/'.$username.'/aboutme"'.
 	($target?' target="$target"':'').' title="'.&mt('View this users personal page').'">'.$link.'</a>';
 }
 
@@ -2543,7 +2556,7 @@ $upperleft</td>
 </td></tr>
 <tr>
 <td bgcolor="$tabbg" align="right"><font size="2" face="Arial, Helvetica, sans-serif">$realm</font>&nbsp;</td></tr>
-</table><br>
+</table><br />
 ENDBODY
 }
 
@@ -3638,6 +3651,13 @@ sub icon {
     return $iconname;
 } 
 
+sub connection_aborted {
+    my ($r)=@_;
+    $r->print(" ");$r->rflush();
+    my $c = $r->connection;
+    return $c->aborted();
+}
+
 =pod
 
 =back