[LON-CAPA-cvs] cvs: loncom /interface lonmenu.pm lonremote.pm

[www]

www		Wed Apr  2 17:02:19 2003 EDT

  Modified files:              
    /loncom/interface	lonmenu.pm lonremote.pm 
  Log:
  Don't want the inline menu rendered inside of the Remote Control ...
  
  
Index: loncom/interface/lonmenu.pm
diff -u loncom/interface/lonmenu.pm:1.47 loncom/interface/lonmenu.pm:1.48
--- loncom/interface/lonmenu.pm:1.47	Mon Mar 10 15:21:45 2003
+++ loncom/interface/lonmenu.pm	Wed Apr  2 17:02:19 2003
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.47 2003/03/10 20:21:45 matthew Exp $
+# $Id: lonmenu.pm,v 1.48 2003/04/02 22:02:19 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -25,12 +25,16 @@
 #
 # 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;
 
@@ -48,9 +52,9 @@
     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=(<<ENDMAINMENU);
+	my $output=(<<ENDMAINMENU);
 <script>
 // BEGIN LON-CAPA Internal
 </script>
@@ -59,8 +63,25 @@
 // END LON-CAPA Internal
 </script>
 ENDMAINMENU
-    if ($registration) { $output.=&innerregister($forcereg,$target); }
-    return $output."<hr />";
+        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
Index: loncom/interface/lonremote.pm
diff -u loncom/interface/lonremote.pm:1.2 loncom/interface/lonremote.pm:1.3
--- loncom/interface/lonremote.pm:1.2	Wed Apr  2 16:23:04 2003
+++ loncom/interface/lonremote.pm	Wed Apr  2 17:02:19 2003
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # User Authentication Module
 #
-# $Id: lonremote.pm,v 1.2 2003/04/02 21:23:04 www Exp $
+# $Id: lonremote.pm,v 1.3 2003/04/02 22:02:19 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -43,6 +43,8 @@
 
 sub launchremote {
     my ($r,$lowerurl)=@_;
+    &Apache::lonnet::put('environment',{'remote' => 'on'});
+    &Apache::lonnet::appenv('environment.remote' => 'on');
 # -------------------------------------------------------- Menu script and info
 #    my $windowinfo=&Apache::lonmenu::open($clientos);
 #    my $startupremote=&Apache::lonmenu::startupremote($lowerurl);
@@ -58,8 +60,6 @@
 </body>
 </html>
 ENDLAUNCH
-   &Apache::lonnet::put('environment',{'remote' => 'on'});
-   &Apache::lonnet::appenv('environment.remote' => 'on');
 }
 
 sub collapseremote {