--- loncom/interface/lonmenu.pm	2003/04/03 00:52:21	1.49
+++ loncom/interface/lonmenu.pm	2003/04/03 15:23:41	1.52
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.49 2003/04/03 00:52:21 www Exp $
+# $Id: lonmenu.pm,v 1.52 2003/04/03 15:23:41 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -364,6 +364,8 @@ sub startupremote {
 # The Remote actually gets launched!
 #
     my $configmenu=&rawconfig();
+    my $esclowerurl=&Apache::lonnet::escape($lowerurl);
+
     return(<<ENDREMOTESTARTUP);
 <script>
 
@@ -393,7 +395,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 +404,7 @@ function wait() {
 }
 
 function main() {
-   canceltim=setTimeout('tim=1;',60000);
+   canceltim=setTimeout('tim=1;',30000);
    window.status='-';
    wait();
 }
@@ -484,9 +486,19 @@ sub switch {
     $act=~s/\$udom/$udom/g;
     unless (($ENV{'browser.interface'} eq 'textual')  ||
             ($ENV{'environment.remote'} eq 'off')) {
+# Remote
        return "\n".
  qq(window.status+='.';swmenu.switchbutton($row,$col,"$img","$top","$bot","$act","$desc"););
+   } elsif ($ENV{'browser.interface'} eq 'textual') {
+# Accessibility
+       if ($nobreak==2) { return ''; }
+       my $text=$top.' '.$bot;
+       $text=~s/\- //;
+       return "\n".($nobreak?' ':'<br />').
+        '<a href="javascript:'.$act.';" target="_top">'.$text.'</a> '.
+        ($nobreak?'':$desc);
    } else {
+# Inline Remote
        if ($nobreak==2) { return ''; }
        my $text=$top.' '.$bot;
        $text=~s/\- //;
@@ -630,7 +642,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)