--- loncom/interface/lonmenu.pm 2003/02/17 17:34:16 1.40
+++ loncom/interface/lonmenu.pm 2006/04/14 20:12:35 1.173
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Routines to control the menu
#
-# $Id: lonmenu.pm,v 1.40 2003/02/17 17:34:16 www Exp $
+# $Id: lonmenu.pm,v 1.173 2006/04/14 20:12:35 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -25,126 +25,412 @@
#
# 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::loncommon;
-use Apache::File;
+use Apache::lonhtmlcommon();
+use Apache::loncommon();
+use Apache::lonenc();
+use Apache::lonlocal;
+
use vars qw(@desklines $readdesk);
+
+my @inlineremote;
+
+# ================================================================ Little texts
+
+sub initlittle {
+ return &Apache::lonlocal::texthash('ret' => 'Return to Last Location',
+ 'nav' => 'Navigate Contents',
+ 'main' => 'Main Menu',
+ 'roles' => ($env{'user.adv'}?
+ 'Roles':'Courses'),
+ 'docs' => 'Course Documents',
+ 'exit' => 'Exit',
+ 'launch' => 'Launch Remote Control',
+ 'groups' => 'Groups');
+}
+
+sub get_colors {
+ my ($font,$pgbg,$tabbg);
+ if ($env{'browser.interface'} eq 'textual') {
+ $pgbg='#FFFFFF';
+ $tabbg='#FFFFFF';
+ $font='#000000';
+ } else {
+ my $domain =&Apache::loncommon::determinedomain();
+ my $function =&Apache::loncommon::get_users_function();
+
+ $pgbg =&Apache::loncommon::designparm($function.'.pgbg', $domain);
+ $tabbg =&Apache::loncommon::designparm($function.'.tabbg',$domain);
+ $font =&Apache::loncommon::designparm($function.'.font', $domain);
+ }
+ return ($font,$pgbg,$tabbg);
+}
# ============================= This gets called at the top of the body section
sub menubuttons {
my $forcereg=shift;
- my $target =shift;
my $registration=shift;
- unless ($ENV{'browser.interface'} eq 'textual') { return ''; }
- my $output='Main Menu
';
- if ($registration) { $output.=&innerregister($forcereg,$target); }
- return $output."
";
+ my $titletable=shift;
+ &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
+ ['inhibitmenu']);
+ if (($env{'form.inhibitmenu'} eq 'yes') ||
+ ($ENV{'REQUEST_URI'} eq '/adm/logout')) { return ''; }
+ my %lt=&initlittle();
+ my $navmaps='';
+ my $reloadlink='';
+ my $docs='';
+ my $groups='';
+ my $showgroups=0;
+ my $escurl=&Apache::lonnet::escape(&Apache::lonenc::check_encrypt($env{'request.noversionuri'}));
+ my $escsymb=&Apache::lonnet::escape(&Apache::lonenc::check_encrypt($env{'request.symb'}));
+ my $face= 'face="Arial,Helvetica,sans-serif"';
+ if ($env{'request.state'} eq 'construct') {
+ if (($env{'request.noversionuri'} eq '') || (!defined($env{'request.noversionuri'}))) {
+ my $returnurl = $env{'request.filename'};
+ $returnurl =~ s:^/home/([^/]+)/public_html/(.*)$:/priv/$1/$2:;
+ $escurl = &Apache::lonnet::escape($returnurl);
+ }
+ }
+ if ($env{'request.course.id'}) {
+ my %coursegroups;
+ my $viewgrps_permission =
+ &Apache::lonnet::allowed('vcg',$env{'request.course.id'});
+ if (!$viewgrps_permission) {
+ %coursegroups = &Apache::lonnet::get_active_groups($env{'user.domain'},$env{'user.name'},$env{'course.'.$env{'request.course.id'}.'.domain'}, $env{'course.'.$env{'request.course.id'}.'.num'});
+ }
+ if ((keys(%coursegroups) > 0) || ($viewgrps_permission)) {
+ $showgroups = 1;
+ }
+ }
+
+ my ($font,$pgbg,$tabbg) = &get_colors();
+
+ if ($env{'browser.interface'} eq 'textual') {
+# Textual display only
+ if ($env{'request.course.id'}) {
+ $navmaps=(<$lt{'nav'}
+ENDNAV
+ if (($env{'request.noversionuri'}=~/^\/adm\//) &&
+ ($env{'request.noversionuri'}!~/^\/adm\/wrapper\//) &&
+ ($env{'request.noversionuri'}!~/^\/adm\/.*\/(smppg|bulletinboard|aboutme)(\?|$)/)) {
+ my $escreload=&Apache::lonnet::escape('return:');
+ $reloadlink=(<$lt{'ret'}
+ENDRELOAD
+ }
+ if (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) {
+ $docs=(<$lt{'docs'}
+ENDDOCS
+ }
+ if ($showgroups) {
+ $groups =(<
+$lt{'groups'}
+ENDGROUPS
+ }
+ }
+ my $form=&serverform();
+ my $utility=&utilityfunctions();
+ my $output=(<
+// BEGIN LON-CAPA Internal
+$utility
+
+$lt{'main'}
+$reloadlink $navmaps $docs $groups
+$lt{'roles'}
+$lt{'exit'}
+
+
+$form
+ENDMAINMENU
+ if ($registration) { $output.=&innerregister($forcereg); }
+ return $output."
";
+ } elsif ($env{'environment.remote'} eq 'off') {
+# Remote Control is switched off
+# figure out colors
+ my %lt=&initlittle();
+
+ my $domain=&Apache::loncommon::determinedomain();
+ my $function =&Apache::loncommon::get_users_function();
+ 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);
+ if ($env{'user.name'} eq 'public' && $env{'user.domain'} eq 'public') {
+ my $logo=&Apache::loncommon::lonhttpdurl("/adm/lonIcons/minilogo.gif");
+ return (<
+
+
+ENDINLINEMENU
+ }
+# Do we have a NAV link?
+ if ($env{'request.course.id'}) {
+ my $link='/adm/navmaps?postdata='.$escurl.'&postsymb='.
+ $escsymb;
+ if ($env{'environment.remotenavmap'} eq 'on') {
+ $link="javascript:gonav('".$link."')";
+ }
+ $navmaps=(<
+$lt{'nav'}
+ENDNAV
+ if (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) {
+ $docs=(<
+$lt{'docs'}
+ENDDOCS
+ }
+ if ($showgroups) {
+ $groups =(<
+$lt{'groups'}
+ENDGROUPS
+ }
+ if (
+ ($env{'request.noversionuri'}=~m[^/(res|public)/] &&
+ $env{'request.symb'} eq '')
+ ||
+ (($env{'request.noversionuri'}=~/^\/adm\//) &&
+ ($env{'request.noversionuri'}!~/^\/adm\/wrapper\//) &&
+ ($env{'request.noversionuri'}!~
+ m[^/adm/.*/(smppg|bulletinboard|aboutme)($|\?)])
+ )
+ ) {
+ my $escreload=&Apache::lonnet::escape('return:');
+ $reloadlink=(<
+$lt{'ret'}
+ENDRELOAD
+ }
+ }
+ if (($env{'request.state'} eq 'construct') && ($env{'request.course.id'})) {
+ my $escreload=&Apache::lonnet::escape('return:');
+ $reloadlink=(<
+$lt{'ret'}
+ENDCRELOAD
+ }
+ my $reg='';
+ if ($registration) {
+ $reg=&innerregister($forcereg,$titletable);
+ }
+ my $form=&serverform();
+ my $utility=&utilityfunctions();
+ my $logo=&Apache::loncommon::lonhttpdurl("/adm/lonIcons/minilogo.gif");
+
+ return (<
+// BEGIN LON-CAPA Internal
+//
+
+
+$form
+
+$reg
+ENDINLINEMENU
+ } else {
+ return '';
+ }
}
# ====================================== This gets called in the header section
sub registerurl {
- my $forcereg=shift;
- my $target = shift;
+ my ($forcereg) = @_;
my $result = '';
-
- if ($target eq 'edit') {
- $result .="\n";
- }
- if (($ENV{'browser.interface'} eq 'textual') ||
- ((($ENV{'request.publicaccess'}) ||
- (!&Apache::lonnet::is_on_map($ENV{'REQUEST_URI'}))) &&
+ if ($env{'request.noversionuri'} eq '/res/adm/pages/menu.html') { return ''; }
+ my $force_title='';
+ if ($env{'request.state'} eq 'construct') {
+ $force_title=&Apache::lonxml::display_title();
+ }
+ if (($env{'browser.interface'} eq 'textual') ||
+ ($env{'environment.remote'} eq 'off') ||
+ ((($env{'request.publicaccess'}) ||
+ (!&Apache::lonnet::is_on_map(
+ &Apache::lonnet::unescape($env{'request.noversionuri'})))) &&
(!$forcereg))) {
- return $result.
- '';
+ return $result.
+ ''.$force_title;
}
+# Graphical display after login only
if ($Apache::lonxml::registered && !$forcereg) { return ''; }
- $result.=&innerregister($forcereg,$target);
- return $result;
+ $result.=&innerregister($forcereg);
+ return $result.$force_title;
}
# =========== This gets called in order to register a URL, both with the Remote
# =========== and in the body of the document
sub innerregister {
- my $forcereg=shift;
- my $target = shift;
+ my ($forcereg, $titletable) = @_;
my $result = '';
+ my ($uname,$thisdisfn);
+ my $const_space = ($env{'request.state'} eq 'construct');
+ my $is_const_dir = 0;
+
+ if ($env{'request.noversionuri'} eq '/res/adm/pages/menu.html') { return ''; }
$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 ($font,$pgbg,$tabbg) = &get_colors();
+
my $newmail='';
+ if ($noremote) {
+ $newmail='';
+ }
+ if (($textual) && ($env{'request.symb'}) && ($env{'request.course.id'})) {
+ my ($mapurl,$rid,$resurl)=
+ &Apache::lonnet::decode_symb(&Apache::lonnet::symbread());
+ $newmail.=$env{'course.'.$env{'request.course.id'}.'.description'};
+ my $maptitle=&Apache::lonnet::gettitle($mapurl);
+ my $restitle=&Apache::lonnet::gettitle(&Apache::lonnet::symbread());
+ if ($maptitle && $maptitle ne 'default.sequence') {
+ $newmail.=', '.$maptitle;
+ }
+ if ($restitle) {
+ $newmail.=': '.$restitle;
+ }
+ $newmail.=' ';
+ }
if (&Apache::lonmsg::newmail()) {
- $newmail=($textual?'You have messages ':
+ $newmail=($textual?
+ 'You have new messages ':
'swmenu.setstatus("you have","messages");');
}
+ if ($env{'request.state'} eq 'construct') {
+ $newmail = $titletable;
+ } else {
+ if ($noremote) {
+ $newmail.=' |
';
+ }
+ }
my $timesync=($textual?'':'swmenu.syncclock(1000*'.time.');');
-# -- This is for URLs that actually can be registered
- if (($ENV{'REQUEST_URI'}!~/^\/(res\/)*adm\//) || ($forcereg)) {
+ my $tablestart=($noremote?'':'').($textinter?'':'');
+# =============================================================================
+# ============================ This is for URLs that actually can be registered
+ if (($env{'request.noversionuri'}!~m|^/(res/)*adm/|) || ($forcereg)) {
# -- This applies to homework problems for users with grading privileges
+ my $crs='/'.$env{'request.course.id'};
+ if ($env{'request.course.sec'}) {
+ $crs.='_'.$env{'request.course.sec'};
+ }
+ $crs=~s/\_/\//g;
+
my $hwkadd='';
- if
- ($ENV{'request.filename'}=~/\.(problem|exam|quiz|assess|survey|form)$/) {
- if (&Apache::lonnet::allowed('vgr',$ENV{'request.course.id'})) {
- $hwkadd.=&switch('','',7,1,'subm.gif','view sub','missions',
- "gocmd('/adm/grades','submission')",
- 'View user submissions for this assessment resource');
- }
- if (&Apache::lonnet::allowed('mgr',$ENV{'request.course.id'})) {
- $hwkadd.=&switch('','',7,2,'pgrd.gif','problem','grades',
+ if ($env{'request.symb'} ne '' &&
+ $env{'request.filename'}=~/\.(problem|exam|quiz|assess|survey|form|task)$/) {
+ if (&Apache::lonnet::allowed('mgr',$crs)) {
+ $hwkadd.=&switch('','',7,2,'pgrd.gif','problem[_1]','grades[_3]',
"gocmd('/adm/grades','gradingmenu')",
'Modify user grades for this assessment resource');
- }
- if (&Apache::lonnet::allowed('opa',$ENV{'request.course.id'})) {
- $hwkadd.=&switch('','',7,3,'pparm.gif','problem','parms',
- "gocmd('/adm/parmset','set')",
- 'Modify deadlines, etc, for this assessment resource');
+ } elsif (&Apache::lonnet::allowed('vgr',$crs)) {
+ $hwkadd.=&switch('','',7,2,'subm.gif','view sub-[_1]','missions[_1]',
+ "gocmd('/adm/grades','submission')",
+ 'View user submissions for this assessment resource');
}
}
+ if ($env{'request.symb'} ne '' &&
+ &Apache::lonnet::allowed('opa',$crs)) {
+ $hwkadd.=&switch('','',7,3,'pparm.gif','problem[_2]','parms[_2]',
+ "gocmd('/adm/parmset','set')",
+ 'Modify deadlines, etc, for this resource');
+ }
# -- End Homework
###
### Determine whether or not to display the 'cstr' button for this
### resource
###
my $editbutton = '';
- if ($ENV{'user.author'}) {
- if ($ENV{'request.role'}=~/^(ca|au)/) {
+ if ($env{'user.author'}) {
+ if ($env{'request.role'}=~/^(ca|au)/) {
# Set defaults for authors
my ($top,$bottom) = ('con-','struct');
- my $action = "go('/priv/".$ENV{'user.name'}."');";
- my $cadom = $ENV{'request.role.domain'};
- my $caname = $ENV{'user.name'};
+ my $action = "go('/priv/".$env{'user.name'}."');";
+ my $cadom = $env{'request.role.domain'};
+ my $caname = $env{'user.name'};
my $desc = "Enter my resource construction space";
# Set defaults for co-authors
- if ($ENV{'request.role'} =~ /^ca/) {
- ($cadom,$caname)=($ENV{'request.role'}=~/(\w+)\/(\w+)$/);
+ if ($env{'request.role'} =~ /^ca/) {
+ ($cadom,$caname)=($env{'request.role'}=~/(\w+)\/(\w+)$/);
($top,$bottom) = ('co con-','struct');
$action = "go('/priv/".$caname."');";
$desc = "Enter construction space as co-author";
}
# Check that we are on the correct machine
my $home = &Apache::lonnet::homeserver($caname,$cadom);
- if ($home eq $Apache::lonnet::perlvar{'lonHostID'}) {
- $editbutton=&switch
- ('','',6,1,$top,,$bottom,$action,$desc);
+ my $allowed=0;
+ my @ids=&Apache::lonnet::current_machine_ids();
+ foreach my $id (@ids) { if ($id eq $home) { $allowed=1; } }
+ if (!$allowed) {
+ $editbutton=&switch('','',6,1,$top,,$bottom,$action,$desc);
}
}
##
@@ -153,63 +439,145 @@ sub innerregister {
my $cfile='';
my $cfuname='';
my $cfudom='';
- if ($ENV{'request.filename'}) {
- my $file=&Apache::lonnet::declutter($ENV{'request.filename'});
+ if ($env{'request.filename'}) {
+ my $file=&Apache::lonnet::declutter($env{'request.filename'});
$file=~s/^(\w+)\/(\w+)/\/priv\/$2/;
- # Chech that the user has permission to edit this resource
+ # Check that the user has permission to edit this resource
($cfuname,$cfudom)=&Apache::loncacc::constructaccess($file,$1);
if (defined($cfudom)) {
- if (&Apache::lonnet::homeserver($cfuname,$cfudom)
- eq $Apache::lonnet::perlvar{'lonHostID'}) {
+ my $home=&Apache::lonnet::homeserver($cfuname,$cfudom);
+ my $allowed=0;
+ my @ids=&Apache::lonnet::current_machine_ids();
+ foreach my $id (@ids) { if ($id eq $home) { $allowed=1; } }
+ if ($allowed) {
$cfile=$file;
}
}
}
# Finally, turn the button on or off
- if ($cfile) {
+ if ($cfile && !$const_space) {
$editbutton=&switch
- ('','',6,1,'cstr.gif','edit','resource',
+ ('','',6,1,'cstr.gif','edit[_1]','resource[_2]',
"go('".$cfile."');","Edit this resource");
} elsif ($editbutton eq '') {
- $editbutton=&clear(6,1);
+ $editbutton=&switch('','',6,1,'port.gif',
+ 'port-[_1]','folio[_1]',
+ "go('/adm/portfolio');",
+ "Enter my portfolio space");
}
}
###
###
- $result = (<$inlineremote[21] | | $inlineremote[23] |
+$inlineremote[61] | $inlineremote[62] | $inlineremote[63] |
+$inlineremote[71] | $inlineremote[72] | $inlineremote[73] |
+$inlineremote[81] | $inlineremote[82] | $inlineremote[83] |
+$inlineremote[91] | $inlineremote[92] | $inlineremote[93] |
+ENDINLINE
+ }
+ }
+ $result =(<
+// BEGIN LON-CAPA Internal
+
+$timesync
+$newmail
+$tablestart
+$inlinebuttons
+$tableend
+
+
+ENDREGTEXT
+# Registered, graphical output
+ } else {
+ my $requri=&Apache::lonnet::clutter(&Apache::lonnet::fixversion((split(/\?/,$env{'request.noversionuri'}))[0]));
+ $requri=&Apache::lonenc::check_encrypt(&Apache::lonnet::unescape($requri));
+ my $cursymb=&Apache::lonenc::check_encrypt($env{'request.symb'});
+ my $navstatus=&get_nav_status();
+ my $clearcstr;
+
+ if ($env{'user.adv'}) { $clearcstr='clearbut(6,1)'; }
+ $result = (<
+
ENDREGTHIS
-
+ }
+# =============================================================================
} else {
- $result = (<
+
ENDDONOTREGTHIS
+ }
+# =============================================================================
}
return $result;
}
sub loadevents() {
+ if ($env{'request.state'} eq 'construct' ||
+ $env{'request.noversionuri'} eq '/res/adm/pages/menu.html') { return ''; }
return 'LONCAPAreg();';
}
sub unloadevents() {
+ if ($env{'request.state'} eq 'construct' ||
+ $env{'request.noversionuri'} eq '/res/adm/pages/menu.html') { return ''; }
return 'LONCAPAstale();';
}
@@ -280,14 +661,27 @@ 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);
+ my $message=&mt('"Waiting for Remote Control window to load: "+[_1]','waited');
return(<
-
+
@@ -341,28 +737,51 @@ ENDSETFLAGS
}
sub maincall() {
- if ($ENV{'browser.interface'} eq 'textual') { return ''; }
+ if (($env{'browser.interface'} eq 'textual') ||
+ ($env{'environment.remote'} eq 'off')) { return ''; }
return(<
+
ENDMAINCALL
}
+
+sub load_remote_msg {
+ my ($lowerurl)=@_;
+
+ if (($env{'browser.interface'} eq 'textual') ||
+ ($env{'environment.remote'} eq 'off')) { return ''; }
+
+ my $esclowerurl=&Apache::lonnet::escape($lowerurl);
+ my $link=&mt('Continue on in Inline Menu mode',
+ "/adm/remote?action=collapse?url=$esclowerurl");
+ return(<
+
+
+$link
+ENDREMOTEFORM
+}
# ================================================================= 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
@@ -377,8 +796,9 @@ ENDRESIZE
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");
+self.name='loncapaclient';
ENDOPEN
- return '';
+ return '';
}
@@ -386,9 +806,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
@@ -399,15 +823,70 @@ 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') {
+ $top=&mt($top);
+ $bot=&mt($bot);
+ $desc=&mt($desc);
+ $img=&mt($img);
+
+ my ($font,$pgbg,$tabbg) = &get_colors();
+
+ 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/\s*\-\s*//gs;
+ if ($nobreak) {
+ $inlineremote[10*$row+$col]=
+ ''.$text.'';
+ } else {
+ $inlineremote[10*$row+$col]="\n
".
+ $desc.' '.$text.'';
+ }
} else {
+# Inline Remote
+ if ($nobreak==2) { return ''; }
my $text=$top.' '.$bot;
- $text=~s/\- //;
- return ($nobreak?'':'
').
- ''.$text.' '.$desc;
+ $text=~s/\s*\-\s*//gs;
+
+ my $lonhttpdPort=$Apache::lonnet::perlvar{'lonhttpdPort'};
+ if (!defined($lonhttpdPort)) { $lonhttpdPort='8080'; }
+ my $pic=
+ '';
+ if (($env{'browser.interface'} eq 'textual') || ($env{'browser.interface'} eq 'faketextual')) {
+# Accessibility
+ if ($nobreak==3) {
+ $inlineremote[10*$row+$col]="\n".
+ ''.$text.
+ ' | '.
+ ''.$pic.' | ';
+ } elsif ($nobreak) {
+ $inlineremote[10*$row+$col]="\n".
+ ''.
+ ''.$pic.
+ ' | '.$text.' | ';
+ } else {
+ $inlineremote[10*$row+$col]="\n
".
+ ''.
+ ''.$pic.
+ ' | '.$desc.
+ ' |
';
+ }
+ } else {
+# Inline Menu
+ $inlineremote[10*$row+$col]=
+ ''.$pic.
+ ''.$desc.
+ '';
+ }
}
+ return '';
}
sub secondlevel {
@@ -426,40 +905,46 @@ 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 ';";
} else {
unless ($textualoverride) { return ''; }
}
- my $uname=$ENV{'user.name'};
- my $udom=$ENV{'user.domain'};
- my $adv=$ENV{'user.adv'};
- my $author=$ENV{'user.author'};
+ my $uname=$env{'user.name'};
+ my $udom=$env{'user.domain'};
+ my $adv=$env{'user.adv'};
+ my $author=$env{'user.author'};
my $crs='';
- if ($ENV{'request.course.id'}) {
- $crs='/'.$ENV{'request.course.id'};
- if ($ENV{'request.course.sec'}) {
- $crs.='_'.$ENV{'request.course.sec'};
+ if ($env{'request.course.id'}) {
+ $crs='/'.$env{'request.course.id'};
+ if ($env{'request.course.sec'}) {
+ $crs.='_'.$env{'request.course.sec'};
}
$crs=~s/\_/\//g;
}
- my $pub=($ENV{'request.state'} eq 'published');
- my $con=($ENV{'request.state'} eq 'construct');
- my $rol=$ENV{'request.role'};
- my $requested_domain = $ENV{'request.role.domain'};
+ my $pub=($env{'request.state'} eq 'published');
+ my $con=($env{'request.state'} eq 'construct');
+ my $rol=$env{'request.role'};
+ my $requested_domain = $env{'request.role.domain'};
foreach (@desklines) {
my ($row,$col,$pro,$prt,$img,$top,$bot,$act,$desc)=split(/\:/,$_);
$prt=~s/\$uname/$uname/g;
@@ -481,28 +966,44 @@ sub rawconfig {
$output.=&secondlevel(
$uname,$udom,$rol,$crs,$pub,$con,$row,$col,$prt,$img,$top,$bot,$act,$desc);
}
- } elsif (($pro=~/p(\w+)/) && ($prt)) {
+ } elsif (($pro=~/^p(\w+)/) && ($prt)) {
if (&Apache::lonnet::allowed($1,$prt)) {
$output.=switch($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc);
}
} elsif ($pro eq 'course') {
- if ($ENV{'request.course.fn'}) {
+ if ($env{'request.course.fn'}) {
$output.=switch($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc);
}
+ } elsif ($pro =~ /^courseenv_(.*)$/) {
+ my $key = $1;
+ if ($env{'course.'.$env{'request.course.id'}.'.'.$key}) {
+ $output.=switch($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc);
+ }
+ } elsif ($pro =~ /^course_(.*)$/) {
+ # Check for permissions inside of a course
+ if (($env{'request.course.id'}) &&
+ (&Apache::lonnet::allowed($1,$env{'request.course.id'}.
+ ($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:''))
+ )) {
+ $output.=switch($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc);
+ }
} elsif ($pro eq 'author') {
if ($author) {
- if ((($prt eq 'rca') && ($ENV{'request.role'}=~/^ca/)) ||
- (($prt eq 'rau') && ($ENV{'request.role'}=~/^au/))) {
+ if ((($prt eq 'rca') && ($env{'request.role'}=~/^ca/)) ||
+ (($prt eq 'rau') && ($env{'request.role'}=~/^au/))) {
# Check that we are on the correct machine
my $cadom=$requested_domain;
- my $caname=$ENV{'user.name'};
+ my $caname=$env{'user.name'};
if ($prt eq 'rca') {
($cadom,$caname)=
- ($ENV{'request.role'}=~/(\w+)\/(\w+)$/);
+ ($env{'request.role'}=~/(\w+)\/(\w+)$/);
}
$act =~ s/\$caname/$caname/g;
my $home = &Apache::lonnet::homeserver($caname,$cadom);
- if ($home eq $Apache::lonnet::perlvar{'lonHostID'}) {
+ my $allowed=0;
+ my @ids=&Apache::lonnet::current_machine_ids();
+ foreach my $id (@ids) { if ($id eq $home) { $allowed=1; } }
+ if ($allowed) {
$output.=switch($caname,$cadom,
$row,$col,$img,$top,$bot,$act,$desc);
}
@@ -510,19 +1011,25 @@ 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.';";
+ if (&Apache::lonmsg::newmail()) {
+ $output.='swmenu.setstatus("you have","messages");';
+ }
}
+
return $output;
}
# ======================================================================= 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(<
+
-
-$bodytag
-ENDHEADER
- $r->print(&rawconfig(1));
- $r->print('