--- loncom/interface/lonmenu.pm	2003/04/05 22:14:40	1.58
+++ loncom/interface/lonmenu.pm	2003/06/06 02:24:49	1.76
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.58 2003/04/05 22:14:40 www Exp $
+# $Id: lonmenu.pm,v 1.76 2003/06/06 02:24:49 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -57,6 +57,7 @@ sub menubuttons {
     my $target  =shift;
     my $registration=shift;
     my $navmaps='';
+    my $reloadlink='';
     my $escurl=&Apache::lonnet::escape($ENV{'REQUEST_URI'});
     my $escsymb=&Apache::lonnet::escape($ENV{'request.symb'});
     if ($ENV{'browser.interface'} eq 'textual') {
@@ -65,13 +66,21 @@ sub menubuttons {
 	    $navmaps=(<<ENDNAV);
 <a href="/adm/navmaps?postdata=$escurl&postsymb=$escsymb" target="_top">Navigate Contents</a>
 ENDNAV
+            if (($ENV{'REQUEST_URI'}=~/^\/adm\//) &&
+         ($ENV{'REQUEST_URI'}!~/^\/adm\/wrapper\//) &&
+         ($ENV{'REQUEST_URI'}!~/^\/adm\/.*\/(smppg|bulletinboard|aboutme)(\?|$)/)) {
+                my $escreload=&Apache::lonnet::escape('return:');
+                $reloadlink=(<<ENDRELOAD);
+<a href="/adm/flip?postdata=$escreload" target="_top"><font color="$font">Return to Last Location</font></a>
+ENDRELOAD
+            }
         }
 	my $output=(<<ENDMAINMENU);
 <script>
 // BEGIN LON-CAPA Internal
 </script>
 <a href="/adm/menu" target="_top">Main Menu</a>
-$navmaps<br />
+$reloadlink $navmaps<br />
 <script>
 // END LON-CAPA Internal
 </script>
@@ -106,6 +115,15 @@ ENDMAINMENU
 <td bgcolor="$tabbg">
 <a href="/adm/navmaps?postdata=$escurl&postsymb=$escsymb" target="_top"><font color="$font">Navigate Contents</font></a></td>
 ENDNAVREM
+            if (($ENV{'REQUEST_URI'}=~/^\/adm\//) &&
+                ($ENV{'REQUEST_URI'}!~/^\/adm\/wrapper\//) &&
+         ($ENV{'REQUEST_URI'}!~/^\/adm\/.*\/(smppg|bulletinboard|aboutme)(\?|$)/)) {
+                my $escreload=&Apache::lonnet::escape('return:');
+                $reloadlink=(<<ENDRELOAD);
+<td bgcolor="$tabbg">
+<a href="/adm/flip?postdata=$escreload" target="_top"><font color="$font">Return to Last Location</font></a></td>
+ENDRELOAD
+            }
         }
         my $reg='';
         if ($registration) {
@@ -120,10 +138,14 @@ ENDNAVREM
 <td bgcolor="$tabbg">
 <a href="/adm/menu" target="_top"><font color="$font">Main Menu</font></a>
 </td>
+$reloadlink
 $navmaps
 <td bgcolor="$tabbg">
 <a href="/adm/remote?action=launch&url=$escurl" target="_top">
 <font color="$font">Launch Remote Control</font></a></td>
+<td bgcolor="$tabbg">
+<img align="right" src="/adm/lonIcons/minilogo.gif" />
+<b>LON-CAPA</b></td>
 </tr>
 </table>
 <script>
@@ -142,7 +164,11 @@ sub registerurl {
     my $forcereg=shift;
     my $target = shift;
     my $result = '';
-    
+    if ($ENV{'REQUEST_URI'} eq '/res/adm/pages/menu.html') { return ''; }
+    my $force_title='';
+    if ($ENV{'request.state'} eq 'construct') {
+	$force_title=&Apache::lonxml::display_title();
+    }
     if ($target eq 'edit') {
         $result .="<script type=\"text/javascript\">\n".
             "if (typeof swmenu != 'undefined') {swmenu.currentURL=null;}\n".
@@ -154,13 +180,13 @@ sub registerurl {
         ((($ENV{'request.publicaccess'}) || 
          (!&Apache::lonnet::is_on_map($ENV{'REQUEST_URI'}))) &&
         (!$forcereg))) {
-	return $result.
-         '<script type="text/javascript">function LONCAPAreg(){;} function LONCAPAstale(){}</script>';
+ 	return $result.
+          '<script type="text/javascript">function LONCAPAreg(){;} function LONCAPAstale(){}</script>'.$force_title;
     }
 # Graphical display after login only
     if ($Apache::lonxml::registered && !$forcereg) { return ''; }
     $result.=&innerregister($forcereg,$target);
-    return $result;
+    return $result.$force_title;
 }
 
 # =========== This gets called in order to register a URL, both with the Remote
@@ -170,6 +196,7 @@ sub innerregister {
     my $forcereg=shift;
     my $target = shift;
     my $result = '';
+    if ($ENV{'REQUEST_URI'} eq '/res/adm/pages/menu.html') { return ''; }
 
     $Apache::lonxml::registered=1;
 
@@ -184,11 +211,30 @@ sub innerregister {
     my $reopen=&Apache::lonmenu::reopenmenu();
 
     my $newmail='';
+    if ($noremote) {
+	$newmail='<table bgcolor="'.$pgbg.'" border="0" cellspacing="3" cellpadding="3" width="100%"><tr><td bgcolor="'.$tabbg.'">';
+    }
+    if (($textual) && ($ENV{'request.symb'}) && ($ENV{'request.course.id'})) {
+	my ($mapurl,$rid,$resurl)=split(/\_\_\_/,$ENV{'request.symb'});
+        $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.='&nbsp;&nbsp;&nbsp;';
+    }
     if (&Apache::lonmsg::newmail()) { 
        $newmail=($textual?
  '<b><a href="/adm/communicate">You have new messages</a></b><br />':
                           'swmenu.setstatus("you have","messages");');
     }
+    if ($noremote) {
+	$newmail.='</td></tr></table>';
+    }
     my $timesync=($textual?'':'swmenu.syncclock(1000*'.time.');');
     my $tablestart=($noremote?'<table bgcolor="'.$pgbg.'" border="0" cellspacing="3" cellpadding="3" width="100%">':'');
     my $tableend=($noremote?'</table>':'');
@@ -312,7 +358,7 @@ $inlinebuttons
 $tableend
 $form
 <script>
-//END LON-CAPA Internal
+// END LON-CAPA Internal
 </script>
 
 ENDREGTEXT
@@ -353,7 +399,6 @@ var swmenu=null;
  'clearbut(2,1);clearbut(2,3);clearbut(8,1);clearbut(8,2);clearbut(8,3);'+
  'clearbut(9,1);clearbut(9,2);clearbut(9,3);clearbut(6,3);clearbut(6,1)',
 			  2000);
-
       }
 
 // END LON-CAPA Internal
@@ -405,10 +450,12 @@ ENDDONOTREGTHIS
 }
 
 sub loadevents() {
+    if ($ENV{'REQUEST_URI'} eq '/res/adm/pages/menu.html') { return ''; }
     return 'LONCAPAreg();';
 }
 
 sub unloadevents() {
+    if ($ENV{'REQUEST_URI'} eq '/res/adm/pages/menu.html') { return ''; }
     return 'LONCAPAstale();';
 }
 
@@ -521,6 +568,7 @@ ENDRESIZE
 window.status='Opening LON-CAPA Remote Control';
 var menu=window.open("/res/adm/pages/menu.html","$menuname",
 "height=350,width=150,scrollbars=no,menubar=no,top=5,left=5,screenX=5,screenY=5");
+self.name='loncapaclient';
 ENDOPEN
     return '<script>'.$returnval.'</script>';
 }
@@ -558,7 +606,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
@@ -568,7 +616,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>':'');
@@ -758,7 +806,7 @@ function gocmd(url,cmd) {
 }
 
 function catalog_info() {
-   loncatinfo=window.open(window.location.pathname+'.meta',"LONcatInfo",'height=320,width=280,resizeable=yes,location=no,menubar=no,toolbar=no');
+   loncatinfo=window.open(window.location.pathname+'.meta',"LONcatInfo",'height=320,width=280,resizeable=yes,scrollbars=yes,location=no,menubar=no,toolbar=no');
 }
 
 function chat_win() {
@@ -770,7 +818,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" />