--- loncom/interface/lonmenu.pm 2006/04/21 20:45:42 1.176 +++ loncom/interface/lonmenu.pm 2006/07/14 16:46:36 1.195 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Routines to control the menu # -# $Id: lonmenu.pm,v 1.176 2006/04/21 20:45:42 albertel Exp $ +# $Id: lonmenu.pm,v 1.195 2006/07/14 16:46:36 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -44,6 +44,8 @@ use Apache::lonhtmlcommon(); use Apache::loncommon(); use Apache::lonenc(); use Apache::lonlocal; +use lib '/home/httpd/lib/perl/'; +use LONCAPA; use vars qw(@desklines $readdesk); @@ -61,25 +63,12 @@ sub initlittle { 'docs' => 'Course Documents', 'exit' => 'Exit', 'launch' => 'Launch Remote Control', - 'groups' => 'Groups'); + 'groups' => 'Groups', + 'gdoc' => 'Group Documents', + 'teams' => 'Teams', + ); } -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 { @@ -99,23 +88,23 @@ sub menubuttons { 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 $escurl=&escape(&Apache::lonenc::check_encrypt($env{'request.noversionuri'})); + my $escsymb=&escape(&Apache::lonenc::check_encrypt($env{'request.symb'})); 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); + $escurl = &escape($returnurl); } } if ($env{'request.course.id'}) { my %coursegroups; - my $viewgrps_permission = - &Apache::lonnet::allowed('vcg',$env{'request.course.id'}); + 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; } @@ -125,12 +114,12 @@ sub menubuttons { # Textual display only 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:'); + my $escreload=&escape('return:'); $reloadlink=(<$lt{'ret'} ENDRELOAD @@ -140,11 +129,11 @@ ENDRELOAD $lt{'docs'} ENDDOCS } - if ($showgroups) { - $groups =(<$lt{'groups'} -ENDGROUPS - } +# if ($showgroups) { +# $groups =(<$lt{'groups'} +#ENDGROUPS +# } } my $form=&serverform(); my $utility=&utilityfunctions(); @@ -186,11 +175,8 @@ ENDMAINMENU $lt{'exit'} - - Logo - LON-CAPA  - - + LON-CAPALogo + ENDINLINEMENU @@ -205,16 +191,19 @@ ENDINLINEMENU $navmaps=(<$lt{'nav'} ENDNAV +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=(<$lt{'docs'} +$text ENDDOCS } - if ($showgroups) { - $groups =(<$lt{'groups'} -ENDGROUPS - } +# if ($showgroups) { +# my $text = ($is_group) ? $lt{'teams'} : $lt{'groups'}; +# $groups =(<$text +#ENDGROUPS +# } if ( ($env{'request.noversionuri'}=~m[^/(res|public)/] && $env{'request.symb'} eq '') @@ -225,14 +214,14 @@ ENDGROUPS m[^/adm/.*/(smppg|bulletinboard|aboutme)($|\?)]) ) ) { - my $escreload=&Apache::lonnet::escape('return:'); + my $escreload=&escape('return:'); $reloadlink=(<$lt{'ret'} ENDRELOAD } } if (($env{'request.state'} eq 'construct') && ($env{'request.course.id'})) { - my $escreload=&Apache::lonnet::escape('return:'); + my $escreload=&escape('return:'); $reloadlink=(<$lt{'ret'} ENDCRELOAD @@ -244,7 +233,17 @@ ENDCRELOAD my $form=&serverform(); my $utility=&utilityfunctions(); my $logo=&Apache::loncommon::lonhttpdurl("/adm/lonIcons/minilogo.gif"); - + my $remote; + if ($env{'user.adv'}) { + $remote = ''.$lt{'launch'}.'' + } + my $helptopic='Student_Intro'; + if ($env{'request.role'}=~/^(ca|au)/) { + $helptopic='Authoring_Intro'; + } elsif ($env{'request.role'}=~/^cc/) { + $helptopic='Course_Coordination_Intro'; + } + my $helplink=&Apache::loncommon::help_open_topic($helptopic,'Help'); return (< // BEGIN LON-CAPA Internal @@ -254,15 +253,17 @@ $utility + $reloadlink $navmaps $docs $groups - +$remote - - + +
$lt{'main'}$lt{'launch'}$lt{'roles'}$lt{'exit'}LogoLON-CAPA$helplink$lt{'exit'}
$form @@ -290,7 +291,7 @@ sub registerurl { ($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; @@ -320,18 +321,26 @@ sub innerregister { my $textual=($textinter || $noremote); - @inlineremote=(); - undef @inlineremote; + undef(@inlineremote); 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'})) { + if (&Apache::lonmsg::newmail()) { + if ($textual) { + $newmail.= ''; + } else { + $newmail= 'swmenu.setstatus("you have","messages");'; + } + } elsif (($textual) + && ($env{'request.symb'}) + && ($env{'request.course.id'})) { + $newmail.= ''; } if ($env{'request.state'} eq 'construct') { $newmail = $titletable; } else { if ($noremote) { - $newmail.='
+ '. + &mt('You have new messages').''; my ($mapurl,$rid,$resurl)= &Apache::lonnet::decode_symb(&Apache::lonnet::symbread()); $newmail.=$env{'course.'.$env{'request.course.id'}.'.description'}; @@ -343,23 +352,19 @@ sub innerregister { if ($restitle) { $newmail.=': '.$restitle; } - $newmail.='   '; - } - if (&Apache::lonmsg::newmail()) { - $newmail=($textual? - 'You have new messages
': - 'swmenu.setstatus("you have","messages");'); + $newmail.='   
'; + $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'}!~m|^/(res/)*adm/|) || ($forcereg)) { @@ -446,10 +451,7 @@ sub innerregister { ('','',6,1,'cstr.gif','edit[_1]','resource[_2]', "go('".$cfile."');","Edit this resource"); } elsif ($editbutton eq '') { - $editbutton=&switch('','',6,1,'port.gif', - 'port-[_1]','folio[_1]', - "go('/adm/portfolio');", - "Enter my portfolio space"); + $editbutton=&clear(6,1); } } ### @@ -540,7 +542,7 @@ 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)); + $requri=&Apache::lonenc::check_encrypt(&unescape($requri)); my $cursymb=&Apache::lonenc::check_encrypt($env{'request.symb'}); my $navstatus=&get_nav_status(); my $clearcstr; @@ -655,7 +657,7 @@ sub startupremote { # 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(< @@ -738,9 +740,9 @@ sub load_remote_msg { 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(<
@@ -781,7 +783,7 @@ ENDRESIZE $returnval.=(<'.$returnval.''; @@ -814,8 +816,6 @@ sub switch { $desc=&mt($desc); $img=&mt($img); - my ($font,$pgbg,$tabbg) = &get_colors(); - unless (($env{'browser.interface'} eq 'textual') || ($env{'environment.remote'} eq 'off')) { # Remote @@ -842,34 +842,33 @@ sub switch { 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')) { + if ($env{'browser.interface'} eq 'faketextual') { # Accessibility if ($nobreak==3) { $inlineremote[10*$row+$col]="\n". - ''.$text. - ''. + ''.$text. + ''. ''.$pic.''; } elsif ($nobreak) { $inlineremote[10*$row+$col]="\n". - ''. - ''.$pic. - ''.$text.''; + ''. + ''.$pic.' + '.$text.''; } else { $inlineremote[10*$row+$col]="\n". - ''. + ''. ''.$pic. - ''.$desc. - ''; + ''. + $desc.''; } } else { # Inline Menu $inlineremote[10*$row+$col]= ''.$pic. - ''.$desc. - ''; + ''.$desc.''; } } return ''; @@ -931,12 +930,16 @@ sub rawconfig { 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(/\:/,$_); + foreach my $line (@desklines) { + my ($row,$col,$pro,$prt,$img,$top,$bot,$act,$desc)=split(/\:/,$line); $prt=~s/\$uname/$uname/g; $prt=~s/\$udom/$udom/g; $prt=~s/\$crs/$crs/g; $prt=~s/\$requested_domain/$requested_domain/g; + 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') { @@ -1057,7 +1060,7 @@ sub utilityfunctions { unless (($env{'browser.interface'} eq 'textual') || ($env{'environment.remote'} eq 'off') || ($caller eq '/adm/menu')) { return ''; } my $currenturl=&Apache::lonnet::clutter(&Apache::lonnet::fixversion((split(/\?/,$env{'request.noversionuri'}))[0])); - $currenturl=&Apache::lonenc::check_encrypt(&Apache::lonnet::unescape($currenturl)); + $currenturl=&Apache::lonenc::check_encrypt(&unescape($currenturl)); my $currentsymb=&Apache::lonenc::check_encrypt($env{'request.symb'}); my $nav_control=&nav_control_js(); @@ -1195,7 +1198,7 @@ function annotate() { +"" +"" - +"" + +"<\\/form>" +'$end_page'); annotator.document.close(); } @@ -1211,13 +1214,13 @@ function set_bookmark() { +"
\\n " - +"
Link Name:
" - +"
Address:

" + +"bgcolor='ffffff' align=center>Link Name:
" + +"
Address:

<\\/center><\\/td>" + +"<\\/tr><\\/table><\\/form><\\/center>" +'$end_page' ); bmquery.document.close(); } @@ -1227,7 +1230,7 @@ ENDUTILITY sub serverform { return(< +
@@ -1238,14 +1241,14 @@ ENDSERVERFORM sub constspaceform { return(< + -
+
-
+ @@ -1265,6 +1268,20 @@ sub get_nav_status { return $navstatus; } +#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; +} + + # ================================================================ Main Program BEGIN {