--- loncom/interface/lonmenu.pm	2003/01/31 21:46:36	1.32
+++ loncom/interface/lonmenu.pm	2003/02/13 20:35:39	1.35
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.32 2003/01/31 21:46:36 www Exp $
+# $Id: lonmenu.pm,v 1.35 2003/02/13 20:35:39 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -36,6 +36,8 @@ package Apache::lonmenu;
 
 use strict;
 use Apache::lonnet;
+use Apache::Constants qw(:common);
+use Apache::loncommon;
 use Apache::File;
 use vars qw(@desklines $readdesk);
 
@@ -43,28 +45,50 @@ use vars qw(@desklines $readdesk);
 
 sub startupremote {
     my ($lowerurl)=@_;
+    if ($ENV{'browser.interface'} eq 'textual') {
+     return ('<meta HTTP-EQUIV="Refresh" CONTENT="0.5; url='.$lowerurl.'" />');
+    }
     my $configmenu=&rawconfig();
     return(<<ENDREMOTESTARTUP);
 <script>
 
+function wheelswitch() {
+   if (window.status=='|') { 
+      window.status='/'; 
+   } else {
+      if (window.status=='/') {
+         window.status='-';
+      } else {
+         if (window.status=='-') { 
+            window.status='\\\\'; 
+         } else {
+            if (window.status=='\\\\') { window.status='|'; }
+         }
+      }
+   } 
+}
+
 // ---------------------------------------------------------- The wait function
 var canceltim;
 function wait() {
    if ((menuloaded==1) || (tim==1)) {
+      window.status='Done.';
       if (tim==0) {
          clearTimeout(canceltim);
          $configmenu
          window.location='$lowerurl';  
       } else {
-         alert("Remote Control Timed Out.");
+         alert("Remote Control timed out. It is possible that it was blocked by pop-up window filters.");
       }
    } else {
-      setTimeout('wait();',100);
+      wheelswitch();
+      setTimeout('wait();',200);
    }
 }
 
 function main() {
-   canceltim=setTimeout('tim=1;',80000);
+   canceltim=setTimeout('tim=1;',60000);
+   window.status='-';
    wait();
 }
 
@@ -82,6 +106,7 @@ ENDSETFLAGS
 }
 
 sub maincall() {
+    if ($ENV{'browser.interface'} eq 'textual') { return ''; }
     return(<<ENDMAINCALL);
 <script>
     main();
@@ -92,6 +117,7 @@ ENDMAINCALL
 
 sub reopenmenu {
    my $nothing='';
+   if ($ENV{'browser.interface'} eq 'textual') { return ''; }
    my $menuname='LCmenu'.$Apache::lonnet::perlvar{'lonHostID'};
    if ($ENV{'browser.type'} eq 'explorer') { $nothing='javascript:void(0);'; }
    return('window.open("'.$nothing.'","'.$menuname.'","",false);');
@@ -101,6 +127,7 @@ sub reopenmenu {
 
 sub open {
     my $returnval='';
+    if ($ENV{'browser.interface'} eq 'textual') { return ''; }
     my $menuname='LCmenu'.$Apache::lonnet::perlvar{'lonHostID'};
     unless (shift eq 'unix') {
 # resizing does not work on linux because of virtual desktop sizes
@@ -112,6 +139,7 @@ if (window.screen) {
 ENDRESIZE
     }
     $returnval.=(<<ENDOPEN);
+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");
 ENDOPEN
@@ -122,6 +150,7 @@ ENDOPEN
 
 sub switchmenu {
     my ($row,$col,$imgsrc,$texttop,$textbot,$action,$description)=@_;
+    if ($ENV{'browser.interface'} eq 'textual') { return ''; }
     my $openwin=&openmenu();
     return(<<ENDSMENU);
 <script>
@@ -135,7 +164,9 @@ ENDSMENU
 
 sub clear {
     my ($row,$col)=@_;
-    return qq(swmenu.clearbut($row,$col););
+    unless ($ENV{'browser.interface'} eq 'textual') {
+       return "\n".qq(window.status+='.';swmenu.clearbut($row,$col););
+   } else { return ''; }
 }
 
 # Switch acts on the javascript that is executed when a button is clicked.  
@@ -144,8 +175,14 @@ sub switch {
     my ($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc)=@_;
     $act=~s/\$uname/$uname/g;
     $act=~s/\$udom/$udom/g;
-    return "\n".
- qq(swmenu.switchbutton($row,$col,"$img","$top","$bot","$act","$desc"););
+    unless ($ENV{'browser.interface'} eq 'textual') {
+       return "\n".
+ qq(window.status+='.';swmenu.switchbutton($row,$col,"$img","$top","$bot","$act","$desc"););
+   } else {
+       my $text=$top.' '.$bot;
+       $text=~s/\- //;
+       return '<br /><a href="'.$act.'">'.$text.'</a> '.$desc;
+   }
 }
 
 sub secondlevel {
@@ -164,6 +201,7 @@ sub secondlevel {
 
 sub openmenu {
     my $menuname='LCmenu'.$Apache::lonnet::perlvar{'lonHostID'};
+    if ($ENV{'browser.interface'} eq 'textual') { return ''; }
     if ($ENV{'browser.type'} eq 'explorer') {
        return "window.open('javascript:void(0);','".$menuname."');";
    } else {
@@ -172,7 +210,15 @@ sub openmenu {
 }
 
 sub rawconfig {
-    my $output="var swmenu=".&openmenu();
+    my $textualoverride=shift;
+    my $output='';
+    unless ($ENV{'browser.interface'} eq 'textual') {
+       $output.=
+ "window.status='Opening Remote Control';var swmenu=".&openmenu().
+"\nwindow.status='Configuring Remote Control ';";
+    } else {
+       unless ($textualoverride) { return ''; }
+    }
     my $uname=$ENV{'user.name'};
     my $udom=$ENV{'user.domain'};
     my $adv=$ENV{'user.adv'};
@@ -239,20 +285,28 @@ sub rawconfig {
             }
         }
     }
-    $output.="swmenu.syncclock(1000*".time.");";
+    unless ($ENV{'browser.interface'} eq 'textual') {
+       $output.="\nwindow.status='Synchronizing Time';swmenu.syncclock(1000*".time.");\nwindow.status='Remote Control Configured.';";
+    }
     return $output;
 }
 
 # ======================================================================= Close
 
 sub close {
+    if ($ENV{'browser.interface'} eq 'textual') { return ''; }
     my $menuname='LCmenu'.$Apache::lonnet::perlvar{'lonHostID'};
     return(<<ENDCLOSE);
 <script>
+window.status='Accessing Remote Control';
 menu=window.open("/adm/rat/empty.html","$menuname",
                  "height=350,width=150,scrollbars=no,menubar=no");
+window.status='Disabling Remote Control';
+menu.active=0;
 menu.autologout=0;
+window.status='Closing Remote Control';
 menu.close();
+window.status='Done.';
 </script>
 ENDCLOSE
 }
@@ -263,6 +317,23 @@ sub footer {
 
 }
 
+# ================================================ Handler when called directly
+
+
+sub handler {
+    my $r = shift;
+    $r->content_type('text/html');
+    $r->send_http_header;
+    return OK if $r->header_only;
+
+    my $bodytag=&Apache::loncommon::bodytag('Main Menu');
+# ------------------------------------------------------------ Print the screen
+    $r->print('<html><head><title>LON-CAPA Main Menu</title></head>'.$bodytag);
+    $r->print(&rawconfig(1));
+    $r->print('</body></html>');
+    return OK;
+}
+
 # ================================================================ Main Program
 
 BEGIN {