--- loncom/interface/lonmenu.pm	2003/04/03 03:08:12	1.50
+++ loncom/interface/lonmenu.pm	2003/04/04 22:00:26	1.57
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.50 2003/04/03 03:08:12 www Exp $
+# $Id: lonmenu.pm,v 1.57 2003/04/04 22:00:26 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -45,6 +45,7 @@ use Apache::lonhtmlcommon();
 use Apache::loncommon;
 use Apache::File;
 use vars qw(@desklines $readdesk);
+my @inlineremote;
 
 # ============================= This gets called at the top of the body section
 
@@ -52,13 +53,22 @@ sub menubuttons {
     my $forcereg=shift;
     my $target  =shift;
     my $registration=shift;
+    my $navmaps='';
+    my $escurl=&Apache::lonnet::escape($ENV{'REQUEST_URI'});
+    my $escsymb=&Apache::lonnet::escape($ENV{'request.symb'});
     if ($ENV{'browser.interface'} eq 'textual') {
 # Textual display only
+        if ($ENV{'request.course.id'}) {
+	    $navmaps=(<<ENDNAV);
+<a href="/adm/navmaps?postdata=$escurl&postsymb=$escsymb" target="_top">Navigate Contents</a>
+ENDNAV
+        }
 	my $output=(<<ENDMAINMENU);
 <script>
 // BEGIN LON-CAPA Internal
 </script>
-<a href="/adm/menu" target="_top">Main Menu</a><br />
+<a href="/adm/menu" target="_top">Main Menu</a>
+$navmaps<br />
 <script>
 // END LON-CAPA Internal
 </script>
@@ -67,18 +77,26 @@ ENDMAINMENU
 	return $output."<hr />";
     } elsif ($ENV{'environment.remote'} eq 'off') {
 # Remote Control is switched off
+        if ($ENV{'request.course.id'}) {
+	    $navmaps=(<<ENDNAVREM);
+<a href="/adm/navmaps?postdata=$escurl&postsymb=$escsymb" target="_top">Navigate Contents</a>
+ENDNAVREM
+        }
 	my $output=(<<ENDINLINEMENU);
 <script>
 // BEGIN LON-CAPA Internal
 </script>
+<table bgcolor="#AAAAAA" width="100%" border="2"><tr><td>
 <a href="/adm/menu" target="_top">Main Menu</a>
-<a href="/adm/remote?action=launch" target="_top">Launch Remote Control</a>
+$navmaps
+<a href="/adm/remote?action=launch&url=$escurl" target="_top">Launch Remote Control</a>
+<br />
 <script>
 // END LON-CAPA Internal
 </script>
 ENDINLINEMENU
         if ($registration) { $output.=&innerregister($forcereg,$target); }
-	return $output."<hr />";
+	return $output."</td></tr></table>";
     } else {
 	return '';
     }
@@ -98,6 +116,7 @@ sub registerurl {
                 "\n</script>\n";
     }
     if (($ENV{'browser.interface'} eq 'textual') ||
+        ($ENV{'environment.remote'} eq 'off') ||
         ((($ENV{'request.publicaccess'}) || 
          (!&Apache::lonnet::is_on_map($ENV{'REQUEST_URI'}))) &&
         (!$forcereg))) {
@@ -125,6 +144,9 @@ sub innerregister {
     
     my $textual=($textinter || $noremote);
 
+    @inlineremote=();
+    undef @inlineremote;
+
     my $reopen=&Apache::lonmenu::reopenmenu();
 
     my $newmail='';
@@ -240,6 +262,8 @@ ENDMENUITEMS
 # Registered, textual output
             my $utility=&utilityfunctions();
             my $form=&serverform();
+            my $inlinebuttons=
+                        join('',map { (defined($_)?$_:'') } @inlineremote);
 	    $result =(<<ENDREGTEXT);
 <script>
 // BEGIN LON-CAPA Internal
@@ -247,9 +271,7 @@ $utility
 </script>
 $timesync
 $newmail
-$buttons
-$hwkadd
-$editbutton
+$inlinebuttons
 $form
 <script>
 //END LON-CAPA Internal
@@ -364,6 +386,8 @@ sub startupremote {
 # The Remote actually gets launched!
 #
     my $configmenu=&rawconfig();
+    my $esclowerurl=&Apache::lonnet::escape($lowerurl);
+
     return(<<ENDREMOTESTARTUP);
 <script>
 
@@ -393,7 +417,7 @@ function wait() {
          $configmenu
          window.location='$lowerurl';  
       } else {
-         alert("Remote Control timed out. It is possible that it was blocked by pop-up window filters.");
+	  window.location='/adm/remote?action=collapse&url=$esclowerurl';
       }
    } else {
       wheelswitch();
@@ -402,7 +426,7 @@ function wait() {
 }
 
 function main() {
-   canceltim=setTimeout('tim=1;',60000);
+   canceltim=setTimeout('tim=1;',30000);
    window.status='-';
    wait();
 }
@@ -471,7 +495,10 @@ sub clear {
     unless (($ENV{'browser.interface'} eq 'textual') ||
             ($ENV{'environment.remote'} eq 'off')) {
        return "\n".qq(window.status+='.';swmenu.clearbut($row,$col););
-   } else { return ''; }
+   } else { 
+       $inlineremote[10*$row+$col]='';
+       return ''; 
+   }
 }
 
 # ============================================ Switch a button or create a link
@@ -492,7 +519,7 @@ sub switch {
        if ($nobreak==2) { return ''; }
        my $text=$top.' '.$bot;
        $text=~s/\- //;
-       return "\n".($nobreak?' ':'<br />').
+       $inlineremote[10*$row+$col]="\n".($nobreak?' ':'<br />').
         '<a href="javascript:'.$act.';" target="_top">'.$text.'</a> '.
         ($nobreak?'':$desc);
    } else {
@@ -500,10 +527,11 @@ sub switch {
        if ($nobreak==2) { return ''; }
        my $text=$top.' '.$bot;
        $text=~s/\- //;
-       return "\n".($nobreak?' ':'<br />').
+       $inlineremote[10*$row+$col]="\n".($nobreak?' ':'<br />').
         '<a href="javascript:'.$act.';" target="_top">'.$text.'</a> '.
         ($nobreak?'':$desc);
    }
+    return '';
 }
 
 sub secondlevel {
@@ -528,6 +556,13 @@ sub openmenu {
     return "window.open(".$nothing.",'".$menuname."');";
 }
 
+sub inlinemenu {
+    @inlineremote=();
+    undef @inlineremote;
+    &rawconfig(1);
+    return join('',map { (defined($_)?$_:'') } @inlineremote);
+}
+
 sub rawconfig {
     my $textualoverride=shift;
     my $output='';
@@ -640,7 +675,8 @@ sub footer {
 }
 
 sub utilityfunctions {
-    unless ($ENV{'browser.interface'} eq 'textual') { return ''; }
+    unless (($ENV{'browser.interface'} eq 'textual')  ||
+        ($ENV{'environment.remote'} eq 'off')) { return ''; }
     my $currenturl=$ENV{'REQUEST_URI'};
     my $currentsymb=$ENV{'request.symb'};
 return (<<ENDUTILITY)
@@ -678,6 +714,14 @@ function gocmd(url,cmd) {
       this.document.server.submit();
    }
 }
+
+function catalog_info() {
+   loncatinfo=window.open(window.location.pathname+'.meta',"LONcatInfo",'height=320,width=280,resizeable=yes,location=no,menubar=no,toolbar=no');
+}
+
+function chat_win() {
+   lonchat=window.open('/res/adm/pages/chatroom.html',"LONchat",'height=320,width=280,resizeable=yes,location=no,menubar=no,toolbar=no');
+}
 ENDUTILITY
 }
 
@@ -701,10 +745,13 @@ sub handler {
     $r->send_http_header;
     return OK if $r->header_only;
 
-    my $utility=&utilityfunctions();
     my $form=&serverform();
     my $bodytag=&Apache::loncommon::bodytag('Main Menu');
-# ------------------------------------------------------------ Print the screen
+# ---- Print the screen, pretent to be in text mode to generate text-based menu
+    unless ($ENV{'brower.interface'} eq 'textual') {
+	$ENV{'environment.remote'}='off';
+    }
+    my $utility=&utilityfunctions();
     $r->print(<<ENDHEADER);
 <html><head>
 <title>LON-CAPA Main Menu</title>
@@ -714,7 +761,7 @@ $utility
 </head>
 $bodytag
 ENDHEADER
-    $r->print(&rawconfig(1).$form);
+    $r->print(&inlinemenu().$form);
     $r->print('</body></html>');
     return OK;
 }