--- loncom/interface/lonmenu.pm	2003/02/17 19:28:54	1.41
+++ loncom/interface/lonmenu.pm	2003/04/03 14:44:01	1.51
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.41 2003/02/17 19:28:54 www Exp $
+# $Id: lonmenu.pm,v 1.51 2003/04/03 14:44:01 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -25,18 +25,23 @@
 #
 # http://www.lon-capa.org/
 #
-# (TeX Conversion Module
 #
-# 05/29/00,05/30 Gerd Kortemeyer)
+# There are two parameters controlling the action of this module:
+#
+# browser.interface - if this is 'textual', it overrides the second parameter
+# and goes to screen reader PDA mode
+#
+# environment.remote - if this is 'on', the routines controll the remote
+# control, otherwise they render the main window controls; ignored it
+# browser.interface is 'textual'
 #
-# 10/05,05/28,05/30,06/01,06/08,06/09,07/04,08/07 Gerd Kortemeyer
-# 02/15/02 Matthew Hall
 
 package Apache::lonmenu;
 
 use strict;
 use Apache::lonnet;
 use Apache::Constants qw(:common);
+use Apache::lonhtmlcommon();
 use Apache::loncommon;
 use Apache::File;
 use vars qw(@desklines $readdesk);
@@ -47,11 +52,36 @@ sub menubuttons {
     my $forcereg=shift;
     my $target  =shift;
     my $registration=shift;
-    unless ($ENV{'browser.interface'} eq 'textual') { return ''; }
+    if ($ENV{'browser.interface'} eq 'textual') {
 # Textual display only
-    my $output='<a href="/adm/menu">Main Menu</a><br />';
-    if ($registration) { $output.=&innerregister($forcereg,$target); }
-    return $output."<hr />";
+	my $output=(<<ENDMAINMENU);
+<script>
+// BEGIN LON-CAPA Internal
+</script>
+<a href="/adm/menu" target="_top">Main Menu</a><br />
+<script>
+// END LON-CAPA Internal
+</script>
+ENDMAINMENU
+        if ($registration) { $output.=&innerregister($forcereg,$target); }
+	return $output."<hr />";
+    } elsif ($ENV{'environment.remote'} eq 'off') {
+# Remote Control is switched off
+	my $output=(<<ENDINLINEMENU);
+<script>
+// BEGIN LON-CAPA Internal
+</script>
+<a href="/adm/menu" target="_top">Main Menu</a>
+<a href="/adm/remote?action=launch" target="_top">Launch Remote Control</a>
+<script>
+// END LON-CAPA Internal
+</script>
+ENDINLINEMENU
+        if ($registration) { $output.=&innerregister($forcereg,$target); }
+	return $output."<hr />";
+    } else {
+	return '';
+    }
 }
 
 # ====================================== This gets called in the header section
