--- loncom/interface/lonmenu.pm	2003/02/17 19:28:54	1.41
+++ loncom/interface/lonmenu.pm	2003/04/17 14:51:31	1.61
@@ -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.61 2003/04/17 14:51:31 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -25,21 +25,30 @@
 #
 # 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);
+my @inlineremote;
+my $font;
+my $tabbg;
+my $pgbg;
 
 # ============================= This gets called at the top of the body section
 
@@ -47,11 +56,103 @@ sub menubuttons {
     my $forcereg=shift;
     my $target  =shift;
     my $registration=shift;
-    unless ($ENV{'browser.interface'} eq 'textual') { return ''; }
+    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') {
 # Textual display only
-    my $output='<a href="/adm/menu">Main Menu</a><br />';
-    if ($registration) { $output.=&innerregister($forcereg,$target); }
-    return $output."<hr />";
+        if ($ENV{'request.course.id'}) {
+	    $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>
+$reloadlink $navmaps<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
+# figure out colors
+	my $function='student';
+        if ($ENV{'request.role'}=~/^(cc|in|ta|ep)/) {
+	    $function='coordinator';
+        }
+	if ($ENV{'request.role'}=~/^(su|dc|ad|li)/) {
+            $function='admin';
+        }
+        if (($ENV{'request.role'}=~/^(au|ca)/) ||
+            ($ENV{'REQUEST_URI'}=~/^(\/priv|\~)/)) {
+            $function='author';
+        }
+        my $domain=&Apache::loncommon::determinedomain();
+        $pgbg=&Apache::loncommon::designparm($function.'.pgbg',$domain);
+        $tabbg=&Apache::loncommon::designparm($function.'.tabbg',$domain);
+        $font=&Apache::loncommon::designparm($function.'.font',$domain);
+        my $link=&Apache::loncommon::designparm($function.'.link',$domain);
+        my $alink=&Apache::loncommon::designparm($function.'.alink',$domain);
+        my $vlink=&Apache::loncommon::designparm($function.'.vlink',$domain);
+        my $sidebg=&Apache::loncommon::designparm($function.'.sidebg',$domain);
+# Do we have a NAV link?
+        if ($ENV{'request.course.id'}) {
+	    $navmaps=(<<ENDNAVREM);
+<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) {
+           $reg=&innerregister($forcereg,$target);
+        }
+	return (<<ENDINLINEMENU);
+<script>
+// BEGIN LON-CAPA Internal
+</script>
+<table bgcolor="$pgbg" width="100%" border="0" cellpadding="3" cellspacing="3">
+<tr>
+<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>
+</tr>
+</table>
+<script>
+// END LON-CAPA Internal
+</script>
+$reg
+ENDINLINEMENU
+    } else {
+	return '';
+    }
 }
 
 # ====================================== This gets called in the header section
@@ -62,12 +163,13 @@ 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";
     }
     if (($ENV{'browser.interface'} eq 'textual') ||
+        ($ENV{'environment.remote'} eq 'off') ||
         ((($ENV{'request.publicaccess'}) || 
          (!&Apache::lonnet::is_on_map($ENV{'REQUEST_URI'}))) &&
         (!$forcereg))) {
@@ -90,16 +192,38 @@ 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);
+
+    @inlineremote=();
+    undef @inlineremote;
+
     my $reopen=&Apache::lonmenu::reopenmenu();
 
     my $newmail='';
