--- loncom/interface/lonmenu.pm 2005/06/08 02:27:21 1.155 +++ 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.155 2005/06/08 02:27:21 www Exp $ +# $Id: lonmenu.pm,v 1.173 2006/04/14 20:12:35 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -40,7 +40,6 @@ package Apache::lonmenu; use strict; use Apache::lonnet; -use Apache::Constants qw(:common); use Apache::lonhtmlcommon(); use Apache::loncommon(); use Apache::lonenc(); @@ -50,9 +49,6 @@ use vars qw(@desklines $readdesk); my @inlineremote; -my $font; -my $tabbg; -my $pgbg; # ================================================================ Little texts @@ -64,26 +60,45 @@ sub initlittle { 'Roles':'Courses'), 'docs' => 'Course Documents', 'exit' => 'Exit', - 'launch' => 'Launch Remote Control'); + '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; 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'}; @@ -91,12 +106,22 @@ sub menubuttons { $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 - my %lt=&initlittle(); - $pgbg='#FFFFFF'; - $tabbg='#FFFFFF'; - $font='#000000'; if ($env{'request.course.id'}) { $navmaps=(<$lt{'nav'} @@ -106,14 +131,20 @@ ENDNAV ($env{'request.noversionuri'}!~/^\/adm\/.*\/(smppg|bulletinboard|aboutme)(\?|$)/)) { my $escreload=&Apache::lonnet::escape('return:'); $reloadlink=(<$lt{'ret'} +$lt{'ret'} ENDRELOAD } if (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) { $docs=(<$lt{'docs'} +$lt{'docs'} ENDDOCS } + if ($showgroups) { + $groups =(< +$lt{'groups'} +ENDGROUPS + } } my $form=&serverform(); my $utility=&utilityfunctions(); @@ -123,40 +154,46 @@ ENDDOCS $utility $lt{'main'} -$reloadlink $navmaps $docs -$lt{'roles'} -$lt{'exit'} +$reloadlink $navmaps $docs $groups +$lt{'roles'} +$lt{'exit'}
$form ENDMAINMENU - if ($registration) { $output.=&innerregister($forcereg,$target); } + 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 $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') { + my $logo=&Apache::loncommon::lonhttpdurl("/adm/lonIcons/minilogo.gif"); + return (< + + + + + +
+ $lt{'exit'} + + Logo + LON-CAPA  +
+ +ENDINLINEMENU + } # Do we have a NAV link? if ($env{'request.course.id'}) { my $link='/adm/navmaps?postdata='.$escurl.'&postsymb='. @@ -166,14 +203,20 @@ ENDMAINMENU } $navmaps=(< -$lt{'nav'} +$lt{'nav'} ENDNAV if (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) { $docs=(< -$lt{'docs'} +$lt{'docs'} ENDDOCS } + if ($showgroups) { + $groups =(< +$lt{'groups'} +ENDGROUPS + } if ( ($env{'request.noversionuri'}=~m[^/(res|public)/] && $env{'request.symb'} eq '') @@ -187,17 +230,25 @@ ENDDOCS my $escreload=&Apache::lonnet::escape('return:'); $reloadlink=(< -$lt{'ret'} +$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,$target,$titletable); + $reg=&innerregister($forcereg,$titletable); } my $form=&serverform(); my $utility=&utilityfunctions(); my $logo=&Apache::loncommon::lonhttpdurl("/adm/lonIcons/minilogo.gif"); + return (< // BEGIN LON-CAPA Internal @@ -205,30 +256,30 @@ ENDRELOAD $utility // ]]> - +
$reloadlink $navmaps $docs +$groups +$lt{'launch'} -$form
-$lt{'main'} +$lt{'main'} -$lt{'launch'} -$lt{'roles'} +$lt{'roles'} -$lt{'exit'} +$lt{'exit'} - +Logo LON-CAPA
- +$form @@ -242,20 +293,13 @@ ENDINLINEMENU # ====================================== 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 ''; } 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'}) || @@ -267,9 +311,7 @@ sub registerurl { } # Graphical display after login only if ($Apache::lonxml::registered && !$forcereg) { return ''; } - if ($target ne 'edit') { - $result.=&innerregister($forcereg,$target); - } + $result.=&innerregister($forcereg); return $result.$force_title; } @@ -277,9 +319,7 @@ sub registerurl { # =========== and in the body of the document sub innerregister { - my $forcereg=shift; - my $target = shift; - my $titletable = shift; + my ($forcereg, $titletable) = @_; my $result = ''; my ($uname,$thisdisfn); my $const_space = ($env{'request.state'} eq 'construct'); @@ -299,9 +339,11 @@ sub innerregister { my $reopen=&Apache::lonmenu::reopenmenu(); + my ($font,$pgbg,$tabbg) = &get_colors(); + my $newmail=''; if ($noremote) { - $newmail='
'; + $newmail='
'; } if (($textual) && ($env{'request.symb'}) && ($env{'request.course.id'})) { my ($mapurl,$rid,$resurl)= @@ -326,7 +368,7 @@ sub innerregister { $newmail = $titletable; } else { if ($noremote) { - $newmail.='
'; + $newmail.='
'; } } my $timesync=($textual?'':'swmenu.syncclock(1000*'.time.');'); @@ -344,7 +386,7 @@ sub innerregister { my $hwkadd=''; if ($env{'request.symb'} ne '' && - $env{'request.filename'}=~/\.(problem|exam|quiz|assess|survey|form)$/) { + $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')", @@ -785,6 +827,9 @@ sub switch { $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 @@ -1083,15 +1128,20 @@ function gocstr(url,filename) { this.document.cstrprint.curseed.value = this.document.lonhomework.rndseed.value } if (this.document.lonhomework.problemtype) { - for (var i=0; i +
@@ -1136,14 +1191,14 @@ ENDSERVERFORM sub constspaceform { return(< + -
+
-
+ @@ -1163,84 +1218,26 @@ sub get_nav_status { return $navstatus; } -# ================================================ Handler when called directly - - -sub handler { - my $r = shift; - &Apache::loncommon::content_type($r,'text/html'); - $r->send_http_header; - return OK if $r->header_only; - - my $form; - if ($env{'environment.remote'} ne 'off' && - $env{'browser.interface'} ne 'textual') { - $form=&serverform(); - } - my $bodytag=&Apache::loncommon::bodytag('Main Menu'); - 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 $script_tag; - if ($env{'environment.remote'} ne 'off') { - my $utility=&utilityfunctions('/adm/menu'); - $script_tag=(< -$utility - -ENDSCRIPT - } -# ---- Print the screen, pretend to be in text mode to generate text-based menu - unless ($env{'browser.interface'} eq 'textual') { - $env{'browser.interface'}='faketextual'; - $env{'environment.remote'}='off'; - } - my $html=&Apache::lonxml::xmlbegin(); - $r->print(< -LON-CAPA Main Menu -$script_tag - -$bodytag -ENDHEADER - $r->print(''.&inlinemenu().'
'.$form); - $r->print(''); - return OK; -} - # ================================================================ 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) { + push(@desklines,$configline); + } + } + CORE::close($config); + } + } + $readdesk='done'; } - } - $readdesk='done'; - } } 1;