@@ -62,7 +92,7 @@ sub registerurl {
     my $result = '';
     
     if ($target eq 'edit') {
-        $result .="<script type=\"text/javascrtipt\">\n".
+        $result .="<script type=\"text/javascript\">\n".
             "if (typeof swmenu != 'undefined') {swmenu.currentURL=null;}\n".
             &Apache::loncommon::browser_and_searcher_javascript().
                 "\n</script>\n";
@@ -90,7 +120,11 @@ sub innerregister {
 
     $Apache::lonxml::registered=1;
 
-    my $textual=($ENV{'browser.interface'} eq 'textual');
+    my $textinter=($ENV{'browser.interface'} eq 'textual');
+    my $noremote=($ENV{'environment.remote'} eq 'off');
+    
+    my $textual=($textinter || $noremote);
+
     my $reopen=&Apache::lonmenu::reopenmenu();
 
     my $newmail='';
@@ -204,12 +238,23 @@ ENDMENUITEMS
         }
         if ($textual) {
 # Registered, textual output
+            my $utility=&utilityfunctions();
+            my $form=&serverform();
 	    $result =(<<ENDREGTEXT);
+<script>
+// BEGIN LON-CAPA Internal
+$utility
+</script>
 $timesync
 $newmail
 $buttons
 $hwkadd
 $editbutton
+$form
+<script>
+//END LON-CAPA Internal
+</script>
+
 ENDREGTEXT
 # Registered, graphical output
         } else {
@@ -217,6 +262,7 @@ ENDREGTEXT
      
 <script language="JavaScript">
 // BEGIN LON-CAPA Internal
+var swmenu=null;
 
     function LONCAPAreg() {
 	  swmenu=$reopen;
@@ -225,7 +271,7 @@ ENDREGTEXT
           $newmail
           $buttons
 	  swmenu.currentURL=window.location.pathname;
-          swmenu.reloadURL=window.location.pathname;
+          swmenu.reloadURL=window.location.pathname+window.location.search;
           swmenu.currentSymb="$ENV{'request.symb'}";
           swmenu.reloadSymb="$ENV{'request.symb'}";
           swmenu.currentStale=0;
@@ -267,6 +313,7 @@ ENDDONOTREGTEXT
 
 <script language="JavaScript">
 // BEGIN LON-CAPA Internal
+var swmenu=null;
 
     function LONCAPAreg() {
 	  swmenu=$reopen
@@ -309,9 +356,13 @@ sub unloadevents() {
 
 sub startupremote {
     my ($lowerurl)=@_;
-    if ($ENV{'browser.interface'} eq 'textual') {
+    if (($ENV{'browser.interface'} eq 'textual') ||
+        ($ENV{'environment.remote'} eq 'off')) {
      return ('<meta HTTP-EQUIV="Refresh" CONTENT="0.5; url='.$lowerurl.'" />');
     }
+#
+# The Remote actually gets launched!
+#
     my $configmenu=&rawconfig();
     return(<<ENDREMOTESTARTUP);
 <script>
@@ -370,7 +421,8 @@ ENDSETFLAGS
 }
 
 sub maincall() {
-    if ($ENV{'browser.interface'} eq 'textual') { return ''; }
+    if (($ENV{'browser.interface'} eq 'textual') ||
+        ($ENV{'environment.remote'} eq 'off')) { return ''; }
     return(<<ENDMAINCALL);
 <script>
     main();
@@ -380,18 +432,19 @@ ENDMAINCALL
 # ================================================================= Reopen menu
 
 sub reopenmenu {
-   my $nothing='';
-   if ($ENV{'browser.interface'} eq 'textual') { return ''; }
+   if (($ENV{'browser.interface'} eq 'textual') ||
+       ($ENV{'environment.remote'} eq 'off')) { return ''; }
    my $menuname='LCmenu'.$Apache::lonnet::perlvar{'lonHostID'};
-   if ($ENV{'browser.type'} eq 'explorer') { $nothing='javascript:void(0);'; }
-   return('window.open("'.$nothing.'","'.$menuname.'","",false);');
+   my $nothing = &Apache::lonhtmlcommon::javascript_nothing();
+   return('window.open('.$nothing.',"'.$menuname.'","",false);');
 } 
 
 # =============================================================== Open the menu
 
 sub open {
     my $returnval='';
-    if ($ENV{'browser.interface'} eq 'textual') { return ''; }
+    if (($ENV{'browser.interface'} eq 'textual') ||
+        ($ENV{'environment.remote'} eq 'off')) { return ''; }
     my $menuname='LCmenu'.$Apache::lonnet::perlvar{'lonHostID'};
     unless (shift eq 'unix') {
 # resizing does not work on linux because of virtual desktop sizes
@@ -415,7 +468,8 @@ ENDOPEN
 
 sub clear {
     my ($row,$col)=@_;
-    unless ($ENV{'browser.interface'} eq 'textual') {
+    unless (($ENV{'browser.interface'} eq 'textual') ||
+            ($ENV{'environment.remote'} eq 'off')) {
        return "\n".qq(window.status+='.';swmenu.clearbut($row,$col););
    } else { return ''; }
 }
@@ -428,15 +482,27 @@ sub switch {
     my ($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc,$nobreak)=@_;
     $act=~s/\$uname/$uname/g;
     $act=~s/\$udom/$udom/g;
-    unless ($ENV{'browser.interface'} eq 'textual') {
+    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/\- //;
-       return ($nobreak?'':'<br />').
-        '<a href="javascript:'.$act.';">'.$text.'</a> '.($nobreak?'':$desc);
+       return "\n".($nobreak?' ':'<br />').
+        '<a href="javascript:'.$act.';" target="_top">'.$text.'</a> '.
+        ($nobreak?'':$desc);
    }
 }
 
@@ -456,18 +522,17 @@ 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 {
-       return "window.open('','".$menuname."');";
-   }
+    if (($ENV{'browser.interface'} eq 'textual') ||
+        ($ENV{'environment.remote'} eq 'off')) { return ''; }
+    my $nothing = &Apache::lonhtmlcommon::javascript_nothing();
+    return "window.open(".$nothing.",'".$menuname."');";
 }
 
 sub rawconfig {
     my $textualoverride=shift;
     my $output='';
-    unless ($ENV{'browser.interface'} eq 'textual') {
+    unless (($ENV{'browser.interface'} eq 'textual') ||
+            ($ENV{'environment.remote'} eq 'off')) {
        $output.=
  "window.status='Opening Remote Control';var swmenu=".&openmenu().
 "\nwindow.status='Configuring Remote Control ';";
@@ -540,7 +605,8 @@ sub rawconfig {
             }
         }
     }
-    unless ($ENV{'browser.interface'} eq 'textual') {
+    unless (($ENV{'browser.interface'} eq 'textual') ||
+            ($ENV{'environment.remote'} eq 'off')) {
        $output.="\nwindow.status='Synchronizing Time';swmenu.syncclock(1000*".time.");\nwindow.status='Remote Control Configured.';";
     }
     return $output;
@@ -549,7 +615,8 @@ sub rawconfig {
 # ======================================================================= Close
 
 sub close {
-    if ($ENV{'browser.interface'} eq 'textual') { return ''; }
+    if (($ENV{'browser.interface'} eq 'textual') ||
+        ($ENV{'environment.remote'} eq 'off')) { return ''; }
     my $menuname='LCmenu'.$Apache::lonnet::perlvar{'lonHostID'};
     return(<<ENDCLOSE);
 <script>
@@ -572,6 +639,60 @@ sub footer {
 
 }
 
+sub utilityfunctions {
+    unless (($ENV{'browser.interface'} eq 'textual')  ||
+        ($ENV{'environment.remote'} eq 'off')) { return ''; }
+    my $currenturl=$ENV{'REQUEST_URI'};
+    my $currentsymb=$ENV{'request.symb'};
+return (<<ENDUTILITY)
+
+    var currentURL="$currenturl";
+    var reloadURL="$currenturl";
+    var currentSymb="$currentsymb";
+
+function go(url) {
+   if (url!='' && url!= null) {
+       currentURL = null;
+       currentSymb= null;
+       window.location.href=url;
+   }
+}
+
+function gopost(url,postdata) {
+   if (url!='') {
+      this.document.server.action=url;
+      this.document.server.postdata.value=postdata;
+      this.document.server.command.value='';
+      this.document.server.url.value='';
+      this.document.server.symb.value='';
+      this.document.server.submit();
+   }
+}
+
+function gocmd(url,cmd) {
+   if (url!='') {
+      this.document.server.action=url;
+      this.document.server.postdata.value='';
+      this.document.server.command.value=cmd;
+      this.document.server.url.value=currentURL;
+      this.document.server.symb.value=currentSymb;
+      this.document.server.submit();
+   }
+}
+ENDUTILITY
+}
+
+sub serverform {
+    return(<<ENDSERVERFORM);
+
+<form name="server" action="/adm/logout" method="post">
+<input type="hidden" name="postdata" value="none" />
+<input type="hidden" name="command" value="none" />
+<input type="hidden" name="url" value="none" />
+<input type="hidden" name="symb" value="none" />
+</form>
+ENDSERVERFORM
+}
 # ================================================ Handler when called directly
 
 
@@ -581,23 +702,20 @@ 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
     $r->print(<<ENDHEADER);
 <html><head>
 <title>LON-CAPA Main Menu</title>
 <script>
-function go(url) {
-    window.location=url;
-}
-function gopost(url) {
-    window.location=url;
-}
+$utility
 </script>
 </head>
 $bodytag
 ENDHEADER
-    $r->print(&rawconfig(1));
+    $r->print(&rawconfig(1).$form);
     $r->print('</body></html>');
     return OK;
 }