+    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");');
     }
     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>':'');
 # =============================================================================
 # ============================ This is for URLs that actually can be registered
     if (($ENV{'REQUEST_URI'}!~/^\/(res\/)*adm\//) || ($forcereg)) {
@@ -184,7 +308,7 @@ sub innerregister {
 	my $menuitems=(<<ENDMENUITEMS);
 c&3&1
 s&2&1&back.gif&backward&&gopost('/adm/flip','back:'+currentURL)&Go to the previous resource in the course sequence&1
-s&2&3&forw.gif&forward&&gopost('/adm/flip','forward:'+currentURL)&Go to the next resource in the course sequence&1
+s&2&3&forw.gif&forward&&gopost('/adm/flip','forward:'+currentURL)&Go to the next resource in the course sequence&3
 s&6&3&catalog.gif&catalog&info&catalog_info()&Show catalog information
 s&8&1&eval.gif&evaluate&this&gopost('/adm/evaluate',currentURL)&Provide my evaluation of this resource
 s&8&2&fdbk.gif&feedback&discuss&gopost('/adm/feedback',currentURL)&Provide feedback messages or contribute to the course discussion about this resource
@@ -204,12 +328,25 @@ ENDMENUITEMS
         }
         if ($textual) {
 # Registered, textual output
+            my $utility=&utilityfunctions();
+            my $form=&serverform();
+            my $inlinebuttons=
+                        join('',map { (defined($_)?$_:'') } @inlineremote);
 	    $result =(<<ENDREGTEXT);
+<script>
+// BEGIN LON-CAPA Internal
+$utility
+</script>
 $timesync
 $newmail
-$buttons
-$hwkadd
-$editbutton
+$tablestart
+$inlinebuttons
+$tableend
+$form
+<script>
+//END LON-CAPA Internal
+</script>
+
 ENDREGTEXT
 # Registered, graphical output
         } else {
@@ -217,6 +354,7 @@ ENDREGTEXT
      
 <script language="JavaScript">
 // BEGIN LON-CAPA Internal
+var swmenu=null;
 
     function LONCAPAreg() {
 	  swmenu=$reopen;
@@ -225,7 +363,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 +405,7 @@ ENDDONOTREGTEXT
 
 <script language="JavaScript">
 // BEGIN LON-CAPA Internal
+var swmenu=null;
 
     function LONCAPAreg() {
 	  swmenu=$reopen
@@ -309,10 +448,16 @@ 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();
+    my $esclowerurl=&Apache::lonnet::escape($lowerurl);
+
     return(<<ENDREMOTESTARTUP);
 <script>
 
@@ -342,7 +487,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();
@@ -351,7 +496,7 @@ function wait() {
 }
 
 function main() {
-   canceltim=setTimeout('tim=1;',60000);
+   canceltim=setTimeout('tim=1;',30000);
    window.status='-';
    wait();
 }
@@ -370,7 +515,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 +526,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,9 +562,13 @@ 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 ''; }
+   } else { 
+       $inlineremote[10*$row+$col]='';
+       return ''; 
+   }
 }
 
 # ============================================ Switch a button or create a link
@@ -428,16 +579,33 @@ 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/\- //;
+       $inlineremote[10*$row+$col]="\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);
+       $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.'"'.
+          ($nobreak?' size="+1"':'').
+     '>'.$text.'</font></a></td>'.
+     ($nobreak?'':'<td colspan="3" width="80%"><font color="'.$font.'" size="-1">'.$desc.'</font>').($nobreak!=1?'</tr>':'');
    }
+    return '';
 }
 
 sub secondlevel {
@@ -456,18 +624,24 @@ 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 inlinemenu {
+    @inlineremote=();
+    undef @inlineremote;
+    &rawconfig(1);
+    return join('',map { (defined($_)?$_:'') } @inlineremote);
 }
 
 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 +714,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 +724,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 +748,68 @@ 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();
+   }
+}
+
+function catalog_info() {
+   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() {
+   lonchat=window.open('/res/adm/pages/chatroom.html',"LONchat",'height=320,width=280,resizeable=yes,location=no,menubar=no,toolbar=no');
+}
+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 +819,38 @@ sub handler {
     $r->send_http_header;
     return OK if $r->header_only;
 
+    my $form=&serverform();
     my $bodytag=&Apache::loncommon::bodytag('Main Menu');
-# ------------------------------------------------------------ Print the screen
+    my $function='student';
+    if ($ENV{'request.role'}=~/^(cc|in|ta|ep)/) {
+	$function='coordinator';
+    }
+    if ($ENV{'request.role'}=~/^(su|dc|ad|li)/) {
+	$function='admin';
+    }
+    if (($ENV{'request.role'}=~/^(au|ca)/) ||
+	($ENV{'REQUEST_URI'}=~/^(\/priv|\~)/)) {
+	$function='author';
+    }
+    my $domain=&Apache::loncommon::determinedomain();
+    $pgbg=&Apache::loncommon::designparm($function.'.pgbg',$domain);
+    $tabbg=&Apache::loncommon::designparm($function.'.tabbg',$domain);
+    $font=&Apache::loncommon::designparm($function.'.font',$domain);
+# ---- 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>
 <script>
-function go(url) {
-    window.location=url;
-}
-function gopost(url) {
-    window.location=url;
-}
+$utility
 </script>
 </head>
 $bodytag
 ENDHEADER
-    $r->print(&rawconfig(1));
+    $r->print('<table>'.&inlinemenu().'</table>'.$form);
     $r->print('</body></html>');
     return OK;
 }