--- loncom/interface/lonmenu.pm	2003/04/17 13:21:36	1.60
+++ loncom/interface/lonmenu.pm	2003/04/18 01:20:25	1.64
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.60 2003/04/17 13:21:36 www Exp $
+# $Id: lonmenu.pm,v 1.64 2003/04/18 01:20:25 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -203,10 +203,18 @@ sub innerregister {
     my $reopen=&Apache::lonmenu::reopenmenu();
 
     my $newmail='';
-    if (($textual) && ($ENV{'request.symb'})) {
+    if (($textual) && ($ENV{'request.symb'}) && ($ENV{'request.course.id'})) {
 	my ($mapurl,$rid,$resurl)=split(/\_\_\_/,$ENV{'request.symb'});
-        $newmail=&Apache::lonnet::gettitle($mapurl).': '.
-	         &Apache::lonnet::gettitle($resurl).'   ';
+        $newmail=$ENV{'course.'.$ENV{'request.course.id'}.'.description'};
+        my $maptitle=&Apache::lonnet::gettitle($mapurl);
+	my $restitle=&Apache::lonnet::gettitle($resurl);
+        if ($maptitle) {
+	    $newmail.=', '.$maptitle;
+        }
+        if ($restitle) {
+	    $newmail.=': '.$restitle;
+        }
+        $newmail.='   ';
     }
     if (&Apache::lonmsg::newmail()) { 
        $newmail=($textual?
@@ -336,7 +344,7 @@ $inlinebuttons
 $tableend
 $form
 <script>
-//END LON-CAPA Internal
+// END LON-CAPA Internal
 </script>
 
 ENDREGTEXT
@@ -582,7 +590,7 @@ sub switch {
        my $text=$top.' '.$bot;
        $text=~s/\- //;
        $inlineremote[10*$row+$col]="\n".($nobreak?' ':'<br />').
-        '<a href="javascript:'.$act.';" target="_top">'.$text.'</a> '.
+        '<a href="javascript:'.$act.';">'.$text.'</a> '.
         ($nobreak?'':$desc);
    } else {
 # Inline Remote
@@ -592,7 +600,7 @@ sub switch {
        $inlineremote[10*$row+$col]="\n".
          ($nobreak==3?'<td width="50%" colspan="2" align="right"':'<tr><td').
          ' bgcolor="'.$tabbg.'"'.($nobreak==1?' width="50%" colspan="2"':'').
-     '"><a href="javascript:'.$act.';" target="_top"><font color="'.$font.'"'.
+     '"><a href="javascript:'.$act.';"><font color="'.$font.'"'.
           ($nobreak?' size="+1"':'').
      '>'.$text.'</font></a></td>'.
      ($nobreak?'':'<td colspan="3" width="80%"><font color="'.$font.'" size="-1">'.$desc.'</font>').($nobreak!=1?'</tr>':'');
@@ -794,7 +802,7 @@ ENDUTILITY
 sub serverform {
     return(<<ENDSERVERFORM);
 
-<form name="server" action="/adm/logout" method="post">
+<form name="server" action="/adm/logout" method="post" target="_top">
 <input type="hidden" name="postdata" value="none" />
 <input type="hidden" name="command" value="none" />
 <input type="hidden" name="url" value="none" />