--- loncom/interface/lonmenu.pm 2004/11/13 21:07:19 1.129 +++ loncom/interface/lonmenu.pm 2008/12/13 15:51:51 1.239.4.1 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Routines to control the menu # -# $Id: lonmenu.pm,v 1.129 2004/11/13 21:07:19 albertel Exp $ +# $Id: lonmenu.pm,v 1.239.4.1 2008/12/13 15:51:51 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -39,142 +39,241 @@ package Apache::lonmenu; use strict; -use Apache::lonnet(); -use Apache::Constants qw(:common); +use Apache::lonnet; use Apache::lonhtmlcommon(); use Apache::loncommon(); use Apache::lonenc(); use Apache::lonlocal; +use LONCAPA qw(:DEFAULT :match); -use vars qw(@desklines $readdesk); +use vars qw(@desklines %category_names %category_members %category_positions $readdesk); my @inlineremote; -my $font; -my $tabbg; -my $pgbg; + + # ================================================================ Little texts +sub show_course { + my $course = !$env{'user.adv'}; + if (!$env{'user.adv'}) { + foreach my $env (keys(%env)) { + next if ($env !~ m/^user\.priv\./); + if ($env !~ m/^user\.priv\.(?:st|cm)/) { + $course = 0; + last; + } + } + } + return $course; +} sub initlittle { return &Apache::lonlocal::texthash('ret' => 'Return to Last Location', 'nav' => 'Navigate Contents', 'main' => 'Main Menu', - 'launch' => 'Launch Remote Control'); + 'roles' => (&show_course()? + 'Courses':'Roles'), + 'other' => 'Other Roles', + 'docs' => 'Edit Course', + 'exit' => 'Exit', + 'login' => 'Log In', + 'launch' => 'Launch Remote Control', + 'groups' => 'Groups', + 'gdoc' => 'Group Documents', + ); } # ============================= This gets called at the top of the body section sub menubuttons { my $forcereg=shift; - my $target =shift; my $registration=shift; + my $titletable=shift; &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, ['inhibitmenu']); - if ($ENV{'form.inhibitmenu'} eq 'yes') { return ''; } + if (($env{'form.inhibitmenu'} eq 'yes') || + ($ENV{'REQUEST_URI'} eq '/adm/logout')) { return ''; } + if ($env{'request.noversionuri'} =~ m{^/res/adm/pages/}) { return ''; } + + my %lt=&initlittle(); my $navmaps=''; my $reloadlink=''; - my $escurl=&Apache::lonnet::escape(&Apache::lonenc::check_encrypt($ENV{'request.noversionuri'})); - my $escsymb=&Apache::lonnet::escape(&Apache::lonenc::check_encrypt($ENV{'request.symb'})); - if ($ENV{'browser.interface'} eq 'textual') { + my $docs=''; + my $groups=''; + my $roles=''.$lt{'roles'}.''; + my $role_selector; + my $showgroups=0; + my ($cnum,$cdom); + my $escurl=&escape(&Apache::lonenc::check_encrypt($env{'request.noversionuri'})); + my $escsymb=&escape(&Apache::lonenc::check_encrypt($env{'request.symb'})); + + my $logo=&Apache::loncommon::lonhttpdurl("/adm/lonIcons/minilogo.gif"); + $logo = 'LON-CAPA Logo'; + + 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 = &escape($returnurl); + } + } + if ($env{'request.course.id'}) { + $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; + $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; + my %coursegroups; + my $viewgrps_permission = + &Apache::lonnet::allowed('vcg',$env{'request.course.id'}.($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:'')); + if (!$viewgrps_permission) { + %coursegroups = &Apache::lonnet::get_active_groups($env{'user.domain'},$env{'user.name'},$cdom,$cnum); + } + if ((keys(%coursegroups) > 0) || ($viewgrps_permission)) { + $showgroups = 1; + } + $role_selector = &roles_selector($cdom,$cnum); + if ($role_selector) { + $roles = ''.$role_selector.'  '.$lt{'other'}.''; + } + } + + if ($env{'browser.interface'} eq 'textual') { # Textual display only - my %lt=&initlittle(); - $pgbg='#FFFFFF'; - $tabbg='#FFFFFF'; - $font='#000000'; - if ($ENV{'request.course.id'}) { + if ($env{'request.course.id'}) { $navmaps=(<$lt{'nav'} +$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:'); + if (&show_return_link()) { + my $escreload=&escape('return:'); $reloadlink=(<$lt{'ret'} +$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
+$reloadlink $navmaps $docs $groups $roles +$lt{'exit'} +
+
+$form ENDMAINMENU - if ($registration) { $output.=&innerregister($forcereg,$target); } + if ($registration) { $output.=&innerregister($forcereg); } return $output."
"; - } elsif ($ENV{'environment.remote'} eq 'off') { + } elsif ($env{'environment.remote'} eq 'off') { # Remote Control is switched off # figure out colors my %lt=&initlittle(); - 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.noversionuri'}=~/^(\/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 $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') { + return (< + + $logo + + + $lt{'login'} + + + + +ENDINLINEMENU + } + $roles = ''.$lt{'roles'}.''; # Do we have a NAV link? - if ($ENV{'request.course.id'}) { - $navmaps=(< -$lt{'nav'} + 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 (($ENV{'request.noversionuri'}=~/^\/adm\//) && - ($ENV{'request.noversionuri'}!~/^\/adm\/wrapper\//) && - ($ENV{'request.noversionuri'}!~/^\/adm\/.*\/(smppg|bulletinboard|aboutme)(\?|$)/)) { - my $escreload=&Apache::lonnet::escape('return:'); + my $is_group = (&Apache::loncommon::course_type() eq 'Group'); + if (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) { + my $text = ($is_group) ? $lt{'gdoc'} : $lt{'docs'}; + $docs=(<$text +ENDDOCS + } + if ($showgroups) { + $groups =(<$lt{'groups'} +ENDGROUPS + } + if (&show_return_link()) { + my $escreload=&escape('return:'); $reloadlink=(< -$lt{'ret'} +$lt{'ret'} ENDRELOAD } + if ($role_selector) { + $roles = ''.$role_selector.''.$lt{'other'}.''; + } + } + if (($env{'request.state'} eq 'construct') && ($env{'request.course.id'})) { + my $escreload=&escape('return:'); + $reloadlink=(<$lt{'ret'} +ENDCRELOAD } my $reg=''; if ($registration) { - $reg=&innerregister($forcereg,$target); + $reg=&innerregister($forcereg,$titletable); } + my $form=&serverform(); my $utility=&utilityfunctions(); + + my $helplink=&Apache::loncommon::top_nav_help('Help'); return (< // BEGIN LON-CAPA Internal +// - +
- +$logo + $reloadlink $navmaps - - +$docs +$groups +$roles + +
-$lt{'main'} -$lt{'main'} - -$lt{'launch'} - -LON-CAPA$helplink$lt{'exit'}
- +$form @@ -185,37 +284,41 @@ ENDINLINEMENU } } +sub show_return_link { + return (($env{'request.noversionuri'}=~m{^/(res|public)/} && + $env{'request.symb'} eq '') + || + ($env{'request.noversionuri'}=~ m{^/cgi-bin/printout.pl}) + || + (($env{'request.noversionuri'}=~/^\/adm\//) && + ($env{'request.noversionuri'}!~/^\/adm\/wrapper\//) && + ($env{'request.noversionuri'}!~ + m[^/adm/.*/(smppg|bulletinboard|aboutme)($|\?)]) + )); +} + # ====================================== This gets called in the header section sub registerurl { - my $forcereg=shift; - my $target = shift; + my ($forcereg) = @_; my $result = ''; - if ($ENV{'request.noversionuri'} eq '/res/adm/pages/menu.html') { return ''; } + if ($env{'request.noversionuri'} =~ m{^/res/adm/pages/}) { return ''; } my $force_title=''; - if ($ENV{'request.state'} eq 'construct') { + 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'}) || + 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'})))) && + &unescape($env{'request.noversionuri'})))) && (!$forcereg))) { return $result. ''.$force_title; } # Graphical display after login only - if ($Apache::lonxml::registered && !$forcereg) { return ''; } - if ($target ne 'edit') { - $result.=&innerregister($forcereg,$target); - } + if ($env{'request.registered'} && !$forcereg) { return ''; } + $result.=&innerregister($forcereg); return $result.$force_title; } @@ -223,81 +326,95 @@ sub registerurl { # =========== 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 $const_space = ($env{'request.state'} eq 'construct'); + my $is_const_dir = 0; - if ($ENV{'request.noversionuri'} eq '/res/adm/pages/menu.html') { return ''; } + if ($env{'request.noversionuri'} =~ m{^/res/adm/pages/}) { return ''; } - $Apache::lonxml::registered=1; + $env{'request.registered'} = 1; - my $textinter=($ENV{'browser.interface'} eq 'textual'); - my $noremote=($ENV{'environment.remote'} eq 'off'); + my $textinter=($env{'browser.interface'} eq 'textual'); + my $noremote=($env{'environment.remote'} eq 'off'); my $textual=($textinter || $noremote); - @inlineremote=(); - undef @inlineremote; + undef(@inlineremote); my $reopen=&Apache::lonmenu::reopenmenu(); my $newmail=''; if ($noremote) { - $newmail='
'; + $newmail=''; } - if (($textual) && ($ENV{'request.symb'}) && ($ENV{'request.course.id'})) { - my ($mapurl,$rid,$resurl)=&Apache::lonnet::decode_symb($ENV{'request.symb'}); - $newmail.=$ENV{'course.'.$ENV{'request.course.id'}.'.description'}; + if (&Apache::lonmsg::newmail()) { + if ($textual) { + $newmail.= ''; + } else { + $newmail= 'swmenu.setstatus("you have","messages");'; + } + } + if (($textual) + && ($env{'request.symb'}) + && ($env{'request.course.id'})) { + $newmail.= ''; } - if (&Apache::lonmsg::newmail()) { - $newmail=($textual? - 'You have new messages
': - 'swmenu.setstatus("you have","messages");'); - } - if ($noremote) { - $newmail.='
+ '. + &mt('You have new messages').''; + my ($mapurl,$rid,$resurl)= + &Apache::lonnet::decode_symb(&Apache::lonnet::symbread()); + my $coursetitle=$env{'course.'.$env{'request.course.id'}.'.description'}; + $newmail.=$coursetitle; my $maptitle=&Apache::lonnet::gettitle($mapurl); - my $restitle=&Apache::lonnet::gettitle($resurl); - if ($maptitle) { + my $restitle=&Apache::lonnet::gettitle(&Apache::lonnet::symbread()); + if ($maptitle && ($maptitle ne 'default.sequence') && ($maptitle ne $coursetitle)) { $newmail.=', '.$maptitle; } if ($restitle) { $newmail.=': '.$restitle; } - $newmail.='   '; + $newmail.='   
'; + if ($env{'request.state'} eq 'construct') { + $newmail = $titletable; + } else { + if ($noremote) { + $newmail.='
'; + } } my $timesync=($textual?'':'swmenu.syncclock(1000*'.time.');'); - my $tablestart=($noremote?'':'').($textinter?'
'.&mt('Skip to Content').'
':''); - my $tableend=($noremote?'
':'').($textinter?'':''); + my $tablestart=($noremote?'':''). + ($textinter?'
'.&mt('Skip to Content').'
':''); + my $tableend=($noremote?'
':'').($textinter?'':''); # ============================================================================= # ============================ This is for URLs that actually can be registered - if (($ENV{'request.noversionuri'}!~/^\/(res\/)*adm\//) || ($forcereg)) { + 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'}; + 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',$crs)) { - $hwkadd.=&switch('','',7,1,'subm.gif','view sub-[_1]','missions[_1]', - "gocmd('/adm/grades','submission')", - 'View user submissions for this assessment resource'); - } + 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'); + } 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 (&Apache::lonnet::allowed('opa',$crs)) { + 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'); + 'Modify parameter settings for this resource'); } # -- End Homework ### @@ -305,20 +422,25 @@ sub innerregister { ### resource ### my $editbutton = ''; - if ($ENV{'user.author'}) { - if ($ENV{'request.role'}=~/^(ca|au)/) { + if ($env{'user.author'}) { + if ($env{'request.role'}=~/^(aa|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 $desc = "Enter my resource construction space"; + my $action = "go('/priv/".$env{'user.name'}."');"; + my $cadom = $env{'request.role.domain'}; + my $caname = $env{'user.name'}; + my $desc = "Enter my 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'}=~/($match_domain)\/($match_username)$/); ($top,$bottom) = ('co con-','struct'); $action = "go('/priv/".$caname."');"; $desc = "Enter construction space as co-author"; + } elsif ($env{'request.role'} =~ /^aa/) { + ($cadom,$caname)=($env{'request.role'}=~/($match_domain)\/($match_username)$/); + ($top,$bottom) = ('co con-','struct'); + $action = "go('/priv/".$caname."');"; + $desc = "Enter construction space as assistant co-author"; } # Check that we are on the correct machine my $home = &Apache::lonnet::homeserver($caname,$cadom); @@ -335,9 +457,9 @@ sub innerregister { my $cfile=''; my $cfuname=''; my $cfudom=''; - if ($ENV{'request.filename'}) { - my $file=&Apache::lonnet::declutter($ENV{'request.filename'}); - $file=~s/^(\w+)\/(\w+)/\/priv\/$2/; + if ($env{'request.filename'}) { + my $file=&Apache::lonnet::declutter($env{'request.filename'}); + $file=~s/^($match_domain)\/($match_username)/\/priv\/$2/; # Check that the user has permission to edit this resource ($cfuname,$cfudom)=&Apache::loncacc::constructaccess($file,$1); if (defined($cfudom)) { @@ -353,7 +475,7 @@ sub innerregister { # Finally, turn the button on or off if ($cfile && !$const_space) { $editbutton=&switch - ('','',6,1,'cstr.gif','edit[_1]','resource[_2]', + ('','',6,1,'pcstr.gif','edit[_1]','resource[_2]', "go('".$cfile."');","Edit this resource"); } elsif ($editbutton eq '') { $editbutton=&clear(6,1); @@ -365,72 +487,124 @@ sub innerregister { my $menuitems; if ($const_space) { my ($uname,$thisdisfn) = - ($ENV{'request.filename'}=~m|^/home/([^/]+)/public_html/(.*)|); + ($env{'request.filename'}=~m|^/home/([^/]+)/public_html/(.*)|); my $currdir = '/priv/'.$uname.'/'.$thisdisfn; - $currdir =~ s#[^/]+$##; - $menuitems=(< +$inlineremote[21] $inlineremote[23] +ENDARROWSINLINE + if (&hidden_button_check() ne 'yes') { + $inlinebuttons .= (< +ENDINLINEICONS + } + } else { + if ($inlineremote[21] ne '' || $inlineremote[23] ne '') { + $inlinebuttons=(<$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 +ENDFIRSTLINE + } + if (&hidden_button_check() ne 'yes') { + foreach my $row (6..9) { + if ($inlineremote[${row}.'1'] ne '' + || $inlineremote[$row.'2'] ne '' + || $inlineremote[$row.'3'] ne '') { + $inlinebuttons .= <<"ENDLINE"; +$inlineremote["${row}1"]$inlineremote["${row}2"]$inlineremote["${row}3"] +ENDLINE + } + } + } + } + } } $result =(< // BEGIN LON-CAPA Internal $timesync -$newmail $tablestart $inlinebuttons $tableend -$form +$newmail @@ -438,10 +612,13 @@ $form ENDREGTEXT # Registered, graphical output } else { - my $requri=(split(/\?/,$ENV{'request.noversionuri'}))[0]; - $requri=&Apache::lonenc::check_encrypt(&Apache::lonnet::unescape($requri)); - my $cursymb=&Apache::lonenc::check_encrypt($ENV{'request.symb'}); + my $requri=&Apache::lonnet::clutter(&Apache::lonnet::fixversion((split(/\?/,$env{'request.noversionuri'}))[0])); + $requri=&Apache::lonenc::check_encrypt(&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 = (< @@ -471,16 +648,15 @@ var swmenu=null; swmenu.switchbutton (3,1,'reload.gif','return','location','go(reloadURL)','Return to the last known location in the course sequence'); } - swmenu.clearbut(7,1); swmenu.clearbut(7,2); swmenu.clearbut(7,3); swmenu.menucltim=swmenu.setTimeout( 'clearbut(2,1);clearbut(2,3);clearbut(8,1);clearbut(8,2);clearbut(8,3);'+ - 'clearbut(9,1);clearbut(9,3);clearbut(6,3);clearbut(6,1)', + 'clearbut(9,1);clearbut(9,3);clearbut(6,3);$clearcstr', 2000); } -// END LON-CAPA Internal +// END LON-CAPA Internal ENDREGTHIS } @@ -529,12 +705,14 @@ ENDDONOTREGTHIS } sub loadevents() { - if ($ENV{'request.noversionuri'} eq '/res/adm/pages/menu.html') { return ''; } + if ($env{'request.state'} eq 'construct' || + $env{'request.noversionuri'} =~ m{^/res/adm/pages/}) { return ''; } return 'LONCAPAreg();'; } sub unloadevents() { - if ($ENV{'request.noversionuri'} eq '/res/adm/pages/menu.html') { return ''; } + if ($env{'request.state'} eq 'construct' || + $env{'request.noversionuri'} =~ m{^/res/adm/pages/}) { return ''; } return 'LONCAPAstale();'; } @@ -542,15 +720,15 @@ sub unloadevents() { sub startupremote { my ($lowerurl)=@_; - if (($ENV{'browser.interface'} eq 'textual') || - ($ENV{'environment.remote'} eq 'off')) { + 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 $esclowerurl=&escape($lowerurl); my $message=&mt('"Waiting for Remote Control window to load: "+[_1]','waited'); return(< @@ -618,8 +796,8 @@ ENDSETFLAGS } sub maincall() { - if (($ENV{'browser.interface'} eq 'textual') || - ($ENV{'environment.remote'} eq 'off')) { return ''; } + if (($env{'browser.interface'} eq 'textual') || + ($env{'environment.remote'} eq 'off')) { return ''; } return(< main(); @@ -630,12 +808,12 @@ ENDMAINCALL sub load_remote_msg { my ($lowerurl)=@_; - if (($ENV{'browser.interface'} eq 'textual') || - ($ENV{'environment.remote'} eq 'off')) { return ''; } + if (($env{'browser.interface'} eq 'textual') || + ($env{'environment.remote'} eq 'off')) { return ''; } - my $esclowerurl=&Apache::lonnet::escape($lowerurl); + my $esclowerurl=&escape($lowerurl); my $link=&mt('Continue on in Inline Menu mode', - "/adm/remote?action=collapse?url=$esclowerurl"); + "/adm/remote?action=collapse&url=$esclowerurl"); return(<
@@ -645,12 +823,19 @@ sub load_remote_msg {

$link

ENDREMOTEFORM } + +sub get_menu_name { + my $hostid = $Apache::lonnet::perlvar{'lonHostID'}; + $hostid =~ s/\W//g; + return 'LCmenu'.$hostid; +} + # ================================================================= Reopen menu sub reopenmenu { - if (($ENV{'browser.interface'} eq 'textual') || - ($ENV{'environment.remote'} eq 'off')) { return ''; } - my $menuname='LCmenu'.$Apache::lonnet::perlvar{'lonHostID'}; + if (($env{'browser.interface'} eq 'textual') || + ($env{'environment.remote'} eq 'off')) { return ''; } + my $menuname = &get_menu_name(); my $nothing = &Apache::lonhtmlcommon::javascript_nothing(); return('window.open('.$nothing.',"'.$menuname.'","",false);'); } @@ -659,24 +844,25 @@ sub reopenmenu { sub open { my $returnval=''; - if (($ENV{'browser.interface'} eq 'textual') || - ($ENV{'environment.remote'} eq 'off')) { + if (($env{'browser.interface'} eq 'textual') || + ($env{'environment.remote'} eq 'off')) { return ''; } - my $menuname='LCmenu'.$Apache::lonnet::perlvar{'lonHostID'}; - unless (shift eq 'unix') { + my $menuname = &get_menu_name(); + +# unless (shift eq 'unix') { # resizing does not work on linux because of virtual desktop sizes - $returnval.=(<'.$returnval.''; @@ -687,8 +873,8 @@ ENDOPEN sub clear { my ($row,$col)=@_; - unless (($ENV{'browser.interface'} eq 'textual') || - ($ENV{'environment.remote'} eq 'off')) { + unless (($env{'browser.interface'} eq 'textual') || + ($env{'environment.remote'} eq 'off')) { return "\n".qq(window.status+='.';swmenu.clearbut($row,$col);); } else { $inlineremote[10*$row+$col]=''; @@ -701,67 +887,76 @@ sub clear { # The javascript is usually similar to "go('/adm/roles')" or "cstrgo(..)". sub switch { - my ($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc,$nobreak)=@_; + my ($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc,$cat,$nobreak)=@_; $act=~s/\$uname/$uname/g; $act=~s/\$udom/$udom/g; $top=&mt($top); $bot=&mt($bot); $desc=&mt($desc); - $img=&mt($img); - unless (($ENV{'browser.interface'} eq 'textual') || - ($ENV{'environment.remote'} eq 'off')) { + if (($env{'environment.remote'} ne 'off') || ($env{'environment.icons'} eq 'classic')) { + $img=&mt($img); + } + my $idx=10*$row+$col; + $category_members{$cat}.=':'.$idx; + + 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') { + } 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]= + $inlineremote[$idx]= ''.$text.''; } else { - $inlineremote[10*$row+$col]="\n
". + $inlineremote[$idx]="\n
". $desc.' '.$text.''; } } else { # Inline Remote + if ($env{'environment.icons'} ne 'classic') { + $img=~s/\.gif$/\.png/; + } if ($nobreak==2) { return ''; } my $text=$top.' '.$bot; $text=~s/\s*\-\s*//gs; - my $lonhttpdPort=$Apache::lonnet::perlvar{'lonhttpdPort'}; - if (!defined($lonhttpdPort)) { $lonhttpdPort='8080'; } my $pic= - ''.$text.''; - if (($ENV{'browser.interface'} eq 'textual') || ($ENV{'browser.interface'} eq 'faketextual')) { + ''.$text.''; + if ($env{'browser.interface'} eq 'faketextual') { # Accessibility if ($nobreak==3) { - $inlineremote[10*$row+$col]="\n". - ''.$text. - ''. + $inlineremote[$idx]="\n". + ''.$text. + ''. ''.$pic.''; } elsif ($nobreak) { - $inlineremote[10*$row+$col]="\n". - ''. - ''.$pic. - ''.$text.''; + $inlineremote[$idx]="\n". + ''. + ''.$pic.' + '.$text.''; } else { - $inlineremote[10*$row+$col]="\n". - ''. + $inlineremote[$idx]="\n". + ''. ''.$pic. - ''.$desc. - ''; + ''. + ''.$desc.''; } } else { # Inline Menu - $inlineremote[10*$row+$col]= - ''.$pic. - ''.$desc. - ''; + if ($env{'environment.icons'} eq 'iconsonly') { + $inlineremote[$idx]=''.$pic.''; + } else { + $inlineremote[$idx]= + ''.$pic. + ''.$desc.''; + } } } return ''; @@ -770,111 +965,150 @@ sub switch { sub secondlevel { my $output=''; my - ($uname,$udom,$rol,$crs,$pub,$con,$row,$col,$prt,$img,$top,$bot,$act,$desc)=@_; + ($uname,$udom,$rol,$crs,$pub,$con,$row,$col,$prt,$img,$top,$bot,$act,$desc,$cat)=@_; if ($prt eq 'any') { - $output.=switch($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc); + $output.=&switch($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc,$cat); } elsif ($prt=~/^r(\w+)/) { if ($rol eq $1) { - $output.=switch($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc); + $output.=&switch($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc,$cat); } } return $output; } sub openmenu { - my $menuname='LCmenu'.$Apache::lonnet::perlvar{'lonHostID'}; - if (($ENV{'browser.interface'} eq 'textual') || - ($ENV{'environment.remote'} eq 'off')) { return ''; } + my $menuname = &get_menu_name(); + 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; + undef(@inlineremote); + undef(%category_members); &rawconfig(1); - return join('',map { (defined($_)?$_:'') } @inlineremote); + my $output=''; + for (my $col=1; $col<=2; $col++) { + $output.='"; + } + $output.="
'; + for (my $row=1; $row<=8; $row++) { + foreach my $cat (keys(%category_members)) { + if ($category_positions{$cat} ne "$col,$row") { next; } + $output.=''; + my %active=(); + foreach my $menu_item (split(/\:/,$category_members{$cat})) { + if ($inlineremote[$menu_item]) { + $active{$menu_item}=1; + } + } + foreach my $item (sort(keys(%active))) { + $output.=$inlineremote[$item]; + } + $output.='
'.&mt($category_names{$cat}).'
'; + } + } + $output.="
"; + return $output; } sub rawconfig { my $textualoverride=shift; my $output=''; - unless (($ENV{'browser.interface'} eq 'textual') || - ($ENV{'environment.remote'} eq 'off')) { + 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 $show_course=&show_course(); + 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'}; - foreach (@desklines) { - my ($row,$col,$pro,$prt,$img,$top,$bot,$act,$desc)=split(/\:/,$_); + 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 my $line (@desklines) { + my ($row,$col,$pro,$prt,$img,$top,$bot,$act,$desc,$cat)=split(/\:/,$line); $prt=~s/\$uname/$uname/g; $prt=~s/\$udom/$udom/g; $prt=~s/\$crs/$crs/g; $prt=~s/\$requested_domain/$requested_domain/g; + if ($category_names{$cat}!~/\w/) { $cat='oth'; } + my $type = &Apache::loncommon::course_type(); + if ($type eq 'Group') { + $desc = &convert_menu_function($desc,$type); + } if ($pro eq 'clear') { $output.=&clear($row,$col); } elsif ($pro eq 'any') { $output.=&secondlevel( - $uname,$udom,$rol,$crs,$pub,$con,$row,$col,$prt,$img,$top,$bot,$act,$desc); + $uname,$udom,$rol,$crs,$pub,$con,$row,$col,$prt,$img,$top,$bot,$act,$desc,$cat); } elsif ($pro eq 'smp') { unless ($adv) { $output.=&secondlevel( - $uname,$udom,$rol,$crs,$pub,$con,$row,$col,$prt,$img,$top,$bot,$act,$desc); + $uname,$udom,$rol,$crs,$pub,$con,$row,$col,$prt,$img,$top,$bot,$act,$desc,$cat); } } elsif ($pro eq 'adv') { if ($adv) { $output.=&secondlevel( - $uname,$udom,$rol,$crs,$pub,$con,$row,$col,$prt,$img,$top,$bot,$act,$desc); + $uname,$udom,$rol,$crs,$pub,$con,$row,$col,$prt,$img,$top,$bot,$act,$desc,$cat); + } + } elsif ($pro eq 'shc') { + if ($show_course) { + $output.=&secondlevel( + $uname,$udom,$rol,$crs,$pub,$con,$row,$col,$prt,$img,$top,$bot,$act,$desc,$cat); + } + } elsif ($pro eq 'nsc') { + if (!$show_course) { + $output.=&secondlevel( + $uname,$udom,$rol,$crs,$pub,$con,$row,$col,$prt,$img,$top,$bot,$act,$desc,$cat); } } elsif (($pro=~/^p(\w+)/) && ($prt)) { if (&Apache::lonnet::allowed($1,$prt)) { - $output.=switch($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc); + $output.=&switch($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc,$cat); } } elsif ($pro eq 'course') { - if ($ENV{'request.course.fn'}) { - $output.=switch($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc); + if ($env{'request.course.fn'}) { + $output.=&switch($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc,$cat); } } 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); + if ($env{'course.'.$env{'request.course.id'}.'.'.$key}) { + $output.=&switch($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc,$cat); } } 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'}:'')) + 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); + $output.=&switch($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc,$cat); } } 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 'raa') && ($env{'request.role'}=~/^aa/)) || + (($prt eq 'rau') && ($env{'request.role'}=~/^au/))) { # Check that we are on the correct machine my $cadom=$requested_domain; - my $caname=$ENV{'user.name'}; - if ($prt eq 'rca') { + my $caname=$env{'user.name'}; + if (($prt eq 'rca') || ($prt eq 'raa')) { ($cadom,$caname)= - ($ENV{'request.role'}=~/(\w+)\/(\w+)$/); + ($env{'request.role'}=~/($match_domain)\/($match_username)$/); } $act =~ s/\$caname/$caname/g; my $home = &Apache::lonnet::homeserver($caname,$cadom); @@ -882,15 +1116,15 @@ sub rawconfig { 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); + $output.=&switch($caname,$cadom, + $row,$col,$img,$top,$bot,$act,$desc,$cat); } } } } } - unless (($ENV{'browser.interface'} eq 'textual') || - ($ENV{'environment.remote'} eq 'off')) { + 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");'; @@ -903,9 +1137,9 @@ sub rawconfig { # ======================================================================= Close sub close { - if (($ENV{'browser.interface'} eq 'textual') || - ($ENV{'environment.remote'} eq 'off')) { return ''; } - my $menuname='LCmenu'.$Apache::lonnet::perlvar{'lonHostID'}; + if (($env{'browser.interface'} eq 'textual') || + ($env{'environment.remote'} eq 'off')) { return ''; } + my $menuname = &get_menu_name(); return(< window.status='Accessing Remote Control'; @@ -928,7 +1162,7 @@ sub footer { } sub nav_control_js { - my $nav=($ENV{'environment.remotenavmap'} eq 'on'); + my $nav=($env{'environment.remotenavmap'} eq 'on'); return (< 1, + 'js_ready' => 1, + 'bgcolor' => '#BBBBBB', + 'add_entries' => { + 'onload' => 'javascript:document.goannotate.submit();'}}); + + my $end_page_annotate = + &Apache::loncommon::end_page({'js_ready' => 1}); + + my $start_page_bookmark = + &Apache::loncommon::start_page('Bookmarks',undef, + {'only_body' => 1, + 'js_ready' => 1, + 'bgcolor' => '#BBBBBB',}); + + my $end_page_bookmark = + &Apache::loncommon::end_page({'js_ready' => 1}); + return (<" + +"" + +"<\\/form>" + +'$end_page_annotate'); + annotator.document.close(); +} + +function set_bookmark() { + go(''); + clienttitle=document.title; + clienthref=location.pathname; + w_bmquery_flag=1; + bmquery=window.open('','bmquery','width=365,height=165,scrollbars=0'); + bmquery.document.write( + '$start_page_bookmark' + +"
\\n
Link Name:
" + +"
Address:

