--- loncom/interface/lonmenu.pm 2003/02/20 18:00:31 1.43
+++ loncom/interface/lonmenu.pm 2003/05/23 13:56:39 1.67
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Routines to control the menu
#
-# $Id: lonmenu.pm,v 1.43 2003/02/20 18:00:31 www Exp $
+# $Id: lonmenu.pm,v 1.67 2003/05/23 13:56:39 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,106 @@ 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='Main Menu
';
- if ($registration) { $output.=&innerregister($forcereg,$target); }
- return $output."
";
+ if ($ENV{'request.course.id'}) {
+ $navmaps=(<Navigate Contents
+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=(<Return to Last Location
+ENDRELOAD
+ }
+ }
+ my $output=(<
+// BEGIN LON-CAPA Internal
+
+Main Menu
+$reloadlink $navmaps
+
+ENDMAINMENU
+ if ($registration) { $output.=&innerregister($forcereg,$target); }
+ return $output."
";
+ } 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=(<
+Navigate Contents
+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=(<
+Return to Last Location
+ENDRELOAD
+ }
+ }
+ my $reg='';
+ if ($registration) {
+ $reg=&innerregister($forcereg,$target);
+ }
+ return (<
+// BEGIN LON-CAPA Internal
+
+
+
+$reg
+ENDINLINEMENU
+ } else {
+ return '';
+ }
}
# ====================================== This gets called in the header section
@@ -60,24 +164,29 @@ sub registerurl {
my $forcereg=shift;
my $target = shift;
my $result = '';
-
+
+ my $force_title='';
+ if ($ENV{'request.state'} eq 'construct') {
+ $force_title=&Apache::lonxml::display_title();
+ }
if ($target eq 'edit') {
- $result .="\n";
}
if (($ENV{'browser.interface'} eq 'textual') ||
+ ($ENV{'environment.remote'} eq 'off') ||
((($ENV{'request.publicaccess'}) ||
(!&Apache::lonnet::is_on_map($ENV{'REQUEST_URI'}))) &&
(!$forcereg))) {
return $result.
- '';
+ ''.$force_title;
}
# Graphical display after login only
if ($Apache::lonxml::registered && !$forcereg) { return ''; }
$result.=&innerregister($forcereg,$target);
- return $result;
+ return $result.$force_title;
}
# =========== This gets called in order to register a URL, both with the Remote
@@ -90,16 +199,44 @@ 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 ($noremote) {
+ $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.=' ';
+ }
if (&Apache::lonmsg::newmail()) {
$newmail=($textual?
'You have new messages ':
'swmenu.setstatus("you have","messages");');
}
+ if ($noremote) {
+ $newmail.=' |
';
+ }
my $timesync=($textual?'':'swmenu.syncclock(1000*'.time.');');
+ my $tablestart=($noremote?'':'');
+ my $tableend=($noremote?'
':'');
# =============================================================================
# ============================ This is for URLs that actually can be registered
if (($ENV{'REQUEST_URI'}!~/^\/(res\/)*adm\//) || ($forcereg)) {
@@ -184,7 +321,7 @@ sub innerregister {
my $menuitems=(<
// BEGIN LON-CAPA Internal
@@ -213,12 +352,12 @@ $utility
$timesync
$newmail
-$buttons
-$hwkadd
-$editbutton
+$tablestart
+$inlinebuttons
+$tableend
$form
ENDREGTEXT
@@ -232,12 +371,13 @@ var swmenu=null;
function LONCAPAreg() {
swmenu=$reopen;
+ swmenu.noclient=0;
swmenu.clearTimeout(swmenu.menucltim);
$timesync
$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;
@@ -259,7 +399,7 @@ var swmenu=null;
'clearbut(2,1);clearbut(2,3);clearbut(8,1);clearbut(8,2);clearbut(8,3);'+
'clearbut(9,1);clearbut(9,2);clearbut(9,3);clearbut(6,3);clearbut(6,1)',
2000);
-
+ swmenu.noclient=1;
}
// END LON-CAPA Internal
@@ -283,6 +423,7 @@ var swmenu=null;
function LONCAPAreg() {
swmenu=$reopen
+ swmenu.noclient=0;
$timesync
swmenu.currentStale=1;
swmenu.clearbut(2,1);
@@ -299,6 +440,8 @@ var swmenu=null;
}
function LONCAPAstale() {
+ swmenu=$reopen
+ swmenu.noclient=1;
}
// END LON-CAPA Internal
@@ -322,10 +465,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 ('');
}
+#
+# The Remote actually gets launched!
+#
my $configmenu=&rawconfig();
+ my $esclowerurl=&Apache::lonnet::escape($lowerurl);
+
return(<
@@ -355,7 +504,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();
@@ -364,7 +513,7 @@ function wait() {
}
function main() {
- canceltim=setTimeout('tim=1;',60000);
+ canceltim=setTimeout('tim=1;',30000);
window.status='-';
wait();
}
@@ -383,7 +532,8 @@ ENDSETFLAGS
}
sub maincall() {
- if ($ENV{'browser.interface'} eq 'textual') { return ''; }
+ if (($ENV{'browser.interface'} eq 'textual') ||
+ ($ENV{'environment.remote'} eq 'off')) { return ''; }
return(<
main();
@@ -393,18 +543,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
@@ -428,9 +579,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
@@ -441,17 +596,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"););
- } else {
+ } elsif ($ENV{'browser.interface'} eq 'textual') {
+# Accessibility
if ($nobreak==2) { return ''; }
my $text=$top.' '.$bot;
$text=~s/\- //;
- return "\n".($nobreak?' ':'
').
- ''.$text.' '.
+ $inlineremote[10*$row+$col]="\n".($nobreak?' ':'
').
+ ''.$text.' '.
($nobreak?'':$desc);
+ } else {
+# Inline Remote
+ if ($nobreak==2) { return ''; }
+ my $text=$top.' '.$bot;
+ $text=~s/\- //;
+ $inlineremote[10*$row+$col]="\n".
+ ($nobreak==3?' | '.$text.' | '.
+ ($nobreak?'':''.$desc.'').($nobreak!=1?'':'');
}
+ return '';
}
sub secondlevel {
@@ -470,18 +641,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 ';";
@@ -554,7 +731,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;
@@ -563,7 +741,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(<
@@ -587,7 +766,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 (<
+ |