<\\/center><\\/td>" + +"<\\/tr><\\/table><\\/form><\\/center>" + +'$end_page_bookmark' ); + bmquery.document.close(); +} + ENDUTILITY } sub serverform { return(< @@ -1034,13 +1374,19 @@ sub constspaceform { +
+ + + +
+ ENDCONSTSPACEFORM } sub get_nav_status { my $navstatus="swmenu.w_loncapanav_flag="; - if ($ENV{'environment.remotenavmap'} eq 'on') { + if ($env{'environment.remotenavmap'} eq 'on') { $navstatus.="1"; } else { $navstatus.="-1"; @@ -1048,68 +1394,270 @@ sub get_nav_status { return $navstatus; } -# ================================================ Handler when called directly +#FIXME this needs to move into mydesktab and the other locations +# the text is generated +sub convert_menu_function { + my ($rolename,$type) = @_; + if ($type eq 'Group') { + $rolename =~ s/student/member/g; + $rolename =~ s/group/team/g; + $rolename =~ s/course/group/g; + $rolename =~ s/Course/Group/g; + } + return $rolename; +} + +sub hidden_button_check { + my $hidden; + if ($env{'request.course.id'} eq '') { + return; + } + if ($env{'request.role.adv'}) { + return; + } + my $buttonshide = &Apache::lonnet::EXT('resource.0.buttonshide'); + return $buttonshide; +} + +sub roles_selector { + my ($cdom,$cnum) = @_; + my $now = time; + my (%courseroles,%seccount,%gotnosection); + my $is_cc; + my $role_selector; + if ($env{'user.role.cc./'.$cdom.'/'.$cnum}) { + my ($start,$end) = split(/\./,$env{'user.role.cc./'.$cdom.'/'.$cnum}); + + if ((($start) && ($start<0)) || + (($end) && ($end<$now)) || + (($start) && ($now<$start))) { + $is_cc = 0; + } else { + $is_cc = 1; + } + } + if ($is_cc) { + my %adv_roles = + &Apache::lonnet::get_course_adv_roles($env{'request.course.id'},1); + foreach my $role (keys(%adv_roles)) { + my ($urole,$usec) = split(/:/,$role); + if (!$gotnosection{$urole}) { + $seccount{$urole} ++; + $gotnosection{$urole} = 1; + } + if (ref($courseroles{$urole}) eq 'ARRAY') { + if ($usec ne '') { + if (!grep(/^Q$usec\E$/,@{$courseroles{$urole}})) { + push(@{$courseroles{$urole}},$usec); + $seccount{$urole} ++; + } + } + } else { + @{$courseroles{$urole}} = (); + if ($usec ne '') { + $seccount{$urole} ++; + push(@{$courseroles{$urole}},$usec); + } + } + } + my %sections_count = &Apache::loncommon::get_sections($cdom,$cnum); + @{$courseroles{'st'}} = (); + if (keys(%sections_count) > 0) { + push(@{$courseroles{'st'}},keys(%sections_count)); + } + } else { + foreach my $item (keys(%env)) { + if ($item =~ m-^user\.role\.([^.]+)\./\Q$cdom\E/\Q$cnum\E/?(\w*)$-) { + my $role = $1; + my $sec = $2; + next if ($role eq 'gr'); + my ($start,$end) = split(/\./,$env{$item}); + next if (($start && $start > $now) || ($end && $end < $now)); + if ($sec eq '') { + if (!$gotnosection{$role}) { + $seccount{$role} ++; + $gotnosection{$role} = 1; + } + } + if (ref($courseroles{$role}) eq 'ARRAY') { + if ($sec ne '') { + if (!grep(/^Q$sec\E$/,@{$courseroles{$role}})) { + push(@{$courseroles{$role}},$sec); + $seccount{$role} ++; + } + } + } else { + @{$courseroles{$role}} = (); + if ($sec ne '') { + $seccount{$role} ++; + push(@{$courseroles{$role}},$sec); + } + } + } + } + } + my @roles_order = ('cc','in','ta','ep','ad','st'); + if (keys(%courseroles) > 1) { + $role_selector = &jump_to_role($cdom,$cnum,\%seccount,\%courseroles); + $role_selector .= '
+ '."\n". + ''."\n". + ''."\n". + ''."\n". + ''."\n". + '
'; + } + return $role_selector; +} + +sub jump_to_role { + my ($cdom,$cnum,$seccount,$courseroles) = @_; + my %lt = &Apache::lonlocal::texthash( + this => 'This role has section(s) associated with it.', + ente => 'Enter a specific section.', + orlb => 'Enter a specific section, or leave blank for no section.', + avai => 'Available sections are:', + youe => 'You entered an invalid section choice:', + plst => 'Please try again', + ); + my $js; + if (ref($courseroles) eq 'HASH') { + $js = ' var secpick = new Array("'.$lt{'ente'}.'","'.$lt{'orlb'}.'");'."\n". + ' var numsec = new Array();'."\n". + ' var rolesections = new Array();'."\n". + ' var rolenames = new Array();'."\n". + ' var roleseclist = new Array();'."\n"; + my @items = keys(%{$courseroles}); + for (my $i=0; $i<@items; $i++) { + $js .= ' rolenames['.$i.'] = "'.$items[$i].'";'."\n"; + my ($secs,$secstr); + if (ref($courseroles->{$items[$i]}) eq 'ARRAY') { + my @sections = sort { $a <=> $b } @{$courseroles->{$items[$i]}}; + $secs = join('","',@sections); + $secstr = join(', ',@sections); + } + $js .= ' rolesections['.$i.'] = new Array("'.$secs.'");'."\n". + ' roleseclist['.$i.'] = "'.$secstr.'";'."\n". + ' numsec['.$i.'] = "'.$seccount->{$items[$i]}.'";'."\n"; + } + } + my $output = <<"END"; + +END + return $output; } + # ================================================================ Main Program BEGIN { - if (! defined($readdesk)) { - { - my $tabfile = $Apache::lonnet::perlvar{'lonTabDir'}.'/mydesk.tab'; - if ( CORE::open( my $config,"<$tabfile") ) { - while (my $configline=<$config>) { - $configline=(split(/\#/,$configline))[0]; - $configline=~s/^\s+//; - chomp($configline); - if ($configline) { - $desklines[$#desklines+1]=$configline; - } - } - CORE::close($config); + if (! defined($readdesk)) { + { + my $tabfile = $Apache::lonnet::perlvar{'lonTabDir'}.'/mydesk.tab'; + if ( CORE::open( my $config,"<$tabfile") ) { + while (my $configline=<$config>) { + $configline=(split(/\#/,$configline))[0]; + $configline=~s/^\s+//; + chomp($configline); + if ($configline=~/^cat\:/) { + my @entries=split(/\:/,$configline); + $category_positions{$entries[2]}=$entries[1]; + $category_names{$entries[2]}=$entries[3]; + } elsif ($configline) { + push(@desklines,$configline); + } + } + CORE::close($config); + } + } + $readdesk='done'; } - } - $readdesk='done'; - } } 1;